sinatra-trails 0.0.3 → 0.0.4

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.
@@ -65,27 +65,34 @@ module Sinatra
65
65
  class ScopeMatcher
66
66
  def initialize scope, matchers
67
67
  @scope = scope
68
- @names, @routes = matchers.partition { |el| Symbol === el }
68
+ @names, @matchers = matchers.partition { |el| Symbol === el }
69
69
  end
70
70
 
71
71
  def match str
72
- Regexp.union(matchers).match str
72
+ to_regexp.match str
73
73
  end
74
74
 
75
- def matchers
76
- @matchers ||=
77
- if @routes.empty? && @names.empty?
75
+ def to_regexp
76
+ @to_regexp ||= Regexp.union(routes)
77
+ end
78
+
79
+ def routes
80
+ @routes ||=
81
+ if @matchers.empty? && @names.empty?
78
82
  @scope.routes
79
83
  else
80
- @routes + @names.map { |name| @scope[name] }
84
+ @matchers + @names.map { |name| @scope[name] }
81
85
  end
82
86
  end
83
87
 
84
88
  def actual_keys
85
- @keys ||= matchers.map{ |m| m.keys }.flatten
89
+ @actual_keys ||= routes.map{ |m| m.keys }.flatten
90
+ end
91
+
92
+ def keys
93
+ self
86
94
  end
87
95
 
88
- def keys() self end
89
96
  def any?() actual_keys.any? end
90
97
  def zip(arr) actual_keys.zip(arr) end
91
98
  end
@@ -1,5 +1,5 @@
1
1
  module Sinatra
2
2
  module Trails
3
- VERSION = "0.0.3"
3
+ VERSION = "0.0.4"
4
4
  end
5
5
  end
metadata CHANGED
@@ -1,7 +1,7 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: sinatra-trails
3
3
  version: !ruby/object:Gem::Version
4
- version: 0.0.3
4
+ version: 0.0.4
5
5
  prerelease:
6
6
  platform: ruby
7
7
  authors:
@@ -13,7 +13,7 @@ date: 2011-10-04 00:00:00.000000000Z
13
13
  dependencies:
14
14
  - !ruby/object:Gem::Dependency
15
15
  name: sinatra
16
- requirement: &2158241920 !ruby/object:Gem::Requirement
16
+ requirement: &2166677580 !ruby/object:Gem::Requirement
17
17
  none: false
18
18
  requirements:
19
19
  - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
21
21
  version: '0'
22
22
  type: :runtime
23
23
  prerelease: false
24
- version_requirements: *2158241920
24
+ version_requirements: *2166677580
25
25
  - !ruby/object:Gem::Dependency
26
26
  name: i18n
27
- requirement: &2158241500 !ruby/object:Gem::Requirement
27
+ requirement: &2166677160 !ruby/object:Gem::Requirement
28
28
  none: false
29
29
  requirements:
30
30
  - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
32
32
  version: '0'
33
33
  type: :runtime
34
34
  prerelease: false
35
- version_requirements: *2158241500
35
+ version_requirements: *2166677160
36
36
  - !ruby/object:Gem::Dependency
37
37
  name: activesupport
38
- requirement: &2158241000 !ruby/object:Gem::Requirement
38
+ requirement: &2166676660 !ruby/object:Gem::Requirement
39
39
  none: false
40
40
  requirements:
41
41
  - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
43
43
  version: '3.0'
44
44
  type: :runtime
45
45
  prerelease: false
46
- version_requirements: *2158241000
46
+ version_requirements: *2166676660
47
47
  - !ruby/object:Gem::Dependency
48
48
  name: rake
49
- requirement: &2158240580 !ruby/object:Gem::Requirement
49
+ requirement: &2166676240 !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: *2158240580
57
+ version_requirements: *2166676240
58
58
  - !ruby/object:Gem::Dependency
59
59
  name: rspec
60
- requirement: &2158263920 !ruby/object:Gem::Requirement
60
+ requirement: &2166675780 !ruby/object:Gem::Requirement
61
61
  none: false
62
62
  requirements:
63
63
  - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
65
65
  version: '0'
66
66
  type: :development
67
67
  prerelease: false
68
- version_requirements: *2158263920
68
+ version_requirements: *2166675780
69
69
  - !ruby/object:Gem::Dependency
70
70
  name: rack-test
71
- requirement: &2158263500 !ruby/object:Gem::Requirement
71
+ requirement: &2166675360 !ruby/object:Gem::Requirement
72
72
  none: false
73
73
  requirements:
74
74
  - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
76
76
  version: '0'
77
77
  type: :development
78
78
  prerelease: false
79
- version_requirements: *2158263500
79
+ version_requirements: *2166675360
80
80
  description: A named routes Sinatra DSL inspired by Rails routing
81
81
  email:
82
82
  - macarui@gmail.com