http_router 0.5.1 → 0.5.2

data/lib/http_router/route.rb

@@ -2,20 +2,26 @@ require 'strscan'
 
 class HttpRouter
   class Route
-    attr_reader :dest, :paths, :path, :matches_with, :original_path
+    attr_reader :dest, :paths, :path, :matches_with, :original_path, :regex
     attr_accessor :trailing_slash_ignore, :partially_match, :default_values
 
     def initialize(router, path)
       @router = router
-      path[0,0] = '/' unless path[0] == ?/
-      @path = path
-      @original_path = path.dup
-      @partially_match = extract_partial_match(path)
-      @trailing_slash_ignore = extract_trailing_slash(path)
       @matches_with = {}
       @arbitrary = []
       @conditions =  {}
       @default_values = {}
+      case path
+      when Regexp
+        @regex = path
+        path = '/*'
+        match_path(@regex)
+      end
+      @path = path
+      @original_path = path.dup
+      path[0,0] = '/' unless path[0] == ?/
+      @partially_match = extract_partial_match(path)
+      @trailing_slash_ignore = extract_trailing_slash(path)
     end
 
     def method_missing(method, *args, &block)
@@ -26,6 +32,10 @@ class HttpRouter
       end
     end
 
+    def regex?
+      !@regex.nil?
+    end
+
     def to_s
       "#{@original_path} conditions: #{@conditions.inspect} default_values: #{@default_values.inspect} name: #{named.inspect}"
     end
@@ -174,7 +184,15 @@ class HttpRouter
 
     # Convenient regexp matching on an entire path. Returns +self+
     def match_path(matcher)
-      arbitrary{|env, params, dest| match = matcher.match(env.path_info); !match.nil? and match.begin(0) == 0 and match[0].size == env.path_info.size}
+      arbitrary{|env, params, dest|
+        match = matcher.match(env.path_info)
+        if !match.nil? and match.begin(0) == 0 and match[0].size == env.path_info.size
+          env['router.regex_match'] = match
+          true
+        else
+          false
+        end
+      }
     end
 
     # Adds an arbitrary proc matcher to a Route. Receives either a block, or a proc. The proc will receive a Rack::Request object, a Hash of the params, and the destination for this route. The proc must return true if the Route is matched. Returns +self+.

data/lib/http_router/version.rb

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

data/test/test_recognize.rb

@@ -1,6 +1,9 @@
 class TestRecognition < MiniTest::Unit::TestCase
-  def test_simple
+  def test_empty
     assert_route router.add(''),              '/'
+  end
+
+  def test_simple
     assert_route router.add('/'),             '/'
     assert_route router.add('/test'),         '/test'
     assert_route router.add('/test/one'),     '/test/one'

data/test/test_variable.rb

@@ -50,9 +50,10 @@ class TestVariable < MiniTest::Unit::TestCase
   end
 
   def test_match_path
-    r = router { add('/:test').match_path(%r{/(test123|\d+)}) }
-    assert_route r, '/test123', {:test => "test123"}
-    assert_route r, '/123', {:test => "123"}
+    r = router { add(%r{/(test123|\d+)}) }
+    assert_equal true, r.regex?
+    assert_route r, '/test123'
+    assert_route r, '/123'
     assert_route nil, '/test123andmore'
     assert_route nil, '/lesstest123'
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: false
   segments: 
   - 0
   - 5
-  - 1
-  version: 0.5.1
+  - 2
+  version: 0.5.2
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-12 00:00:00 -08:00
+date: 2011-01-20 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency