http_router 0.8.11 → 0.9.3

data/test/generation.rb

@@ -1,83 +1,13 @@
 require 'json'
-
-generation_file = "#{File.dirname(__FILE__)}/common/generate.txt"
-generation = File.read(generation_file)
-
-class GenerationTest
-  Info = Struct.new(:case, :original_line, :num)
-  
-  attr_reader :routes, :tests
-  def initialize(file)
-    @tests = []
-    @routes = Info.new([], "", 0)
-  end
-
-  def error(msg)
-    raise("Error in case: #{@routes.original_line.strip}:#{@routes.num + 1}\n#{msg}")
-  end
-
-  def add_test(line, num)
-    @tests << Info.new(JSON.parse(line), line, num)
-  end
-
-  def add_routes(line, num)
-    info = Info.new(JSON.parse(line), line, num)
-    error("Routes have already been defined without tests") if info.case.is_a?(Array) && !@routes.case.empty?
-    if info.case.is_a?(Array)
-      @routes = info
-    elsif @routes.case.empty?
-      info.case = [info.case]
-      @routes = info
-    else
-      @routes.case << info.case
-    end
-  end
-
-  def interpret_val(val)
-    case val
-    when nil
-      error("Unable to interpret #{val.inspect}")
-    when Hash
-      val['regex'] ? Regexp.new(val['regex']) : error("Okay serious, no idea #{val.inspect}")
-    else
-      val
-    end
-  end
-
-  def invoke
-    error("invoke called with no tests or routes") if @tests.empty? || @routes.nil?
-    router = HttpRouter.new
-    @routes.case.each do |route_definition|
-      error("Too many keys! #{route_definition.keys.inspect}") unless route_definition.keys.size == 1
-      route_name, route_properties = route_definition.keys.first, route_definition.values.first
-      route = case route_properties
-      when String
-        router.add(route_properties)
-      when Hash
-        opts = {}
-        route_path = interpret_val(route_properties.delete("path"))
-        if route_properties.key?("conditions")
-          opts[:conditions] = Hash[route_properties.delete("conditions").map{|k, v| [k.to_sym, interpret_val(v)]}]
-        end
-        if route_properties.key?("default")
-          opts[:default_values] = Hash[route_properties.delete("default").map{|k, v| [k.to_sym, interpret_val(v)]}]
-        end
-        route_properties.each do |key, val|
-          opts[key.to_sym] = interpret_val(val)
-        end
-        router.add(route_path, opts)
-      else
-        error("Route isn't a String or hash")
-      end
-      route.name(route_name.to_sym)
-      route.to{|env| [200, {"env-to-test" => env.dup}, [route_name]]}
-    end
+require "#{File.dirname(__FILE__)}/generic"
+class GenerationTest < AbstractTest
+  def run_tests
     @tests.map(&:case).each do |(expected_result, name, args)|
       args = [args] unless args.is_a?(Array)
       args.compact!
       args.map!{|a| a.is_a?(Hash) ? Hash[a.map{|k,v| [k.to_sym, v]}] : a }
       result = begin
-        router.url(name.to_sym, *args)
+        @router.url(name.to_sym, *args)
       rescue HttpRouter::InvalidRouteException
         nil
       rescue HttpRouter::MissingParameterException
@@ -89,31 +19,4 @@ class GenerationTest
   end
 end
 
-tests = []
-test = nil
-num = 0
-generation.each_line do |line|
-  begin
-    case line
-    when /^#/, /^\s*$/
-      # skip
-    when /^(  |\t)/
-      test.add_test(line, num)
-    else
-      if test.nil? || !test.tests.empty?
-        tests << test if test
-        test = GenerationTest.new(generation_file)
-      end
-      test.add_routes(line, num)
-    end
-  rescue
-    warn "There was a problem with #{num}:#{line}"
-    raise
-  end
-  num += 1
-end
-tests << test
-
-puts "Running generation tests (Routes: #{tests.size}, Tests: #{tests.inject(0){|s, t| s+=t.tests.size}})..."
-tests.each(&:invoke)
-puts "\ndone!"
+GenerationTest.run("#{File.dirname(__FILE__)}/common/generate.txt")

data/test/generic.rb

@@ -0,0 +1,111 @@
+require 'json'
+
+class AbstractTest
+  def self.run(file)
+    contents = File.read(file)
+    tests = []
+    test = nil
+    num = 0
+    contents.each_line do |line|
+      begin
+        case line
+        when /^#/, /^\s*$/
+          # skip
+        when /^(  |\t)/
+          test.add_test(line, num)
+        else
+          if test.nil? || !test.tests.empty?
+            tests << test if test
+            test = new(file)
+          end
+          test.add_routes(line, num)
+        end
+      rescue
+        warn "There was a problem with #{num}:#{line}"
+        raise
+      end
+      num += 1
+    end
+    tests << test
+
+    puts "Running tests (#{name}) (Routes: #{tests.size}, Tests: #{tests.inject(0){|s, t| s+=t.tests.size}})..."
+    tests.each(&:invoke)
+    puts "\ndone!"
+  end
+
+  Info = Struct.new(:case, :original_line, :num)
+  
+  attr_reader :routes, :tests
+  def initialize(file)
+    @tests = []
+    @routes = Info.new([], "", 0)
+  end
+
+  def error(msg)
+    raise("Error in case: #{@routes.original_line.strip}:#{@routes.num + 1}\n#{msg}")
+  end
+
+  def add_test(line, num)
+    @tests << Info.new(JSON.parse(line), line, num)
+  end
+
+  def add_routes(line, num)
+    info = Info.new(JSON.parse(line), line, num)
+    error("Routes have already been defined without tests") if info.case.is_a?(Array) && !@routes.case.empty?
+    if info.case.is_a?(Array)
+      @routes = info
+    elsif @routes.case.empty?
+      info.case = [info.case]
+      @routes = info
+    else
+      @routes.case << info.case
+    end
+  end
+
+  def interpret_val(val)
+    case val
+    when nil
+      error("Unable to interpret #{val.inspect}")
+    when Hash
+      val['regex'] ? Regexp.new(val['regex']) : error("Okay serious, no idea #{val.inspect}")
+    else
+      val
+    end
+  end
+
+  def run_tests
+    raise
+  end
+
+  def invoke
+    error("invoke called with no tests or routes") if @tests.empty? || @routes.nil?
+    @router = HttpRouter.new
+    @routes.case.each do |route_definition|
+      error("Too many keys! #{route_definition.keys.inspect}") unless route_definition.keys.size == 1
+      route_name, route_properties = route_definition.keys.first, route_definition.values.first
+      route = case route_properties
+      when String
+        @router.add(route_properties)
+      when Hash
+        opts = {}
+        route_path = interpret_val(route_properties.delete("path"))
+        if route_properties.key?("conditions")
+          opts[:conditions] = Hash[route_properties.delete("conditions").map{|k, v| [k.to_sym, interpret_val(v)]}]
+        end
+        if route_properties.key?("default")
+          opts[:default_values] = Hash[route_properties.delete("default").map{|k, v| [k.to_sym, interpret_val(v)]}]
+        end
+        route_properties.each do |key, val|
+          opts[key.to_sym] = interpret_val(val)
+        end
+        @router.add(route_path, opts)
+      else
+        error("Route isn't a String or hash")
+      end
+      route.name(route_name.to_sym)
+      route.to{|env| [200, {"env-to-test" => env.dup}, [route_name]]}
+    end
+    run_tests
+    print '.'
+  end
+end

data/test/recognition.rb

@@ -1,74 +1,6 @@
-require 'json'
-
-recognition_file = "#{File.dirname(__FILE__)}/common/recognize.txt"
-recognition = File.read(recognition_file)
-
-class RecognitionTest
-  Info = Struct.new(:case, :original_line, :num)
-  
-  attr_reader :routes, :tests
-  def initialize(file)
-    @tests = []
-    @routes = Info.new([], "", 0)
-  end
-
-  def error(msg)
-    raise("Error in case: #{@routes.original_line.strip}:#{@routes.num + 1}\n#{msg}")
-  end
-
-  def add_test(line, num)
-    @tests << Info.new(JSON.parse(line), line, num)
-  end
-
-  def add_routes(line, num)
-    info = Info.new(JSON.parse(line), line, num)
-    error("Routes have already been defined without tests") if info.case.is_a?(Array) && !@routes.case.empty?
-    if info.case.is_a?(Array)
-      @routes = info
-    elsif @routes.case.empty?
-      info.case = [info.case]
-      @routes = info
-    else
-      @routes.case << info.case
-    end
-  end
-
-  def interpret_val(val)
-    case val
-    when nil
-      error("Unable to interpret #{val.inspect}")
-    when Hash
-      val['regex'] ? Regexp.new(val['regex']) : error("Okay serious, no idea #{val.inspect}")
-    else
-      val
-    end
-  end
-
-  def invoke
-    error("invoke called with no tests or routes") if @tests.empty? || @routes.nil?
-    router = HttpRouter.new
-    @routes.case.each do |route_definition|
-      error("Too many keys! #{route_definition.keys.inspect}") unless route_definition.keys.size == 1
-      route_name, route_properties = route_definition.keys.first, route_definition.values.first
-      route = case route_properties
-      when String
-        router.add(route_properties)
-      when Hash
-        opts = {}
-        route_path = interpret_val(route_properties.delete("path"))
-        if route_properties.key?("conditions")
-          opts[:conditions] = Hash[route_properties.delete("conditions").map{|k, v| [k.to_sym, interpret_val(v)]}]
-        end
-        route_properties.each do |key, val|
-          opts[key.to_sym] = interpret_val(val)
-        end
-        router.add(route_path, opts)
-      else
-        error("Route isn't a String or hash")
-      end
-      route.name(route_name.to_sym)
-      route.to{|env| [200, {"env-to-test" => env.dup}, [route_name]]}
-    end
+require "#{File.dirname(__FILE__)}/generic"
+class RecognitionTest < AbstractTest
+  def run_tests
     @tests.map(&:case).each do |(name, req, params)|
       env = case req
       when String
@@ -79,7 +11,7 @@ class RecognitionTest
         e['rack.url_scheme'] = req['scheme'] if req.key?('scheme')
         e
       end
-      response = router.call(env)
+      response = @router.call(env)
       case name
       when nil
         error("Expected no response") unless response.first == 404
@@ -112,31 +44,5 @@ class RecognitionTest
   end
 end
 
-tests = []
-test = nil
-num = 0
-recognition.each_line do |line|
-  begin
-    case line
-    when /^#/, /^\s*$/
-      # skip
-    when /^(  |\t)/
-      test.add_test(line, num)
-    else
-      if test.nil? || !test.tests.empty?
-        tests << test if test
-        test = RecognitionTest.new(recognition_file)
-      end
-      test.add_routes(line, num)
-    end
-  rescue
-    warn "There was a problem with #{num}:#{line}"
-    raise
-  end
-  num += 1
-end
-tests << test
-
-puts "Running recognition tests (Routes: #{tests.size}, Tests: #{tests.inject(0){|s, t| s+=t.tests.size}})..."
-tests.each(&:invoke)
-puts "\ndone!"
+RecognitionTest.run("#{File.dirname(__FILE__)}/common/recognize.txt")
+RecognitionTest.run("#{File.dirname(__FILE__)}/common/http_recognize.txt")

data/test/test_misc.rb

@@ -8,8 +8,8 @@ class TestMisc < MiniTest::Unit::TestCase
 
     assert_equal nil, r1.recognize(Rack::Request.new(Rack::MockRequest.env_for('/test2')))
     assert r2.recognize(Rack::MockRequest.env_for('/test2'))
-    assert_equal r1.routes.first, r1.named_routes[:test_route]
-    assert_equal r2.routes.first, r2.named_routes[:test_route]
+    assert_equal r1.routes.first, r1.named_routes[:test_route].first
+    assert_equal r2.routes.first, r2.named_routes[:test_route].first
 
     r1.add('/another').name(:test).to(:test2)
 
@@ -33,4 +33,28 @@ class TestMisc < MiniTest::Unit::TestCase
     assert 304, response[0]
     assert "/hi", response[1]["Location"]
   end
+
+  def test_multi_name_gen
+    r = HttpRouter.new
+    r.add('/').name(:index).default_destination
+    r.add('/:name').name(:index).default_destination
+    r.add('/:name/:category').name(:index).default_destination
+    assert_equal '/', r.url(:index)
+    assert_equal '/name', r.url(:index, 'name')
+    assert_equal '/name/category', r.url(:index, 'name', 'category')
+  end
+
+  def test_regex_generation
+    r = HttpRouter.new
+    r.add(%r|/test/.*|, :path_for_generation => '/test/:variable').name(:route).default_destination
+    assert_equal '/test/var', r.url(:route, "var")
+  end
+
+  def test_regex_generation
+    r = HttpRouter.new
+    r.add(%r|/test/.*|, :path_for_generation => '/test/:variable').name(:route).default_destination
+    assert_equal '/test/var', r.url(:route, "var")
+    assert_equal '/test/var', r.url(:route, :variable => "var")
+    assert_raises(HttpRouter::InvalidRouteException) { r.url(:route) }
+  end
 end

data/test/test_mounting.rb

@@ -30,10 +30,10 @@ class TestMounting < MiniTest::Unit::TestCase
 
   def test_path_with_optional
     @r1.add("/foo(/:bar)").to(@r2)
-    @r2.add("/hey(/:there)").name(:test).to{|env| [200, {}, []]}
-    assert_equal "/foo/hey", @r2.url(:test)
-    assert_equal "/foo/bar/hey", @r2.url(:test, :bar => "bar")
-    assert_equal "/foo/bar/hey/there", @r2.url(:test, :bar => "bar", :there => "there")
+    @r2.add("/hey(/:there)").name(:test2).to{|env| [200, {}, []]}
+    assert_equal "/foo/hey", @r2.url(:test2)
+    assert_equal "/foo/bar/hey", @r2.url(:test2, :bar => "bar")
+    assert_equal "/foo/bar/hey/there", @r2.url(:test2, :bar => "bar", :there => "there")
   end
 
   def test_nest3

data/test/test_recognition.rb

@@ -73,6 +73,15 @@ class TestRecognition < MiniTest::Unit::TestCase
     assert_body 'working', router.call(Rack::MockRequest.env_for('/'))
   end
 
