Skip to content

Commit fcc7b31

Browse files
committed
Use rubocop-fnando.
1 parent acc0956 commit fcc7b31

38 files changed

+84
-210
lines changed

.rubocop.yml

Lines changed: 4 additions & 113 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,9 @@
11
---
2+
inherit_gem:
3+
rubocop-fnando: .rubocop.yml
24

35
AllCops:
6+
TargetRubyVersion: 2.5
47
Exclude:
58
- bin/**/*
69
- gemfiles/**/*
@@ -10,129 +13,17 @@ AllCops:
1013
- "*.gemspec"
1114
- config.ru
1215

13-
Layout/DotPosition:
14-
EnforcedStyle: leading
15-
16-
Layout/RescueEnsureAlignment:
17-
Enabled: false
18-
19-
Layout/SpaceBeforeBlockBraces:
20-
EnforcedStyle: space
21-
22-
Layout/SpaceInsideBlockBraces:
23-
EnforcedStyle: space
24-
SpaceBeforeBlockParameters: false
25-
26-
Layout/SpaceInsideHashLiteralBraces:
27-
Enabled: false
28-
29-
Metrics/AbcSize:
30-
Enabled: false
31-
3216
Metrics/ClassLength:
3317
Enabled: false
3418

35-
Metrics/CyclomaticComplexity:
36-
Enabled: false
37-
3819
Metrics/LineLength:
3920
Max: 80
4021

4122
Metrics/MethodLength:
4223
Enabled: false
4324

44-
Metrics/ParameterLists:
45-
Enabled: false
46-
47-
Naming/FileName:
48-
Enabled: false
49-
50-
Naming/PredicateName:
51-
NamePrefixBlacklist:
52-
- is_
53-
54-
Naming/UncommunicativeMethodParamName:
55-
Enabled: false
56-
5725
Style/Alias:
5826
EnforcedStyle: prefer_alias_method
5927

60-
Style/BlockDelimiters:
61-
Enabled: false
62-
63-
Style/ClassCheck:
64-
EnforcedStyle: kind_of?
65-
66-
Style/CollectionMethods:
67-
PreferredMethods:
68-
collect: map
69-
collect!: map!
70-
inject: reduce
71-
detect: find
72-
find_all: select
73-
74-
Style/Documentation:
75-
Enabled: false
76-
77-
Style/DoubleNegation:
78-
Enabled: false
79-
80-
Style/Encoding:
81-
Enabled: false
82-
83-
Style/FrozenStringLiteralComment:
84-
EnforcedStyle: always
85-
86-
Style/IfUnlessModifier:
87-
Enabled: false
88-
89-
Style/ModuleFunction:
90-
Enabled: false
91-
92-
Style/OneLineConditional:
93-
Enabled: false
94-
95-
Style/PercentLiteralDelimiters:
96-
PreferredDelimiters:
97-
"%": "[]"
98-
"%i": "[]"
99-
"%q": "[]"
100-
"%Q": "[]"
101-
"%r": "[]"
102-
"%s": "[]"
103-
"%w": "[]"
104-
"%W": "[]"
105-
"%x": "[]"
106-
107-
Style/PerlBackrefs:
108-
Enabled: false
109-
110-
Style/Proc:
111-
Enabled: false
112-
113-
Style/RegexpLiteral:
114-
Enabled: false
115-
116-
Style/SafeNavigation:
117-
Enabled: false
118-
119-
Style/SingleLineBlockParams:
120-
Enabled: false
121-
122-
Style/StringLiterals:
123-
EnforcedStyle: double_quotes
124-
SupportedStyles:
125-
- single_quotes
126-
- double_quotes
127-
128-
Style/TrailingCommaInArrayLiteral:
129-
Enabled: false
130-
131-
Style/TrailingCommaInHashLiteral:
132-
Enabled: false
133-
134-
Style/VariableInterpolation:
135-
Enabled: false
136-
137-
Style/WhileUntilModifier:
28+
Lint/RedundantCopDisableDirective:
13829
Enabled: false

browser.gemspec

Lines changed: 8 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
1+
# frozen_string_literal: true
2+
13
require "./lib/browser/version"
24

35
Gem::Specification.new do |s|
@@ -19,13 +21,14 @@ Gem::Specification.new do |s|
1921
s.require_paths = ["lib"]
2022

2123
s.add_development_dependency "bundler", ">= 0"
22-
s.add_development_dependency "rake"
23-
s.add_development_dependency "rails"
24-
s.add_development_dependency "rack-test"
2524
s.add_development_dependency "minitest"
25+
s.add_development_dependency "minitest-autotest"
2626
s.add_development_dependency "minitest-utils"
2727
s.add_development_dependency "pry-meta"
28-
s.add_development_dependency "minitest-autotest"
29-
s.add_development_dependency "simplecov"
28+
s.add_development_dependency "rack-test"
29+
s.add_development_dependency "rails"
30+
s.add_development_dependency "rake"
3031
s.add_development_dependency "rubocop"
32+
s.add_development_dependency "rubocop-fnando"
33+
s.add_development_dependency "simplecov"
3134
end

