webrick-route_servlet 1.1.1 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 397fa019560396894135b4744be9920b854e8214
-  data.tar.gz: a5103f261531146f365564acb6de35529515eb2d
+  metadata.gz: 8c0162b442d50867355a76985facd0a6557453f6
+  data.tar.gz: 1e5b074844be091adeaf2bd27c9c5a5a4a9a57f3
 SHA512:
-  metadata.gz: ce1e23750eefeb89db43af8ac9b7130915bbf222f613740c4668fa2c22e49d8ef39a3607e1d37898abe11a7b0bfe9c9486c4a8e53659d718fa2da978224d8a70
-  data.tar.gz: e113ad6d9ba8e7d81371c04bb189a0e840b29e272be31e54715861ba812044cefe444ae5b6cb70d3c51f652ec1c0bc19fbc10da8b15a641d4cd9f1c18642dd06
+  metadata.gz: 9c634ba1c14372d967976930d112aec4ad1f57135eb8a2deb0f2fa524e67280d405d050064fb62fce55e7dc5b2a9e729023263073811f8015516b92ad6073e53
+  data.tar.gz: 2831c6281d71e3f2175838e3d0ee6196c093442af1f5078b140d6ef12db0d38dfa03018cc8ed6c374ed69fe0fd5e61810d0f4fe33bf1cdd4a09ab45a08081710

data/example/multi_routes.rb

@@ -24,7 +24,7 @@ class NotFoundServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     res.content_type = "text/html"
     res.body = "<h2>NotFoundServlet</h2>"
-    res.body += "<p>path: #{req.params["path"]}</p>"
+    res.body += "<p>path: #{req.params[:path]}</p>"
     res.body += "<a href='/'>index</a>"
   end
 end
@@ -34,11 +34,11 @@ class OpenSocialApiServlet < WEBrick::HTTPServlet::AbstractServlet
     res.content_type = "text/plain"
     res.body = JSON.pretty_generate({
       "servlet" => self.class.name,
-      "type" => req.params["type"],
-      "guid" => req.params["guid"],
-      "selector" => req.params["selector"],
-      "appid" => req.params["appid"],
-      "resourceid" => req.params["resourceid"],
+      "type" => req.params[:type],
+      "guid" => req.params[:guid],
+      "selector" => req.params[:selector],
+      "appid" => req.params[:appid],
+      "resourceid" => req.params[:resourceid],
     })
   end
 end
@@ -48,7 +48,7 @@ class NotFoundApiServlet < WEBrick::HTTPServlet::AbstractServlet
     res.content_type = "text/plain"
     res.body = JSON.pretty_generate({
       "servlet" => self.class.name,
-      "path" => req.params["path"],
+      "path" => req.params[:path],
     })
   end
 end

data/example/simple_action_servlet.rb

