http_router 0.3.10 → 0.3.11

data/README.rdoc

@@ -14,7 +14,7 @@ This is very new code. Lots of stuff probably doesn't work right. I will likely
 * Regex support for variables.
 * Request condition support.
 * Partial matches.
-* Supports interstitial variables (e.g. /my-:variable-brings.all.the.boys/yard).
+* Supports interstitial variables (e.g. /my-:variable-brings.all.the.boys/yard) and unnamed variable /one/:/two
 * Very fast and small code base (~1,000 loc).
 * Sinatra compatibility.
 

data/Rakefile

@@ -1,18 +1,15 @@
 require 'rubygems'
+require 'bundler'
 require 'spec'
+require 'code_stats'
 require 'spec/rake/spectask'
+
 Spec::Rake::SpecTask.new(:spec) do |t|
   t.spec_opts ||= []
   t.spec_opts << "--options" << "spec/spec.opts"
   t.spec_files = FileList['spec/**/*_spec.rb']
 end
 
-begin
-  require 'code_stats'
-  CodeStats::Tasks.new
-rescue LoadError
-end
-
 require 'rake/rdoctask'
 desc "Generate documentation"
 Rake::RDocTask.new do |rd|
@@ -21,6 +18,5 @@ Rake::RDocTask.new do |rd|
   rd.rdoc_dir = 'rdoc'
 end
 
-require 'ext/gem_rake'
-
-Bundler::GemHelper.install_tasks
+Bundler::GemHelper.install_tasks
+CodeStats::Tasks.new(:reporting_depth => 3)

data/benchmarks/rec2.rb

@@ -1,5 +1,8 @@
 require 'rubygems'
 require 'rbench'
+
+$LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
+
 require 'lib/http_router'
 
 u = HttpRouter.new

data/http_router.gemspec

@@ -23,10 +23,11 @@ Gem::Specification.new do |s|
   s.add_runtime_dependency 'rack',        '>=1.0'
   s.add_runtime_dependency 'url_mount',   '>=0.2.1'
   s.add_development_dependency 'rspec'
+  s.add_development_dependency 'code_stats'
   s.add_development_dependency 'rake'
   s.add_development_dependency 'sinatra'
   s.add_development_dependency 'rbench'
-  s.add_development_dependency 'tumbler', ">= 0.0.11"
+  s.add_development_dependency 'bundler', ">= 1.0.0.rc4"
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/http_router.rb

@@ -1,5 +1,3 @@
-$LOAD_PATH << File.expand_path(File.dirname(__FILE__))
-
 require 'rack'
 require 'url_mount'
 require 'ext/rack/uri_escape'

data/lib/http_router/node.rb

@@ -133,10 +133,10 @@ class HttpRouter
       current_nodes
     end
 
-    def find_on_parts(request, parts, params, alternate_request_methods)
+    def find_on_parts(request, parts, params)
       if parts and !parts.empty?
         if parts.size == 1 and parts.first == ''
-          potential_match = find_on_parts(request, [], params, alternate_request_methods)
+          potential_match = find_on_parts(request, [], params)
           if potential_match and (router.ignore_trailing_slash? or potential_match.value && potential_match.value.route.trailing_slash_ignore?)
             parts.shift
             return potential_match
@@ -149,10 +149,10 @@ class HttpRouter
             if tester.respond_to?(:matches?) and match = tester.matches?(parts)
               dupped_parts = parts.dup
               params.push((val = tester.consume(match, dupped_parts) and val.is_a?(Array)) ? val.map{|v| Rack::Utils.uri_unescape(v)} : Rack::Utils.uri_unescape(val))
-              parts.replace(dupped_parts) if response = node.find_on_parts(request, dupped_parts, params, alternate_request_methods)
+              parts.replace(dupped_parts) if response = node.find_on_parts(request, dupped_parts, params)
             elsif tester.respond_to?(:match) and match = tester.match(parts.whole_path) and match.begin(0) == 0
               dupped_parts = router.split(parts.whole_path[match[0].size, parts.whole_path.size])
-              parts.replace(dupped_parts) if response = node.find_on_parts(request, dupped_parts, params, alternate_request_methods)
+              parts.replace(dupped_parts) if response = node.find_on_parts(request, dupped_parts, params)
             else
               nil
             end
@@ -161,14 +161,14 @@ class HttpRouter
         end
         if match = @lookup && @lookup[parts.first]
           parts.shift
