http_router 0.8.10 → 0.8.11

data/test/recognition.rb

@@ -0,0 +1,142 @@
+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
+    @tests.map(&:case).each do |(name, req, params)|
+      env = case req
+      when String
+        Rack::MockRequest.env_for(req)
+      when Hash
+        e = Rack::MockRequest.env_for(req['path'])
+        e['REQUEST_METHOD'] = req['method'] if req.key?('method')
+        e['rack.url_scheme'] = req['scheme'] if req.key?('scheme')
+        e
+      end
+      response = router.call(env)
+      case name
+      when nil
+        error("Expected no response") unless response.first == 404
+      when Array
+        name.each_with_index do |part, i|
+          case part
+          when Hash then part.keys.all? or error("#{part.inspect} didn't match #{response[i].inspect}")
+          else           part == response[i] or error("#{part.inspect} didn't match #{response[i].inspect}")
+          end
+        end
+      else
+        error("Expected #{name} for #{req.inspect} got #{response.inspect}") unless response.last == [name]
+      end
+      env['router.params'] ||= {}
+      params ||= {}
+      if params['PATH_INFO']
+        path_info = params.delete("PATH_INFO")
+        error("path_info #{env['PATH_INFO'].inspect} is not #{path_info.inspect}") unless path_info == env['PATH_INFO']
+      end
+
+      env['router.params'].keys.each do |k|
+        p_v = params.delete(k.to_s)
+        v = env['router.params'].delete(k.to_sym)
+        error("I got #{p_v.inspect} but expected #{v.inspect}") unless p_v == v
+      end
+      error("Left over expectations: #{params.inspect}") unless params.empty?
+      error("Left over matched params: #{env['router.params'].inspect}") unless env['router.params'].empty?
+    end
+    print '.'
+  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!"

data/test/{test_arbitrary.rb → test_recognition.rb}

@@ -1,4 +1,13 @@
-class TestArbitrary < MiniTest::Unit::TestCase
+class TestRecognition < MiniTest::Unit::TestCase
+  if //.respond_to?(:names)
+    eval <<-EOT
+    def test_match_path_with_groups
+      r = router { add(%r{/(?<year>\\d{4})/(?<month>\\d{2})/(?<day>\\d{2})/?}) }
+      assert_route r, "/1234/23/56", {:year => "1234", :month => "23", :day => "56"}
+    end
+    EOT
+  end
+
   def test_match
     hello, love80, love8080 = router {
       add('test').arbitrary(Proc.new{|req, params| req.rack.host == 'hellodooly' })
@@ -55,4 +64,30 @@ class TestArbitrary < MiniTest::Unit::TestCase
     }
     assert_route yes, '/test'
   end
-end
+
+  def test_passing
+    passed, working = router {
+      add('/').to { |env| throw :pass; [200, {}, ['pass']] }
+      add('/').to { |env| [200, {}, ['working']] }
+    }
+    assert_body 'working', router.call(Rack::MockRequest.env_for('/'))
+  end
+
+  def test_passing_with_cascade
+    passed, working = router {
+      add('/').to { |env| [200, {'X-Cascade' => 'pass'}, ['pass']] }
+      add('/').to { |env| [200, {}, ['working']] }
+    }
+    assert_body 'working', router.call(Rack::MockRequest.env_for('/'))
+  end
+
+  def test_request_mutation
+    got_this_far = false
+    non_matching, matching = router {
+      add("/test/:var/:var2/*glob").matching(:var2 => /123/, :glob => /[a-z]+/).get.arbitrary{|env, params| got_this_far = true; false}
+      add("/test/:var/:var2/*glob").matching(:var2 => /123/, :glob => /[a-z]+/).get
+    }
+    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
+end

metadata

@@ -1,13 +1,8 @@
 --- !ruby/object:Gem::Specification 
 name: http_router
 version: !ruby/object:Gem::Version 
-  hash: 43
   prerelease: 
-  segments: 
-  - 0
-  - 8
-  - 10
-  version: 0.8.10
+  version: 0.8.11
 platform: ruby
 authors: 
 - Joshua Hull
@@ -15,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-23 00:00:00 -07:00
+date: 2011-07-05 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -26,11 +21,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :runtime
   version_requirements: *id001
@@ -42,11 +32,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 21
-        segments: 
-        - 0
-        - 2
-        - 1
         version: 0.2.1
   type: :runtime
   version_requirements: *id002
@@ -58,11 +43,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 2
-        - 0
-        - 0
         version: 2.0.0
   type: :development
   version_requirements: *id003
@@ -74,9 +54,6 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id004
@@ -88,11 +65,6 @@ dependencies:
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
-        segments: 
-        - 0
-        - 8
-        - 7
         version: 0.8.7
   type: :development
   version_requirements: *id005
@@ -104,58 +76,53 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id006
 - !ruby/object:Gem::Dependency 
-  name: phocus
+  name: json
   prerelease: false
   requirement: &id007 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
   type: :development
   version_requirements: *id007
 - !ruby/object:Gem::Dependency 
-  name: bundler
+  name: phocus
   prerelease: false
   requirement: &id008 !ruby/object:Gem::Requirement 
+    none: false
+    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 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 23
-        segments: 
-        - 1
-        - 0
-        - 0
         version: 1.0.0
   type: :development
-  version_requirements: *id008
+  version_requirements: *id009
 - !ruby/object:Gem::Dependency 
   name: thin
   prerelease: false
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &id010 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15
-        segments: 
-        - 1
-        - 2
-        - 8
         version: 1.2.8
   type: :development
-  version_requirements: *id009
+  version_requirements: *id010
 description: This library allows you to recognize and build URLs in a Rack application.
 email: joshbuddy@gmail.com
 executables: []
@@ -211,18 +178,16 @@ files:
 - lib/http_router/response.rb
 - lib/http_router/route.rb
 - lib/http_router/version.rb
+- test/common/generate.txt
+- test/common/recognize.txt
+- test/generation.rb
 - test/helper.rb
 - test/rack/test_route.rb
-- test/test_arbitrary.rb
-- test/test_generate.rb
-- test/test_greedy.rb
-- test/test_interstitial.rb
+- test/recognition.rb
 - test/test_misc.rb
 - test/test_mounting.rb
-- test/test_recognize.rb
-- test/test_request.rb
+- test/test_recognition.rb
 - test/test_trailing_slash.rb
-- test/test_variable.rb
 has_rdoc: true
 homepage: http://github.com/joshbuddy/http_router
 licenses: []
@@ -237,18 +202,12 @@ 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: []
 

data/test/test_generate.rb

@@ -1,110 +0,0 @@
-# encoding: utf-8
-class TestGenerate < MiniTest::Unit::TestCase
-
-  def test_static
-    router {
-      add('/').name(:a)
-      add('/test').name(:b)
-      add('/test/time').name(:c)
-      add('/one/more/what').name(:d)
-      add('/test.html').name(:e)
-    }
-    assert_generate '/', :a
-    assert_generate '/test', :b
-    assert_generate '/test/time', :c
-    assert_generate '/one/more/what', :d
-    assert_generate '/test.html', :e
-  end
-
-  def test_dynamic
-    assert_generate '/test', '/:var', :var => 'test'
-    assert_generate '/test', '/:var', 'test'
-  end
-
-  def test_array_with_extras
-    assert_generate '/test?query=string', '/:var', :var => 'test', :query => 'string'
-    assert_generate '/test?query=string', '/:var', 'test', :query => 'string'
-  end
-
-  def test_multiple_dynamics
-    assert_generate '/one/two', "/:var/:baz", :var => 'one', :baz => 'two'
-    assert_generate '/one/two', "/:var/:baz", 'one', 'two'
-  end
-
-  def test_extension
-    assert_generate '/test.html', "/test.:format", :format => 'html'
-    assert_generate '/test.html', "/test.:format", 'html'
-  end
-
-  def test_optional_extension
-    assert_generate '/test.html', "/test(.:format)", :format => 'html'
-    assert_generate '/test.html', "/test(.:format)", 'html'
-    assert_generate '/test',      "/test(.:format)"
-  end
-
-  def test_variable_with_extension
-    assert_generate '/test.html', "/:var.:format", :var => 'test', :format => 'html'
-    assert_generate '/test.html', "/:var.:format", 'test', 'html'
-  end
-
-  def test_variable_with_optional_extension
-    assert_generate '/test.html', "/:var(.:format)", :var => 'test', :format => 'html'
-    assert_generate '/test.html', "/:var(.:format)", 'test', 'html'
-    assert_generate '/test',      "/:var(.:format)", :var => 'test'
-    assert_generate '/test',      "/:var(.:format)", 'test'
-  end
-
-  def test_optionals
-    assert_generate '/var',      "/:var1(/:var2)", 'var'
-    assert_generate '/var/fooz', "/:var1(/:var2)", 'var', 'fooz'
-    assert_generate '/var',      "/:var1(/:var2)", :var1 => 'var'
-    assert_generate '/var/fooz', "/:var1(/:var2)", :var1 => 'var', :var2 => 'fooz'
-    assert_raises(HttpRouter::InvalidRouteException) { router.url(router.add("/:var1(/:var2)").to(:test), :var2 => 'fooz') }
-  end
-
-  def test_optionals_with_format
-    assert_generate '/var',           "/:var1(/:var2.:format)", 'var'
-    assert_generate '/var/fooz.html', "/:var1(/:var2.:format)", 'var', 'fooz', 'html'
-    assert_generate '/var',           "/:var1(/:var2.:format)", :var1 => 'var'
-    assert_generate '/var/fooz.html', "/:var1(/:var2.:format)", :var1 => 'var', :var2 => 'fooz', :format => 'html'
-  end
-
-  def test_nested_optionals
-    assert_generate '/var',          "/:var1(/:var2(/:var3))", 'var'
-    assert_generate '/var/fooz',     "/:var1(/:var2(/:var3))", 'var', 'fooz'
-    assert_generate '/var/fooz/baz', "/:var1(/:var2(/:var3))", 'var', 'fooz', 'baz'
-    assert_generate '/var',          "/:var1(/:var2(/:var3))", :var1 => 'var'
-    assert_generate '/var/fooz',     "/:var1(/:var2(/:var3))", :var1 => 'var', :var2 => 'fooz'
-    assert_generate '/var/fooz/baz', "/:var1(/:var2(/:var3))", :var1 => 'var', :var2 => 'fooz', :var3 => 'baz'
-  end
-
-  def test_default_value
-    assert_generate "/123?page=1", router.add("/:var").default(:page => 1),         123
-    assert_generate "/1/123",      router.add("/:page/:entry").default(:page => 1), :entry => '123'
-  end
-
-  def test_nil_values
-    assert_generate '/url', "/url(/:var)", :var => nil
-  end
-
-  def test_unicode
-    assert_generate '/%C3%A4', "/:var", :var => 'ä'
-  end
-
-  def test_raise
-    r = router { add(':var').matching(:var => /\d+/) }
-    assert_raises(HttpRouter::InvalidRouteException) { router.url(r, 'asd') }
-  end
-  
-  def test_array
-    assert_generate '/var?foo[]=baz&foo[]=bar', '/var', :foo => ['baz', 'bar']
-  end
-  
-  def test_hash
-    assert_generate '/var?foo[az]=baz', '/var', :foo => {:az => 'baz'}
-  end
-  
-  def test_hash_with_array
-    assert_generate '/var?foo[ar][]=bar', '/var', :foo => {:ar => ['bar']}
-  end
-end