Skip to content

Commit 40c8fab

Browse files
luke-hillluke-hill
committed
Partial autofix for Layout/SpaceInsideBlockBraces
1 parent 9e08a7a commit 40c8fab

9 files changed

+56
-58
lines changed

‎ruby/cucumber-cucumber-expressions.gemspec‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,7 @@ Gem::Specification.new do |s|
2727
s.add_development_dependency 'rspec', '~> 3.11', '>= 3.11.0'
2828
s.add_development_dependency 'rubocop', '~> 1.27.0'
2929

30-
s.rubygems_version = '>= 3.0.8'
31-
s.files = `git ls-files`.split("\n").reject {|path| path =~ /\.gitignore$/ }
32-
s.test_files = `git ls-files -- spec/*`.split("\n")
30+
s.files = `git ls-files`.split("\n").reject { |path| path =~ /\.gitignore$/ }
3331
s.rdoc_options = ['--charset=UTF-8']
3432
s.require_path = 'lib'
3533
end

‎ruby/lib/cucumber/cucumber_expressions/group_builder.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ def add(group_builder)
1818

1919
def build(match, group_indices)
2020
group_index = group_indices.next
21-
children = @group_builders.map {|gb| gb.build(match, group_indices)}
21+
children = @group_builders.map { |gb| gb.build(match, group_indices) }
2222
Group.new(match[group_index], match.offset(group_index)[0], match.offset(group_index)[1], children)
2323
end
2424

‎ruby/lib/cucumber/cucumber_expressions/parameter_type_registry.rb‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -16,19 +16,19 @@ class ParameterTypeRegistry
1616

1717
def initialize
1818
@parameter_type_by_name = {}
19-
@parameter_types_by_regexp = Hash.new {|hash, regexp| hash[regexp] = []}
19+
@parameter_types_by_regexp = Hash.new { |hash, regexp| hash[regexp] = [] }
2020

21-
define_parameter_type(ParameterType.new('int', INTEGER_REGEXPS, Integer, ->(s = nil) { s && s.to_i}, true, true))
22-
define_parameter_type(ParameterType.new('float', FLOAT_REGEXP, Float, ->(s = nil) { s && s.to_f}, true, false))
23-
define_parameter_type(ParameterType.new('word', WORD_REGEXP, String, ->(s = nil) { s}, false, false))
24-
define_parameter_type(ParameterType.new('string', STRING_REGEXP, String, ->(s1, s2) { arg = s1 != nil ? s1 : s2; arg.gsub(/\\"/, '"').gsub(/\\'/, "'")}, true, false))
25-
define_parameter_type(ParameterType.new('', ANONYMOUS_REGEXP, String, ->(s = nil) { s}, false, true))
26-
define_parameter_type(ParameterType.new('bigdecimal', FLOAT_REGEXP, BigDecimal, ->(s = nil) { BigDecimal(s)}, false, false))
27-
define_parameter_type(ParameterType.new('biginteger', INTEGER_REGEXPS, Integer, ->(s = nil) { s && s.to_i}, false, false))
28-
define_parameter_type(ParameterType.new('byte', INTEGER_REGEXPS, Integer, ->(s = nil) { s && s.to_i}, false, false))
29-
define_parameter_type(ParameterType.new('short', INTEGER_REGEXPS, Integer, ->(s = nil) { s && s.to_i}, false, false))
30-
define_parameter_type(ParameterType.new('long', INTEGER_REGEXPS, Integer, ->(s = nil) { s && s.to_i}, false, false))
31-
define_parameter_type(ParameterType.new('double', FLOAT_REGEXP, Float, ->(s = nil) { s && s.to_f}, false, false))
21+
define_parameter_type(ParameterType.new('int', INTEGER_REGEXPS, Integer, ->(s = nil) { s && s.to_i }, true, true))
22+
define_parameter_type(ParameterType.new('float', FLOAT_REGEXP, Float, ->(s = nil) { s && s.to_f }, true, false))
23+
define_parameter_type(ParameterType.new('word', WORD_REGEXP, String, ->(s = nil) { s }, false, false))
24+
define_parameter_type(ParameterType.new('string', STRING_REGEXP, String, ->(s1, s2) { arg = s1 != nil ? s1 : s2; arg.gsub('\\"', '"').gsub("\\'", "'") }, true, false))
25+
define_parameter_type(ParameterType.new('', ANONYMOUS_REGEXP, String, ->(s = nil) { s }, false, true))
26+
define_parameter_type(ParameterType.new('bigdecimal', FLOAT_REGEXP, BigDecimal, ->(s = nil) { BigDecimal(s) }, false, false))
27+
define_parameter_type(ParameterType.new('biginteger', INTEGER_REGEXPS, Integer, ->(s = nil) { s && s.to_i }, false, false))
28+
define_parameter_type(ParameterType.new('byte', INTEGER_REGEXPS, Integer, ->(s = nil) { s && s.to_i }, false, false))
29+
define_parameter_type(ParameterType.new('short', INTEGER_REGEXPS, Integer, ->(s = nil) { s && s.to_i }, false, false))
30+
define_parameter_type(ParameterType.new('long', INTEGER_REGEXPS, Integer, ->(s = nil) { s && s.to_i }, false, false))
31+
define_parameter_type(ParameterType.new('double', FLOAT_REGEXP, Float, ->(s = nil) { s && s.to_f }, false, false))
3232
end
3333

3434
def lookup_by_type_name(name)

‎ruby/lib/cucumber/cucumber_expressions/regular_expression.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@ def match(text)
2424
nil,
2525
parameter_type_regexp,
2626
String,
27-
->(*s) { s[0]},
27+
->(*s) { s[0] },
2828
false,
2929
false
3030
)

‎ruby/spec/cucumber/cucumber_expressions/combinatorial_generated_expression_factory_test.rb‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -15,21 +15,21 @@ class Timestamp; end
1515
it 'generates multiple expressions' do
1616
parameter_type_combinations = [
1717
[
18-
ParameterType.new('color', /red|blue|yellow/, Color, ->(s) { Color.new}, true, false),
19-
ParameterType.new('csscolor', /red|blue|yellow/, CssColor, ->(s) { CssColor.new}, true, false)
18+
ParameterType.new('color', /red|blue|yellow/, Color, ->(s) { Color.new }, true, false),
19+
ParameterType.new('csscolor', /red|blue|yellow/, CssColor, ->(s) { CssColor.new }, true, false)
2020
],
2121
[
22-
ParameterType.new('date', /\d{4}-\d{2}-\d{2}/, Date, ->(s) { Date.new}, true, false),
23-
ParameterType.new('datetime', /\d{4}-\d{2}-\d{2}/, DateTime, ->(s) { DateTime.new}, true, false),
24-
ParameterType.new('timestamp', /\d{4}-\d{2}-\d{2}/, Timestamp, ->(s) { Timestamp.new}, true, false)
22+
ParameterType.new('date', /\d{4}-\d{2}-\d{2}/, Date, ->(s) { Date.new }, true, false),
23+
ParameterType.new('datetime', /\d{4}-\d{2}-\d{2}/, DateTime, ->(s) { DateTime.new }, true, false),
24+
ParameterType.new('timestamp', /\d{4}-\d{2}-\d{2}/, Timestamp, ->(s) { Timestamp.new }, true, false)
2525
]
2626
]
2727

2828
factory = CombinatorialGeneratedExpressionFactory.new(
2929
'I bought a {%s} ball on {%s}',
3030
parameter_type_combinations
3131
)
32-
expressions = factory.generate_expressions.map {|ge| ge.source}
32+
expressions = factory.generate_expressions.map { |ge| ge.source }
3333
expect(expressions).to eq([
3434
'I bought a {color} ball on {date}',
3535
'I bought a {color} ball on {datetime}',

‎ruby/spec/cucumber/cucumber_expressions/custom_parameter_type_spec.rb‎

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ def ==(other)
5050
'color', # name
5151
/red|blue|yellow/, # regexp
5252
Color, # type
53-
->(s) { Color.new(s)}, # transform
53+
->(s) { Color.new(s) }, # transform
5454
true, # use_for_snippets
5555
false # prefer_for_regexp_match
5656
)
@@ -64,7 +64,7 @@ def ==(other)
6464
'[string]',
6565
/.*/,
6666
String,
67-
->(s) { s},
67+
->(s) { s },
6868
true,
6969
false
7070
)
@@ -85,7 +85,7 @@ def ==(other)
8585
'coordinate',
8686
/(\d+),\s*(\d+),\s*(\d+)/,
8787
Coordinate,
88-
->(x, y, z) { Coordinate.new(x.to_i, y.to_i, z.to_i)},
88+
->(x, y, z) { Coordinate.new(x.to_i, y.to_i, z.to_i) },
8989
true,
9090
false
9191
)
@@ -111,7 +111,7 @@ def ==(other)
111111
'color',
112112
[/red|blue|yellow/, /(?:dark|light) (?:red|blue|yellow)/],
113113
Color,
114-
->(s) { Color.new(s)},
114+
->(s) { Color.new(s) },
115115
true,
116116
false
117117
)
@@ -128,15 +128,15 @@ def ==(other)
128128
'throwing',
129129
/bad/,
130130
CssColor,
131-
->(s) { raise "Can't transform [#{s}]"},
131+
->(s) { raise "Can't transform [#{s}]" },
132132
true,
133133
false
134134
)
135135
)
136136
expression = CucumberExpression.new('I have a {throwing} parameter', @parameter_type_registry)
137137
args = expression.match('I have a bad parameter')
138138

