http_router 0.6.3 → 0.6.4

data/Rakefile

@@ -6,8 +6,8 @@ desc "Run tests"
 task :test do
   $: << 'lib'
   require 'http_router'
-  require 'test/helper'
-  Dir['test/**/test_*.rb'].each { |test| require test }
+  require './test/helper'
+  Dir['./test/**/test_*.rb'].each { |test| require test }
 end
 
 require 'rake/rdoctask'

data/lib/http_router/node/free_regex.rb

@@ -11,6 +11,7 @@ class HttpRouter
         if match = @matcher.match(whole_path)
           request = request.clone
           request.extra_env['router.regex_match'] = match
+          match.names.size.times{|i| request.params << match[i + 1]} if match.respond_to?(:names) && match.names
           super
         end
       end

data/lib/http_router/regex_route.rb

@@ -5,7 +5,8 @@ class HttpRouter
     end
 
     def compile
-      add_non_path_to_tree(@router.root.add_free_match(@original_path), path, [])
+      @param_names = @original_path.respond_to?(:names) ? @original_path.names.map(&:to_sym) : []
+      add_non_path_to_tree(@router.root.add_free_match(@original_path), path, @param_names)
       @compiled = true
     end
 

data/lib/http_router/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 class HttpRouter #:nodoc
-  VERSION = '0.6.3'
+  VERSION = '0.6.4'
 end

data/test/test_variable.rb

@@ -110,4 +110,12 @@ class TestVariable < MiniTest::Unit::TestCase
     assert_route with_regex,    '/common/123',   {:common_variable => 'common', :matched => '123'}
     assert_route without_regex, '/common/other', {:common_variable => 'common', :unmatched => 'other'}
   end
+
+  if //.respond_to?(:names)
+    eval "
+    def test_match_path_with_groups
+      r = router { add(%r{/(?<year>\\d{4})/(?<month>\\d{2})/(?<day>\\d{2})/?}) }
+      assert_route r, '/1234/23/56', {:year => '1234', :month => '23', :day => '56'}
+    end"
+  end
 end

metadata

@@ -1,13 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 1
   prerelease: false
   segments: 
   - 0
   - 6
-  - 3
-  version: 0.6.3
+  - 4
+  version: 0.6.4
 platform: ruby
 authors: 
 - Joshua Hull
@@ -26,7 +25,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -42,7 +40,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
         segments: 
         - 0
         - 2
@@ -58,7 +55,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
         segments: 
         - 2
         - 0
@@ -74,7 +70,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -88,7 +83,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -102,7 +96,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -116,7 +109,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
         segments: 
         - 0
         version: "0"
@@ -130,7 +122,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
         segments: 
         - 1
         - 0
@@ -217,7 +208,6 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"
@@ -226,7 +216,6 @@ required_rubygems_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
       segments: 
       - 0
       version: "0"