webrick-route_servlet 1.0.1 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5aa5c1743a4152eddc48fe428cfeaff57abc8f6e
-  data.tar.gz: a0155a9bc5e559afc803494347769525426fcacc
+  metadata.gz: 4acab3896a5966e52a287750419797607524db9f
+  data.tar.gz: 782551c377a6ad7b591b8b60a1e9d62649ff209f
 SHA512:
-  metadata.gz: 35267f848162f28b8305161b2775065febd3e43b924a0f07701a3c4801c31f9c420feb0ff7291e181729ef19f8dcf35b9bc71dbed02794d36caa078d6bef29e2
-  data.tar.gz: 8f6faaa7cb0dbe580ec4df4c0bd9085f2de1a4bf2eb53413b9b9c5f35f3f8542519e4f51dd18c9ddb2a303299a04e902a2fe14fd14f2b317b62c4fb09e1657ef
+  metadata.gz: 0202005cc2f708ad284fe629bc0c24d692d81b324391781f121a04b6fc6262f7d214e4901dc0df1fc8dc9ebb76ed4df230a277fbb63e72ddb7f7a9538199b72a
+  data.tar.gz: 0770f6cf8afef2a15377e714a55b0bff18b46cefcfcd58c82a604a5b63921e9ed3ed5c60791aa26fb559de360dd10b73a17fddd059e4413c6a503cd3fb4081fc

data/example/{simple_server.rb → multi_routes.rb}

@@ -4,44 +4,58 @@ $LOAD_PATH << File.expand_path("../lib", File.dirname(__FILE__))
 
 require 'webrick'
 require 'webrick/route_servlet'
+require 'json'
 
 class IndexServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     res.content_type = "text/html"
     res.body = "<h2>IndexServlet</h2>"
-    res.body += "<h4>PageServlet:</h4>"
-    3.times {
-      page = ("a".."z").to_a.shuffle[0..7].join
-      res.body += "<a href='/#{page}'>/#{page}</a><br />"
-    }
+    res.body += "<h4>XxxApiServlet:</h4>"
+    res.body += "<a href='/api/people/@me/@frields'>/api/people/@me/@frields</a><br />"
+    res.body += "<a href='/api/no/match/api'>/api/no/match/api</a><br />"
     res.body += "<br />"
     res.body += "<h4>NotFoundServlet:</h4>"
     res.body += "<a href='/no/match/path'>/no/match/path</a><br />"
   end
 end
 
-class PageServlet < WEBrick::HTTPServlet::AbstractServlet
+class NotFoundServlet < WEBrick::HTTPServlet::AbstractServlet
   def do_GET(req, res)
     res.content_type = "text/html"
-    res.body = "<h2>PageServlet</h2>"
-    res.body += "<p>page: #{req.params["page"]}</p>"
+    res.body = "<h2>NotFoundServlet</h2>"
+    res.body += "<p>path: #{req.params["path"]}</p>"
     res.body += "<a href='/'>index</a>"
   end
 end
 
-class NotFoundServlet < WEBrick::HTTPServlet::AbstractServlet
+class PeopleApiServlet < 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 += "<a href='/'>index</a>"
+    res.content_type = "text/plain"
+    res.body = JSON.pretty_generate({
+      "servlet" => self.class.name,
+      "guid" => req.params["guid"],
+      "selector" => req.params["selector"],
+    })
+  end
+end
+
+class NotFoundApiServlet < WEBrick::HTTPServlet::AbstractServlet
+  def do_GET(req, res)
+    res.content_type = "text/plain"
+    res.body = JSON.pretty_generate({
+      "servlet" => self.class.name,
+      "path" => req.params["path"],
+    })
   end
 end
 
 server = WEBrick::HTTPServer.new(:Port=>3000)
 server.mount("/", WEBrick::RouteServlet.servlet{|s|
   s.root IndexServlet
-  s.match "/:page", PageServlet
   s.match "/*path", NotFoundServlet
 })
+server.mount("/api", WEBrick::RouteServlet.servlet{|s|
+  s.match "/people/:guid/:selector", PeopleApiServlet
+  s.match "/*path", NotFoundApiServlet
+})
 server.start

data/example/simple_routes.rb

@@ -0,0 +1,54 @@
+#!/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>"
+    res.body += "<h4>ActionServlet:</h4>"
+    3.times {
+      controller = ["/users", "/posts"].shuffle[0]
+      action = rand(3)==0 ? "" : ["/show", "/edit"].shuffle[0]
+      id = action.empty? || rand(3)==0 ? "" : "/#{rand(255)+1}"
+      format = [".html", ""].shuffle[0]
+      path = controller + action + id + format
+      res.body += "<a href='#{path}'>#{path}</a><br />"
+    }
+    res.body += "<br />"
+    res.body += "<h4>NotFoundServlet:</h4>"
+    res.body += "<a href='/no/match/path/route'>/no/match/path/route</a><br />"
+  end
+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 += "<p><a href='/'>index</a></p>"
+  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.match '/:controller(/:action(/:id))(.:format)', ActionServlet
+  s.match "/*path", NotFoundServlet
+})
+server.start

data/lib/webrick/route_servlet.rb

@@ -43,7 +43,7 @@ module WEBrick
         md = re.match(req.path_info)
         if md
           req.extend WEBrick::RouteServlet::HTTPRequest
-          req.params = md
+          req.params = Hash[md.names.zip(md.captures)]
           return [servlet, options, 200]
         end
       end
@@ -65,9 +65,18 @@ module WEBrick
 
       def normalize_path_re(re)
         unless Regexp===re
-          re = re.to_s.gsub(%r#/{2,}#, "/").sub(%r#^/?#, "^/").sub(%r#/?$#, '/?$')
-          re = re.gsub(%r#/:([^/]+)#, '/(?<\1>[^/]+)')
-          re = re.gsub(%r#/\*([^/]+)#, '/(?<\1>.+?)')
+          # normalize slash
+          re = re.to_s.gsub(%r#/{2,}#, "/")
+          # escape
+          re = re.gsub(/([\.\-?*+\\^$])/, '\\\\\1')
+          # start end regexp
+          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>.+?)')
           re = Regexp.new(re)
         end
         re

data/lib/webrick/route_servlet/version.rb

@@ -1,5 +1,5 @@
 module WEBrick
   module RouteServlet
-    VERSION = "1.0.1"
+    VERSION = "1.1.0"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: webrick-route_servlet
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.1.0
 platform: ruby
 authors:
 - Yoshida Tetsuya
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-16 00:00:00.000000000 Z
+date: 2013-08-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -50,7 +50,8 @@ files:
 - LICENSE.txt
 - README.md
 - Rakefile
-- example/simple_server.rb
+- example/multi_routes.rb
+- example/simple_routes.rb
 - lib/webrick/route_servlet.rb
 - lib/webrick/route_servlet/http_request.rb
 - lib/webrick/route_servlet/version.rb