webrick-route_servlet 1.2.5 → 1.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c41ace391d4524a5b3214938ca0c03f2b2d335a9
-  data.tar.gz: 8714cc1d1cd6a51d18fc6f7dd3ce4aa82bae86bc
+  metadata.gz: be0c4e4874218b5385f46e35c294adee75b85ace
+  data.tar.gz: 79c1bf0c6b92d21cf4a5059586ae8a9348281654
 SHA512:
-  metadata.gz: 7790eaccb7bac3d7e643fb87d7e807755fcbb6a7e7d25d95b1de5b84385ab0a1ef9312ea8b71a682b46d3710745cc1c5c54bd7c7ccfe2b89c6a4006e3dab8e9c
-  data.tar.gz: 04bc52e0687ec19021fdc3558ae3f59d6a0efd469465127604c5ea28c7d966746445e09060368a638fe52810eb2bc21dad4c51738e54526367f5fae9f1ade5a7
+  metadata.gz: ca91db9a0dde9ad0415d5558e837ed1ac5fea3ec4d366480a08db82ac8328938ee66870745cf4b38ea670ef7f27aea3abadd055468680a586ce65cb2b04d0e73
+  data.tar.gz: 64b0bcdf8a7b0d0f257065fd54cc70ffe8d01e0cc28063fd848eb01c5c9d3d4633e1b7248b0cf154ab5f4da186599a4855c252a1e7caf73e782d275695ef069e

data/README.md

@@ -69,6 +69,13 @@ constraints
 
     s.match "/photos/:id", PhotoServlet, :constraints => { :id => /[A-Z]\d{5}/ }
     s.match "/photos/:id", PhotoServlet, :id => /[A-Z]\d{5}/
+    s.match "/photos/:id", PhotoServlet, :constraints => PhotoConstraint.new
+    
+    class PhotoConstraint
+      def matches?(req)
+        /[A-Z]\d{5}/===req.params[:id]
+      end
+    end
 
 only / except
 
@@ -77,8 +84,8 @@ only / except
 
 defaults
 
-    s.match "/photos/:id(.:format)", ActionServlet, :defaults => { :format => "json" }
-    s.match "/photos/:id(.:format)", ActionServlet, :format => "json"
+    s.match "/photos/:id(.:format)", PhotoServlet, :defaults => { :format => "json" }
+    s.match "/photos/:id(.:format)", PhotoServlet, :format => "json"
 
 ## Contributing
 

data/lib/webrick/route_servlet.rb

@@ -56,8 +56,16 @@ module WEBrick
               end
             end
 
+            # set
             req.action = params[:action] || request_options[:action]
             req.params = params
+
+            # advanced constraints
+            constraints = request_options[:constraints]
+            if constraints.respond_to?(:matches?)
+              next unless constraints.matches?(req)
+            end
+
             return [servlet, servlet_options]
           end
         end
@@ -146,7 +154,7 @@ module WEBrick
           keys = re.scan(%r#:([^/()\.]+)#).map(&:first).sort{|a,b| b.length <=> a.length}
           keys.each do |key|
             value_re = Regexp.new("(?<#{key}>[^/]+?)")
-            if Regexp===constraints[key.to_sym]
+            if constraints.respond_to?(:[]) && Regexp===constraints[key.to_sym]
               value_re = /(?<#{key}>#{constraints[key.to_sym]})/
             end
             re = re.gsub(":#{key}", value_re.to_s)

data/lib/webrick/route_servlet/version.rb

@@ -1,5 +1,5 @@
 module WEBrick
   module RouteServlet
-    VERSION = "1.2.5"
+    VERSION = "1.2.6"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webrick-route_servlet
 version: !ruby/object:Gem::Version
-  version: 1.2.5
+  version: 1.2.6
 platform: ruby
 authors:
 - Yoshida Tetsuya