webrick-route_servlet 1.2.1 → 1.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1a1b0f4ab6a7f0d6c068df163c11cd01434e9511
-  data.tar.gz: dd6622a22e81c2a4d99c99519af1e080491e6e3d
+  metadata.gz: ea2b3e3f91704a6122a1c5a3aa35e46c912142a3
+  data.tar.gz: 8f6b55aecfcf2a0ba62a0f40a5a5c96e2bb2fecc
 SHA512:
-  metadata.gz: eb231b422ae59a9f130f6795d0868f0258c63bbcbed6660100f66acbd24e22e7a7264834db5b8e7637027a88a8a78fff60b64346bec8569723d735760170ea64
-  data.tar.gz: 7c225b2f52c7aac4d728091a87348c392d1066bf50f30d52b22a56db91badb9439183b084cfc2ceb3402b200d5ae3d28a4062ef993838ca9c1af36dd8a21dcf5
+  metadata.gz: fe7b63371a13fc1a686a8aba3ac48c5d4dd6cb84bdab1a1cf3f28e0e58eabb5deea6d4bc5222ea3b37bd406d32e6a73a2a2f5db61ca17ff2efba2d05fca30bca
+  data.tar.gz: 65167911e10308ab4bbfa05f32dfa4fda801b7725b6bf523859c77d3537bbe4208d38602b32bb03727d13e209008838ccb5910c6d5f1edf4b1834e3fe3e29e00

data/README.md

@@ -31,6 +31,49 @@ Or install it yourself as:
 
 https://github.com/yoshida-eth0/ruby-webrick-route_servlet/tree/master/example
 
+## Supported methods
+
+match
+
+    s.match "/:controller(/:action(/:id))(.:format)", ActionServlet
+    s.match "/*path", NotFoundServlet
+
+root
+
+    s.root IndexServlet
+
+resources
+
+    s.resources "/photos", PhotoServlet
+
+resource
+
+    s.resource "/profile", ProfileServlet
+
+get / post / put / delete
+
+    s.get "/photos", PhotoServlet
+    s.post "/photos", PhotoServlet
+    s.put "/photos/123", PhotoServlet
+    s.delete "/photos/123", PhotoServlet
+
+## Supported options
+
+via
+
+    s.match "/photos/show", PhotoServlet, :via => :get
+    s.match "/photos/show", PhotoServlet, :via => [:get, :post]
+
+constraints
+
+    s.match "/photos/show", PhotoServlet, :constraints => { :id => /[A-Z]\d{5}/ }
+    s.match "/photos/show", PhotoServlet, :id => /[A-Z]\d{5}/
+
+only / except
+
+    s.resources "/photo", PhotoServlet, :only => [:index]
+    s.resources "/photo", PhotoServlet, :except => [:index, :show]
+
 ## Contributing
 
 1. Fork it

data/lib/webrick/route_servlet.rb

@@ -47,7 +47,8 @@ module WEBrick
           if md
             params = Hash[md.names.map(&:to_sym).zip(md.captures)]
             params.delete_if{|k,v| v.nil?}
-            req.params = request_options.merge(params)
+            req.action = params[:action] || request_options[:action]
+            req.params = params
             return [servlet, servlet_options]
           end
         end
@@ -60,19 +61,22 @@ module WEBrick
 
       def match(re, servlet, *servlet_options, **request_options)
         @routes ||= []
-        @routes << [:*, _normalize_path_re(re), servlet, servlet_options, request_options]
+        re = _normalize_path_re(re, request_options)
+        _select_via(request_options).each do |via|
+          @routes << [via, re, servlet, servlet_options, request_options]
+        end
       end
 
       def root(servlet, *servlet_options, **request_options)
         @routes ||= []
-        @routes.unshift([:*, _normalize_path_re("/"), servlet, servlet_options, request_options])
+        @routes.unshift([:*, _normalize_path_re("/", request_options), servlet, servlet_options, request_options])
       end
 
       ["get", "post", "put", "delete"].each do |method|
         class_eval %{
           def #{method}(re, servlet, *servlet_options, **request_options)
             @routes ||= []
-            @routes << [:#{method.upcase}, _normalize_path_re(re), servlet, servlet_options, request_options]
+            @routes << [:#{method.upcase}, _normalize_path_re(re, request_options), servlet, servlet_options, request_options]
           end
         }
       end
@@ -118,7 +122,7 @@ module WEBrick
         @routes ||= []
       end
 
-      def _normalize_path_re(re)
+      def _normalize_path_re(re, request_options)
         unless Regexp===re
           # normalize slash
           re = re.to_s.gsub(%r#/{2,}#, "/")
@@ -128,16 +132,28 @@ module WEBrick
           re = re.sub(%r#^/?#, "^/").sub(%r#/?$#, '/?$')
           # normalize parentheses
           re = re.gsub(")", ")?")
-          # named capture
-          re = re.gsub(%r#/:([^/()\.]+)#, '/(?<\1>[^/]+?)')
-          re = re.gsub(%r#\.:([^/()\.]+)#, '.(?<\1>[^/]+?)')
-          re = re.gsub(%r#/\\\*([^/]+)#, '/(?<\1>.+?)')
+          # constrain named capture
+          constraints = request_options[:constraints] || request_options
+          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]
+              value_re = /(?<#{key}>#{constraints[key.to_sym]})/
+            end
+            re = re.gsub(":#{key}", value_re.to_s)
+          end
           re = Regexp.new(re)
         end
         re
       end
       private :_normalize_path_re
 
+      def _select_via(request_options)
+        via = request_options[:via] || :*
+        via = [via] unless Array===via
+        a = via.map(&:to_sym).map(&:upcase)
+      end
+
       def _select_rest_actions(actions, request_options)
         actions
 
@@ -148,11 +164,11 @@ module WEBrick
           actions.select!{|k,v| only.include?(k)}
         end
 
-        # expect
-        if request_options[:expect]
-          expect = request_options[:expect]
-          expect = [expect] unless Array===expect
-          actions.delete_if{|k,v| expect.include?(k)}
+        # except
+        if request_options[:except]
+          except = request_options[:except]
+          except = [except] unless Array===except
+          actions.delete_if{|k,v| except.include?(k)}
         end
 
         actions

data/lib/webrick/route_servlet/action_servlet.rb

@@ -2,13 +2,10 @@ module WEBrick
   module RouteServlet
     class ActionServlet < WEBrick::HTTPServlet::AbstractServlet
       def service(req, res)
-        action = req.params[:action] rescue ""
-        action ||= ""
-
-        if respond_to?(action)
-          send(action, req, res)
+        if respond_to?(req.action)
+          send(req.action, req, res)
         else
-          raise RuntimeError, "action is not implemented: #{self.class}##{action}"
+          raise RuntimeError, "action is not implemented: #{self.class}##{req.action}"
         end
       end
     end

data/lib/webrick/route_servlet/http_request.rb

@@ -1,6 +1,7 @@
 module WEBrick
   module RouteServlet
     module HTTPRequest
+      attr_accessor :action
       attr_accessor :params
     end
   end

data/lib/webrick/route_servlet/version.rb

@@ -1,5 +1,5 @@
 module WEBrick
   module RouteServlet
-    VERSION = "1.2.1"
+    VERSION = "1.2.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: webrick-route_servlet
 version: !ruby/object:Gem::Version
-  version: 1.2.1
+  version: 1.2.2
 platform: ruby
 authors:
 - Yoshida Tetsuya
@@ -78,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.0.0
 signing_key: 
 specification_version: 4
 summary: WEBrick::RouteServlet is like a Rails routes.rb. This servlet recognizes