journey 1.0.3 → 1.0.4

data/CHANGELOG.rdoc

@@ -1,3 +1,13 @@
+Thu Jun 14 14:03:22 2012  Aaron Patterson <aaron@tenderlovemaking.com>
+
+	* lib/journey/formatter.rb: when generating routes, skip route
+          literals (routes that do not have replacement values like
+          "/:controller") when matching unnamed routes.
+            
+            https://github.com/rails/rails/issues/6459
+
+        * test/test_router.rb: corresponding test
+
 Wed Feb 15 11:49:41 2012  Aaron Patterson <aaron@tenderlovemaking.com>
 
 	* lib/journey/formatter.rb: reject non-truthy parameters parts.

data/journey.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "journey"
-  s.version = "1.0.3.20120222115248"
+  s.version = "1.0.4.20120614141756"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Patterson"]
-  s.date = "2012-02-22"
+  s.date = "2012-06-14"
   s.description = "Journey is a router.  It routes requests."
   s.email = ["aaron@tenderlovemaking.com"]
   s.extra_rdoc_files = ["Manifest.txt", "CHANGELOG.rdoc", "README.rdoc"]
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
   s.rdoc_options = ["--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = "journey"
-  s.rubygems_version = "1.8.11"
+  s.rubygems_version = "1.8.22"
   s.summary = "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"]
 

data/lib/journey/formatter.rb

@@ -34,6 +34,8 @@ module Journey
 
         parameterized_parts.keep_if { |_,v| v  }
 
+        next if !name && route.requirements.empty? && route.parts.empty?
+
         next unless verify_required_parts!(route, parameterized_parts)
 
         z = Hash[options.to_a - data.to_a - route.defaults.to_a]

data/lib/journey/router.rb

@@ -17,7 +17,7 @@ module Journey
     class RoutingError < ::StandardError
     end
 
-    VERSION = '1.0.3'
+    VERSION = '1.0.4'
 
     class NullReq # :nodoc:
       attr_reader :env
@@ -59,8 +59,8 @@ module Journey
                                                            @params_key)
 
         unless route.path.anchored
-          env['SCRIPT_NAME'] = script_name.to_s + match.to_s
-          env['PATH_INFO']   = match.post_match
+          env['SCRIPT_NAME'] = (script_name.to_s + match.to_s).chomp('/')
+          env['PATH_INFO']   = Utils.normalize_path(match.post_match)
         end
 
         env[@params_key] = (set_params || {}).merge parameters

data/test/test_router.rb

@@ -53,9 +53,9 @@ module Journey
     def test_unicode
       klass  = FakeRequestFeeler.new nil
       router = Router.new(routes, {})
-      
+
       #match the escaped version of /ほげ
-      exp = Router::Strexp.new '/%E3%81%BB%E3%81%92', {}, ['/.?'] 
+      exp = Router::Strexp.new '/%E3%81%BB%E3%81%92', {}, ['/.?']
       path  = Path::Pattern.new exp
 
       routes.add_route nil, path, {}, {:id => nil}, {}
@@ -197,6 +197,19 @@ module Journey
       assert_equal 404, resp.first
     end
 
+    def test_clear_trailing_slash_from_script_name_on_root_unanchored_routes
+      strexp = Router::Strexp.new("/", {}, ['/', '.', '?'], false)
+      path   = Path::Pattern.new strexp
+      app    = lambda { |env| [200, {}, ['success!']] }
+      @router.routes.add_route(app, path, {}, {}, {})
+
+      env  = rack_env('SCRIPT_NAME' => '', 'PATH_INFO' => '/weblog')
+      resp = @router.call(env)
+      assert_equal ['success!'], resp.last
+      assert_equal '', env['SCRIPT_NAME']
+      assert_equal '/weblog', env['PATH_INFO']
+    end
+
     def test_defaults_merge_correctly
       path  = Path::Pattern.new '/foo(/:id)'
       @router.routes.add_route nil, path, {}, {:id => nil}, {}
@@ -247,11 +260,11 @@ module Journey
         "/messages/:id/edit(.:format)",
         "/messages/:id(.:format)"
       ]
-      env = rails_env 'PATH_INFO' => '/messages/1.1.1'
+      env = rails_env 'PATH_INFO' => '/messages/unknown/path'
       yielded = false
 
       @router.recognize(env) do |*whatever|
-        yielded = false
+        yielded = true
       end
       refute yielded
     end
@@ -280,13 +293,6 @@ module Journey
       assert_equal "/messages/index/10", path
     end
 
-    def add_routes router, paths
-      paths.each do |path|
-        path  = Path::Pattern.new path
-        router.routes.add_route nil, path, {}, {}, {}
-      end
-    end
-
     def test_nil_path_parts_are_ignored
       path  = Path::Pattern.new "/:controller(/:action(.:format))"
       @router.routes.add_route nil, path, {}, {}, {}
@@ -299,11 +305,12 @@ module Journey
     end
 
     def test_generate_slash
-      path  = Path::Pattern.new '/'
-      @router.routes.add_route nil, path, {}, {}, {}
-
       params = [ [:controller, "tasks"],
                  [:action, "show"] ]
+      str = Router::Strexp.new("/", Hash[params], ['/', '.', '?'], true)
+      path  = Path::Pattern.new str
+
+      @router.routes.add_route nil, path, {}, {}, {}
 
       path, _ = @formatter.generate(:path_info, nil, Hash[params], {})
       assert_equal '/', path
@@ -501,6 +508,13 @@ module Journey
 
     private
 
+    def add_routes router, paths
+      paths.each do |path|
+        path  = Path::Pattern.new path
+        router.routes.add_route nil, path, {}, {}, {}
+      end
+    end
+
     RailsEnv = Struct.new(:env)
 
     def rails_env env

metadata

@@ -1,92 +1,124 @@
---- !ruby/object:Gem::Specification
+--- !ruby/object:Gem::Specification 
 name: journey
-version: !ruby/object:Gem::Version
-  version: 1.0.3
+version: !ruby/object:Gem::Version 
+  hash: 31
   prerelease: 
+  segments: 
+  - 1
+  - 0
+  - 4
+  version: 1.0.4
 platform: ruby
-authors:
+authors: 
 - Aaron Patterson
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-22 00:00:00.000000000 Z
-dependencies:
-- !ruby/object:Gem::Dependency
+
+date: 2012-06-14 00:00:00 Z
+dependencies: 
+- !ruby/object:Gem::Dependency 
   name: minitest
-  requirement: &70295885781440 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.11'
+      - !ruby/object:Gem::Version 
+        hash: 21
+        segments: 
+        - 2
+        - 11
+        version: "2.11"
   type: :development
-  prerelease: false
-  version_requirements: *70295885781440
-- !ruby/object:Gem::Dependency
+  version_requirements: *id001
+- !ruby/object:Gem::Dependency 
   name: racc
-  requirement: &70295885780960 !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: *70295885780960
-- !ruby/object:Gem::Dependency
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &70295885780520 !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: *70295885780520
-- !ruby/object:Gem::Dependency
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
   name: json
-  requirement: &70295885780140 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
-    - - ! '>='
-      - !ruby/object:Gem::Version
-        version: '0'
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
   type: :development
-  prerelease: false
-  version_requirements: *70295885780140
-- !ruby/object:Gem::Dependency
+  version_requirements: *id004
+- !ruby/object:Gem::Dependency 
   name: rdoc
-  requirement: &70295885779680 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '3.10'
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 3
+        - 10
+        version: "3.10"
   type: :development
-  prerelease: false
-  version_requirements: *70295885779680
-- !ruby/object:Gem::Dependency
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
   name: hoe
-  requirement: &70295885779180 !ruby/object:Gem::Requirement
+  prerelease: false
+  requirement: &id006 !ruby/object:Gem::Requirement 
     none: false
-    requirements:
+    requirements: 
     - - ~>
-      - !ruby/object:Gem::Version
-        version: '2.13'
+      - !ruby/object:Gem::Version 
+        hash: 25
+        segments: 
+        - 2
+        - 13
+        version: "2.13"
   type: :development
-  prerelease: false
-  version_requirements: *70295885779180
+  version_requirements: *id006
 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,31 +170,39 @@ files:
 - test/test_routes.rb
 homepage: http://github.com/rails/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
-      version: '0'
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
+      version: "0"
 requirements: []
+
 rubyforge_project: journey
-rubygems_version: 1.8.11
+rubygems_version: 1.8.22
 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