rack-conneg 0.1.4 → 0.1.5

data/README.rdoc

@@ -1,4 +1,5 @@
 = Description
+
 Content negotiation for Rack applications, including a Rails-style respond_to block.
 
 = Features
@@ -7,7 +8,7 @@ Content negotiation for Rack applications, including a Rails-style respond_to bl
 * Allows certain routes to pass through without negotiation (useful for static files, etc.)
 * Falls back to a pre-set type if negotiation fails
 * Injects a respond_to method with default handler into the application's namespace
-* Injects negotiated_type and negotiated_ext methods both into the application and into Rack::Request
+* Injects negotiated_type, negotiated_ext, and negotiated? methods both into the application and into Rack::Request
 
 = Sinatra Example
 
@@ -39,3 +40,10 @@ Content negotiation for Rack applications, including a Rails-style respond_to bl
       }
     end
   end
+
+= Release History
+
+<b>0.1.2</b> - Initial release
+<b>0.1.3</b> - Added proper RegExp escaping to match content types with + in them
+<b>0.1.4</b> - Added ignore_contents_of() to recursively ignore directory contents and negotiated? method to determine if negotiation took place
+<b>0.1.5</b> - Allow negotiation to fall back if no Accept: header supplied

data/lib/rack/conneg.rb

@@ -5,7 +5,7 @@ module Rack #:nodoc:#
   
   class Conneg
     
-    VERSION = '0.1.4'
+    VERSION = '0.1.5'
     
     attr :ignores
     
@@ -56,26 +56,28 @@ module Rack #:nodoc:#
         else
           # Create an array of types out of the HTTP_ACCEPT header, sorted
           # by q value and original order
-          accept_types = env['HTTP_ACCEPT'].split(/,/)
-          accept_types.each_with_index { |t,i|
-            (accept_type,weight) = t.split(/;/)
-            weight = weight.nil? ? 1.0 : weight.split(/\=/).last.to_f
-            accept_types[i] = { :type => accept_type, :weight => weight, :order => i }
-          }
-          accept_types.sort! { |a,b| 
-            ord = b[:weight] <=> a[:weight] 
-            if ord == 0
-              ord = a[:order] <=> b[:order]
-            end
-            ord
-          }
+          if env['HTTP_ACCEPT']
+            accept_types = env['HTTP_ACCEPT'].split(/,/)
+            accept_types.each_with_index { |t,i|
+              (accept_type,weight) = t.split(/;/)
+              weight = weight.nil? ? 1.0 : weight.split(/\=/).last.to_f
+              accept_types[i] = { :type => accept_type, :weight => weight, :order => i }
+            }
+            accept_types.sort! { |a,b| 
+              ord = b[:weight] <=> a[:weight] 
+              if ord == 0
+                ord = a[:order] <=> b[:order]
+              end
+              ord
+            }
           
-          # Find the first item in accept_types that matches a registered
-          # content type
-          accept_types.find { |t|
-            re = %r{^#{Regexp.escape(t[:type].gsub(/\*/,'.+'))}$}
-            @types.find { |type| re.match(type) ? mime_type = type : nil }
-          }
+            # Find the first item in accept_types that matches a registered
+            # content type
+            accept_types.find { |t|
+              re = %r{^#{Regexp.escape(t[:type].gsub(/\*/,'.+'))}$}
+              @types.find { |type| re.match(type) ? mime_type = type : nil }
+            }
+          end
         end
         
         mime_type ||= fallback

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rack-conneg
 version: !ruby/object:Gem::Version 
-  version: 0.1.4
+  hash: 17
+  prerelease: 
+  segments: 
+  - 0
+  - 1
+  - 5
+  version: 0.1.5
 platform: ruby
 authors: 
 - Michael B. Klein
@@ -9,19 +15,23 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-03-11 00:00:00 -08:00
-default_executable: 
+date: 2011-09-27 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rack
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 0
         version: "1.0"
-    version: 
+  type: :runtime
+  version_requirements: *id001
 description: Middleware that provides both file extension and HTTP_ACCEPT-type content negotiation for Rack applications
 email: Michael.Klein@oregonstate.edu
 executables: []
@@ -33,7 +43,6 @@ extra_rdoc_files:
 files: 
 - README.rdoc
 - lib/rack/conneg.rb
-has_rdoc: true
 homepage: 
 licenses: []
 
@@ -44,21 +53,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
 summary: Content Negotiation middleware for Rack applications