http_router 0.11.0 → 0.11.1

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: afb349e4d4bfdd4a1d17f69c7447304b1150ff74
+  data.tar.gz: 1c784865657a739153919fb02b33620e9b1daaa4
+SHA512:
+  metadata.gz: 40163e582745fabb018c8ce4a7da8ca36a6ea3ee4dc06d88fe8c571e5435a8cf2a39e5f18d00f0a301eff2ba86b178b883f858dcb2febddb38b82df4ad37ae6e
+  data.tar.gz: 925003de1d9d4455099a42e645d5d4915f7bdaf7129ecccc07168832804130cc2932be9c29f86edec126af4bcc205ecdac06a256ec5fd85caa486660ca943e8d

data/Gemfile

@@ -1,3 +1,3 @@
-source :rubygems
+source 'https://rubygems.org'
 
-gemspec
+gemspec

data/Rakefile

@@ -161,11 +161,15 @@ namespace :test do
   end
 end
 
-require 'rake/rdoctask'
+begin
+  require 'rake/rdoctask'
+rescue 
+  require 'rdoc/task'
+end
 desc "Generate documentation"
 Rake::RDocTask.new do |rd|
-  rd.main = "README.rdoc"
-  rd.rdoc_files.include("README.rdoc", "lib/**/*.rb")
+  rd.main = "README.md"
+  rd.rdoc_files.include("README.md", "lib/**/*.rb")
   rd.rdoc_dir = 'rdoc'
 end
 

data/lib/http_router.rb

@@ -24,6 +24,8 @@ class HttpRouter
   TooManyParametersException  = Class.new(RuntimeError)
   # Raised when there are left over options
   LeftOverOptions             = Class.new(RuntimeError)
+  # Raised when there are duplicate param names specified in a Path
+  AmbiguousVariableException  = Class.new(RuntimeError)
 
   RecognizeResponse           = Struct.new(:matches, :acceptable_methods)
 
@@ -104,41 +106,20 @@ class HttpRouter
     end
   end
 
+  # Creates helper methods for each supported HTTP verb, except GET, which is
+  # a special case that accepts both GET and HEAD requests.
+  Route::VALID_HTTP_VERBS_WITHOUT_GET.each do |request_method|
+    request_method_symbol = request_method.downcase.to_sym
+    define_method(request_method_symbol) do |path, opts = {}, &app|
+      add_with_request_method(path, request_method_symbol, opts, &app)
+    end
+  end
+
   # Adds a path that only responds to the request method +GET+.
   #
   # Returns the route object.
   def get(path, opts = {}, &app); add_with_request_method(path, [:get, :head], opts, &app); end
 
-  # Adds a path that only responds to the request method +POST+.
-  #
-  # Returns the route object.
-  def post(path, opts = {}, &app); add_with_request_method(path, :post, opts, &app); end
-
-  # Adds a path that only responds to the request method +DELETE+.
-  #
-  # Returns the route object.
-  def delete(path, opts = {}, &app); add_with_request_method(path, :delete, opts, &app); end
-
-  # Adds a path that only responds to the request method +PUT+.
-  #
-  # Returns the route object.
-  def put(path, opts = {}, &app); add_with_request_method(path, :put, opts, &app); end
-
-  # Adds a path that only responds to the request method +PATCH+.
-  #
-  # Returns the route object.
-  def patch(path, opts = {}, &app); add_with_request_method(path, :patch, opts, &app); end
-
-  # Adds a path that only responds to the request method +OPTIONS+.
-  #
-  # Returns the route object.
-  def trace(path, opts = {}, &app); add_with_request_method(path, :trace, opts, &app); end
-
-  # Adds a path that only responds to the request method +OPTIONS+.
-  #
-  # Returns the route object.
-  def conenct(path, opts = {}, &app); add_with_request_method(path, :conenct, opts, &app); end
-
   # Performs recoginition without actually calling the application and returns an array of all
   # matching routes or nil if no match was found.
   def recognize(env, &callback)

data/lib/http_router/node/path.rb

@@ -6,7 +6,8 @@ class HttpRouter
       def initialize(router, parent, route, path, param_names = [])
         @route, @path, @param_names, @dynamic = route, path, param_names, !param_names.empty?
         @route.add_path(self)
-        raise AmbiguousVariableException, "You have duplicate variable name present: #{param_names.join(', ')}" if param_names.uniq.size != param_names.size
+
+        raise AmbiguousVariableException, "You have duplicate variable names present: #{duplicates.join(', ')}" if param_names.uniq.size != param_names.size
         super router, parent
         router.uncompile
       end
@@ -46,6 +47,10 @@ class HttpRouter
       def inspect_label
         "Path: #{path.inspect} for route #{route.name || 'unnamed route'} to #{route.dest.inspect}"
       end
+
+      def duplicates
+        param_names.group_by { |e| e }.select { |k, v| v.size > 1 }.map(&:first)
+      end
     end
   end
 end

data/lib/http_router/node/spanning_regex.rb

@@ -12,10 +12,10 @@ class HttpRouter
           request.path = remaining_path.split('/')
           #{node_to_code}
           request.path = _#{whole_path_var}