@@ -0,0 +1,99 @@
+#!/usr/bin/ruby
+
+$LOAD_PATH << File.expand_path("../lib", File.dirname(__FILE__))
+
+require 'webrick'
+require 'webrick/route_servlet'
+
+class IndexServlet < WEBrick::HTTPServlet::AbstractServlet
+  def do_GET(req, res)
+    res.content_type = "text/html"
+    res.body = "<h2>IndexServlet</h2>\n"
+    res.body += "<h4>UserServlet:</h4>\n"
+    res.body += create_link("GET", "/users", "index")
+    res.body += create_link("POST", "/users", "create")
+    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 += "<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" +
+    "</form>\n"
+  end
+end
+
+class UserServlet < WEBrick::RouteServlet::ActionServlet
+  def index(req, res)
+    res.content_type = "text/html"
+    res.body = "<h2>RestServlet#index</h2>\n"
+    res.body += "<p>params: #{req.params}</p>\n"
+    res.body += "<p><a href='/'>index</a></p>\n"
+  end
+
+  def create(req, res)
+    res.content_type = "text/html"
+    res.body = "<h2>RestServlet#create</h2>\n"
+    res.body += "<p>params: #{req.params}</p>\n"
+    res.body += "<p><a href='/'>index</a></p>\n"
+  end
+
+  def new(req, res)
+    res.content_type = "text/html"
+    res.body = "<h2>RestServlet#new</h2>\n"
+    res.body += "<p>params: #{req.params}</p>\n"
+    res.body += "<p><a href='/'>index</a></p>\n"
+  end
+
+  def edit(req, res)
+    res.content_type = "text/html"
+    res.body = "<h2>RestServlet#edit</h2>\n"
+    res.body += "<p>params: #{req.params}</p>\n"
+    res.body += "<p><a href='/'>index</a></p>\n"
+  end
+
+  def show(req, res)
+    res.content_type = "text/html"
+    res.body = "<h2>RestServlet#show</h2>\n"
+    res.body += "<p>params: #{req.params}</p>\n"
+    res.body += "<p><a href='/'>index</a></p>\n"
+  end
+
+  def update(req, res)
+    res.content_type = "text/html"
+    res.body = "<h2>RestServlet#update</h2>\n"
+    res.body += "<p>params: #{req.params}</p>\n"
+    res.body += "<p><a href='/'>index</a></p>\n"
+  end
+
+  def destroy(req, res)
+    res.content_type = "text/html"
+    res.body = "<h2>RestServlet#destroy</h2>\n"
+    res.body += "<p>params: #{req.params}</p>\n"
+    res.body += "<p><a href='/'>index</a></p>\n"
+  end
+end
+
+class NotFoundServlet < WEBrick::HTTPServlet::AbstractServlet
+  def do_GET(req, res)
+    res.content_type = "text/html"
+    res.body = "<h2>NotFoundServlet</h2>"
+    res.body += "path: #{req.params[:path]}"
+    res.body += "<p><a href='/'>index</a></p>"
+  end
+end
+
+server = WEBrick::HTTPServer.new(:Port=>3000)
+server.mount("/", WEBrick::RouteServlet.servlet{|s|
+  s.root IndexServlet
+  s.resources "/users", UserServlet
+  s.match "/*path", NotFoundServlet
+})
+server.start

data/example/simple_routes.rb

@@ -27,11 +27,11 @@ end
 class ActionServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     res.content_type = "text/html"
-    res.body = "<h2>PageServlet</h2>"
-    res.body += "controller: #{req.params["controller"]}<br />"
-    res.body += "action: #{req.params["action"]}<br />"
-    res.body += "id: #{req.params["id"]}<br />"
-    res.body += "format: #{req.params["format"]}<br />"
+    res.body = "<h2>ActionServlet</h2>"
+    res.body += "controller: #{req.params[:controller]}<br />"
+    res.body += "action: #{req.params[:action]}<br />"
+    res.body += "id: #{req.params[:id]}<br />"
+    res.body += "format: #{req.params[:format]}<br />"
     res.body += "<p><a href='/'>index</a></p>"
   end
 end
@@ -40,7 +40,7 @@ class NotFoundServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     res.content_type = "text/html"
     res.body = "<h2>NotFoundServlet</h2>"
-    res.body += "path: #{req.params["path"]}"
+    res.body += "path: #{req.params[:path]}"
     res.body += "<p><a href='/'>index</a></p>"
   end
 end

data/lib/webrick/route_servlet.rb

@@ -1,5 +1,6 @@
 require 'webrick'
 require 'webrick/route_servlet/http_request'
+require 'webrick/route_servlet/action_servlet'
 require "webrick/route_servlet/version"
 
 module WEBrick
@@ -7,13 +8,14 @@ module WEBrick
     def service(req, res)
       e = nil
 
-      servlet, options, status = select_route(req)
+      req.extend WEBrick::RouteServlet::HTTPRequest
+      servlet, servlet_options = select_route(req)
 
       if servlet
-        # 200 or 404
+        # 200
         begin
-          res.status = status
-          servlet.get_instance(@config, *options).service(req, res)
+          res.status = 200
+          servlet.get_instance(@config, *servlet_options).service(req, res)
           return
         rescue Exception => e
         end
@@ -21,9 +23,9 @@ module WEBrick
 
       # 500
       res.status = 500
-      if self.class.route500
+      if self.class.error500
         begin
-          self.class.route500.get_instance(@config).servlet(req, res)
+          self.class.error500.get_instance(@config).servlet(req, res)
           return
         rescue Exception => e
         end
@@ -39,31 +41,68 @@ module WEBrick
     end
 
     def select_route(req)
