kotovalexarian-likes-github/sinatra
1
0
Fork 0
mirror of https://github.com/sinatra/sinatra synced 2023-03-27 23:18:01 -04:00
Code Releases Activity

Merge pull request #1448 from yob/remove-activesupport

Browse source 
Drop activesupport dependency from sinatra-contrib
This commit is contained in:
namusyaka 2018-10-28 02:15:25 +09:00 committed by GitHub
commit e0aa37dce6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
sinatra-contrib/lib/sinatra/capture.rb
View file

@ -1,6 +1,5 @@
require 'sinatra/base' require 'sinatra/base'
require 'sinatra/engine_tracking' require 'sinatra/engine_tracking'
require 'active_support/core_ext/object/try.rb'
module Sinatra module Sinatra
# #
@ -106,12 +105,12 @@ module Sinatra
dummy = DUMMIES.fetch(current_engine) dummy = DUMMIES.fetch(current_engine)
options = { :layout => false, :locals => {:args => args, :block => block }} options = { :layout => false, :locals => {:args => args, :block => block }}
buffer.try :clear buffer.clear unless buffer.nil?
result = render(current_engine, dummy, options, &block) result = render(current_engine, dummy, options, &block)
end end
result.strip.empty? && @capture ? @capture : result result.strip.empty? && @capture ? @capture : result
ensure ensure
buffer.try :replace, old_buffer buffer.replace(old_buffer) unless buffer.nil?
end end
def capture_later(&block) def capture_later(&block)

1
sinatra-contrib/sinatra-contrib.gemspec
View file

@ -39,7 +39,6 @@ EOF
s.add_dependency "sinatra", version s.add_dependency "sinatra", version
s.add_dependency "mustermann", "~> 1.0" s.add_dependency "mustermann", "~> 1.0"
s.add_dependency "backports", ">= 2.8.2" s.add_dependency "backports", ">= 2.8.2"
s.add_dependency "activesupport", ">= 4.0.0"
s.add_dependency "tilt", ">= 1.3", "< 3" s.add_dependency "tilt", ">= 1.3", "< 3"
s.add_dependency "rack-protection", version s.add_dependency "rack-protection", version
s.add_dependency "multi_json" s.add_dependency "multi_json"