Update sinatra.

Gemfile

@@ -13,8 +13,6 @@ gem 'compass_twitter_bootstrap', :git => 'git://github.com/vwall/compass-twitter
 
 gem 'json', :platform => 'ruby_18'
 
-gem 'sinatra', '>= 1.3.2', '< 2.0.0'
-
 gem 'cane', '~> 2.0', :platform => 'ruby_19'
 
 gem 'rspec-fire', :git => 'git://github.com/xaviershay/rspec-fire.git'

interpol.gemspec

@@ -28,5 +28,6 @@ Gem::Specification.new do |gem|
   gem.add_development_dependency 'rake', '~> 0.9.2.2'
   gem.add_development_dependency 'rack-test', '0.6.1'
   gem.add_development_dependency 'hashie', '~> 1.2'
+  gem.add_development_dependency 'sinatra', '~> 1.4'
 end
 

spec/unit/interpol/sinatra/request_params_parser_spec.rb

@@ -68,7 +68,9 @@ def sinatra_before(&block)
       def find_sinatra_base_subclass_wrapped_in(app)
         return app if app.class.ancestors.include?(::Sinatra::Base)
 
-        wrapped_app = if app.respond_to?(:app)
+        wrapped_app = if app.class.name == "Sinatra::Wrapper"
+          app.instance_variable_get(:@instance)
+        elsif app.respond_to?(:app)
           app.app
         elsif app.instance_variables.include?(:@app)
           app.instance_variable_get(:@app)

spec/unit/interpol/stub_app_spec.rb

@@ -214,9 +214,7 @@ def parsed_body
       expect(last_response.status).to eq(404)
       expect(parsed_body).to eq("error" => "The requested resource could not be found")
 
-      pending "sinatra bug: https://github.com/sinatra/sinatra/issues/500" do
-        expect(last_response.headers['Content-Type']).to eq('application/json;charset=utf-8')
-      end
+      expect(last_response.headers['Content-Type']).to eq('application/json;charset=utf-8')
     end
 
     let(:endpoint_example) do