lib/browser/accept_language.rb

Lines changed: 5 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -34,28 +34,26 @@ def name
3434
def code
3535
@code ||= begin
3636
code = part[/\A([^-;]+)/, 1]
37-
code.downcase if code
37+
code&.downcase
3838
end
3939
end
4040

4141
def region
4242
@region ||= begin
4343
region = part[/\A(?:.*?)-([^;-]+)/, 1]
44-
region.upcase if region
44+
region&.upcase
4545
end
4646
end
4747

4848
def quality
4949
@quality ||= begin
5050
Float(quality_value || 1.0)
51-
rescue ArgumentError
52-
0.1
51+
rescue ArgumentError
52+
0.1
5353
end
5454
end
5555

56-
private
57-
58-
def quality_value
56+
private def quality_value
5957
qvalue = part[/;q=([\d.]+)/, 1]
6058
qvalue = qvalue =~ /\A0\.0?\z/ ? "0.0" : qvalue
6159
qvalue = qvalue.gsub(/\.+/, ".") if qvalue

lib/browser/action_controller.rb

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,9 +10,7 @@ module ActionController
1010
helper_method(:browser) if respond_to?(:helper_method)
1111
end
1212

13-
private
14-
15-
def browser
13+
private def browser
1614
@browser ||= Browser.new(
1715
request.headers["User-Agent"],
1816
accept_language: request.headers["Accept-Language"]

lib/browser/alipay.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ def name
1111
end
1212

1313
def full_version
14-
ua[%r[(?:AlipayClient)/([\d.]+)]i, 1] || "0.0"
14+
ua[%r{(?:AlipayClient)/([\d.]+)}i, 1] || "0.0"
1515
end
1616

1717
def match?

lib/browser/base.rb

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -193,7 +193,7 @@ def opera_mini?(expected_version = nil)
193193
end
194194

195195
def webkit_full_version
196-
ua[%r[AppleWebKit/([\d.]+)], 1] || "0.0"
196+
ua[%r{AppleWebKit/([\d.]+)}, 1] || "0.0"
197197
end
198198

199199
def known?

lib/browser/blackberry.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@ def name
1111
end
1212

1313
def full_version
14-
ua[%r[BlackBerry[\da-z]+/([\d.]+)], 1] ||
15-
ua[%r[Version/([\d.]+)], 1] ||
14+
ua[%r{BlackBerry[\da-z]+/([\d.]+)}, 1] ||
15+
ua[%r{Version/([\d.]+)}, 1] ||
1616
"0.0"
1717
end
1818

lib/browser/bot.rb

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -50,21 +50,19 @@ def name
5050
self.class.bots.find {|key, _| downcased_ua.include?(key) }.last
5151
end
5252

53-
private
54-
55-
def bot_with_empty_ua?
53+
private def bot_with_empty_ua?
5654
self.class.detect_empty_ua? && ua.strip == ""
5755
end
5856

59-
def bot_exception?
57+
private def bot_exception?
6058
self.class.bot_exceptions.any? {|key| downcased_ua.include?(key) }
6159
end
6260

63-
def detect_bot?
61+
private def detect_bot?
6462
self.class.bots.any? {|key, _| downcased_ua.include?(key) }
6563
end
6664

67-
def downcased_ua
65+
private def downcased_ua
6866
@downcased_ua ||= ua.downcase
6967
end
7068
end

lib/browser/chrome.rb

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -12,10 +12,10 @@ def name
1212

1313
def full_version
1414
# Each regex on its own line to enforce precedence.
15-
ua[%r[Chrome/([\d.]+)], 1] ||
16-
ua[%r[CriOS/([\d.]+)], 1] ||
17-
ua[%r[Safari/([\d.]+)], 1] ||
18-
ua[%r[AppleWebKit/([\d.]+)], 1] ||
15+
ua[%r{Chrome/([\d.]+)}, 1] ||
16+
ua[%r{CriOS/([\d.]+)}, 1] ||
17+
ua[%r{Safari/([\d.]+)}, 1] ||
18+
ua[%r{AppleWebKit/([\d.]+)}, 1] ||
1919
"0.0"
2020
end
2121

lib/browser/detect_version.rb

Lines changed: 3 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,7 @@
22

33
module Browser
44
module DetectVersion
5-
private
6-
7-
def detect_version?(actual_version, expected_version)
5+
private def detect_version?(actual_version, expected_version)
86
return true unless expected_version
97
return false if expected_version && !actual_version
108

@@ -17,8 +15,8 @@ def detect_version?(actual_version, expected_version)
1715
false
1816
end
1917

20-
def parse_version(version)
21-
version.kind_of?(Numeric) ? version.to_s : version
18+
private def parse_version(version)
19+
version.is_a?(Numeric) ? version.to_s : version
2220
end
2321
end
2422
end

0 commit comments

Comments
 (0)