diff --git a/sinatra-contrib/lib/sinatra/capture.rb b/sinatra-contrib/lib/sinatra/capture.rb index ea2f44ab0c..8a5d5fd9ec 100644 --- a/sinatra-contrib/lib/sinatra/capture.rb +++ b/sinatra-contrib/lib/sinatra/capture.rb @@ -1,6 +1,5 @@ require 'sinatra/base' require 'sinatra/engine_tracking' -require 'active_support/core_ext/object/try.rb' module Sinatra # @@ -106,12 +105,12 @@ def capture(*args, &block) dummy = DUMMIES.fetch(current_engine) options = { :layout => false, :locals => {:args => args, :block => block }} - buffer.try :clear + buffer.clear unless buffer.nil? result = render(current_engine, dummy, options, &block) end result.strip.empty? && @capture ? @capture : result ensure - buffer.try :replace, old_buffer + buffer.replace(old_buffer) unless buffer.nil? end def capture_later(&block) diff --git a/sinatra-contrib/sinatra-contrib.gemspec b/sinatra-contrib/sinatra-contrib.gemspec index c3f33b6636..a61cd8bf04 100644 --- a/sinatra-contrib/sinatra-contrib.gemspec +++ b/sinatra-contrib/sinatra-contrib.gemspec @@ -39,7 +39,6 @@ EOF s.add_dependency "sinatra", version s.add_dependency "mustermann", "~> 1.0" s.add_dependency "backports", ">= 2.8.2" - s.add_dependency "activesupport", ">= 4.0.0" s.add_dependency "tilt", ">= 1.3", "< 3" s.add_dependency "rack-protection", version s.add_dependency "multi_json"