rack-multiplexer 0.0.3 → 0.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 910894805740fdcc2364efa17ac0c7eb3a42fc4c
-  data.tar.gz: 99d0b9def7d71bf7972f4b1e5c5efc7c09ef9ab4
+  metadata.gz: 1693a2a3b7c5e01ff4504b1050be22e70d56a476
+  data.tar.gz: be765bf4e45551f7888e8d445fe9046ea6209d94
 SHA512:
-  metadata.gz: af73e022c78eb88ff1a48a5d5cbcbc784e781de813cc4388f27b4e4f8788d6186cc2e64f698a053c13a895267339fc752aed0f572187a47d63bafe025a043742
-  data.tar.gz: b5a14ed598693b692a224718cd02b7d2911b7d309f41c710a4a2ce72f50fa1c04dacb236e245ba678d69f158ccbc4b879000ba6fb9bf1f2d59515ce65db715ac
+  metadata.gz: e74c42adeebd12b164e473584ccf15b3745e4706ca21bf0c2bcbadf836474d76b7ebbaa1ba483d67ca6952a6cd15ece7d0da101e5d79f14d417baadd0485a68b
+  data.tar.gz: 0c0e978e9bb4aff842e0353e044eafae25df42328deacccace09534b7eb6d3d7131fbf83ce0e78dd98841cf95da6cc329a32f4033dc97637f0cce4c0606951f2

data/README.md

@@ -1,6 +1,6 @@
 # Rack::Multiplexer
-Provides a simple router & dispatcher for Rack applications as a Rack application.
-The routing process takes O(1) complexity because all routes are compiled as one Regexp.
+Provides a simple router & dispatcher for Rack applications as a Rack application.  
+The routing algorithm has only O(1) time complexity because all routes are compiled into one Regexp.
 
 ## Installation
 ```

data/lib/rack/multiplexer.rb

@@ -2,8 +2,7 @@ require "rack/multiplexer/version"
 require "rack/request"
 
 # Provides a simple router & dispatcher for Rack applications as a Rack application.
-# From Ruby's standpoint, the routing algorithm has only O(1) time complexity
-# because all routes are compiled as one Regexp.
+# The routing algorithm has only O(1) time complexity because all routes are compiled into one Regexp.
 #
 # Example:
 #
@@ -17,18 +16,7 @@ require "rack/request"
 #
 module Rack
   class Multiplexer
-    DEFAULT_NOT_FOUND_APPLICATION = ->(env) {
-      [
-        404,
-        {
-          "Content-Type" => "text/plain",
-          "Content-Length" => "0",
-        },
-        [""],
-      ]
-    }
-
-    def initialize(not_found_application = DEFAULT_NOT_FOUND_APPLICATION, &block)
+    def initialize(not_found_application = default_not_found_application, &block)
       @not_found_application = not_found_application
       instance_eval(&block) if block
     end
@@ -76,7 +64,7 @@ module Rack
           404,
           {
             "Content-Type" => "text/plain",
-            "Content-Length" => 0,
+            "Content-Length" => "0",
           },
           [""],
         ]
@@ -135,7 +123,7 @@ module Rack
         keys = []
         segments = []
         pattern.split("/").each do |segment|
-          segments << segment.gsub(PLACEHOLDER_REGEXP, "([^#?/]+)")
+          segments << Regexp.escape(segment).gsub(PLACEHOLDER_REGEXP, "([^#?/]+)")
           if key = Regexp.last_match(1)
             keys << key
           end

data/lib/rack/multiplexer/version.rb

@@ -1,5 +1,5 @@
 module Rack
   class Multiplexer
-    VERSION = "0.0.3"
+    VERSION = "0.0.4"
   end
 end

data/scripts/benchmark.rb

@@ -0,0 +1,28 @@
+# Benchmark script for comparison of the routing algorithm between v0.0.2 and v0.0.3.
+# In my laptop environment, v0.0.3 is 17x faster than 0.0.2 with 676 routes & 100,000 tries.
+
+$LOAD_PATH.unshift File.expand_path("../../lib", __FILE__)
+require "rack/multiplexer"
+require "benchmark"
+
+multiplexer = Rack::Multiplexer.new
+(?a..?z).each do |head|
+  (?a..?z).each do |tail|
+    multiplexer.get("/#{head}{tail}") do
+      [200, {}, ["OK"]]
+    end
+  end
+end
+
+env = {
+  "PATH_INFO" => "/mm",
+  "REQUEST_METHOD" => "GET",
+}
+
+n = 100_000
+puts Benchmark::CAPTION
+puts Benchmark.measure {
+  n.times do
+    multiplexer.call(env)
+  end
+}

data/spec/rack/multiplexer_spec.rb

@@ -110,5 +110,15 @@ describe Rack::Multiplexer do
         multiplexer.call(env.merge("REQUEST_METHOD" => "HEAD", "PATH_INFO" => "/a"))[0].should == 200
       end
     end
+
+    context "with path including '.'" do
+      it "matches exactly" do
+        multiplexer = described_class.new
+        multiplexer.get("/a.*") {|env| [200, {}, ["ok"]] }
+        multiplexer.call(env.merge("REQUEST_METHOD" => "GET", "PATH_INFO" => "/a.*"))[0].should == 200
+        multiplexer.call(env.merge("REQUEST_METHOD" => "GET", "PATH_INFO" => "/aaa"))[0].should == 404
+        multiplexer.call(env.merge("REQUEST_METHOD" => "GET", "PATH_INFO" => "/abc"))[0].should == 404
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-multiplexer
 version: !ruby/object:Gem::Version
-  version: 0.0.3
+  version: 0.0.4
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-26 00:00:00.000000000 Z
+date: 2013-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
@@ -110,6 +110,7 @@ files:
 - lib/rack/multiplexer.rb
 - lib/rack/multiplexer/version.rb
 - rack-multiplexer.gemspec
+- scripts/benchmark.rb
 - spec/rack/multiplexer_spec.rb
 - spec/spec_helper.rb
 homepage: https://github.com/r7kamura/rack-multiplexer
@@ -139,4 +140,3 @@ summary: Provides a simple router & dispatcher for Rack.
 test_files:
 - spec/rack/multiplexer_spec.rb
 - spec/spec_helper.rb
-has_rdoc: