rack-router 0.2.1 → 0.3.0

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+*.swp

data/lib/rack/route.rb

@@ -37,10 +37,13 @@ module Rack
           pattern_match[1].to_sym
         end
         pattern.gsub(WILDCARD_PATTERN,'(?:/(.*)|)')
-      elsif pattern_match = pattern.match(NAMED_SEGMENTS_PATTERN)
-        pattern.gsub(NAMED_SEGMENTS_REPLACEMENT_PATTERN, '/(?<\1>[^$/]+)')
       else
-        pattern
+        p = if pattern_match = pattern.match(NAMED_SEGMENTS_PATTERN)
+          pattern.gsub(NAMED_SEGMENTS_REPLACEMENT_PATTERN, '/(?<\1>[^.$/]+)')
+        else
+          pattern
+        end
+        p + '(?:\.(?<format>.*))?'
       end
       Regexp.new("\\A#{src}\\Z")
     end
@@ -50,13 +53,15 @@ module Rack
         raise ArgumentError.new("path is required")
       end
 
-      if path_match = path.split(DOT).first.match(regexp)
+      if path_match = path.match(regexp)
         params = if @wildcard_name
           { @wildcard_name => path_match[1].to_s.split('/') }
         else
           Hash[path_match.names.map(&:to_sym).zip(path_match.captures)]
         end
 
+        params.delete(:format) if params.has_key?(:format) && params[:format].nil?
+
         if meets_constraints(params)
           params
         end

data/lib/rack/router.rb

@@ -13,12 +13,6 @@ module Rack
     REQUEST_METHOD = 'REQUEST_METHOD'.freeze
     PATH_INFO = 'PATH_INFO'.freeze
     ROUTE_PARAMS = 'rack.route_params'.freeze
-    DEFAULT_NOT_FOUND_BODY = '<h1>Not Found</h1>'.freeze
-    DEFAULT_NOT_FOUND_RESPONSE = [404,
-      {
-        "Content-Type" => "text/html",
-        "Content-Length" => DEFAULT_NOT_FOUND_BODY.length.to_s
-      }, [DEFAULT_NOT_FOUND_BODY]]
 
     def initialize(&block)
       @routes = {}
@@ -85,7 +79,15 @@ module Rack
     end
 
     def not_found(env)
-      DEFAULT_NOT_FOUND_RESPONSE
+      body = "<h1>Not Found</h1><p>No route matches #{env[REQUEST_METHOD]} #{env[PATH_INFO]}</p>"
+      [
+        404,
+        {
+          "Content-Type" => "text/html",
+          "Content-Length" => body.length.to_s
+        },
+        [body]
+      ]
     end
   end
 end

data/lib/rack/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Router
-    VERSION = "0.2.1"
+    VERSION = "0.3.0"
   end
 end

data/rack-router.gemspec

@@ -3,7 +3,7 @@ Gem::Specification.new do |gem|
   gem.authors       = ["Paul Barry"]
   gem.email         = ["mail@paulbarry.com"]
   gem.description   = %q{A simple router for Rack apps}
-  gem.summary       = %q{A simple router for rack apps}
+  gem.summary       = %q{A simple router for Rack apps}
   gem.homepage      = "https://github.com/pjb3/rack-router"
 
   gem.files         = `git ls-files`.split($\)
@@ -11,5 +11,5 @@ Gem::Specification.new do |gem|
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.name          = "rack-router"
   gem.require_paths = ["lib"]
-  gem.version       = "0.2.1"
+  gem.version       = "0.3.0"
 end

data/test/route_test.rb

@@ -25,7 +25,8 @@ class RouteTest < Test::Unit::TestCase
     match "/posts/:id" , "/posts/42"     , { :id => "42" }
     match "/posts/:id" , "/posts"        , nil
     match "/:x/:y"     , "/a/b"          , { :x => "a" , :y => "b" }
-    match "/posts/:id" , "/posts/42.html", { :id => "42" }
+    match "/posts"     , "/posts.json"   , { :format => "json" }
+    match "/posts/:id" , "/posts/42.json", { :id => "42", :format => "json" }
   end
 
   def test_match_with_constraints

data/test/router_test.rb

@@ -21,6 +21,7 @@ class RouterTest < Test::Unit::TestCase
     }, router.routes)
 
     assert_equal ["42"], router.call("REQUEST_METHOD" => "GET", "PATH_INFO" => "/42").last
+    assert_equal ["<h1>Not Found</h1><p>No route matches GET /not/found</p>"], router.call("REQUEST_METHOD" => "GET", "PATH_INFO" => "/not/found").last
     assert_equal "/stuff", router[:stuff]
     assert_equal "/it", router[:it]
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rack-router
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-21 00:00:00.000000000 Z
+date: 2013-02-27 00:00:00.000000000 Z
 dependencies: []
 description: A simple router for Rack apps
 email:
@@ -53,11 +53,10 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
-summary: A simple router for rack apps
+summary: A simple router for Rack apps
 test_files:
 - test/route_test.rb
 - test/router_test.rb
-has_rdoc: