journey 1.0.0.rc2 → 1.0.0.rc3

data/.travis.yml

@@ -1,6 +1,7 @@
 rvm:
   - 1.8.7
   - 1.9.2
+  - 1.9.3
   - jruby
   - rbx
   - ree

data/journey.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "journey"
-  s.version = "1.0.0.rc2.20111221114756"
+  s.version = "1.0.0.rc3.20111222185342"
 
   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-21"
+  s.date = "2011-12-23"
   s.description = "Journey is a router.  It routes requests."
   s.email = ["aaron@tenderlovemaking.com"]
   s.extra_rdoc_files = ["Manifest.txt", "CHANGELOG.rdoc", "README.rdoc"]

data/lib/journey/gtg/transition_table.rb

@@ -10,8 +10,8 @@ module Journey
       def initialize
         @regexp_states = Hash.new { |h,k| h[k] = {} }
         @string_states = Hash.new { |h,k| h[k] = {} }
-        @accepting  = {}
-        @memos      = Hash.new { |h,k| h[k] = [] }
+        @accepting     = {}
+        @memos         = Hash.new { |h,k| h[k] = [] }
       end
 
       def add_accepting state

data/lib/journey/path/pattern.rb

@@ -103,8 +103,7 @@ module Journey
           return @separator_re unless @matchers.key? node
 
           re = @matchers[node]
-          # FIXME: is the question mark needed?
-          "(#{re}?)"
+          "(#{re})"
         end
 
         def visit_GROUP node
@@ -121,7 +120,8 @@ module Journey
         end
 
         def visit_STAR node
-          "(.+)"
+          re = @matchers[node.left.to_sym] || '.+'
+          "(#{re})"
         end
       end
 
@@ -172,11 +172,11 @@ module Journey
         to_regexp.source
       end
 
-      private
       def to_regexp
         @re ||= regexp_visitor.new(@separators, @requirements).accept spec
       end
 
+      private
       def regexp_visitor
         @anchored ? AnchoredRegexp : UnanchoredRegexp
       end

data/lib/journey/route.rb

@@ -5,7 +5,7 @@ module Journey
     attr_reader :constraints
     alias :conditions :constraints
 
-    attr_accessor :precidence
+    attr_accessor :precedence
 
     ##
     # +path+ is a path constraint.
@@ -25,7 +25,7 @@ module Journey
       @required_parts    = nil
       @parts             = nil
       @decorated_ast     = nil
-      @precidence        = 0
+      @precedence        = 0
     end
 
     def ast

data/lib/journey/router.rb

@@ -17,7 +17,7 @@ module Journey
     class RoutingError < ::StandardError
     end
 
-    VERSION = '1.0.0.rc2'
+    VERSION = '1.0.0.rc3'
 
     class NullReq # :nodoc:
       attr_reader :env
@@ -122,7 +122,7 @@ module Journey
         r.path.match(env['PATH_INFO'])
       }
 
-      routes.sort_by(&:precidence).find_all { |r|
+      routes.sort_by(&:precedence).find_all { |r|
         r.constraints.all? { |k,v| v === req.send(k) } &&
           r.verb === env['REQUEST_METHOD']
       }.reject { |r| addr && !(r.ip === addr) }.map { |r|

data/lib/journey/routes.rb

@@ -58,7 +58,7 @@ module Journey
     def add_route app, path, conditions, defaults, name = nil
       route = Route.new(name, app, path, conditions, defaults)
 
-      route.precidence = routes.length
+      route.precedence = routes.length
       routes << route
       named_routes[name] = route if name && !named_routes[name]
       clear_cache!

data/test/path/test_pattern.rb

@@ -5,16 +5,16 @@ module Journey
     class TestPattern < MiniTest::Unit::TestCase
       x = /.+/
       {
-        '/:controller(/:action)'       => %r{\A/(#{x}?)(?:/([^/.?]+))?\Z},
-        '/:controller/foo'             => %r{\A/(#{x}?)/foo\Z},
-        '/:controller/:action'         => %r{\A/(#{x}?)/([^/.?]+)\Z},
-        '/:controller'                 => %r{\A/(#{x}?)\Z},
-        '/:controller(/:action(/:id))' => %r{\A/(#{x}?)(?:/([^/.?]+)(?:/([^/.?]+))?)?\Z},
-        '/:controller/:action.xml'     => %r{\A/(#{x}?)/([^/.?]+)\.xml\Z},
-        '/:controller.:format'         => %r{\A/(#{x}?)\.([^/.?]+)\Z},
-        '/:controller(.:format)'       => %r{\A/(#{x}?)(?:\.([^/.?]+))?\Z},
-        '/:controller/*foo'            => %r{\A/(#{x}?)/(.+)\Z},
-        '/:controller/*foo/bar'        => %r{\A/(#{x}?)/(.+)/bar\Z},
+        '/:controller(/:action)'       => %r{\A/(#{x})(?:/([^/.?]+))?\Z},
+        '/:controller/foo'             => %r{\A/(#{x})/foo\Z},
+        '/:controller/:action'         => %r{\A/(#{x})/([^/.?]+)\Z},
+        '/:controller'                 => %r{\A/(#{x})\Z},
+        '/:controller(/:action(/:id))' => %r{\A/(#{x})(?:/([^/.?]+)(?:/([^/.?]+))?)?\Z},
+        '/:controller/:action.xml'     => %r{\A/(#{x})/([^/.?]+)\.xml\Z},
+        '/:controller.:format'         => %r{\A/(#{x})\.([^/.?]+)\Z},
+        '/:controller(.:format)'       => %r{\A/(#{x})(?:\.([^/.?]+))?\Z},
+        '/:controller/*foo'            => %r{\A/(#{x})/(.+)\Z},
+        '/:controller/*foo/bar'        => %r{\A/(#{x})/(.+)/bar\Z},
       }.each do |path, expected|
         define_method(:"test_to_regexp_#{path}") do
           strexp = Router::Strexp.new(
@@ -23,21 +23,21 @@ module Journey
             ["/", ".", "?"]
           )
           path = Pattern.new strexp
-          assert_equal(expected, path.send(:to_regexp))
+          assert_equal(expected, path.to_regexp)
         end
       end
 
       {
-        '/:controller(/:action)'       => %r{\A/(#{x}?)(?:/([^/.?]+))?},
-        '/:controller/foo'             => %r{\A/(#{x}?)/foo},
-        '/:controller/:action'         => %r{\A/(#{x}?)/([^/.?]+)},
-        '/:controller'                 => %r{\A/(#{x}?)},
-        '/:controller(/:action(/:id))' => %r{\A/(#{x}?)(?:/([^/.?]+)(?:/([^/.?]+))?)?},
-        '/:controller/:action.xml'     => %r{\A/(#{x}?)/([^/.?]+)\.xml},
-        '/:controller.:format'         => %r{\A/(#{x}?)\.([^/.?]+)},
-        '/:controller(.:format)'       => %r{\A/(#{x}?)(?:\.([^/.?]+))?},
-        '/:controller/*foo'            => %r{\A/(#{x}?)/(.+)},
-        '/:controller/*foo/bar'        => %r{\A/(#{x}?)/(.+)/bar},
+        '/:controller(/:action)'       => %r{\A/(#{x})(?:/([^/.?]+))?},
+        '/:controller/foo'             => %r{\A/(#{x})/foo},
+        '/:controller/:action'         => %r{\A/(#{x})/([^/.?]+)},
+        '/:controller'                 => %r{\A/(#{x})},
+        '/:controller(/:action(/:id))' => %r{\A/(#{x})(?:/([^/.?]+)(?:/([^/.?]+))?)?},
+        '/:controller/:action.xml'     => %r{\A/(#{x})/([^/.?]+)\.xml},
+        '/:controller.:format'         => %r{\A/(#{x})\.([^/.?]+)},
+        '/:controller(.:format)'       => %r{\A/(#{x})(?:\.([^/.?]+))?},
+        '/:controller/*foo'            => %r{\A/(#{x})/(.+)},
+        '/:controller/*foo/bar'        => %r{\A/(#{x})/(.+)/bar},
       }.each do |path, expected|
         define_method(:"test_to_non_anchored_regexp_#{path}") do
           strexp = Router::Strexp.new(
@@ -47,7 +47,7 @@ module Journey
             false
           )
           path = Pattern.new strexp
-          assert_equal(expected, path.send(:to_regexp))
+          assert_equal(expected, path.to_regexp)
         end
       end
 
@@ -101,6 +101,17 @@ module Journey
         end
       end
 
+      def test_to_regexp_match_non_optional
+        strexp = Router::Strexp.new(
+          '/:name',
+          { :name => /\d+/ },
+          ["/", ".", "?"]
+        )
+        path = Pattern.new strexp
+        assert_match('/123', path)
+        refute_match('/', path)
+      end
+
       def test_to_regexp_with_group
         strexp = Router::Strexp.new(
           '/page/:name',
@@ -157,6 +168,17 @@ module Journey
         assert_equal %w{ tender 10 }, match.captures
       end
 
+      def test_star_with_custom_re
+        z = /\d+/
+        strexp = Router::Strexp.new(
+          '/page/*foo',
+          { :foo => z },
+          ["/", ".", "?"]
+        )
+        path = Pattern.new strexp
+        assert_equal(%r{\A/page/(#{z})\Z}, path.to_regexp)
+      end
+
       def test_insensitive_regexp_with_group
         strexp = Router::Strexp.new(
           '/page/:name/aaron',
@@ -180,7 +202,7 @@ module Journey
       def test_to_regexp_defaults
         path = Pattern.new '/:controller(/:action(/:id))'
         expected = %r{\A/([^/.?]+)(?:/([^/.?]+)(?:/([^/.?]+))?)?\Z}
-        assert_equal expected, path.send(:to_regexp)
+        assert_equal expected, path.to_regexp
       end
 
       def test_failed_match

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: journey
 version: !ruby/object:Gem::Version
-  version: 1.0.0.rc2
+  version: 1.0.0.rc3
   prerelease: 6
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-12-21 00:00:00.000000000 Z
+date: 2011-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70190462428740 !ruby/object:Gem::Requirement
+  requirement: &70284201057560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.9'
   type: :development
   prerelease: false
-  version_requirements: *70190462428740
+  version_requirements: *70284201057560
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &70190462428320 !ruby/object:Gem::Requirement
+  requirement: &70284201057120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *70190462428320
+  version_requirements: *70284201057120
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70190462427900 !ruby/object:Gem::Requirement
+  requirement: &70284201056700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: *70190462427900
+  version_requirements: *70284201056700
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70190462427540 !ruby/object:Gem::Requirement
+  requirement: &70284201056340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70190462427540
+  version_requirements: *70284201056340
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70190462427080 !ruby/object:Gem::Requirement
+  requirement: &70284201055880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '2.12'
   type: :development
   prerelease: false
-  version_requirements: *70190462427080
+  version_requirements: *70284201055880
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70190462693860 !ruby/object:Gem::Requirement
+  requirement: &70284201323800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70190462693860
+  version_requirements: *70284201323800
 description: Journey is a router.  It routes requests.
 email:
 - aaron@tenderlovemaking.com