139-
expect {args[0].value(nil)}.to raise_error("Can't transform [bad]")
139+
expect { args[0].value(nil) }.to raise_error("Can't transform [bad]")
140140
end
141141

142142
describe 'conflicting parameter type' do
@@ -147,7 +147,7 @@ def ==(other)
147147
'color',
148148
/.*/,
149149
CssColor,
150-
->(s) { CssColor.new(s)},
150+
->(s) { CssColor.new(s) },
151151
true,
152152
false
153153
)
@@ -161,7 +161,7 @@ def ==(other)
161161
'whatever',
162162
/.*/,
163163
Color,
164-
->(s) { Color.new(s)},
164+
->(s) { Color.new(s) },
165165
false,
166166
false
167167
)
@@ -174,7 +174,7 @@ def ==(other)
174174
'css-color',
175175
/red|blue|yellow/,
176176
CssColor,
177-
->(s) { CssColor.new(s)},
177+
->(s) { CssColor.new(s) },
178178
true,
179179
false
180180
)
@@ -200,7 +200,7 @@ def ==(other)
200200
nil,
201201
/red|blue|yellow/,
202202
Color,
203-
->(s) { Color.new(s)},
203+
->(s) { Color.new(s) },
204204
true,
205205
false
206206
)

‎ruby/spec/cucumber/cucumber_expressions/parameter_type_registry_spec.rb‎

Lines changed: 23 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -18,20 +18,20 @@ class Place; end
1818
end
1919

2020
it 'does not allow more than one prefer_for_regexp_match parameter type for each regexp' do
21-
@registry.define_parameter_type(ParameterType.new('name', CAPITALISED_WORD, Name, ->(s) { Name.new}, true, true))
22-
@registry.define_parameter_type(ParameterType.new('person', CAPITALISED_WORD, Person, ->(s) { Person.new}, true, false))
21+
@registry.define_parameter_type(ParameterType.new('name', CAPITALISED_WORD, Name, ->(s) { Name.new }, true, true))
22+
@registry.define_parameter_type(ParameterType.new('person', CAPITALISED_WORD, Person, ->(s) { Person.new }, true, false))
2323
expect do
24-
@registry.define_parameter_type(ParameterType.new('place', CAPITALISED_WORD, Place, ->(s) { Place.new}, true, true))
24+
@registry.define_parameter_type(ParameterType.new('place', CAPITALISED_WORD, Place, ->(s) { Place.new }, true, true))
2525
end.to raise_error(
2626
CucumberExpressionError,
2727
'There can only be one preferential parameter type per regexp. The regexp /[A-Z]+\\w+/ is used for two preferential parameter types, {name} and {place}'
2828
)
2929
end
3030

3131
it 'looks up prefer_for_regexp_match parameter type by regexp' do
32-
name = ParameterType.new('name', CAPITALISED_WORD, Name, ->(s) { Name.new}, true, false)
33-
person = ParameterType.new('person', CAPITALISED_WORD, Person, ->(s) { Person.new}, true, true)
34-
place = ParameterType.new('place', CAPITALISED_WORD, Place, ->(s) { Place.new}, true, false)
32+
name = ParameterType.new('name', CAPITALISED_WORD, Name, ->(s) { Name.new }, true, false)
33+
person = ParameterType.new('person', CAPITALISED_WORD, Person, ->(s) { Person.new }, true, true)
34+
place = ParameterType.new('place', CAPITALISED_WORD, Place, ->(s) { Place.new }, true, false)
3535