-          return match.find_on_parts(request, parts, params, alternate_request_methods)
+          return match.find_on_parts(request, parts, params)
         elsif @catchall
           params.push((val = @catchall.variable.consume(nil, parts) and val.is_a?(Array)) ? val.map{|v| Rack::Utils.uri_unescape(v)} : Rack::Utils.uri_unescape(val))
-          return @catchall.find_on_parts(request, parts, params, alternate_request_methods)
+          return @catchall.find_on_parts(request, parts, params)
         end
       end
       if request_node
-        request_node.find_on_request_methods(request, alternate_request_methods)
+        request_node.find_on_request_methods(request)
       elsif arbitrary_node
         arbitrary_node.find_on_arbitrary(request)
       elsif @value
@@ -203,7 +203,7 @@ class HttpRouter
     RequestMethods =  [:request_method, :host, :port, :scheme, :user_agent, :ip, :fullpath, :query_string]
     attr_accessor :request_method
 
-    def find_on_request_methods(request, alternate_request_methods)
+    def find_on_request_methods(request)
       if @request_method
         request_method_satisfied = false
         request_value = request.send(request_method)
@@ -212,23 +212,19 @@ class HttpRouter
             regexp === request_value
           end
           request_method_satisfied = true if next_node
-          next_node &&= next_node.last.find_on_request_methods(request, alternate_request_methods)
+          next_node &&= next_node.last.find_on_request_methods(request)
           return next_node if next_node
         end
         if @lookup and next_node = @lookup[request_value]
           request_method_satisfied = true
-          next_node = next_node.find_on_request_methods(request, alternate_request_methods)
+          next_node = next_node.find_on_request_methods(request)
           return next_node if next_node
         end
         if @catchall
           request_method_satisfied = true
-          next_node = @catchall.find_on_request_methods(request, alternate_request_methods)
+          next_node = @catchall.find_on_request_methods(request)
           return next_node if next_node
         end
-        if @request_method == :request_method
-          alternate_request_methods.concat(@lookup.keys)
-          alternate_request_methods.request_method_found ||= request_method_satisfied
-        end
       end
 
       if @arbitrary_node

data/lib/http_router/root.rb

@@ -1,5 +1,7 @@
 class HttpRouter
   class Root < Node
+    HttpRequestMethods = %w(HEAD GET HEAD POST DELETE PUT)
+    
     class AlternativeRequestMethods < Array
       attr_accessor :request_method_found
     end
@@ -10,26 +12,21 @@ class HttpRouter
     end
 
     def find(request)
-      path = request.path_info.dup
-      parts = router.split(path)
-      parts << '' if path[path.size - 1] == ?/
       params = []
-      alternate_request_methods = AlternativeRequestMethods.new
-      alternate_request_methods.request_method_found = false
-      process_response(
-        find_on_parts(request, parts, params, alternate_request_methods),
-        parts,
-        params, 
-        request,
-        alternate_request_methods
-      )
+      parts = get_parts(request)
+      node = find_on_parts(request, parts, params)
+      process_response(node, parts, params, request)
     end
-    
+
+    def get_parts(request)
+      parts = router.split(request.path_info.dup)
+      parts << '' if request.path_info[-1] == ?/
+      parts
+    end
+
     private
-    def process_response(node, parts, params, request, alternate_request_methods)
-      if node.respond_to?(:matched?) && !node.matched?
-        node
-      elsif node && node.value
+    def process_response(node, parts, params, request)
+      if node && node.value
         if parts.empty?
           Response.matched(node.value, params, request.path_info)
         elsif node.value.route.partially_match?
@@ -39,10 +36,17 @@ class HttpRouter
           nil
         end
       else
-        if alternate_request_methods.request_method_found or alternate_request_methods.empty?
+        alternate_methods = (HttpRequestMethods - [request.request_method]).select do |alternate_method|
+          test_request = request.dup
+          test_request.env['REQUEST_METHOD'] = alternate_method
+          node = find_on_parts(test_request, get_parts(request), [])
+          node && node.value
+        end
+
+        if alternate_methods.empty?
           nil
         else
-          Response.unmatched(405, {"Allow" => alternate_request_methods.uniq.join(", ")})
+          Response.unmatched(405, {"Allow" => alternate_methods.join(", ")})
         end
       end
     end

data/lib/http_router/route.rb

