mynyml-rack-abstract-format 0.9.6 → 0.9.7

data/Rakefile

@@ -22,7 +22,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name            = 'rack-abstract-format'
-  s.version         = '0.9.6'
+  s.version         = '0.9.7'
   s.summary         = "Rack middleware that abstracts format (extension) away from the path (into env)"
   s.description     = "Rack middleware that abstracts format (extension) away from the path (into env)"
   s.author          = "Martin Aumont"

data/examples/app.ru

@@ -1,6 +1,12 @@
 # run me with:
 #   $rackup examples/app.ru -p 3000
 #
+# and try different url extensions:
+#		localhost:3000/foo.html
+#		localhost:3000/foo.xml
+#		localhost:3000/foo.txt
+#		...
+#
 require 'pathname'
 require 'rubygems'
 require 'rack'

data/lib/rack/abstract_format.rb

@@ -10,7 +10,7 @@ module Rack
     def call(env)
       path = Pathname(env['PATH_INFO'])
       env['PATH_INFO'] = path.to_s.sub(/#{path.extname}$/,'')
-      env['HTTP_ACCEPT'] = concat(env['HTTP_ACCEPT'], Rack::Mime.mime_type(path.extname))
+      env['HTTP_ACCEPT'] = concat(env['HTTP_ACCEPT'], Rack::Mime.mime_type(path.extname, nil))
       @app.call(env)
     end
 
@@ -21,7 +21,7 @@ module Rack
       #   ["application/xml", "text/html", "application/xhtml+xml", "application/xml;q=0.9", "*/*;q=0.8"]
       #
       def concat(accept, type)
-        (accept || '').split(',').unshift(type).join(',')
+        (accept || '').split(',').unshift(type).compact.join(',')
       end
   end
 end

data/rack-abstract-format.gemspec

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: rack-abstract-format
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Martin Aumont
@@ -9,7 +9,7 @@ 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: []
 

data/test/test_abstract_format.rb

@@ -28,4 +28,9 @@ class AbstractFormatTest < Test::Unit::TestCase
     env = get('/path/resource.html', 'HTTP_ACCEPT' => 'application/xml')
     assert_equal 'text/html,application/xml' , env['HTTP_ACCEPT']
   end
+
+  test "url without extension" do
+    env = get('/path/resource', 'HTTP_ACCEPT' => 'text/html')
+    assert_equal 'text/html' , env['HTTP_ACCEPT']
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mynyml-rack-abstract-format
 version: !ruby/object:Gem::Version 
-  version: 0.9.6
+  version: 0.9.7
 platform: ruby
 authors: 
 - Martin Aumont
@@ -9,7 +9,7 @@ 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: []