webrick-route_servlet 1.2.6 → 1.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: be0c4e4874218b5385f46e35c294adee75b85ace
-  data.tar.gz: 79c1bf0c6b92d21cf4a5059586ae8a9348281654
+  metadata.gz: 59db5b865d282727f1700c6b59f5bea65eb075fc
+  data.tar.gz: 965f884f6e5ecf9f824a924f93a35137872439ad
 SHA512:
-  metadata.gz: ca91db9a0dde9ad0415d5558e837ed1ac5fea3ec4d366480a08db82ac8328938ee66870745cf4b38ea670ef7f27aea3abadd055468680a586ce65cb2b04d0e73
-  data.tar.gz: 64b0bcdf8a7b0d0f257065fd54cc70ffe8d01e0cc28063fd848eb01c5c9d3d4633e1b7248b0cf154ab5f4da186599a4855c252a1e7caf73e782d275695ef069e
+  metadata.gz: 70b4ecbe5bddc1d6e2ea08aff9f83f82e30e3d1833366d42208105ece4140fe249dae40de6bed1da1224328dd85ef12b089eb0b4b0ffdc00355b63700e7e9d59
+  data.tar.gz: 65b60c7c7f21c2672d995ad96c12d36e245a590e9886b0ffd43962fde8b3081affaec5e71dde9e275e816adffa4e40ec1392961283c9efe6fc0bc5f8f7a4aa55

data/README.md

@@ -77,9 +77,14 @@ constraints
       end
     end
 
-only / except
+only
 
-    s.resources "/photo", PhotoServlet, :only => [:index]
+    s.resources "/photo", PhotoServlet, :only => :index
+    s.resources "/photo", PhotoServlet, :only => [:index, :show]
+
+except
+
+    s.resources "/photo", PhotoServlet, :except => :index
     s.resources "/photo", PhotoServlet, :except => [:index, :show]
 
 defaults

data/example/simple_action_servlet.rb

@@ -15,17 +15,18 @@ class IndexServlet < WEBrick::HTTPServlet::AbstractServlet
     res.body += create_link("GET", "/users/new", "new")
     res.body += create_link("GET", "/users/1/edit", "edit")
     res.body += create_link("GET", "/users/1", "show")
-    res.body += create_link("PUT", "/users/1", "update", true)
-    res.body += create_link("DELETE", "/users/1", "destroy", true)
+    res.body += create_link("PUT", "/users/1", "update")
+    res.body += create_link("DELETE", "/users/1", "destroy")
     res.body += "<br />"
     res.body += "<h4>NotFoundServlet:</h4>"
     res.body += "<a href='/no/match/path/route'>/no/match/path/route</a><br />"
   end
 
-  def create_link(method, path, action, disabled=false)
-    disabled = disabled ? " disabled='disabled'" : ""
-    "<form action='#{path}' method='#{method}'>\n" +
-    "<input type='submit' value='#{method} #{path} => #{action}'#{disabled} />\n" +
+  def create_link(method, path, action)
+    method2 = method=="GET" ? "GET" : "POST"
+    "<form action='#{path}' method='#{method2}'>\n" +
+    "<input type='hidden' name='_method' value='#{method}' />\n" +
+    "<input type='submit' value='#{method} #{path} => #{action}' />\n" +
     "</form>\n"
   end
 end

data/lib/webrick/route_servlet.rb

@@ -41,8 +41,13 @@ module WEBrick
     end
 
     def select_route(req)
+      req_method = req.request_method.to_sym
+      if req.query["_method"]
+        req_method = req.query["_method"].upcase.to_sym
+      end
+
       self.class.routes.each do |method, re, servlet, servlet_options, request_options|
-        if method==:* || method==req.request_method.to_sym
+        if method==:* || method==req_method
           md = re.match(req.path_info)
           if md
             # path params
@@ -108,7 +113,7 @@ module WEBrick
           :edit    => [:get,    "#{re}/:id/edit(.:format)"],
           :show    => [:get,    "#{re}/:id(.:format)"],
           :update  => [:put,    "#{re}/:id(.:format)"],
-          :delete  => [:delete, "#{re}/:id(.:format)"],
+          :destroy => [:delete, "#{re}/:id(.:format)"],
         }
         _select_rest_actions(actions, request_options)
 
@@ -121,12 +126,12 @@ module WEBrick
         re = re.to_s.sub(%r#/$#, "")
 
         actions = {
-          :create => [:post,   "#{re}(.:format)"],
-          :new    => [:get,    "#{re}/new(.:format)"],
-          :edit   => [:get,    "#{re}/edit(.:format)"],
-          :show   => [:get,    "#{re}(.:format)"],
-          :update => [:put,    "#{re}(.:format)"],
-          :delete => [:delete, "#{re}(.:format)"],
+          :create  => [:post,   "#{re}(.:format)"],
+          :new     => [:get,    "#{re}/new(.:format)"],
+          :edit    => [:get,    "#{re}/edit(.:format)"],
+          :show    => [:get,    "#{re}(.:format)"],
+          :update  => [:put,    "#{re}(.:format)"],
+          :destroy => [:delete, "#{re}(.:format)"],
         }
         _select_rest_actions(actions, request_options)
 

data/lib/webrick/route_servlet/version.rb

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

metadata

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