-          request.params.slice!(#{-params_count.size}, #{params_count})
+          request.params.slice!(#{-params_count}, #{params_count})
         end
         "
       end
     end
   end
-end
+end

data/lib/http_router/route.rb

@@ -2,7 +2,9 @@ require 'set'
 
 class HttpRouter
   class Route
-    VALID_HTTP_VERBS = %w{GET POST PUT DELETE HEAD OPTIONS TRACE}
+    # The list of HTTP request methods supported by HttpRouter.
+    VALID_HTTP_VERBS = %w{GET POST PUT DELETE HEAD OPTIONS TRACE PATCH OPTIONS LINK UNLINK}
+    VALID_HTTP_VERBS_WITHOUT_GET = VALID_HTTP_VERBS - %w{GET}
 
     attr_reader :default_values, :router, :match_partially, :other_hosts, :paths, :request_methods, :name
     attr_accessor :match_partially, :router, :host, :user_agent, :ignore_trailing_slash,

data/lib/http_router/route_helper.rb

@@ -46,7 +46,9 @@ class HttpRouter
       methods = [methods] unless methods.is_a?(Array)
       methods.each do |method|
         method = method.to_s.upcase
-        raise unless Route::VALID_HTTP_VERBS.include?(method)
+        unless Route::VALID_HTTP_VERBS.include?(method)
+          raise ArgumentError, "Unsupported HTTP request method: #{method}"
+        end
         @request_methods << method
       end
     end
@@ -77,28 +79,17 @@ class HttpRouter
       self
     end
 
-    def head
-      add_request_method "HEAD"
-      self
+    # Creates helper methods for each supported HTTP verb.
+    Route::VALID_HTTP_VERBS_WITHOUT_GET.each do |request_method|
+      define_method(request_method.downcase) do
+        add_request_method(request_method)
+        self
+      end
     end
 
     def get
-      add_request_method "GET"
-      self
-    end
-
-    def post
-      add_request_method "POST"
-      self
-    end
-
-    def put
-      add_request_method "PUT"
-      self
-    end
-
-    def delete
-      add_request_method "DELETE"
+      add_request_method("GET")
+      add_request_method("HEAD")
       self
     end
 

data/lib/http_router/version.rb

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

data/test/test_misc.rb

@@ -87,6 +87,12 @@ class TestMisc < MiniTest::Unit::TestCase
     assert_raises(HttpRouter::InvalidRouteException) { r.path(:route) }
   end
 
+  def test_ambigiuous_parameters_in_route
+    r = router
+    r.add("/abc/:id/test/:id", :name => :route).default_destination
+    assert_raises(HttpRouter::AmbiguousVariableException) { r.path(:route, :id => 'fail') }
+  end
+
   def test_public_interface
     methods = HttpRouter.public_instance_methods.map(&:to_sym)
     assert methods.include?(:url_mount)

metadata

@@ -1,126 +1,155 @@
 --- !ruby/object:Gem::Specification
 name: http_router
 version: !ruby/object:Gem::Version
-  version: 0.11.0
-  prerelease: 
+  version: 0.11.1
 platform: ruby
 authors:
 - Joshua Hull
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-04-11 00:00:00.000000000 Z
+date: 2014-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rack
-  requirement: &70277157558240 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70277157558240
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: 1.0.0
 - !ruby/object:Gem::Dependency
   name: url_mount
-  requirement: &70277157557460 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.2.1
   type: :runtime
   prerelease: false
-  version_requirements: *70277157557460
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.2.1
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70277157556860 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 2.0.0
   type: :development
   prerelease: false
-  version_requirements: *70277157556860
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.0.0
 - !ruby/object:Gem::Dependency
   name: code_stats
-  requirement: &70277157556280 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277157556280
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70277157555580 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
         version: 0.8.7
   type: :development
   prerelease: false
-  version_requirements: *70277157555580
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.8.7
 - !ruby/object:Gem::Dependency
   name: rbench
-  requirement: &70277157571180 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277157571180
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70277157570560 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277157570560
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: phocus
-  requirement: &70277157570000 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277157570000
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &70277157569360 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70277157569360
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70277157568620 !ruby/object:Gem::Requirement
-    none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - =
+    - - '='
       - !ruby/object:Gem::Version
         version: 1.2.8
   type: :development
   prerelease: false
-  version_requirements: *70277157568620
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.2.8
 description: This library allows you to recognize and build URLs in a Rack application.
 email: joshbuddy@gmail.com
 executables: []
@@ -195,26 +224,25 @@ files:
 - test/test_trailing_slash.rb
 homepage: http://github.com/joshbuddy/http_router
 licenses: []
+metadata: {}
 post_install_message: 
 rdoc_options:
 - --charset=UTF-8
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: http_router
-rubygems_version: 1.8.15
+rubygems_version: 2.1.11
 signing_key: 
 specification_version: 3
 summary: A kick-ass HTTP router for use in Rack
@@ -231,4 +259,3 @@ test_files:
 - test/test_mounting.rb
 - test/test_recognition.rb
 - test/test_trailing_slash.rb
-has_rdoc: