Skip to content

Commit 827d012

Browse files
authored
Merge pull request #57 from norman/fix-ci
CI is failing because Rubocop's unhappy. JRuby is still unhappy.
2 parents c45a48f + 8a2a7b9 commit 827d012

File tree

2 files changed

+6
-26
lines changed

2 files changed

+6
-26
lines changed

.rubocop.yml

Lines changed: 3 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1758,15 +1758,6 @@ Lint/RedundantSafeNavigation:
17581758
Enabled: pending
17591759
VersionAdded: '0.93'
17601760
Safe: false
1761-
IgnoredMethods:
1762-
- to_c
1763-
- to_f
1764-
- to_i
1765-
- to_r
1766-
- rationalize
1767-
- public_send
1768-
- send
1769-
- __send__
17701761

17711762
Lint/RedundantSplatExpansion:
17721763
Description: 'Checks for splat unnecessarily being called on literals.'
@@ -1906,12 +1897,6 @@ Lint/SuppressedException:
19061897
VersionAdded: '0.9'
19071898
VersionChanged: '0.81'
19081899

1909-
Lint/Syntax:
1910-
Description: 'Checks syntax error.'
1911-
Enabled: true
1912-
VersionAdded: '0.9'
1913-
1914-
19151900
Lint/ToJSON:
19161901
Description: 'Ensure #to_json includes an optional argument.'
19171902
Enabled: true
@@ -2053,10 +2038,6 @@ Metrics/BlockLength:
20532038
CountComments: false # count full line comments?
20542039
Max: 25
20552040
CountAsOne: []
2056-
ExcludedMethods:
2057-
# By default, exclude the `#refine` method, as it tends to have larger
2058-
# associated blocks.
2059-
- refine
20602041
Exclude:
20612042
- '**/*.gemspec'
20622043
- 'spec/**/*'
@@ -2099,7 +2080,6 @@ Metrics/MethodLength:
20992080
CountComments: false # count full line comments?
21002081
Max: 15
21012082
CountAsOne: []
2102-
ExcludedMethods: []
21032083

21042084
Metrics/ModuleLength:
21052085
Description: 'Avoid modules longer than 100 lines of code.'
@@ -2937,6 +2917,9 @@ Style/DocumentationMethod:
29372917
- 'test/**/*'
29382918
RequireForNonPublicMethods: false
29392919

2920+
Style/DocumentDynamicEvalDefinition:
2921+
Enabled: false
2922+
29402923
Style/DoubleCopDisableDirective:
29412924
Description: 'Checks for double rubocop:disable comments on a single line.'
29422925
Enabled: true
@@ -3050,8 +3033,6 @@ Style/ExplicitBlockArgument:
30503033
that just passes its arguments to another block.
30513034
StyleGuide: '#block-argument'
30523035
Enabled: pending
3053-
# May change the yielding arity.
3054-
Safe: false
30553036
VersionAdded: '0.89'
30563037

30573038
Style/ExponentialNotation:
@@ -3279,7 +3260,6 @@ Style/InfiniteLoop:
32793260
Enabled: true
32803261
VersionAdded: '0.26'
32813262
VersionChanged: '0.61'
3282-
SafeAutoCorrect: true
32833263

32843264
Style/InlineComment:
32853265
Description: 'Avoid trailing inline comments.'

lib/babosa/identifier.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -125,10 +125,10 @@ def normalize!(options = {})
125125

126126
if options[:transliterate]
127127
option = options[:transliterate]
128-
if option != true
129-
transliterate!(*option)
130-
else
128+
if option == true
131129
transliterate!(*options[:transliterations])
130+
else
131+
transliterate!(*option)
132132
end
133133
end
134134
to_ascii! if options[:to_ascii]

0 commit comments

Comments
 (0)