http_router 0.7.5 → 0.7.6

data/Rakefile

@@ -7,6 +7,12 @@ task :test => ['test:integration', 'test:examples', 'test:rdoc_examples']
 
 require 'pp'
 
+desc "Clean things"
+task :clean do
+  sh 'find . -name "*.rbc" | xargs rm'
+  sh 'rm -rf pkg'
+end
+
 namespace :test do
   desc "Run integration tests"
   task :integration do

data/benchmarks/rec2.rb

@@ -25,7 +25,7 @@ puts Benchmark.measure {
   puts "u.routes.size: #{u.routes.size}"
 }
 #
-TIMES = 10_000
+TIMES = 50_000
 
 #simple_env = 
 #simple2_env = 

data/lib/http_router/node/arbitrary.rb

@@ -2,6 +2,7 @@ class HttpRouter
   class Node
     class Arbitrary < Node
       alias_method :node_lookup, :[]
+      attr_reader :allow_partial, :blk, :param_names
 
       def initialize(router, allow_partial, blk, param_names)
         @allow_partial, @blk, @param_names = allow_partial, blk, param_names
@@ -18,6 +19,10 @@ class HttpRouter
           end
         end
       end
+
+      def usuable?(other)
+        other.class == self.class && other.allow_partial == allow_partial && other.blk == blk && other.param_names == param_names
+      end
     end
   end
 end

data/lib/http_router/node/destination.rb

@@ -16,6 +16,10 @@ class HttpRouter
           end
         end
       end
+
+      def usuable?(other)
+        other.class == self.class && other.allow_partial == allow_partial && other.blk == blk
+      end
     end
   end
 end

data/lib/http_router/node/free_regex.rb

@@ -17,6 +17,10 @@ class HttpRouter
           super
         end
       end
+
+      def usuable?(other)
+        other.class == self.class && other.matcher == matcher
+      end
     end
   end
 end

data/lib/http_router/node/glob.rb

@@ -11,6 +11,10 @@ class HttpRouter
           super(request)
         end
       end
+
+      def usuable?(other)
+        other.class == self.class
+      end
     end
   end
 end

data/lib/http_router/node/lookup.rb

@@ -16,6 +16,10 @@ class HttpRouter
       def add(part)
         Node.new(@router, @map[part] ||= [])
       end
+
+      def usuable?(other)
+        other.class == self.class
+      end
     end
   end
 end

data/lib/http_router/node/regex.rb

@@ -2,7 +2,7 @@ class HttpRouter
   class Node
     class Regex < Node
       alias_method :node_lookup, :[]
-      attr_reader :matcher, :splitting_indicies
+      attr_reader :matcher, :splitting_indicies, :capturing_indicies
 
       def initialize(router, matcher, capturing_indicies, splitting_indicies = nil)
         @matcher, @capturing_indicies, @splitting_indicies = matcher, capturing_indicies, splitting_indicies
@@ -22,6 +22,10 @@ class HttpRouter
         @splitting_indicies.each { |idx| request.params << unescape(match[idx]).split(/\//) } if @splitting_indicies
         @capturing_indicies.each { |idx| request.params << unescape(match[idx]) }
       end
+
+      def usuable?(other)
+        other.class == self.class && other.matcher == matcher && other.splitting_indicies == splitting_indicies && other.capturing_indicies == capturing_indicies
+      end
     end
   end
 end

data/lib/http_router/node/request.rb

@@ -1,7 +1,7 @@
 class HttpRouter
   class Node
     class Request < Node
-      attr_reader :request_method
+      attr_reader :request_method, :opts
 
       def initialize(router, opts)
         @opts = opts
@@ -19,6 +19,10 @@ class HttpRouter
         }
         super(request)
       end
+
+      def usuable?(other)
+        other.class == self.class && other.opts == opts
+      end
     end
   end
 end

data/lib/http_router/node/variable.rb

@@ -8,6 +8,10 @@ class HttpRouter
           super(request)
         end
       end
+
+      def usuable?(other)
+        other.class == self.class
+      end
     end
   end
 end

data/lib/http_router/node.rb

@@ -54,13 +54,17 @@ class HttpRouter
     end
 
     def add_lookup(part)
-      add(Lookup.new(@router)) unless @matchers.last.is_a?(Lookup)
+      add(Lookup.new(@router))
       @matchers.last.add(part)
     end
 
+    def usable?(other)
+      false
+    end
+
     private
     def add(matcher)
-      @matchers << matcher
+      @matchers << matcher unless matcher.usable?(@matchers.last)
       @matchers.last
     end
 

data/lib/http_router/version.rb

@@ -1,4 +1,4 @@
 # encoding: utf-8
 class HttpRouter #:nodoc
-  VERSION = '0.7.5'
+  VERSION = '0.7.6'
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 7
-  - 5
-  version: 0.7.5
+  - 6
+  version: 0.7.6
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-28 00:00:00 -07:00
+date: 2011-05-10 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency