journey 1.0.2 → 1.0.3

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (6) hide show
  1. data/journey.gemspec +2 -2
  2. data/lib/journey/gtg/simulator.rb +1 -2
  3. data/lib/journey/router.rb +1 -1
  4. data/lib/journey/scanner.rb +1 -1
  5. data/test/route/definition/test_scanner.rb +2 -0
  6. metadata +14 -14
data/journey.gemspec CHANGED
@@ -2,11 +2,11 @@
2
2
 
3
3
  Gem::Specification.new do |s|
4
4
  s.name = "journey"
5
- s.version = "1.0.2.20120220091328"
5
+ s.version = "1.0.3.20120222115248"
6
6
 
7
7
  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
8
8
  s.authors = ["Aaron Patterson"]
9
- s.date = "2012-02-20"
9
+ s.date = "2012-02-22"
10
10
  s.description = "Journey is a router. It routes requests."
11
11
  s.email = ["aaron@tenderlovemaking.com"]
12
12
  s.extra_rdoc_files = ["Manifest.txt", "CHANGELOG.rdoc", "README.rdoc"]
data/lib/journey/gtg/simulator.rb CHANGED
@@ -20,8 +20,7 @@ module Journey
20
20
  def simulate string
21
21
  input = StringScanner.new string
22
22
  state = [0]
23
- until input.eos?
24
- sym = input.scan(/[\/\.\?]|[^\/\.\?]+/)
23
+ while sym = input.scan(/[\/\.\?]|[^\/\.\?]+/)
25
24
  state = tt.move(state, sym)
26
25
  end
27
26
 
data/lib/journey/router.rb CHANGED
@@ -17,7 +17,7 @@ module Journey
17
17
  class RoutingError < ::StandardError
18
18
  end
19
19
 
20
- VERSION = '1.0.2'
20
+ VERSION = '1.0.3'
21
21
 
22
22
  class NullReq # :nodoc:
23
23
  attr_reader :env
data/lib/journey/scanner.rb CHANGED
@@ -47,7 +47,7 @@ module Journey
47
47
  [:DOT, text]
48
48
  when text = @ss.scan(/:\w+/)
49
49
  [:SYMBOL, text]
50
- when text = @ss.scan(/[\w%-]+/)
50
+ when text = @ss.scan(/[\w%\-~]+/)
51
51
  [:LITERAL, text]
52
52
  # any char
53
53
  when text = @ss.scan(/./)
data/test/route/definition/test_scanner.rb CHANGED
@@ -13,6 +13,8 @@ module Journey
13
13
  ['/', [[:SLASH, '/']]],
14
14
  ['*omg', [[:STAR, '*'], [:LITERAL, 'omg']]],
15
15
  ['/page', [[:SLASH, '/'], [:LITERAL, 'page']]],
16
+ ['/~page', [[:SLASH, '/'], [:LITERAL, '~page']]],
17
+ ['/pa-ge', [[:SLASH, '/'], [:LITERAL, 'pa-ge']]],
16
18
  ['/:page', [[:SLASH, '/'], [:SYMBOL, ':page']]],
17
19
  ['/(:page)', [
18
20
  [:SLASH, '/'],
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: journey
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.2
4
+ version: 1.0.3
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -9,11 +9,11 @@ authors:
9
9
  autorequire:
10
10
  bindir: bin
11
11
  cert_chain: []
12
- date: 2012-02-20 00:00:00.000000000 Z
12
+ date: 2012-02-22 00:00:00.000000000 Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: minitest
16
- requirement: &70161474949720 !ruby/object:Gem::Requirement
16
+ requirement: &70295885781440 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ~>
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '2.11'
22
22
  type: :development
23
23
  prerelease: false
24
- version_requirements: *70161474949720
24
+ version_requirements: *70295885781440
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: racc
27
- requirement: &70161474947600 !ruby/object:Gem::Requirement
27
+ requirement: &70295885780960 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: 1.4.6
33
33
  type: :development
34
34
  prerelease: false
35
- version_requirements: *70161474947600
35
+ version_requirements: *70295885780960
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: rdoc
38
- requirement: &70161474945280 !ruby/object:Gem::Requirement
38
+ requirement: &70295885780520 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ~>
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '3.11'
44
44
  type: :development
45
45
  prerelease: false
46
- version_requirements: *70161474945280
46
+ version_requirements: *70295885780520
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: json
49
- requirement: &70161474933900 !ruby/object:Gem::Requirement
49
+ requirement: &70295885780140 !ruby/object:Gem::Requirement
50
50
  none: false
51
51
  requirements:
52
52
  - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
54
54
  version: '0'
55
55
  type: :development
56
56
  prerelease: false
57
- version_requirements: *70161474933900
57
+ version_requirements: *70295885780140
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rdoc
60
- requirement: &70161474932380 !ruby/object:Gem::Requirement
60
+ requirement: &70295885779680 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ~>
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '3.10'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *70161474932380
68
+ version_requirements: *70295885779680
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: hoe
71
- requirement: &70161474931420 !ruby/object:Gem::Requirement
71
+ requirement: &70295885779180 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ~>
@@ -76,7 +76,7 @@ dependencies:
76
76
  version: '2.13'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *70161474931420
79
+ version_requirements: *70295885779180
80
80
  description: Journey is a router. It routes requests.
81
81
  email:
82
82
  - aaron@tenderlovemaking.com