sinatra-respond_to 0.8.0 → 0.9.0

data/Gemfile.lock

@@ -1,33 +1,37 @@
 PATH
   remote: .
   specs:
-    sinatra-respond_to (0.8.0)
+    sinatra-respond_to (0.9.0)
       sinatra (~> 1.3)
 
 GEM
   remote: http://rubygems.org/
   specs:
-    builder (3.0.0)
+    builder (3.1.4)
     diff-lcs (1.1.3)
-    haml (3.1.3)
-    rack (1.3.5)
-    rack-protection (1.1.4)
+    haml (3.1.7)
+    multi_json (1.5.0)
+    rack (1.5.1)
+    rack-protection (1.3.2)
       rack
-    rack-test (0.5.7)
+    rack-test (0.6.2)
       rack (>= 1.0)
-    rcov (0.9.11)
-    rspec (2.5.0)
-      rspec-core (~> 2.5.0)
-      rspec-expectations (~> 2.5.0)
-      rspec-mocks (~> 2.5.0)
-    rspec-core (2.5.2)
-    rspec-expectations (2.5.0)
-      diff-lcs (~> 1.1.2)
-    rspec-mocks (2.5.0)
-    sass (3.1.10)
-    sinatra (1.3.1)
-      rack (~> 1.3, >= 1.3.4)
-      rack-protection (~> 1.1, >= 1.1.2)
+    rspec (2.12.0)
+      rspec-core (~> 2.12.0)
+      rspec-expectations (~> 2.12.0)
+      rspec-mocks (~> 2.12.0)
+    rspec-core (2.12.2)
+    rspec-expectations (2.12.1)
+      diff-lcs (~> 1.1.3)
+    rspec-mocks (2.12.2)
+    sass (3.2.5)
+    simplecov (0.7.1)
+      multi_json (~> 1.0)
+      simplecov-html (~> 0.7.1)
+    simplecov-html (0.7.1)
+    sinatra (1.3.4)
+      rack (~> 1.4)
+      rack-protection (~> 1.3)
       tilt (~> 1.3, >= 1.3.3)
     tilt (1.3.3)
 
@@ -36,10 +40,10 @@ PLATFORMS
 
 DEPENDENCIES
   builder (>= 2.0)
-  bundler (~> 1.1.rc)
+  bundler (~> 1.2)
   haml (>= 3.0)
-  rack-test (~> 0.5.6)
-  rcov (~> 0.9.8)
-  rspec (~> 2.5.0)
+  rack-test (~> 0.6.2)
+  rspec (~> 2.12.0)
   sass (>= 3.0)
+  simplecov (~> 0.7.1)
   sinatra-respond_to!

data/README.md

@@ -10,6 +10,8 @@ A respond\_to style Rails block for baked-in web service support in Sinatra
 
 * Handles setting the content type depending on what is being served
 * Automatically can adjust XMLHttpRequests to return Javascript
+* Recognizes requests based on HTTP\_ACCEPT header parsing. Order of
+  priority is `format` parameter, extension, accept header, default content.
 
 ## SYNOPSIS:
 
@@ -17,7 +19,7 @@ Allows urls of the form **/posts**, **/posts.rss**, and **/posts?format=atom** t
 
     require 'sinatra'
     require 'sinatra/respond_to'
-    
+
     Sinatra::Application.register Sinatra::RespondTo
 
     get '/posts' do
@@ -79,9 +81,9 @@ There a few options available for configuring the default behavior of respond\_t
 
 ## REQUIREMENTS:
 
-* sinatra 1.1
+* sinatra 1.3
 
-If you would like to use Sinatra 1.0, use version `0.5.0`.
+If you would like to use Sinatra 1.2, use version `0.7.0`.
 
 ## INSTALL:
 
@@ -123,7 +125,7 @@ This task will install any missing dependencies, run the tests/specs, and genera
 
 (The MIT License)
 
