http_router 0.3.3 → 0.3.4

data/lib/http_router/interface/sinatra.rb

@@ -63,21 +63,21 @@ class HttpRouter
 
             define_method "#{verb} #{path}", &block
             unbound_method = instance_method("#{verb} #{path}")
-            block =
-              if block.arity != 0
-                proc { unbound_method.bind(self).call(*@block_params) }
-              else
-                proc { unbound_method.bind(self).call }
-              end
+            block = block.arity.zero? ?
+              proc { unbound_method.bind(self).call } :
+              proc { unbound_method.bind(self).call(*@block_params) }
 
             invoke_hook(:route_added, verb, path, block)
 
             route = router.add(path)
+
+            route.matching(options[:matching]) if options.key?(:matching)
+
             route.request_method(verb)
-            route.host(options.delete(:host)) if options.key?(:host)
+            route.host(options[:host]) if options.key?(:host)
             
-            route.to(block)
             route.name(name) if name
+            route.to(block)
             route
           end
 

data/lib/http_router/version.rb

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

data/lib/http_router.rb

@@ -229,7 +229,7 @@ class HttpRouter
     Glob.new(self, *args)
   end
 
-  # Returns a new glob
+  # Returns a new route
   def route(*args)
     Route.new(self, *args)
   end

data/spec/sinatra/recognize_spec.rb

@@ -118,6 +118,33 @@ describe "HttpRouter (for Sinatra) route recognition" do
     end
   end
 
+  describe "matching by regexp" do
+    before :each do
+      @app.get('/numbers/:digits', :matching => { :digits => /\d+/ }) { params[:digits] }
+    end
+
+    describe "when regexp is matched" do
+      before :each do
+        @response = @app.call_with_mock_request('/numbers/2010')
+      end
+
+      it "should map successfully" do
+        @response.status.should == 200
+        @response.body.should == "2010"
+      end
+    end
+
+    describe "when regexp is not matched" do
+      before :each do
+        @response = @app.call_with_mock_request('/numbers/boobs')
+      end
+
+      it "should not map" do
+        @response.status.should == 404
+      end
+    end
+  end
+
   describe "not found" do
 
     it "should correctly generate a not found page without images" do

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 27
   prerelease: false
   segments: 
   - 0
   - 3
-  - 3
-  version: 0.3.3
+  - 4
+  version: 0.3.4
 platform: ruby
 authors: 
 - Joshua Hull