rack-router 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c67f53c99d9372515a3c78af3d35750437ce2464
-  data.tar.gz: 568d4a2e57f583839652a74e7c8978243764b930
+  metadata.gz: e4cdf3fc0c4f10427a17e1af387de613c507f691
+  data.tar.gz: 06f319847932ae6af0b6e6418dbd68699423ae82
 SHA512:
-  metadata.gz: a311a6448794f53522e8c0fc4858414277c18a07cb3b27c3e716d9c32c2c91f6852561b4bff724bed6121eae5da2af65d1ec6b450d3f3c8eb138d54a3d8cd655
-  data.tar.gz: be6af03eb657e91d2e7b4c2a633eb95eea3463c07c356fd0f6d3c46ca5c626f61eabd9bd41e7d8cc4d1c4386f5a0138e386e235f133dd189e9b8bbc6effb7e48
+  metadata.gz: 505582df598d172c41686b8f30e6cfc5f3409e9d5608d91ba54363d90dab3e546d386df05949a13afd5b4c2dcbaa94d1dac73e91d75fa6e613a4018207f0667b
+  data.tar.gz: 33e5e88e820c45f5b4433c1b57ae8e63ce3e3a2e05d2d974b3ca65d430d6d640b80b1983acd3b7524dd2e60ed463ad29fbe7dc78d9ca826f5a8e6aca54a03ce6

data/lib/rack/route.rb

@@ -5,8 +5,7 @@ module Rack
     PATH_INFO = 'PATH_INFO'.freeze
     DEFAULT_WILDCARD_NAME = :paths
     WILDCARD_PATTERN = /\/\*(.*)/.freeze
-    NAMED_SEGMENTS_PATTERN = /\/:([^$\/]+)/.freeze
-    NAMED_SEGMENTS_REPLACEMENT_PATTERN = /\/:([^$\/]+)/.freeze
+    NAMED_SEGMENTS_PATTERN = /\/([^\/]*):([^:$\/]+)/.freeze
     DOT = '.'.freeze
 
     def initialize(request_method, pattern, app, options={})
@@ -39,12 +38,13 @@ module Rack
         pattern.gsub(WILDCARD_PATTERN,'(?:/(.*)|)')
       else
         p = if pattern_match = pattern.match(NAMED_SEGMENTS_PATTERN)
-          pattern.gsub(NAMED_SEGMENTS_REPLACEMENT_PATTERN, '/(?<\1>[^.$/]+)')
+          pattern.gsub(NAMED_SEGMENTS_PATTERN, '/\1(?<\2>[^.$/]+)')
         else
           pattern
         end
         p + '(?:\.(?<format>.*))?'
       end
+      #puts "pattern: #{pattern}, src: #{src}"
       Regexp.new("\\A#{src}\\Z")
     end
 

data/lib/rack/router.rb

@@ -3,7 +3,7 @@ require 'rack/route'
 module Rack
 
   class Router
-    VERSION = "0.4.0"
+    VERSION = "0.5.0"
 
     HEAD = 'HEAD'.freeze
     GET = 'GET'.freeze
@@ -88,4 +88,3 @@ module Rack
     end
   end
 end
-

data/rack-router.gemspec

@@ -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.4.0"
+  gem.version       = "0.5.0"
 end

data/test/route_test.rb

@@ -1,7 +1,7 @@
-require "test/unit"
+require "minitest/autorun"
 require "rack/route"
 
-class RouteTest < Test::Unit::TestCase
+class RouteTest < Minitest::Test
 
   def test_match
     match "/*"         , "/"             , :paths => []
@@ -27,6 +27,8 @@ class RouteTest < Test::Unit::TestCase
     match "/:x/:y"     , "/a/b"          , { :x => "a" , :y => "b" }
     match "/posts"     , "/posts.json"   , { :format => "json" }
     match "/posts/:id" , "/posts/42.json", { :id => "42", :format => "json" }
+    match "/api/v:version"        , "/api/v2", :version => "2"
+    match "/api/v:version/things" , "/api/v2/things" , :version => "2"
   end
 
   def test_match_with_constraints
@@ -70,4 +72,3 @@ class RouteTest < Test::Unit::TestCase
     assert_equal(params, route('GET', pattern).match('GET', path), msg)
   end
 end
-

data/test/router_test.rb

@@ -1,7 +1,7 @@
-require 'test/unit'
+require "minitest/autorun"
 require 'rack/router'
 
-class RouterTest < Test::Unit::TestCase
+class RouterTest < Minitest::Test
   def test_call
     app1  = lambda{|env| [200, {}, [env["rack.route_params"][:id]]] }
     app2  = lambda{|env| [200, {}, ["2"]] }
@@ -26,4 +26,3 @@ class RouterTest < Test::Unit::TestCase
     assert_equal "/it", router[:it]
   end
 end
-

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-router
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Paul Barry
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-16 00:00:00.000000000 Z
+date: 2015-05-20 00:00:00.000000000 Z
 dependencies: []
 description: A simple router for Rack apps
 email:
@@ -17,8 +17,8 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- .gitignore
-- .rvmrc
+- ".gitignore"
+- ".rvmrc"
 - Gemfile
 - LICENSE
 - README.md
@@ -40,21 +40,20 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: A simple router for Rack apps
 test_files:
 - test/route_test.rb
 - test/router_test.rb
-has_rdoc: