http_router 0.4.0 → 0.4.1

data/.gitignore

@@ -4,3 +4,4 @@ pkg
 rdoc
 Gemfile.lock
 .rvmrc
+*.rbc

data/.rspec

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

data/Gemfile

@@ -1,13 +1,3 @@
 source :rubygems
 
-gem 'rack',       '>=1.0'
-gem 'url_mount',  '>=0.2.1'
-
-group :development do
-  gem 'rspec'
-  gem 'rake'
-  gem 'sinatra'
-  gem 'rbench'
-  gem 'code_stats'
-  gem 'tumbler', ">= 0.0.11"
-end
+gemspec

data/Rakefile

@@ -1,13 +1,12 @@
 require 'rubygems'
 require 'bundler'
-require 'spec'
 require 'code_stats'
-require 'spec/rake/spectask'
+require 'rspec/core/rake_task'
 
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts ||= []
-  t.spec_opts << "--options" << "spec/spec.opts"
-  t.spec_files = FileList['spec/**/*_spec.rb']
+desc "Run specs"
+RSpec::Core::RakeTask.new do |t|
+  #t.rspec_opts = %w(--options spec/spec.opts)
+  #t.ruby_opts  = %w(-w)
 end
 
 require 'rake/rdoctask'

data/benchmarks/rec2.rb

@@ -2,7 +2,7 @@ require 'rubygems'
 require 'rbench'
 
 $LOAD_PATH.unshift File.join(File.dirname(__FILE__), '..', 'lib')
-require 'lib/http_router'
+require 'http_router'
 
 #require 'http_router'
 
@@ -34,33 +34,33 @@ simple_and_dynamic_env = Rack::MockRequest.env_for('/dynamic/anything')
 #simple_and_dynamic_env1 = Rack::MockRequest.env_for('/rails/controller/action/id')
 #simple_and_dynamic_env2 = Rack::MockRequest.env_for('/greedy/controller/action/id')
 #simple_and_dynamic_env3 = Rack::MockRequest.env_for('/greedy/hey.hello.html')
+5.times {
+  RBench.run(TIMES) do
 
-RBench.run(TIMES) do
-
-  report "2 levels, static" do
-    u.call(simple_env).first == 200 or raise
-  end
-
-  report "4 levels, static" do
-    u.call(simple2_env).first == 200 or raise
-  end
+    report "2 levels, static" do
+      u.call(simple_env).first == 200 or raise
+    end
 
-  #report "8 levels, static" do
-  #  u.call(simple3_env).first == 200 or raise
-  #end
+    report "4 levels, static" do
+      u.call(simple2_env).first == 200 or raise
+    end
 
-  report "4 levels, 1 dynamic" do
-    u.call(simple_and_dynamic_env).first == 200 or raise
-  end
+    #report "8 levels, static" do
+    #  u.call(simple3_env).first == 200 or raise
+    #end
 
-  #report "8 levels, 3 dynamic" do
-  #  u.call(simple_and_dynamic_env1).first == 200 or raise
-  #end
-  #
-  #report "4 levels, 1 greedy" do
-  #  u.call(simple_and_dynamic_env2).first == 200 or raise
-  #end
+    report "4 levels, 1 dynamic" do
+      u.call(simple_and_dynamic_env).first == 200 or raise
+    end
 
-end
+    #report "8 levels, 3 dynamic" do
+    #  u.call(simple_and_dynamic_env1).first == 200 or raise
+    #end
+    #
+    #report "4 levels, 1 greedy" do
+    #  u.call(simple_and_dynamic_env2).first == 200 or raise
+    #end
 
+  end
+}
 puts `ps -o rss= -p #{Process.pid}`.to_i

data/http_router.gemspec

@@ -20,14 +20,14 @@ Gem::Specification.new do |s|
   s.rubyforge_project = 'http_router'
 
   # dependencies
-  s.add_runtime_dependency 'rack',        '>=1.0'
-  s.add_runtime_dependency 'url_mount',   '>=0.2.1'
-  s.add_development_dependency 'rspec'
+  s.add_runtime_dependency 'rack',        '>= 1.0.0'
+  s.add_runtime_dependency 'url_mount',   '~> 0.2.1'
+  s.add_development_dependency 'rspec',   '~> 2.0.0'
   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 'bundler', ">= 1.0.0.rc4"
