http_router 0.10.2 → 0.11.0

metadata

@@ -1,187 +1,135 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: http_router
-version: !ruby/object:Gem::Version 
-  hash: 51
+version: !ruby/object:Gem::Version
+  version: 0.11.0
   prerelease: 
-  segments: 
-  - 0
-  - 10
-  - 2
-  version: 0.10.2
 platform: ruby
-authors: 
+authors:
 - Joshua Hull
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-09 00:00:00 -07:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-04-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rack
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70277157558240 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: url_mount
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70277157558240
+- !ruby/object:Gem::Dependency
+  name: url_mount
+  requirement: &70277157557460 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
+      - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70277157557460
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: &70277157556860 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
+      - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: code_stats
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *70277157556860
+- !ruby/object:Gem::Dependency
+  name: code_stats
+  requirement: &70277157556280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: *70277157556280
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70277157555580 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
+      - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
-  name: rbench
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: *70277157555580
+- !ruby/object:Gem::Dependency
+  name: rbench
+  requirement: &70277157571180 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: *70277157571180
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70277157570560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
-  name: phocus
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: *70277157570560
+- !ruby/object:Gem::Dependency
+  name: phocus
+  requirement: &70277157570000 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: *70277157570000
+- !ruby/object:Gem::Dependency
+  name: bundler
+  requirement: &70277157569360 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
-        version: 1.0.0
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: *70277157569360
+- !ruby/object:Gem::Dependency
+  name: thin
+  requirement: &70277157568620 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - "="
-      - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 2
-        - 8
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
         version: 1.2.8
   type: :development
-  version_requirements: *id010
+  prerelease: false
+  version_requirements: *70277157568620
 description: This library allows you to recognize and build URLs in a Rack application.
 email: joshbuddy@gmail.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.md
 - LICENSE
-files: 
+files:
 - .gitignore
-- .rspec
 - Gemfile
 - LICENSE
 - README.md
@@ -209,25 +157,28 @@ files:
 - js/test/test.coffee
 - js/test/test.js
 - lib/http_router.rb
+- lib/http_router/generation_helper.rb
+- lib/http_router/generator.rb
 - lib/http_router/node.rb
-- lib/http_router/node/arbitrary.rb
+- lib/http_router/node/abstract_request_node.rb
 - lib/http_router/node/free_regex.rb
 - lib/http_router/node/glob.rb
 - lib/http_router/node/glob_regex.rb
+- lib/http_router/node/host.rb
 - lib/http_router/node/lookup.rb
 - lib/http_router/node/path.rb
 - lib/http_router/node/regex.rb
-- lib/http_router/node/request.rb
+- lib/http_router/node/request_method.rb
 - lib/http_router/node/root.rb
+- lib/http_router/node/scheme.rb
 - lib/http_router/node/spanning_regex.rb
+- lib/http_router/node/user_agent.rb
 - lib/http_router/node/variable.rb
-- lib/http_router/rack.rb
-- lib/http_router/rack/builder.rb
-- lib/http_router/rack/url_map.rb
-- lib/http_router/regex_route.rb
+- lib/http_router/regex_route_generation.rb
 - lib/http_router/request.rb
 - lib/http_router/response.rb
 - lib/http_router/route.rb
+- lib/http_router/route_helper.rb
 - lib/http_router/util.rb
 - lib/http_router/version.rb
 - test/common/generate.txt
@@ -242,41 +193,32 @@ files:
 - test/test_mounting.rb
 - test/test_recognition.rb
 - test/test_trailing_slash.rb
-has_rdoc: true
 homepage: http://github.com/joshbuddy/http_router
 licenses: []
-
 post_install_message: 
-rdoc_options: 
+rdoc_options:
 - --charset=UTF-8
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: http_router
-rubygems_version: 1.6.2
+rubygems_version: 1.8.15
 signing_key: 
 specification_version: 3
 summary: A kick-ass HTTP router for use in Rack
-test_files: 
+test_files:
 - test/common/generate.txt
 - test/common/http_recognize.txt
 - test/common/recognize.txt
