sinatra-respond_to 0.6.0 → 0.7.0

data/Changelog.rdoc

@@ -1,3 +1,13 @@
+=== 0.7.0 / 2011-03-20
+
+* Compatibility with Sinatra 1.2
+* Allows xhr requests to use content type of extension if given
+
+=== 0.6.0 / 2010-11-04
+
+* Remove default charset settings because Sinatra 1.1 includes this
+* Correct problem when Content-Type starts out as nil
+
 === 0.5.0 / 2010-08-22
 
 * Requires Sinatra 1.x

data/Gemfile.lock

@@ -1,8 +1,8 @@
 PATH
   remote: .
   specs:
-    sinatra-respond_to (0.5.0)
-      sinatra (~> 1.1)
+    sinatra-respond_to (0.7.0)
+      sinatra (~> 1.2)
 
 GEM
   remote: http://rubygems.org/
@@ -14,30 +14,27 @@ GEM
     rack-test (0.5.6)
       rack (>= 1.0)
     rcov (0.9.9)
-    rspec (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-      rspec-mocks (~> 2.0.1)
-    rspec-core (2.0.1)
-    rspec-expectations (2.0.1)
-      diff-lcs (>= 1.1.2)
-    rspec-mocks (2.0.1)
-      rspec-core (~> 2.0.1)
-      rspec-expectations (~> 2.0.1)
-    sinatra (1.1.0)
+    rspec (2.5.0)
+      rspec-core (~> 2.5.0)
+      rspec-expectations (~> 2.5.0)
+      rspec-mocks (~> 2.5.0)
+    rspec-core (2.5.1)
+    rspec-expectations (2.5.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.5.0)
+    sinatra (1.2.1)
       rack (~> 1.1)
-      tilt (~> 1.1)
-    tilt (1.1)
+      tilt (< 2.0, >= 1.2.2)
+    tilt (1.2.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   builder (>= 2.0)
-  bundler (~> 1.0.0)
-  haml (>= 2.0)
+  bundler (~> 1.0.10)
+  haml (>= 3.0)
   rack-test (~> 0.5.6)
   rcov (~> 0.9.8)
-  rspec (~> 2.0.1)
-  sinatra (~> 1.1)
+  rspec (~> 2.5.0)
   sinatra-respond_to!

data/README.md

@@ -117,7 +117,7 @@ This task will install any missing dependencies, run the tests/specs, and genera
 
 ## Contributors
 
-* [Ryan Schenk](http://github.com/rschenk/)
+[Contributors](https://github.com/cehoffman/sinatra-respond_to/contributors)
 
 ## LICENSE:
 

data/Rakefile

@@ -1,3 +1,4 @@
+require 'rubygems'
 require 'bundler'
 Bundler::GemHelper.install_tasks
 

data/lib/sinatra/respond_to.rb

@@ -40,9 +40,13 @@ module Sinatra
           if request.params.has_key? 'format'
             format params['format']
           else
-            request.path_info.sub! %r{\.([^\./]+)$}, ''
+            # Sinatra relies on a side-effect from path_info= to
+            # determine its routes. A direct string change (e.g., sub!)
+            # would bypass that -- and fail to have the effect we're looking
+            # for.
+            request.path_info = request.path_info.sub %r{\.([^\./]+)$}, ''
 
-            format request.xhr? && options.assume_xhr_is_js? ? :js : $1 || options.default_content
+            format $1 || (request.xhr? && options.assume_xhr_is_js? ? :js : options.default_content)
           end
         end
       end

data/lib/sinatra/respond_to/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module RespondTo
-    Version = '0.6.0'
+    Version = '0.7.0'
   end
 end

data/sinatra-respond_to.gemspec

@@ -12,14 +12,14 @@ Gem::Specification.new do |s|
 
   s.required_rubygems_version = '>= 1.3.6'
 
-  s.add_runtime_dependency 'sinatra', '~> 1.1'
+  s.add_runtime_dependency 'sinatra', '~> 1.2'
 
-  s.add_development_dependency 'rspec', '~> 2.0.1'
+  s.add_development_dependency 'rspec', '~> 2.5.0'
   s.add_development_dependency 'rack-test', '~> 0.5.6'
   s.add_development_dependency 'rcov', '~> 0.9.8'
   s.add_development_dependency 'builder', '>= 2.0'
-  s.add_development_dependency 'haml', '>= 2.0'
-  s.add_development_dependency 'bundler', '~> 1.0.0'
+  s.add_development_dependency 'haml', '>= 3.0'
+  s.add_development_dependency 'bundler', '~> 1.0.10'
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/extension_spec.rb

@@ -34,6 +34,14 @@ describe Sinatra::RespondTo do
       # Put back the option, no side effects here
       TestApp.enable :assume_xhr_is_js
     end
+
+    it "should not set the content type to application/javascript for an XMLHttpRequest to an explicit extension" do
+      header 'X_REQUESTED_WITH', 'XMLHttpRequest'
+
+      get '/resource.json'
+
+      last_response['Content-Type'].should =~ %r{#{mime_type(:json)}}
+    end
   end
 
   describe "extension routing" do
@@ -41,7 +49,7 @@ describe Sinatra::RespondTo do
       get "/resource?format=xml"
       last_response.body.should =~ %r{\s*<root>Some XML</root>\s*}
     end
-    
+
     it "breaks routes expecting an extension" do
       # In test_app.rb the route is defined as get '/style.css' instead of get '/style'
       get "/style.css"
@@ -312,8 +320,7 @@ describe Sinatra::RespondTo do
       end
 
       it "should not return nil when only content_type sets headers" do
-        settings = mock('settings')
-        settings.should_receive(:default_encoding).and_return('utf-8')
+        settings = mock('settings').as_null_object
         stub!(:settings).and_return(settings)
 
         content_type :xhtml

metadata

@@ -1,12 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: sinatra-respond_to
 version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 0
-  - 6
-  - 0
-  version: 0.6.0
+  prerelease: 
+  version: 0.7.0
 platform: ruby
 authors: 
 - Chris Hoffman
@@ -14,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-04 00:00:00 -05:00
+date: 2011-03-20 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -25,10 +21,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 1
-        version: "1.1"
+        version: "1.2"
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -39,11 +32,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        - 1
-        version: 2.0.1
+        version: 2.5.0
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
@@ -54,10 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 5
-        - 6
         version: 0.5.6
   type: :development
   version_requirements: *id003
@@ -69,10 +54,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        - 9
-        - 8
         version: 0.9.8
   type: :development
   version_requirements: *id004
@@ -84,9 +65,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
         version: "2.0"
   type: :development
   version_requirements: *id005
@@ -98,10 +76,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 0
-        version: "2.0"
+        version: "3.0"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
@@ -112,11 +87,7 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+        version: 1.0.10
   type: :development
   version_requirements: *id007
 description: 
@@ -164,23 +135,17 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      segments: 
-      - 1
-      - 3
-      - 6
       version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: A respond_to style Rails block for baked-in web service support in Sinatra