-Copyright (c) 2009-2010 Chris Hoffman
+Copyright (c) 2009-2013 Chris Hoffman
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/Rakefile

@@ -9,6 +9,12 @@ begin
     t.rcov_opts = ['--sort coverage --text-summary --sort-reverse']
     t.rcov_opts << "--comments --exclude spec,pkg,#{ENV['GEM_HOME']}"
   end
+
+  desc 'Run tests with coverage'
+  task :coverage do
+    ENV['COVERAGE'] = 'true'
+    Rake::Task['spec'].invoke
+  end
 rescue LoadError
   puts 'RSpec not available, try a bundle install'
 end

data/lib/sinatra/respond_to.rb

@@ -1,21 +1,12 @@
 require 'sinatra/base'
 
-# Accept header parsing was looked at but deemed
-# too much of an irregularity to deal with.  Problems with the header
-# differences from IE, Firefox, Safari, and every other UA causes
-# problems with the expected output.  The general expected behavior
-# would be serve html when no extension provided, but most UAs say
-# they will accept application/xml with out a quality indicator, meaning
-# you'd get the xml block served insead.  Just plain retarded, use the
-# extension and you'll never be suprised.
-
 module Sinatra
   module RespondTo
     class UnhandledFormat < Sinatra::NotFound; end
     class MissingTemplate < Sinatra::NotFound
       def code; 404 end
     end
-
+    
     def self.registered(app)
       app.helpers RespondTo::Helpers
 
@@ -39,14 +30,39 @@ module Sinatra
         unless settings.static? && settings.public_folder? && (request.get? || request.head?) && static_file?(request.path_info)
           if request.params.has_key? 'format'
             format params['format']
-          else
-            # 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 $1 || (request.xhr? && settings.assume_xhr_is_js? ? :js : settings.default_content)
+            # Rewrite the accept header with the determined format to allow
+            # downstream middleware to make use the the mime type
+            env['HTTP_ACCEPT'] = ::Sinatra::Base.mime_type(format)
+            request.accept.replace [env['HTTP_ACCEPT']]
+          else
+            # Consider first Accept type as default, otherwise
+            # fall back to settings.default_content
+            default_content = Rack::Mime::MIME_TYPES.invert[request.accept.first]
+            default_content = default_content ? default_content[1..-1] : settings.default_content
+            
+            # Special case, as the specified default_content may use a different symbol than that
+            # found through lookup based on Content-Type
+            default_content = settings.default_content if
+              default_content != settings.default_content &&
+              ::Sinatra::Base.mime_type(default_content) == ::Sinatra::Base.mime_type(settings.default_content)
+
+            ext = $1 if request.path_info.match(%r{\.([^\./]+)$})
+            if ext
+              # 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[0..-(ext.length+2)]
+
+              format ext
+
+              # Rewrite the accept header with the determined format to allow
+              # downstream middleware to make use the the mime type
+              env['HTTP_ACCEPT'] = ::Sinatra::Base.mime_type(format)
+              request.accept.replace [env['HTTP_ACCEPT']]
+            else
+              format(request.xhr? && settings.assume_xhr_is_js? ? :js : default_content)
+            end
           end
         end
       end
@@ -192,6 +208,15 @@ module Sinatra
 
         yield wants
 
+        if wants[format].nil?
+          # Loop through request.accept in prioritized order looking for a Mime Type having a format
+          # that is recognized.
+          alt = nil
+          request.accept.each do |mime_type|
+            break if alt = wants.keys.detect {|k| ::Sinatra::Base.mime_type(k) == mime_type}
+          end
+          format alt if alt
+        end
         raise UnhandledFormat  if wants[format].nil?
         wants[format].call
       end

data/lib/sinatra/respond_to/version.rb

@@ -1,5 +1,5 @@
 module Sinatra
   module RespondTo
-    Version = '0.8.0'
+    Version = '0.9.0'
   end
 end

data/sinatra-respond_to.gemspec

