journey 1.0.2 → 1.0.3

data/journey.gemspec

@@ -2,11 +2,11 @@
 
 Gem::Specification.new do |s|
   s.name = "journey"
-  s.version = "1.0.2.20120220091328"
+  s.version = "1.0.3.20120222115248"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aaron Patterson"]
-  s.date = "2012-02-20"
+  s.date = "2012-02-22"
   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/simulator.rb

@@ -20,8 +20,7 @@ module Journey
       def simulate string
         input = StringScanner.new string
         state = [0]
-        until input.eos?
-          sym   = input.scan(/[\/\.\?]|[^\/\.\?]+/)
+        while sym = input.scan(/[\/\.\?]|[^\/\.\?]+/)
           state = tt.move(state, sym)
         end
 

data/lib/journey/router.rb

@@ -17,7 +17,7 @@ module Journey
     class RoutingError < ::StandardError
     end
 
-    VERSION = '1.0.2'
+    VERSION = '1.0.3'
 
     class NullReq # :nodoc:
       attr_reader :env

data/lib/journey/scanner.rb

@@ -47,7 +47,7 @@ module Journey
         [:DOT, text]
       when text = @ss.scan(/:\w+/)
         [:SYMBOL, text]
-      when text = @ss.scan(/[\w%-]+/)
+      when text = @ss.scan(/[\w%\-~]+/)
         [:LITERAL, text]
         # any char
       when text = @ss.scan(/./)

data/test/route/definition/test_scanner.rb

@@ -13,6 +13,8 @@ module Journey
           ['/',      [[:SLASH, '/']]],
           ['*omg',   [[:STAR, '*'], [:LITERAL, 'omg']]],
           ['/page',  [[:SLASH, '/'], [:LITERAL, 'page']]],
+          ['/~page', [[:SLASH, '/'], [:LITERAL, '~page']]],
+          ['/pa-ge', [[:SLASH, '/'], [:LITERAL, 'pa-ge']]],
           ['/:page', [[:SLASH, '/'], [:SYMBOL, ':page']]],
           ['/(:page)', [
                         [:SLASH, '/'],

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: journey
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-20 00:00:00.000000000 Z
+date: 2012-02-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70161474949720 !ruby/object:Gem::Requirement
+  requirement: &70295885781440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: '2.11'
   type: :development
   prerelease: false
-  version_requirements: *70161474949720
+  version_requirements: *70295885781440
 - !ruby/object:Gem::Dependency
   name: racc
-  requirement: &70161474947600 !ruby/object:Gem::Requirement
+  requirement: &70295885780960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 1.4.6
   type: :development
   prerelease: false
-  version_requirements: *70161474947600
+  version_requirements: *70295885780960
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70161474945280 !ruby/object:Gem::Requirement
+  requirement: &70295885780520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: '3.11'
   type: :development
   prerelease: false
-  version_requirements: *70161474945280
+  version_requirements: *70295885780520
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70161474933900 !ruby/object:Gem::Requirement
+  requirement: &70295885780140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70161474933900
+  version_requirements: *70295885780140
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70161474932380 !ruby/object:Gem::Requirement
+  requirement: &70295885779680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '3.10'
   type: :development
   prerelease: false
-  version_requirements: *70161474932380
+  version_requirements: *70295885779680
 - !ruby/object:Gem::Dependency
   name: hoe
-  requirement: &70161474931420 !ruby/object:Gem::Requirement
+  requirement: &70295885779180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,7 +76,7 @@ dependencies:
         version: '2.13'
   type: :development
   prerelease: false
-  version_requirements: *70161474931420
+  version_requirements: *70295885779180
 description: Journey is a router.  It routes requests.
 email:
 - aaron@tenderlovemaking.com