@@ -301,23 +301,23 @@ class HttpRouter
       paths = HttpRouter::OptionalCompiler.new(@path).paths
       paths.map do |path|
         splitting_indexes = []
-        variable_counter = 0
+        variable_position = 0
         counter = 0
         original_path = path.dup
         split_path = router.split(path)
-        index = 0
+        position = 0
         new_path = split_path.map do |part|
-          r = case part
+          processed_parts = case part
           when /^:([a-zA-Z_0-9]*)$/
             v_name = ($1.empty? ? anonymous_variable(counter += 1) : $1).to_sym
             router.variable(v_name, @matches_with[v_name])
           when /^\*([a-zA-Z_0-9]*)$/
-            if index != split_path.size - 1
+            if position != split_path.size - 1
               v_name = ($1.empty? ? anonymous_variable(counter += 1) : $1).to_sym
-              splitting_indexes << variable_counter
-              remaining_path_parts = split_path[index + 1, split_path.size]
+              splitting_indexes << variable_position
+              remaining_path_parts = split_path[position + 1, split_path.size]
               look_ahead_variable = remaining_path_parts.find{|p| p[0] == ?: || p[0] == ?*}
-              remaining_matcher = split_path[index + 1, look_ahead_variable ? remaining_path_parts.index(look_ahead_variable) : split_path.size].join('/')
+              remaining_matcher = split_path[position + 1, look_ahead_variable ? remaining_path_parts.index(look_ahead_variable) : split_path.size].join('/')
               remaining_path_parts.index(look_ahead_variable) if look_ahead_variable
               router.variable(v_name, /^(#{@matches_with[v_name] || '[^\/]*?'}\/)+(?=#{Regexp.quote(remaining_matcher)})/)
             else
@@ -327,9 +327,9 @@ class HttpRouter
           else
             generate_interstitial_parts(part)
           end
-          variable_counter += Array(r).select{|part| part.is_a?(Variable)}.size
-          index += 1
-          r
+          variable_position += Array(processed_parts).select{|part| part.is_a?(Variable)}.size
+          position += 1
+          processed_parts
         end
         new_path.flatten!
         Path.new(self, original_path, new_path, splitting_indexes.empty? ? nil : splitting_indexes)

data/lib/http_router/version.rb

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

data/spec/misc_spec.rb

@@ -9,7 +9,7 @@ describe "HttpRouter" do
       route = @router.add('/:test', :conditions => {:request_method => %w{HEAD GET}, :host => 'host1'}, :default_values => {:page => 1}, :matching => {:test => /\d+/}, :name => :foobar).to :test
       @router.recognize(Rack::MockRequest.env_for('http://host2/variable', :method => 'POST')).should be_nil
       @router.recognize(Rack::MockRequest.env_for('http://host1/variable', :method => 'POST')).should be_nil
-      @router.recognize(Rack::MockRequest.env_for('http://host2/123',      :method => 'POST')).matched?.should be_false
+      @router.recognize(Rack::MockRequest.env_for('http://host2/123',      :method => 'POST')).should be_nil
       @router.recognize(Rack::MockRequest.env_for('http://host1/123',      :method => 'POST')).matched?.should be_false
       @router.recognize(Rack::MockRequest.env_for('http://host1/123',      :method => 'GET' )).route.dest.should == :test
       @router.url(:foobar, '123').should == '/123?page=1'

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 7
+  hash: 5
   prerelease: false
   segments: 
   - 0
   - 3
-  - 10
-  version: 0.3.10
+  - 11
+  version: 0.3.11
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-06 00:00:00 -07:00
+date: 2010-08-08 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -64,7 +64,7 @@ dependencies:
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: rake
+  name: code_stats
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
@@ -78,7 +78,7 @@ dependencies:
   type: :development
   version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: sinatra
+  name: rake
   prerelease: false
   requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
@@ -92,7 +92,7 @@ dependencies:
   type: :development
   version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rbench
+  name: sinatra
   prerelease: false
   requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
@@ -106,21 +106,36 @@ dependencies:
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: tumbler
+  name: rbench
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 3
         segments: 
         - 0
-        - 0
-        - 11
-        version: 0.0.11
+        version: "0"
   type: :development
   version_requirements: *id007
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  prerelease: false
+  requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 977940573
+        segments: 
+        - 1
+        - 0
+        - 0
+        - rc4
+        version: 1.0.0.rc4
+  type: :development
+  version_requirements: *id008
 description: This library allows you to recognize and build URLs in a Rack application. As well it contains an interface for use within Sinatra.
 email: joshbuddy@gmail.com
 executables: []
@@ -135,7 +150,6 @@ files:
 - Gemfile
 - README.rdoc
 - Rakefile
-- Tumbler
 - benchmarks/gen2.rb
 - benchmarks/generation_bm.rb
 - benchmarks/rack_mount.rb
@@ -154,7 +168,6 @@ files:
 - examples/unnamed_variable.ru
 - examples/variable.ru
 - examples/variable_with_regex.ru
-- ext/gem_rake.rb
 - http_router.gemspec
 - lib/ext/rack/rack_mapper.rb
 - lib/ext/rack/rack_urlmap.rb

data/Tumbler

@@ -1,4 +0,0 @@
-gem_name "http_router"
-
-version_file 'lib/http_router/version.rb'
-changelog_file "CHANGELOG"

data/ext/gem_rake.rb

@@ -1,126 +0,0 @@
-module Bundler
-  class GemHelper
-
-    def self.install_tasks
-      dir = caller.find{|c| /Rakefile:/}[/^(.*?)\/Rakefile:/, 1]
-      GemHelper.new(dir).install
-    end
-
-    attr_reader :spec_path, :base, :name
-
-    def initialize(base, name = nil)
-      @base = base
-      @name = name || interpolate_name
-      @spec_path = File.join(@base, "#{@name}.gemspec")
-    end
-
-    def install
-      desc 'Build your gem into the pkg directory'
-      task 'build' do
-        build_gem
-      end
-
-      desc 'Install your gem into the pkg directory'
-      task 'install' do
-        install_gem
-      end
-
-      desc 'Push your gem to rubygems'
-      task 'push' do
-        push_gem
-      end
-    end
-
-    def build_gem
-      file_name = nil
-      sh("gem build #{spec_path}") {
-        file_name = File.basename(built_gem_path)
-        FileUtils.mkdir_p(File.join(base, 'pkg'))
-        FileUtils.mv(built_gem_path, 'pkg')
-      }
-      File.join(base, 'pkg', file_name)
-    end
-
-    def install_gem
-      built_gem_path = build_gem
-      sh("gem install #{built_gem_path}")
-    end
-
-    def push_gem
-      guard_clean
-      guard_already_tagged
-      tag_version {
-        git_push
-        rubygem_push(build_gem)
-      }
-    end
-
-    protected
-    def rubygem_push(path)
-      sh("gem push #{path}")
-    end
-
-    def built_gem_path
-      Dir[File.join(base, "#{name}-*.gem")].sort_by{|f| File.mtime(f)}.last
-    end
-
-    def interpolate_name
-      gemspecs = Dir[File.join(base, "*.gemspec")]
-      raise "Unable to determine name from existing gemspec." unless gemspecs.size == 1
-
-      File.basename(gemspecs.first)[/^(.*)\.gemspec$/, 1]
-    end
-
-    def git_push
-      sh "git push --all"
-      sh "git push --tags"
-    end
-
-    def guard_already_tagged
-      sh('git tag').split(/\n/).include?(current_version_tag) and raise("This tag has already been committed to the repo.")
-    end
-
-    def guard_clean
-      clean? or raise("There are files that need to be committed first.")
-    end
-
-    def clean?
-      sh("git ls-files -dm").split("\n").size.zero?
-    end
-
-    def tag_version
-      sh "git tag #{current_version_tag}"
-      yield if block_given?
-    rescue
-      sh "git tag -d #{current_version_tag}"
-      raise
-    end
-
-    def current_version
-      raise("Version file could not be found at #{version_file_path}") unless File.exist?(version_file_path)
-      File.read(version_file_path)[/V(ERSION|ersion)\s*=\s*(["'])(.*?)\2/, 3]
-    end
-
-    def version_file_path
-      File.join(base, 'lib', name, 'version.rb')
-    end
-
-    def current_version_tag
-      "v#{current_version}"
-    end
-
-    def sh(cmd, &block)
-      output, code = sh_with_code(cmd, &block)
-      code == 0 ? output : raise(output)
-    end
-
-    def sh_with_code(cmd, &block)
-      output = ''
-      Dir.chdir(base) { 
-        output = `#{cmd}`
-        block.call if block and $? == 0
-      }
-      [output, $?]
-    end
-  end
-end