+  s.add_development_dependency 'bundler', "~> 1.0.0"
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/lib/http_router/route.rb

@@ -42,12 +42,13 @@ class HttpRouter
     # *default_value -- Maps to #default_value method.
     def with_options(options)
       if options
-        name(options[:name])                               if options[:name]
-        matching(options[:matching])                       if options[:matching]
-        condition(options[:conditions])                    if options[:conditions]
-        default(options[:default_values])                  if options[:default_values]
-        partial(options[:partial])                         if options[:partial]
-        Array(options[:arbitrary]).each{|a| arbitrary(&a)} if options[:arbitrary]
+        name(options.delete(:name))                               if options[:name]
+        matching(options.delete(:matching))                       if options[:matching]
+        condition(options.delete(:conditions))                    if options[:conditions]
+        default(options.delete(:default_values))                  if options[:default_values]
+        partial(options.delete(:partial))                         if options[:partial]
+        Array(options.delete(:arbitrary)).each{|a| arbitrary(&a)} if options[:arbitrary]
+        matching(options)
       end
       self
     end

data/lib/http_router/version.rb

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

data/spec/recognize_spec.rb

@@ -392,6 +392,14 @@ describe "HttpRouter#recognize" do
       response.params_as_hash[:variable].should == '123'
     end
 
+    it "should recognize with a regex as part of the options" do
+      route = @router.add('/one-:variable-time', :variable => /\d+/).to(:test)
+      @router.recognize(Rack::MockRequest.env_for('/one-value-time')).should be_nil
+      response = @router.recognize(Rack::MockRequest.env_for('/one-123-time'))
+      response.route.should == route
+      response.params_as_hash[:variable].should == '123'
+    end
+
     it "should recognize when there is an extension" do
       route = @router.add('/hey.:greed.html').to(:test)
       response = @router.recognize(Rack::MockRequest.env_for('/hey.greedyboy.html'))

data/spec/spec_helper.rb

@@ -1,8 +1,5 @@
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-require 'rubygems'
 require 'http_router'
-require 'spec'
-require 'spec/autorun'
 
 module CallWithMockRequestMixin
   def call_with_mock_request(url = "/sample", method = "GET", params = Hash.new)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 13
   prerelease: false
   segments: 
   - 0
   - 4
-  - 0
-  version: 0.4.0
+  - 1
+  version: 0.4.1
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-04 00:00:00 -07:00
+date: 2010-10-18 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +26,12 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 15
+        hash: 23
         segments: 
         - 1
         - 0
-        version: "1.0"
+        - 0
+        version: 1.0.0
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
@@ -39,7 +40,7 @@ dependencies:
   requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
         hash: 21
         segments: 
@@ -55,12 +56,14 @@ dependencies:
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 3
+        hash: 15
         segments: 
+        - 2
         - 0
-        version: "0"
+        - 0
+        version: 2.0.0
   type: :development
   version_requirements: *id003
 - !ruby/object:Gem::Dependency 
@@ -125,15 +128,14 @@ dependencies:
   requirement: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 977940573
+        hash: 23
         segments: 
         - 1
         - 0
         - 0
-        - rc4
-        version: 1.0.0.rc4
+        version: 1.0.0
   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.
@@ -146,6 +148,7 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .gitignore
+- .rspec
 - CHANGELOG
 - Gemfile
 - README.rdoc
@@ -194,7 +197,6 @@ files:
 - spec/rack/urlmap_spec.rb
 - spec/recognize_spec.rb
 - spec/sinatra/recognize_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/joshbuddy/http_router
@@ -241,5 +243,4 @@ test_files:
 - spec/rack/urlmap_spec.rb
 - spec/recognize_spec.rb
 - spec/sinatra/recognize_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb

data/spec/spec.opts

@@ -1,7 +0,0 @@
---colour
---format
-specdoc
---loadby
-mtime
---reverse
---backtrace