mynyml-rack-respond_to 0.9.4 → 0.9.5

data/README

@@ -18,7 +18,6 @@ requested mime type. Standalone version of the equivalent Rails functionality.
 
     def call(env)
       # Pass in the env, and RespondTo will retrieve the requested mime type
-      # from the HTTP_ACCEPT header
       Rack::RespondTo.env = env
 
       # Alternatively, to use standalone you can also assign the mime type

data/Rakefile

@@ -22,7 +22,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name            = 'rack-respond_to'
-  s.version         = '0.9.4'
+  s.version         = '0.9.5'
   s.summary         = "Rack middleware port of Rails's respond_to feature"
   s.description     = "Rack middleware port of Rails's respond_to feature"
   s.author          = "Martin Aumont"
@@ -31,6 +31,8 @@ spec = Gem::Specification.new do |s|
   s.has_rdoc        = true
   s.require_path    = "lib"
   s.files           = all_except([/doc/, /pkg/])
+
+  s.add_dependency 'mynyml-rack-accept-media-types', '>= 0.6'
 end
 
 Rake::GemPackageTask.new(spec) do |p|

data/TODO

@@ -1,2 +1,27 @@
 o handle wildcard content-types?
-  - */*;q=0.8
+  e.g. */* matches first format block
+
+    Rack::RespondTo.mime_type = '*/*'
+
+    body = respond_to do |format|
+      format.html { 'html' }
+      format.xml  { 'xml' }
+    end
+    body #=> 'html'
+
+    body = respond_to do |format|
+      format.xml  { 'xml' }
+      format.html { 'html' }
+    end
+    body #=> 'xml'
+
+o cascade down accept types priority instead of only responding to prefered
+type. e.g:
+
+    env['HTTP_ACCEPT'] #=> 'text/plain,text/html;q=0.9,application/xml;q=0.8'
+
+    body = respond_to do |format|
+      format.html { 'html' }
+      format.xml  { 'xml' }
+    end
+    body #=> 'html'

data/examples/recommended_use.ru

@@ -1,8 +1,7 @@
 # install required dependencies:
-#
 #   $sudo gem install mynyml-rack-abstract-format --source=http://gems.github.com/
 #
-# and run me with:
+# run with:
 #   $rackup examples/recommended_use.ru -p 8080
 #
 # and request:

data/lib/rack/respond_to.rb

@@ -1,3 +1,5 @@
+require 'rack/accept_media_types'
+
 module Rack
 
   # Based on Rails's API, and sinatra-respond_to (http://github.com/cehoffman/sinatra-respond_to)
@@ -34,18 +36,13 @@ module Rack
         end
       end
 
-      # Convenience method that returns the mime type of the given format
-      # (similar to Rack::Mime.mime_type).
+      # Mime type requested.
       #
-      # If format argument is omitted, will return the mime type for
-      # RespondTo.format (i.e. equivelent to RespondTo.mime_type(RespondTo.format)).
       # Useful for setting content type:
       #
-      # ===== Example
-      #
       #   [200, {'Content-Type' => Rack::RespondTo.mime_type}, [body]]
       #
-      def mime_type(format = nil)
+      def mime_type
         @mime_type || accept
       end
 
@@ -66,7 +63,7 @@ module Rack
         # String:: first mime type from header's list or nil if none
         #
         def accept
-          self.env['HTTP_ACCEPT'].split(',').first.split(';').first if env && env['HTTP_ACCEPT'] && !env['HTTP_ACCEPT'].empty?
+          Rack::AcceptMediaTypes.new(self.env['HTTP_ACCEPT'] || '').prefered unless self.env.nil?
         end
     end
 

data/rack-respond_to.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-respond_to
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Martin Aumont
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-03 00:00:00 -04:00
+date: 2009-06-08 00:00:00 -04:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: mynyml-rack-accept-media-types
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.6"
+    version: 
 description: Rack middleware port of Rails's respond_to feature
 email: mynyml@gmail.com
 executables: []

data/test/test_respond_to.rb

@@ -69,11 +69,6 @@ class TestRespondTo < Test::Unit::TestCase
     end
   end
 
-  test "mime type ignores content-type arguments" do
-    Rack::RespondTo.env = {'HTTP_ACCEPT' => 'application/xml;q=0.9,text/html'}
-    assert_equal 'application/xml', Rack::RespondTo.mime_type
-  end
-
   test "explicitly specified mime type takes precedence over env's" do
     Rack::RespondTo.env = {'HTTP_ACCEPT' => 'text/html'}
     Rack::RespondTo.mime_type = 'text/plain'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mynyml-rack-respond_to
 version: !ruby/object:Gem::Version 
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors: 
 - Martin Aumont
@@ -9,10 +9,19 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-06-02 21:00:00 -07:00
+date: 2009-06-07 21:00:00 -07:00
 default_executable: 
-dependencies: []
-
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: mynyml-rack-accept-media-types
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0.6"
+    version: 
 description: Rack middleware port of Rails's respond_to feature
 email: mynyml@gmail.com
 executables: []