@@ -289,3 +231,4 @@ test_files:
 - test/test_mounting.rb
 - test/test_recognition.rb
 - test/test_trailing_slash.rb
+has_rdoc: 

data/.rspec

@@ -1 +0,0 @@
---colour

data/lib/http_router/node/arbitrary.rb

@@ -1,30 +0,0 @@
-class HttpRouter
-  class Node
-    class Arbitrary < Node
-      attr_reader :allow_partial, :blk, :param_names
-
-      def initialize(router, parent, sallow_partial, blk, param_names)
-        @allow_partial, @blk, @param_names = allow_partial, blk, param_names
-        super(router, parent)
-      end
-
-      def usable?(other)
-        other.class == self.class && other.allow_partial == allow_partial && other.blk == blk && other.param_names == param_names
-      end
-
-      def to_code
-        b, method_name = @blk, :"blk_#{root.next_counter}"
-        inject_root_methods { define_method(method_name) { b } }
-        "#{"if request.path_finished?" unless @allow_partial}
-          request.continue = proc { |state|
-            if state
-              #{super}
-            end
-          }
-          #{method_name}[request, #{@param_names.nil? || @param_names.empty? ? '{}' : "Hash[#{@param_names.inspect}.zip(request.params)]"}]
-          request.continue = nil
-        #{"end" unless @allow_partial}"
-      end
-    end
-  end
-end

data/lib/http_router/node/request.rb

@@ -1,52 +0,0 @@
-class HttpRouter
-  class Node
-    class Request < Node
-      VALID_HTTP_VERBS = %w[HEAD GET DELETE POST PUT OPTIONS PATCH TRACE CONNECT]
-
-      attr_reader :request_method, :opts
-
-      def initialize(router, parent, opts)
-        opts.each do |k, v|
-          v = [v] unless v.is_a?(Array)
-          case k
-          when :request_method
-            v.map!{|val| val.to_s.upcase}
-            v.all?{|m| VALID_HTTP_VERBS.include?(m)} or raise InvalidRequestValueError, "Invalid value for request_method #{v.inspect}"
-            v.each{|val| router.known_methods << val}
-          end
-          opts[k] = v
-        end
-        @opts = opts
-        @opts[:request_method].each { |m| router.known_methods << m } if @opts.key?(:request_method)
-        super(router, parent)
-      end
-
-      def usable?(other)
-        other.class == self.class && other.opts == opts
-      end
-
-      def to_code
-        code = "if "
-        code << @opts.map do |k,v|
-          case v.size
-          when 1 then to_code_condition(k, v.first)
-          else        "(#{v.map{|vv| to_code_condition(k, vv)}.join(' or ')})"
-          end           
-        end * ' and '
-        code << "\n  #{super}\nend"
-      end
-
-      def inspect_label
-        "#{self.class.name.split("::").last} #{opts.inspect} (#{@matchers.size} matchers)"
-      end
-
-      private
-      def to_code_condition(k, v)
-        case v
-        when String then "#{v.inspect} == request.rack_request.#{k}"
-        else             "#{v.inspect} === request.rack_request.#{k}"
-        end
-      end
-    end
-  end
-end

data/lib/http_router/rack.rb

@@ -1,19 +0,0 @@
-class HttpRouter
-  module Rack
-    autoload :URLMap,       'http_router/rack/url_map'
-    autoload :Builder,      'http_router/rack/builder'
-    autoload :BuilderMixin, 'http_router/rack/builder'
-
-    # Monkey-patches Rack::Builder to use HttpRouter.
-    # See examples/rack_mapper.rb
-    def self.override_rack_builder!
-      ::Rack::Builder.class_eval("remove_method :map; include HttpRouter::Rack::BuilderMixin")
-    end
-
-    # Monkey-patches Rack::URLMap to use HttpRouter.
-    # See examples/rack_mapper.rb
-    def self.override_rack_urlmap!
-      ::Rack.class_eval("OriginalURLMap = URLMap; HttpRouterURLMap = HttpRouter::Rack::URLMap; remove_const :URLMap; URLMap = HttpRouterURLMap")
-    end
-  end
-end