cucumber-cucumber-expressions 20.0.0 → 20.1.0
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.
- checksums.yaml +4 -4
- data/lib/cucumber/cucumber_expressions/argument.rb +1 -2
- data/lib/cucumber/cucumber_expressions/cucumber_expression.rb +3 -3
- data/lib/cucumber/cucumber_expressions/cucumber_expression_generator.rb +3 -3
- data/lib/cucumber/cucumber_expressions/cucumber_expression_parser.rb +8 -8
- data/lib/cucumber/cucumber_expressions/parameter_type_registry.rb +1 -1
- data/lib/cucumber/cucumber_expressions/tree_regexp.rb +1 -1
- metadata +11 -11
checksums.yaml
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
---
|
|
2
2
|
SHA256:
|
|
3
|
-
metadata.gz:
|
|
4
|
-
data.tar.gz:
|
|
3
|
+
metadata.gz: 1931a9bbc81c10262a22d9d46bb413ab95fd4e8775407157d1fd51c8e2ca4b79
|
|
4
|
+
data.tar.gz: a5980cecd379d662dffbf3991835aeec8f0f91d46d3e813a01d65a0a0afc3cc1
|
|
5
5
|
SHA512:
|
|
6
|
-
metadata.gz:
|
|
7
|
-
data.tar.gz:
|
|
6
|
+
metadata.gz: 7e0bab82978e733f96333e426470a7574c274a2df951396536e2855a338c0542afb28008be0ba2fd64b4205f8edb2d410e36b2226451e3a974597b3f104bcbd3
|
|
7
|
+
data.tar.gz: 66dea88c08bbfd4ee229ffb2640ecc022ebd3b58fcd10663fe12778638df888dca592a023db27e1023e612b8caf04f233cc879d27235e02f532e79efda489d0c
|
|
@@ -33,8 +33,7 @@ module Cucumber
|
|
|
33
33
|
def value(self_obj = :nil)
|
|
34
34
|
raise 'No self_obj' if self_obj == :nil
|
|
35
35
|
|
|
36
|
-
|
|
37
|
-
@parameter_type.transform(self_obj, group_values)
|
|
36
|
+
@parameter_type.transform(self_obj, @group&.values)
|
|
38
37
|
end
|
|
39
38
|
end
|
|
40
39
|
end
|
|
@@ -103,17 +103,17 @@ module Cucumber
|
|
|
103
103
|
end
|
|
104
104
|
|
|
105
105
|
def assert_not_empty(node, &raise_error)
|
|
106
|
-
text_nodes = node.nodes.select { |ast_node| NodeType::TEXT
|
|
106
|
+
text_nodes = node.nodes.select { |ast_node| ast_node.type == NodeType::TEXT }
|
|
107
107
|
raise_error.call(node) if text_nodes.length == 0
|
|
108
108
|
end
|
|
109
109
|
|
|
110
110
|
def assert_no_parameters(node, &raise_error)
|
|
111
|
-
nodes = node.nodes.select { |ast_node| NodeType::PARAMETER
|
|
111
|
+
nodes = node.nodes.select { |ast_node| ast_node.type == NodeType::PARAMETER }
|
|
112
112
|
raise_error.call(nodes[0]) if nodes.length > 0
|
|
113
113
|
end
|
|
114
114
|
|
|
115
115
|
def assert_no_optionals(node, &raise_error)
|
|
116
|
-
nodes = node.nodes.select { |ast_node| NodeType::OPTIONAL
|
|
116
|
+
nodes = node.nodes.select { |ast_node| ast_node.type == NodeType::OPTIONAL }
|
|
117
117
|
raise_error.call(nodes[0]) if nodes.length > 0
|
|
118
118
|
end
|
|
119
119
|
end
|
|
@@ -22,7 +22,7 @@ module Cucumber
|
|
|
22
22
|
return [0, nil]
|
|
23
23
|
end
|
|
24
24
|
# If configured correctly this will never happen
|
|
25
|
-
|
|
25
|
+
[0, nil]
|
|
26
26
|
end
|
|
27
27
|
|
|
28
28
|
# name := whitespace | .
|
|
@@ -30,15 +30,15 @@ module Cucumber
|
|
|
30
30
|
token = tokens[current]
|
|
31
31
|
case token.type
|
|
32
32
|
when TokenType::WHITE_SPACE, TokenType::TEXT
|
|
33
|
-
|
|
33
|
+
[1, [Node.new(NodeType::TEXT, nil, token.text, token.start, token.end)]]
|
|
34
34
|
when TokenType::BEGIN_PARAMETER, TokenType::END_PARAMETER, TokenType::BEGIN_OPTIONAL, TokenType::END_OPTIONAL, TokenType::ALTERNATION
|
|
35
35
|
raise InvalidParameterTypeNameInNode.new(expression, token)
|
|
36
36
|
when TokenType::START_OF_LINE, TokenType::END_OF_LINE
|
|
37
37
|
# If configured correctly this will never happen
|
|
38
|
-
|
|
38
|
+
[0, nil]
|
|
39
39
|
else
|
|
40
40
|
# If configured correctly this will never happen
|
|
41
|
-
|
|
41
|
+
[0, nil]
|
|
42
42
|
end
|
|
43
43
|
end
|
|
44
44
|
|
|
@@ -56,7 +56,7 @@ module Cucumber
|
|
|
56
56
|
return [0, nil] unless looking_at(tokens, current, TokenType::ALTERNATION)
|
|
57
57
|
|
|
58
58
|
token = tokens[current]
|
|
59
|
-
|
|
59
|
+
[1, [Node.new(NodeType::ALTERNATIVE, nil, token.text, token.start, token.end)]]
|
|
60
60
|
end
|
|
61
61
|
|
|
62
62
|
alternative_parsers = [
|
|
@@ -81,7 +81,7 @@ module Cucumber
|
|
|
81
81
|
start = tokens[current].start
|
|
82
82
|
_end = tokens[sub_current].start
|
|
83
83
|
# Does not consume right hand boundary token
|
|
84
|
-
|
|
84
|
+
[consumed, [Node.new(NodeType::ALTERNATION, split_alternatives(start, _end, ast), nil, start, _end)]]
|
|
85
85
|
end
|
|
86
86
|
|
|
87
87
|
#
|
|
@@ -118,7 +118,7 @@ module Cucumber
|
|
|
118
118
|
_end = tokens[sub_current].end
|
|
119
119
|
consumed = sub_current + 1 - current
|
|
120
120
|
ast = [Node.new(type, ast, nil, start, _end)]
|
|
121
|
-
|
|
121
|
+
[consumed, ast]
|
|
122
122
|
end
|
|
123
123
|
end
|
|
124
124
|
|
|
@@ -171,7 +171,7 @@ module Cucumber
|
|
|
171
171
|
alternatives = []
|
|
172
172
|
alternative = []
|
|
173
173
|
alternation.each do |n|
|
|
174
|
-
if NodeType::ALTERNATIVE
|
|
174
|
+
if n.type == NodeType::ALTERNATIVE
|
|
175
175
|
separators.push(n)
|
|
176
176
|
alternatives.push(alternative)
|
|
177
177
|
alternative = []
|
|
@@ -9,7 +9,7 @@ module Cucumber
|
|
|
9
9
|
module CucumberExpressions
|
|
10
10
|
class ParameterTypeRegistry
|
|
11
11
|
INTEGER_REGEXPS = [/-?\d+/, /\d+/].freeze
|
|
12
|
-
FLOAT_REGEXP = /
|
|
12
|
+
FLOAT_REGEXP = /[-+]?(?:\d+(?:\.\d+)?|\.\d+)(?:[E][+-]?\d+)?/.freeze
|
|
13
13
|
WORD_REGEXP = /[^\s]+/.freeze
|
|
14
14
|
STRING_REGEXP = /"([^"\\]*(\\.[^"\\]*)*)"|'([^'\\]*(\\.[^'\\]*)*)'/.freeze
|
|
15
15
|
ANONYMOUS_REGEXP = /.*/.freeze
|
metadata
CHANGED
|
@@ -1,7 +1,7 @@
|
|
|
1
1
|
--- !ruby/object:Gem::Specification
|
|
2
2
|
name: cucumber-cucumber-expressions
|
|
3
3
|
version: !ruby/object:Gem::Version
|
|
4
|
-
version: 20.
|
|
4
|
+
version: 20.1.0
|
|
5
5
|
platform: ruby
|
|
6
6
|
authors:
|
|
7
7
|
- Aslak Hellesøy
|
|
@@ -57,56 +57,56 @@ dependencies:
|
|
|
57
57
|
requirements:
|
|
58
58
|
- - "~>"
|
|
59
59
|
- !ruby/object:Gem::Version
|
|
60
|
-
version: 1.
|
|
60
|
+
version: 1.75.7
|
|
61
61
|
type: :development
|
|
62
62
|
prerelease: false
|
|
63
63
|
version_requirements: !ruby/object:Gem::Requirement
|
|
64
64
|
requirements:
|
|
65
65
|
- - "~>"
|
|
66
66
|
- !ruby/object:Gem::Version
|
|
67
|
-
version: 1.
|
|
67
|
+
version: 1.75.7
|
|
68
68
|
- !ruby/object:Gem::Dependency
|
|
69
69
|
name: rubocop-performance
|
|
70
70
|
requirement: !ruby/object:Gem::Requirement
|
|
71
71
|
requirements:
|
|
72
72
|
- - "~>"
|
|
73
73
|
- !ruby/object:Gem::Version
|
|
74
|
-
version: 1.
|
|
74
|
+
version: 1.25.0
|
|
75
75
|
type: :development
|
|
76
76
|
prerelease: false
|
|
77
77
|
version_requirements: !ruby/object:Gem::Requirement
|
|
78
78
|
requirements:
|
|
79
79
|
- - "~>"
|
|
80
80
|
- !ruby/object:Gem::Version
|
|
81
|
-
version: 1.
|
|
81
|
+
version: 1.25.0
|
|
82
82
|
- !ruby/object:Gem::Dependency
|
|
83
83
|
name: rubocop-rake
|
|
84
84
|
requirement: !ruby/object:Gem::Requirement
|
|
85
85
|
requirements:
|
|
86
86
|
- - "~>"
|
|
87
87
|
- !ruby/object:Gem::Version
|
|
88
|
-
version: 0.
|
|
88
|
+
version: 0.7.1
|
|
89
89
|
type: :development
|
|
90
90
|
prerelease: false
|
|
91
91
|
version_requirements: !ruby/object:Gem::Requirement
|
|
92
92
|
requirements:
|
|
93
93
|
- - "~>"
|
|
94
94
|
- !ruby/object:Gem::Version
|
|
95
|
-
version: 0.
|
|
95
|
+
version: 0.7.1
|
|
96
96
|
- !ruby/object:Gem::Dependency
|
|
97
97
|
name: rubocop-rspec
|
|
98
98
|
requirement: !ruby/object:Gem::Requirement
|
|
99
99
|
requirements:
|
|
100
100
|
- - "~>"
|
|
101
101
|
- !ruby/object:Gem::Version
|
|
102
|
-
version: 3.
|
|
102
|
+
version: 3.6.0
|
|
103
103
|
type: :development
|
|
104
104
|
prerelease: false
|
|
105
105
|
version_requirements: !ruby/object:Gem::Requirement
|
|
106
106
|
requirements:
|
|
107
107
|
- - "~>"
|
|
108
108
|
- !ruby/object:Gem::Version
|
|
109
|
-
version: 3.
|
|
109
|
+
version: 3.6.0
|
|
110
110
|
description: Cucumber Expressions - a simpler alternative to Regular Expressions
|
|
111
111
|
email: cukes@googlegroups.com
|
|
112
112
|
executables: []
|
|
@@ -155,7 +155,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
|
|
|
155
155
|
- !ruby/object:Gem::Version
|
|
156
156
|
version: 3.2.8
|
|
157
157
|
requirements: []
|
|
158
|
-
rubygems_version: 4.0.
|
|
158
|
+
rubygems_version: 4.0.16
|
|
159
159
|
specification_version: 4
|
|
160
|
-
summary: cucumber-expressions-20.
|
|
160
|
+
summary: cucumber-expressions-20.1.0
|
|
161
161
|
test_files: []
|