@@ -10,17 +10,15 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/cehoffman/sinatra-respond_to'
   s.summary     = 'A respond_to style Rails block for baked-in web service support in Sinatra'
 
-  s.required_rubygems_version = '>= 1.3.6'
-
   s.add_runtime_dependency 'sinatra', '~> 1.3'
 
-  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 'rspec', '~> 2.12.0'
+  s.add_development_dependency 'rack-test', '~> 0.6.2'
+  s.add_development_dependency 'simplecov', '~> 0.7.1'
   s.add_development_dependency 'builder', '>= 2.0'
   s.add_development_dependency 'haml', '>= 3.0'
   s.add_development_dependency 'sass', '>= 3.0'
-  s.add_development_dependency 'bundler', '~> 1.1.rc'
+  s.add_development_dependency 'bundler', '~> 1.2'
 
   s.files        = `git ls-files`.split("\n")
   s.test_files   = `git ls-files -- {test,spec,features}/*`.split("\n")

data/spec/extension_spec.rb

@@ -48,6 +48,8 @@ describe Sinatra::RespondTo do
     it "should use a format parameter before sniffing out the extension" do
       get "/resource?format=xml"
       last_response.body.should =~ %r{\s*<root>Some XML</root>\s*}
+      last_response.content_type.should include(mime_type(:xml))
+      last_request.env['HTTP_ACCEPT'].should == mime_type(:xml)
     end
 
     it "breaks routes expecting an extension" do
@@ -61,24 +63,31 @@ describe Sinatra::RespondTo do
       get "/resource"
 
       last_response.body.should =~ %r{\s*<html>\s*<body>Hello from HTML</body>\s*</html>\s*}
+      last_response.content_type.should include(mime_type(:html))
     end
 
     it "should render for a template using builder" do
       get "/resource.xml"
 
       last_response.body.should =~ %r{\s*<root>Some XML</root>\s*}
+      last_response.content_type.should include(mime_type(:xml))
+      last_request.env['HTTP_ACCEPT'].should == mime_type(:xml)
     end
 
     it "should render for a template using erb" do
       get "/resource.js"
 
       last_response.body.should =~ %r{'Hiya from javascript'}
+      last_response.content_type.should include(mime_type(:js))
+      last_request.env['HTTP_ACCEPT'].should == mime_type(:js)
     end
 
     it "should return string literals in block" do
       get "/resource.json"
 
       last_response.body.should =~ %r{We got some json}
+      last_response.content_type.should include(mime_type(:json))
+      last_request.env['HTTP_ACCEPT'].should == mime_type(:json)
     end
 
     # This will fail if the above is failing
@@ -134,6 +143,51 @@ describe Sinatra::RespondTo do
     end
   end
 
+  describe "accept routing" do
+    it "should use a format parameter before sniffing out the accept header" do
+      get "/resource?format=xml", {}, {'HTTP_ACCEPT' => "text/html"}
+      last_response.body.should =~ %r{\s*<root>Some XML</root>\s*}
+      last_response.content_type.should include(mime_type(:xml))
+      last_request.env['HTTP_ACCEPT'].should == mime_type(:xml)
+    end
+
+    it "should use an extension before sniffing out the accept header" do
+      get "/resource.xml", {}, {'HTTP_ACCEPT' => "text/html"}
+
+      last_response.body.should =~ %r{\s*<root>Some XML</root>\s*}
+      last_response.content_type.should include(mime_type(:xml))
+      last_request.env['HTTP_ACCEPT'].should == mime_type(:xml)
+    end
+
+    it "should render for a template using builder" do
+      get "/resource", {}, {'HTTP_ACCEPT' => "application/xml"}
+
+      last_response.body.should =~ %r{\s*<root>Some XML</root>\s*}
+      last_response.content_type.should include(mime_type(:xml))
+    end
+
+    it "should render for a template using haml" do
+      get "/resource", {}, {'HTTP_ACCEPT' => "text/html"}
+
+      last_response.body.should =~ %r{\s*<html>\s*<body>Hello from HTML</body>\s*</html>\s*}
+      last_response.content_type.should include(mime_type(:html))
+    end
+
+    it "should render for a template using json" do
+      get "/resource", {}, {'HTTP_ACCEPT' => "application/json"}
+
+      last_response.body.should =~ %r{We got some json}
+      last_response.content_type.should include(mime_type(:json))
+    end
+
+    it "should render for a template using erb" do
+      get "/resource", {}, {'HTTP_ACCEPT' => "application/javascript"}
+
+      last_response.body.should =~ %r{'Hiya from javascript'}
+      last_response.content_type.should include(mime_type(:js))
+    end
+  end
+
   describe "routes not using respond_to" do
     it "should set the default content type when no extension" do
       get "/normal-no-respond_to"