3636
@registry.define_parameter_type(name)
3737
@registry.define_parameter_type(person)
@@ -41,9 +41,9 @@ class Place; end
4141
end
4242

4343
it 'throws ambiguous exception when no parameter types are prefer_for_regexp_match' do
44-
name = ParameterType.new('name', CAPITALISED_WORD, Name, ->(s) { Name.new}, true, false)
45-
person = ParameterType.new('person', CAPITALISED_WORD, Person, ->(s) { Person.new}, true, false)
46-
place = ParameterType.new('place', CAPITALISED_WORD, Place, ->(s) { Place.new}, true, false)
44+
name = ParameterType.new('name', CAPITALISED_WORD, Name, ->(s) { Name.new }, true, false)
45+
person = ParameterType.new('person', CAPITALISED_WORD, Person, ->(s) { Person.new }, true, false)
46+
place = ParameterType.new('place', CAPITALISED_WORD, Place, ->(s) { Place.new }, true, false)
4747

4848
@registry.define_parameter_type(name)
4949
@registry.define_parameter_type(person)
@@ -54,23 +54,23 @@ class Place; end
5454
end.to raise_error(
5555
CucumberExpressionError,
5656
"Your Regular Expression /([A-Z]+\\w+) and ([A-Z]+\\w+)/\n" \
57-
"matches multiple parameter types with regexp /[A-Z]+\\w+/:\n" \
58-
" {name}\n" \
59-
" {person}\n" \
60-
" {place}\n" \
57+
"matches multiple parameter types with regexp /[A-Z]+\\w+/:\n " \
58+
"{name}\n " \
59+
"{person}\n " \
60+
"{place}\n" \
6161
"\n" \
6262
"I couldn't decide which one to use. You have two options:\n" \
6363
"\n" \
64-
"1) Use a Cucumber Expression instead of a Regular Expression. Try one of these:\n" \
65-
" {name} and {name}\n" \
66-
" {name} and {person}\n" \
67-
" {name} and {place}\n" \
68-
" {person} and {name}\n" \
69-
" {person} and {person}\n" \
70-
" {person} and {place}\n" \
71-
" {place} and {name}\n" \
72-
" {place} and {person}\n" \
73-
" {place} and {place}\n" \
64+
"1) Use a Cucumber Expression instead of a Regular Expression. Try one of these:\n " \
65+
"{name} and {name}\n " \
66+
"{name} and {person}\n " \
67+
"{name} and {place}\n " \
68+
"{person} and {name}\n " \
69+
"{person} and {person}\n " \
70+
"{person} and {place}\n " \
71+
"{place} and {name}\n " \
72+
"{place} and {person}\n " \
73+
"{place} and {place}\n" \
7474
"\n" \
7575
"2) Make one of the parameter types preferential and continue to use a Regular Expression.\n" \
7676
"\n"

‎ruby/spec/cucumber/cucumber_expressions/parameter_type_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module CucumberExpressions
77
describe ParameterType do
88
it 'does not allow ignore flag on regexp' do
99
expect do
10-
ParameterType.new('case-insensitive', /[a-z]+/i, String, ->(s) { s}, true, true)
10+
ParameterType.new('case-insensitive', /[a-z]+/i, String, ->(s) { s }, true, true)
1111
end.to raise_error(
1212
CucumberExpressionError,
1313
"ParameterType Regexps can't use option Regexp::IGNORECASE")

‎ruby/spec/cucumber/cucumber_expressions/tree_regexp_spec.rb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ module CucumberExpressions
77
describe TreeRegexp do
88
it 'exposes the group source' do
99
tr = TreeRegexp.new(/(a(?:b)?)(c)/)
10-
expect(tr.group_builder.children.map {|gb| gb.source}).to eq(['a(?:b)?', 'c'])
10+
expect(tr.group_builder.children.map { |gb| gb.source }).to eq(['a(?:b)?', 'c'])
1111
end
1212

1313
it 'builds a tree' do

0 commit comments

Comments
 (0)