+  def test_non_path_matching
+    passed, working = router {
+      add(:conditions => {:user_agent => /MSIE/}).to { |env| [200, {}, ['IE']] }
+      add('/').to { |env| [200, {}, ['SOMETHING ELSE']] }
+    }
+    assert_body 'SOMETHING ELSE', router.call(Rack::MockRequest.env_for('/'))
+    assert_body 'IE', router.call(Rack::MockRequest.env_for('/', 'HTTP_USER_AGENT' => 'THIS IS MSIE DAWG'))
+  end
+
   def test_passing_with_cascade
     passed, working = router {
       add('/').to { |env| [200, {'X-Cascade' => 'pass'}, ['pass']] }
@@ -90,4 +99,13 @@ class TestRecognition < MiniTest::Unit::TestCase
     assert_route matching, '/test/123/123/asd/aasd/zxcqwe/asdzxc', {:var => '123', :var2 => '123', :glob => %w{asd aasd zxcqwe asdzxc}}
     assert got_this_far, "matching should have gotten this far"
   end
+
+  def test_compiling_uncompiling
+    @router = HttpRouter.new
+    root = @router.add('/').default_destination
+    assert_route root, '/'
+    test = @router.add('/test').default_destination
+    assert_route root, '/'
+    assert_route test, '/test'
+  end
 end

metadata

@@ -1,8 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
+  hash: 61
   prerelease: 
-  version: 0.8.11
+  segments: 
+  - 0
+  - 9
+  - 3
+  version: 0.9.3
 platform: ruby
 authors: 
 - Joshua Hull
@@ -10,119 +15,161 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-07-05 00:00:00 -07:00
+date: 2011-07-27 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: rack
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
+  requirement: *id001
+  name: rack
   type: :runtime
-  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: url_mount
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 0
+        - 2
+        - 1
         version: 0.2.1
+  requirement: *id002
+  name: url_mount
   type: :runtime
-  version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: minitest
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 2
+        - 0
+        - 0
         version: 2.0.0
+  requirement: *id003
+  name: minitest
   type: :development
-  version_requirements: *id003
 - !ruby/object:Gem::Dependency 
-  name: code_stats
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
+  requirement: *id004
+  name: code_stats
   type: :development
-  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: rake
   prerelease: false
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 49
+        segments: 
+        - 0
+        - 8
+        - 7
         version: 0.8.7
+  requirement: *id005
+  name: rake
   type: :development
-  version_requirements: *id005
 - !ruby/object:Gem::Dependency 
-  name: rbench
   prerelease: false
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
+  requirement: *id006
+  name: rbench
   type: :development
-  version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: json
   prerelease: false
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
+  requirement: *id007
+  name: json
   type: :development
-  version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: phocus
   prerelease: false
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  version_requirements: &id008 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
+  requirement: *id008
+  name: phocus
   type: :development
-  version_requirements: *id008
 - !ruby/object:Gem::Dependency 
-  name: bundler
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  version_requirements: &id009 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
+        hash: 23
+        segments: 
+        - 1
+        - 0
+        - 0
         version: 1.0.0
+  requirement: *id009
+  name: bundler
   type: :development
-  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
-  name: thin
   prerelease: false
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  version_requirements: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 15
+        segments: 
+        - 1
+        - 2
+        - 8
         version: 1.2.8
+  requirement: *id010
+  name: thin
   type: :development
-  version_requirements: *id010
 description: This library allows you to recognize and build URLs in a Rack application.
 email: joshbuddy@gmail.com
 executables: []
@@ -156,20 +203,24 @@ files:
 - examples/variable.ru
 - examples/variable_with_regex.ru
 - http_router.gemspec
+- js/lib/http_router.coffee
+- js/lib/http_router.js
+- js/package.json
+- js/test/test.coffee
+- js/test/test.js
 - lib/http_router.rb
 - lib/http_router/node.rb
 - lib/http_router/node/arbitrary.rb
-- lib/http_router/node/destination.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/lookup.rb
+- lib/http_router/node/path.rb
 - lib/http_router/node/regex.rb
 - lib/http_router/node/request.rb
 - lib/http_router/node/root.rb
 - lib/http_router/node/spanning_regex.rb
 - lib/http_router/node/variable.rb
-- lib/http_router/path.rb
 - lib/http_router/rack.rb
 - lib/http_router/rack/builder.rb
 - lib/http_router/rack/url_map.rb
@@ -177,10 +228,13 @@ files:
 - lib/http_router/request.rb
 - lib/http_router/response.rb
 - lib/http_router/route.rb
+- lib/http_router/util.rb
 - lib/http_router/version.rb
 - test/common/generate.txt
+- test/common/http_recognize.txt
 - test/common/recognize.txt
 - test/generation.rb
+- test/generic.rb
 - test/helper.rb
 - test/rack/test_route.rb
 - test/recognition.rb
@@ -202,12 +256,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
   none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
 requirements: []