journey 1.0.0.rc3 → 1.0.0.rc4

data/journey.gemspec

@@ -1,48 +1,46 @@
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = "journey"
-  s.version = "1.0.0.rc3.20111222185342"
+  s.name = %q{journey}
+  s.version = "1.0.0.rc4.20111228163105"
 
   s.required_rubygems_version = Gem::Requirement.new("> 1.3.1") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Patterson"]
-  s.date = "2011-12-23"
-  s.description = "Journey is a router.  It routes requests."
+  s.date = %q{2011-12-28}
+  s.description = %q{Journey is a router.  It routes requests.}
   s.email = ["aaron@tenderlovemaking.com"]
   s.extra_rdoc_files = ["Manifest.txt", "CHANGELOG.rdoc", "README.rdoc"]
   s.files = [".autotest", ".gemtest", ".travis.yml", "CHANGELOG.rdoc", "Gemfile", "Manifest.txt", "README.rdoc", "Rakefile", "journey.gemspec", "lib/journey.rb", "lib/journey/backwards.rb", "lib/journey/core-ext/hash.rb", "lib/journey/formatter.rb", "lib/journey/gtg/builder.rb", "lib/journey/gtg/simulator.rb", "lib/journey/gtg/transition_table.rb", "lib/journey/nfa/builder.rb", "lib/journey/nfa/dot.rb", "lib/journey/nfa/simulator.rb", "lib/journey/nfa/transition_table.rb", "lib/journey/nodes/node.rb", "lib/journey/parser.rb", "lib/journey/parser.y", "lib/journey/parser_extras.rb", "lib/journey/path/pattern.rb", "lib/journey/route.rb", "lib/journey/router.rb", "lib/journey/router/strexp.rb", "lib/journey/router/utils.rb", "lib/journey/routes.rb", "lib/journey/scanner.rb", "lib/journey/visitors.rb", "lib/journey/visualizer/d3.min.js", "lib/journey/visualizer/fsm.css", "lib/journey/visualizer/fsm.js", "lib/journey/visualizer/index.html.erb", "lib/journey/visualizer/reset.css", "test/gtg/test_builder.rb", "test/gtg/test_transition_table.rb", "test/helper.rb", "test/nfa/test_simulator.rb", "test/nfa/test_transition_table.rb", "test/nodes/test_symbol.rb", "test/path/test_pattern.rb", "test/route/definition/test_parser.rb", "test/route/definition/test_scanner.rb", "test/router/test_strexp.rb", "test/router/test_utils.rb", "test/test_route.rb", "test/test_router.rb", "test/test_routes.rb"]
-  s.homepage = "http://github.com/tenderlove/journey"
+  s.homepage = %q{http://github.com/tenderlove/journey}
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
-  s.rubyforge_project = "journey"
-  s.rubygems_version = "1.8.11"
-  s.summary = "Journey is a router"
+  s.rubyforge_project = %q{journey}
+  s.rubygems_version = %q{1.3.7}
+  s.summary = %q{Journey is a router}
   s.test_files = ["test/gtg/test_builder.rb", "test/gtg/test_transition_table.rb", "test/nfa/test_simulator.rb", "test/nfa/test_transition_table.rb", "test/nodes/test_symbol.rb", "test/path/test_pattern.rb", "test/route/definition/test_parser.rb", "test/route/definition/test_scanner.rb", "test/router/test_strexp.rb", "test/router/test_utils.rb", "test/test_route.rb", "test/test_router.rb", "test/test_routes.rb"]
 
   if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<minitest>, ["~> 2.9"])
+      s.add_development_dependency(%q<minitest>, ["~> 2.3"])
       s.add_development_dependency(%q<racc>, [">= 1.4.6"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.11"])
       s.add_development_dependency(%q<json>, [">= 0"])
       s.add_development_dependency(%q<hoe>, ["~> 2.12"])
-      s.add_development_dependency(%q<rdoc>, ["~> 3.10"])
     else
-      s.add_dependency(%q<minitest>, ["~> 2.9"])
+      s.add_dependency(%q<minitest>, ["~> 2.3"])
       s.add_dependency(%q<racc>, [">= 1.4.6"])
       s.add_dependency(%q<rdoc>, ["~> 3.11"])
       s.add_dependency(%q<json>, [">= 0"])
       s.add_dependency(%q<hoe>, ["~> 2.12"])
-      s.add_dependency(%q<rdoc>, ["~> 3.10"])
     end
   else
-    s.add_dependency(%q<minitest>, ["~> 2.9"])
+    s.add_dependency(%q<minitest>, ["~> 2.3"])
     s.add_dependency(%q<racc>, [">= 1.4.6"])
     s.add_dependency(%q<rdoc>, ["~> 3.11"])
     s.add_dependency(%q<json>, [">= 0"])
     s.add_dependency(%q<hoe>, ["~> 2.12"])
-    s.add_dependency(%q<rdoc>, ["~> 3.10"])
   end
 end

data/lib/journey/router.rb

@@ -17,7 +17,7 @@ module Journey
     class RoutingError < ::StandardError
     end
 
-    VERSION = '1.0.0.rc3'
+    VERSION = '1.0.0.rc4'
 
     class NullReq # :nodoc:
       attr_reader :env

data/lib/journey/routes.rb

@@ -60,7 +60,7 @@ module Journey
 
       route.precedence = routes.length
       routes << route
-      named_routes[name] = route if name && !named_routes[name]
+      named_routes[name] = route if name
       clear_cache!
       route
     end

data/lib/journey/visitors.rb

@@ -88,7 +88,8 @@ module Journey
         if consumed == options
           nil
         else
-          visit node.left
+          route = visit node.left
+          route.include?("\0") ? nil : route
         end
       end
 
@@ -107,8 +108,7 @@ module Journey
       def visit_SYMBOL node
         key = node.to_sym
 
-        if options.key? key
-          value = options[key]
+        if value = options[key]
           consumed[key] = value
           Router::Utils.escape_path(value)
         else

data/test/test_route.rb

@@ -74,6 +74,20 @@ module Journey
       assert_equal '/page/10', route.format({ :id => 10 })
     end
 
+    def test_extras_are_not_included_if_optional_with_parameter
+      path  = Path::Pattern.new '(/sections/:section)/pages/:id'
+      route = Route.new("name", nil, path, { }, { :action => 'show' })
+
+      assert_equal '/pages/10', route.format({:id => 10})
+    end
+
+    def test_extras_are_not_included_if_optional_parameter_is_nil
+      path  = Path::Pattern.new '(/sections/:section)/pages/:id'
+      route = Route.new("name", nil, path, { }, { :action => 'show' })
+
+      assert_equal '/pages/10', route.format({:id => 10, :section => nil})
+    end
+
     def test_score
       path = Path::Pattern.new "/page/:id(/:action)(.:format)"
       specific = Route.new "name", nil, path, {}, {:controller=>"pages", :action=>"show"}

data/test/test_routes.rb

@@ -35,8 +35,8 @@ module Journey
       refute_equal sim, routes.simulator
     end
 
-    def test_first_name_wins
-      #def add_route app, path, conditions, defaults, name = nil
+    # FIXME: first name *should* win, revert this after Rails 3.2 release
+    def test_last_name_wins
       routes = Routes.new
 
       one   = Path::Pattern.new '/hello'
@@ -45,7 +45,7 @@ module Journey
       routes.add_route nil, one, {}, {}, 'aaron'
       routes.add_route nil, two, {}, {}, 'aaron'
 
-      assert_equal '/hello', routes.named_routes['aaron'].path.spec.to_s
+      assert_equal '/aaron', routes.named_routes['aaron'].path.spec.to_s
     end
   end
 end

metadata

@@ -1,92 +1,111 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: journey
-version: !ruby/object:Gem::Version
-  version: 1.0.0.rc3
-  prerelease: 6
+version: !ruby/object:Gem::Version 
+  hash: 977940573
+  prerelease: true
+  segments: 
+  - 1
+  - 0
+  - 0
+  - rc4
+  version: 1.0.0.rc4
 platform: ruby
-authors:
+authors: 
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-23 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2011-12-28 00:00:00 -08:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: &70284201057560 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.9'
+      - !ruby/object:Gem::Version 
+        hash: 5
+        segments: 
+        - 2
+        - 3
+        version: "2.3"
   type: :development
-  prerelease: false
-  version_requirements: *70284201057560
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: racc
-  requirement: &70284201057120 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 11
+        segments: 
+        - 1
+        - 4
+        - 6
         version: 1.4.6
   type: :development
-  prerelease: false
-  version_requirements: *70284201057120
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &70284201056700 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.11'
+      - !ruby/object:Gem::Version 
+        hash: 17
+        segments: 
+        - 3
+        - 11
+        version: "3.11"
   type: :development
-  prerelease: false
-  version_requirements: *70284201056700
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &70284201056340 !ruby/object:Gem::Requirement
-    none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
   prerelease: false
-  version_requirements: *70284201056340
-- !ruby/object:Gem::Dependency
-  name: hoe
-  requirement: &70284201055880 !ruby/object:Gem::Requirement
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.12'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: hoe
   prerelease: false
-  version_requirements: *70284201055880
-- !ruby/object:Gem::Dependency
-  name: rdoc
-  requirement: &70284201323800 !ruby/object:Gem::Requirement
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
+      - !ruby/object:Gem::Version 
+        hash: 27
+        segments: 
+        - 2
+        - 12
+        version: "2.12"
   type: :development
-  prerelease: false
-  version_requirements: *70284201323800
+  version_requirements: *id005
 description: Journey is a router.  It routes requests.
-email:
+email: 
 - aaron@tenderlovemaking.com
 executables: []
+
 extensions: []
-extra_rdoc_files:
+
+extra_rdoc_files: 
 - Manifest.txt
 - CHANGELOG.rdoc
 - README.rdoc
-files:
+files: 
 - .autotest
 - .gemtest
 - .travis.yml
@@ -138,33 +157,44 @@ files:
 - test/test_route.rb
 - test/test_router.rb
 - test/test_routes.rb
+has_rdoc: true
 homepage: http://github.com/tenderlove/journey
 licenses: []
+
 post_install_message: 
-rdoc_options:
+rdoc_options: 
 - --main
 - README.rdoc
-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
-      version: '0'
-required_rubygems_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
+  requirements: 
+  - - ">"
+    - !ruby/object:Gem::Version 
+      hash: 25
+      segments: 
+      - 1
+      - 3
+      - 1
       version: 1.3.1
 requirements: []
+
 rubyforge_project: journey
-rubygems_version: 1.8.11
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Journey is a router
-test_files:
+test_files: 
 - test/gtg/test_builder.rb
 - test/gtg/test_transition_table.rb
 - test/nfa/test_simulator.rb