-      self.class.routes.each do |re, servlet, options|
-        md = re.match(req.path_info)
-        if md
-          req.extend WEBrick::RouteServlet::HTTPRequest
-          req.params = Hash[md.names.zip(md.captures)]
-          return [servlet, options, 200]
+      self.class.routes.each do |method, re, servlet, servlet_options, request_options|
+        if method==:* || method==req.request_method.to_sym
+          md = re.match(req.path_info)
+          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)
+            return [servlet, servlet_options]
+          end
         end
       end
       nil
     end
 
     module ClassMethods
-      attr_accessor :route500
+      attr_accessor :error500
 
-      def match(re, servlet, *options)
+      def match(re, servlet, *servlet_options, **request_options)
         @routes ||= []
-        @routes << [normalize_path_re(re), servlet, options]
+        @routes << [:*, _normalize_path_re(re), servlet, servlet_options, request_options]
       end
 
-      def root(servlet, *options)
+      def root(servlet, *servlet_options, **request_options)
         @routes ||= []
-        @routes.unshift([normalize_path_re("/"), servlet, *options])
+        @routes.unshift([:*, _normalize_path_re("/"), servlet, servlet_options, request_options])
       end
 
-      def normalize_path_re(re)
+      ["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]
+          end
+        }
+      end
+
+      def resources(re, servlet, *servlet_options, **request_options)
+        re = re.to_s.sub(%r#/$#, "")
+        get    "#{re}(.:format)",          servlet, *servlet_options, request_options.merge({:action => :index})
+        post   "#{re}(.:format)",          servlet, *servlet_options, request_options.merge({:action => :create})
+        get    "#{re}/new(.:format)",      servlet, *servlet_options, request_options.merge({:action => :new})
+        get    "#{re}/:id/edit(.:format)", servlet, *servlet_options, request_options.merge({:action => :edit})
+        get    "#{re}/:id(.:format)",      servlet, *servlet_options, request_options.merge({:action => :show})
+        put    "#{re}/:id(.:format)",      servlet, *servlet_options, request_options.merge({:action => :update})
+        delete "#{re}/:id(.:format)",      servlet, *servlet_options, request_options.merge({:action => :destroy})
+      end
+
+      def resource(re, servlet, *servlet_options, **request_options)
+        re = re.to_s.sub(%r#/$#, "")
+        post   "#{re}(.:format)",      servlet, *servlet_options, request_options.merge({:action => :create})
+        get    "#{re}/new(.:format)",  servlet, *servlet_options, request_options.merge({:action => :new})
+        get    "#{re}/edit(.:format)", servlet, *servlet_options, request_options.merge({:action => :edit})
+        get    "#{re}(.:format)",      servlet, *servlet_options, request_options.merge({:action => :show})
+        put    "#{re}(.:format)",      servlet, *servlet_options, request_options.merge({:action => :update})
+        delete "#{re}(.:format)",      servlet, *servlet_options, request_options.merge({:action => :destroy})
+      end
+
+      def routes
+        @routes ||= []
+      end
+
+      def _normalize_path_re(re)
         unless Regexp===re
           # normalize slash
           re = re.to_s.gsub(%r#/{2,}#, "/")
@@ -81,10 +120,7 @@ module WEBrick
         end
         re
       end
-
-      def routes
-        @routes || []
-      end
+      private :_normalize_path_re
     end
 
     class << self

data/lib/webrick/route_servlet/action_servlet.rb

@@ -0,0 +1,16 @@
+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)
+        else
+          raise RuntimeError, "action is not implemented: #{self.class}##{action}"
+        end
+      end
+    end
+  end
+end

data/lib/webrick/route_servlet/version.rb

@@ -1,5 +1,5 @@
 module WEBrick
   module RouteServlet
-    VERSION = "1.1.1"
+    VERSION = "1.2.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webrick-route_servlet
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.2.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-17 00:00:00.000000000 Z
+date: 2013-08-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -51,8 +51,10 @@ files:
 - README.md
 - Rakefile
 - example/multi_routes.rb
+- example/simple_action_servlet.rb
 - example/simple_routes.rb
 - lib/webrick/route_servlet.rb
+- lib/webrick/route_servlet/action_servlet.rb
 - lib/webrick/route_servlet/http_request.rb
 - lib/webrick/route_servlet/version.rb
 - webrick-route_servlet.gemspec
@@ -76,7 +78,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.0
+rubygems_version: 2.0.2
 signing_key: 
 specification_version: 4
 summary: WEBrick::RouteServlet is like a Rails routes.rb. This servlet recognizes