rack-multiplexer 0.0.2 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e6995959f7734df487ab98f351f5714867fa8159
-  data.tar.gz: 5da14e65a19d2f3e8df203bcb05c70920b00ccdf
+  metadata.gz: 910894805740fdcc2364efa17ac0c7eb3a42fc4c
+  data.tar.gz: 99d0b9def7d71bf7972f4b1e5c5efc7c09ef9ab4
 SHA512:
-  metadata.gz: 7a8f890c52663e8d5b908d0f47bc85392e2d3429faadbccfa14cd0f2b41ae7d4badc7585e20b915e0152b8bcaab907d6258020190f385ee758917c8a1458f297
-  data.tar.gz: b3f3a4fac56c8dab21869a8a5e35417745c9f795cf85df192eb1ff8a6b6fa2b5d08cea449856bb08344a2665dff4e84f0626c011eb755db63b36b2872a3d32a3
+  metadata.gz: af73e022c78eb88ff1a48a5d5cbcbc784e781de813cc4388f27b4e4f8788d6186cc2e64f698a053c13a895267339fc752aed0f572187a47d63bafe025a043742
+  data.tar.gz: b5a14ed598693b692a224718cd02b7d2911b7d309f41c710a4a2ce72f50fa1c04dacb236e245ba678d69f158ccbc4b879000ba6fb9bf1f2d59515ce65db715ac

data/README.md

@@ -1,5 +1,6 @@
 # Rack::Multiplexer
-Provides a simple router & dispatcher for Rack applications.
+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.
 
 ## Installation
 ```
@@ -16,10 +17,8 @@ require "rack-multiplexer"
 multiplexer = Rack::Multiplexer.new
 multiplexer.get("/a", ->(env) { [200, {}, ["a"]] })
 multiplexer.get("/b", ->(env) { [200, {}, ["b"]] })
-multiplexer.post("/c", ->(env) { [200, {}, ["c"]] })
-multiplexer.put("/d", ->(env) { [200, {}, ["c"]] })
-multiplexer.delete("/e", ->(env) { [200, {}, ["c"]] })
-multiplexer.get("/f/:g", ->(env) { [200, {}, [env["rack.request.query_hash"]["g"]]] })
+multiplexer.put("/c", ->(env) { [200, {}, ["c"]] })
+multiplexer.get("/d/:e", ->(env) { [200, {}, [env["rack.request.query_hash"]["e"]]] })
 
 run multiplexer
 ```

data/lib/rack/multiplexer/version.rb

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

data/lib/rack/multiplexer.rb

@@ -1,6 +1,20 @@
 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.
+#
+# Example:
+#
+#   # config.ru
+#   multiplexer = Rack::Multiplexer.new
+#   multiplexer.get("/a", ->(env) { [200, {}, ["a"]] })
+#   multiplexer.get("/b", ->(env) { [200, {}, ["b"]] })
+#   multiplexer.put("/c", ->(env) { [200, {}, ["c"]] })
+#   multiplexer.get("/d/:e", ->(env) { [200, {}, [env["rack.request.query_hash"]["e"]]] })
+#   run multiplexer
+#
 module Rack
   class Multiplexer
     DEFAULT_NOT_FOUND_APPLICATION = ->(env) {
@@ -22,8 +36,8 @@ module Rack
     def call(env)
       path = env["PATH_INFO"]
       (
-        routes[env["REQUEST_METHOD"]].find {|route| route.match?(path) } ||
-        routes["ANY"].find {|route| route.match?(path) } ||
+        routes[env["REQUEST_METHOD"]].find(path) ||
+        routes["ANY"].find(path) ||
         @not_found_application
       ).call(env)
     end
@@ -52,9 +66,8 @@ module Rack
       routes[method] << Route.new(pattern, application)
     end
 
-    # @routes are indexed by method.
     def routes
-      @routes ||= Hash.new {|hash, key| hash[key] = [] }
+      @routes ||= Hash.new {|hash, key| hash[key] = Routes.new }
     end
 
     def default_not_found_application
@@ -70,9 +83,38 @@ module Rack
       }
     end
 
+    class Routes
+      def initialize
+        @routes = []
+      end
+
+      def find(path)
+        if regexp === path
+          @routes.size.times do |i|
+            return @routes[i] if Regexp.last_match("_#{i}")
+          end
+        end
+      end
+
+      def <<(route)
+        @routes << route
+      end
+
+      private
+
+      def regexp
+        @regexp ||= begin
+          regexps = @routes.map.with_index {|route, index| /(?<_#{index}>#{route.regexp})/ }
+          /\A#{Regexp.union(regexps)}\z/
+        end
+      end
+    end
+
     class Route
       PLACEHOLDER_REGEXP = /:(\w+)/
 
+      attr_reader :regexp
+
       def initialize(pattern, application)
         @application = application
         @regexp, @keys = compile(pattern)
@@ -98,7 +140,7 @@ module Rack
             keys << key
           end
         end
-        return Regexp.new("\\A#{segments.join(?/)}\\z"), keys
+        return Regexp.new(segments.join(?/)), keys
       end
     end
   end

data/spec/rack/multiplexer_spec.rb

@@ -74,6 +74,7 @@ describe Rack::Multiplexer do
       it "delegates with rack.request.query_hash" do
         multiplexer = described_class.new
         multiplexer.get("/:any", application)
+        multiplexer.get("/a", application)
         multiplexer.call(env.merge("REQUEST_METHOD" => "GET", "PATH_INFO" => "/a"))[2][0].should == "/a?any=a&"
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rack-multiplexer
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.3
 platform: ruby
 authors:
 - Ryo Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-19 00:00:00.000000000 Z
+date: 2013-11-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack