mynyml-rack-abstract-format 0.9 → 0.9.4

data/README

@@ -9,6 +9,8 @@ always point to the same action independently from the requested format.
 
 USAGE
 
+require 'rack/abstract_format'
+
 use Rack::AbstractFormat
 run app
 

data/Rakefile

@@ -22,7 +22,7 @@ end
 
 spec = Gem::Specification.new do |s|
   s.name            = 'rack-abstract-format'
-  s.version         = '0.9'
+  s.version         = '0.9.4'
   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.rb → app.ru}

@@ -1,5 +1,5 @@
 # run me with:
-#   $rackup examples/app.rb
+#   $rackup examples/app.ru -p 3000
 #
 require 'rubygems'
 require 'rack'
@@ -11,7 +11,7 @@ class App
       env['PATH_INFO']      #=> #{env['PATH_INFO'].inspect}
       env['request.format'] #=> #{env['request.format'].inspect}
     TXT
-    [200, {'Content-Type' => 'text/plain'}, [body]] 
+    [200, {'Content-Type' => 'text/plain'}, [body]]
   end
 end
 

data/lib/rack/abstract_format.rb

@@ -10,8 +10,13 @@ module Rack
     def call(env)
       path = Pathname(env['PATH_INFO'])
       env['PATH_INFO'] = path.to_s.sub(/#{path.extname}$/,'')
-      env['request.format'] = path.extname.sub(/^\./,'')
+      env['Accept'] = concat(env['Accept'], Rack::Mime.mime_type(path.extname))
       @app.call(env)
     end
+
+    private
+      def concat(accept, type)
+        (accept || '').split(',').unshift(type).join(',')
+      end
   end
 end

data/{simple_router.gemspec → rack-abstract-format.gemspec}

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
-name: simple_router
+name: rack-abstract-format
 version: !ruby/object:Gem::Version 
-  version: 0.8.1
+  version: 0.9.4
 platform: ruby
 authors: 
 - Martin Aumont
@@ -9,11 +9,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-21 00:00:00 -04:00
+date: 2009-06-02 00:00:00 -04:00
 default_executable: 
 dependencies: []
 
-description: Rack middleware that abstracts format information (extension) away from the path (into env)
+description: Rack middleware that abstracts format (extension) away from the path (into env)
 email: mynyml@gmail.com
 executables: []
 
@@ -26,6 +26,9 @@ files:
 - test
 - test/test_abstract_format.rb
 - test/test_helper.rb
+- examples
+- examples/app.ru
+- rack-abstract-format.gemspec
 - lib
 - lib/rack
 - lib/rack/abstract_format.rb
@@ -58,6 +61,6 @@ rubyforge_project:
 rubygems_version: 1.3.3
 signing_key: 
 specification_version: 3
-summary: Rack middleware that abstracts format information (extension) away from the path (into env)
+summary: Rack middleware that abstracts format (extension) away from the path (into env)
 test_files: []
 

data/test/test_abstract_format.rb

@@ -8,9 +8,9 @@ App = Rack::Builder.new {
 
 class AbstractFormatTest < Test::Unit::TestCase
 
-  def get(path)
-    env = Rack::MockRequest.env_for(path)
-    App.call(env).last
+  def get(path, opts={})
+    env = Rack::MockRequest.env_for(path, opts)
+    App.call(env)
     env
   end
 
@@ -24,8 +24,8 @@ class AbstractFormatTest < Test::Unit::TestCase
     assert_equal '/path.to/resource', env['PATH_INFO']
   end
 
-  test "stores format in environment" do
-    env = get('/path.to/resource.xml')
-    assert_equal 'xml', env['request.format']
+  test "prepends requested media type to Accept header" do
+    env = get('/path/resource.html', 'Accept' => 'application/xml')
+    assert_equal 'text/html,application/xml' , env['Accept']
   end
 end

data/test/test_helper.rb

@@ -4,6 +4,7 @@ require 'rubygems'
 require 'rack'
 begin
   require 'ruby-debug'
+  require 'phocus/test_unit'
 rescue LoadError, RuntimeError
 end
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mynyml-rack-abstract-format
 version: !ruby/object:Gem::Version 
-  version: "0.9"
+  version: 0.9.4
 platform: ruby
 authors: 
 - Martin Aumont
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-05-20 21:00:00 -07:00
+date: 2009-06-01 21:00:00 -07:00
 default_executable: 
 dependencies: []
 
@@ -27,8 +27,8 @@ files:
 - test/test_abstract_format.rb
 - test/test_helper.rb
 - examples
-- examples/app.rb
-- simple_router.gemspec
+- examples/app.ru
+- rack-abstract-format.gemspec
 - lib
 - lib/rack
 - lib/rack/abstract_format.rb