data/spec/spec_helper.rb

@@ -4,6 +4,11 @@ require 'rubygems'
 require 'bundler/setup'
 require 'rspec'
 require 'rack/test'
+require 'simplecov'
+
+SimpleCov.start do
+  add_filter 'vendor'
+end if ENV['COVERAGE']
 
 require File.join(File.dirname(__FILE__), '..', 'lib', 'sinatra', 'respond_to')
 require File.join(File.dirname(__FILE__), 'app', 'test_app')

metadata

@@ -1,104 +1,144 @@
 --- !ruby/object:Gem::Specification
 name: sinatra-respond_to
 version: !ruby/object:Gem::Version
-  version: 0.8.0
   prerelease: 
+  version: 0.9.0
 platform: ruby
 authors:
 - Chris Hoffman
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-11-17 00:00:00.000000000 Z
+date: 2013-02-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: sinatra
-  requirement: &70288457045960 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: '1.3'
+    none: false
   type: :runtime
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.3'
+    none: false
   prerelease: false
-  version_requirements: *70288457045960
+  name: sinatra
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: &70288457044660 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 2.5.0
+        version: 2.12.0
+    none: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.12.0
+    none: false
   prerelease: false
-  version_requirements: *70288457044660
+  name: rspec
 - !ruby/object:Gem::Dependency
-  name: rack-test
-  requirement: &70288457043920 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.5.6
+        version: 0.6.2
+    none: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.6.2
+    none: false
   prerelease: false
-  version_requirements: *70288457043920
+  name: rack-test
 - !ruby/object:Gem::Dependency
-  name: rcov
-  requirement: &70288457043240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 0.9.8
+        version: 0.7.1
+    none: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.7.1
+    none: false
   prerelease: false
-  version_requirements: *70288457043240
+  name: simplecov
 - !ruby/object:Gem::Dependency
-  name: builder
-  requirement: &70288457042560 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '2.0'
+    none: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '2.0'
+    none: false
   prerelease: false
-  version_requirements: *70288457042560
+  name: builder
 - !ruby/object:Gem::Dependency
-  name: haml
-  requirement: &70288457041720 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    none: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    none: false
   prerelease: false
-  version_requirements: *70288457041720
+  name: haml
 - !ruby/object:Gem::Dependency
-  name: sass
-  requirement: &70288457040280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
         version: '3.0'
+    none: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '3.0'
+    none: false
   prerelease: false
-  version_requirements: *70288457040280
+  name: sass
 - !ruby/object:Gem::Dependency
-  name: bundler
-  requirement: &70288457038780 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.1.rc
+        version: '1.2'
+    none: false
   type: :development
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: '1.2'
+    none: false
   prerelease: false
-  version_requirements: *70288457038780
+  name: bundler
 description: 
 email:
 - cehoffman@gmail.com
@@ -134,23 +174,26 @@ rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
+      hash: 1859816800588862554
       version: '0'
       segments:
       - 0
-      hash: 890127812341403240
-required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.3.6
+      hash: 1859816800588862554
+      version: '0'
+      segments:
+      - 0
+  none: false
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.11
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: A respond_to style Rails block for baked-in web service support in Sinatra