Skip to content

Commit 0f5c93b

Browse files
reidmorrisonreidmorrison
committed
RuboCop
1 parent f0f4d0f commit 0f5c93b

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

43 files changed

+292
-200
lines changed

‎.gitignore

+2
Original file line numberDiff line numberDiff line change
@@ -13,3 +13,5 @@ Gemfile.lock
1313
*.sqlite3
1414
.rakeTasks
1515
*.sqlite3
16+
TODO.md
17+

‎.rubocop.yml

+109
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,109 @@
1+
AllCops:
2+
TargetRubyVersion: 2.3
3+
Exclude:
4+
- '.git/**/*'
5+
- '.github/**/*'
6+
- 'gemfiles/**/*'
7+
8+
# Match existing layout
9+
Layout/DotPosition:
10+
EnforcedStyle: trailing
11+
12+
# Rubocop cannot yet see beyond one line above or below, when aligning =
13+
Layout/ExtraSpacing:
14+
Enabled: false
15+
AllowForAlignment: true
16+
ForceEqualSignAlignment: true
17+
AutoCorrect: false
18+
19+
# Pick one
20+
Layout/IndentHeredoc:
21+
EnforcedStyle: squiggly
22+
23+
# Match existing layout
24+
Layout/MultilineMethodCallIndentation:
25+
EnforcedStyle: indented
26+
IndentationWidth: 2
27+
28+
# Rubocop cannot yet see beyond one line above or below, when aligning =
29+
Layout/SpaceAroundOperators:
30+
Enabled: false
31+
AllowForAlignment: true
32+
AutoCorrect: false
33+
34+
# Match existing layout
35+
Layout/SpaceInsideHashLiteralBraces:
36+
EnforcedStyle: no_space
37+
EnforcedStyleForEmptyBraces: no_space
38+
39+
# Files must end with a blank line
40+
Layout/TrailingBlankLines:
41+
EnforcedStyle: final_newline
42+
43+
# TODO: Soften Limits for phase 1 only
44+
Metrics/AbcSize:
45+
Max: 40
46+
47+
# Support long block lengths for tests
48+
Metrics/BlockLength:
49+
Exclude:
50+
- 'test/**/*'
51+
52+
# Soften limits
53+
Metrics/ClassLength:
54+
Max: 250
55+
Exclude:
56+
- 'test/**/*'
57+
58+
# TODO: Soften Limits for phase 1 only
59+
Metrics/CyclomaticComplexity:
60+
Max: 15
61+
62+
Metrics/LineLength:
63+
Max: 128
64+
Exclude:
65+
- 'cli.rb'
66+
- 'test/**/*'
67+
68+
# Soften limits
69+
Metrics/MethodLength:
70+
Max: 50
71+
72+
# Soften limits
73+
Metrics/ModuleLength:
74+
Max: 250
75+
76+
Metrics/ParameterLists:
77+
CountKeywordArgs: false
78+
79+
# TODO: Soften Limits for phase 1 only
80+
Metrics/PerceivedComplexity:
81+
Max: 21
82+
83+
# Initialization Vector abbreviation
84+
Naming/UncommunicativeMethodParamName:
85+
AllowedNames: ['iv', '_', 'io', 'ap']
86+
87+
# Does not allow Symbols to load
88+
Security/YAMLLoad:
89+
AutoCorrect: false
90+
91+
# Needed for testing DateTime
92+
Style/DateTime:
93+
Exclude: ['test/**/*']
94+
95+
# TODO: Soften Limits for phase 1 only
96+
Style/Documentation:
97+
Enabled: false
98+
99+
# One line methods
100+
Style/EmptyMethod:
101+
Enabled: false
102+
103+
# Ruby 3 compatibility feature
104+
Style/FrozenStringLiteralComment:
105+
Enabled: false
106+
107+
Style/NumericPredicate:
108+
AutoCorrect: true
109+

‎Gemfile

+5-5
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,16 @@ source 'https://rubygems.org'
22

33
gemspec
44

5-
gem 'rake'
5+
gem 'active_model_serializers'
6+
gem 'awesome_print'
67
gem 'minitest'
78
gem 'minitest-rails'
8-
gem 'awesome_print'
9-
gem 'active_model_serializers'
9+
gem 'rake'
1010

11-
gem 'sqlite3', platform: :ruby
12-
gem 'jdbc-sqlite3', platform: :jruby
1311
gem 'activerecord-jdbcsqlite3-adapter', platform: :jruby
1412
gem 'appraisal'
13+
gem 'jdbc-sqlite3', platform: :jruby
1514
gem 'puma'
15+
gem 'sqlite3', platform: :ruby
1616

1717
gem 'rails', '~> 5.2.0'

‎README.md

+1-2
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ For complete documentation see: http://rocketjob.github.io/semantic_logger/rails
1111

1212
## Supports
1313

14-
- Ruby 2.1, 2.2 (or above) Or, JRuby 9.0 (or above)
15-
- Rails 4, 5 (or above)
14+
- Rails 3.2, 4, 5
1615

1716
## Author
1817

‎Rakefile

+2-2
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ task :gem do
99
system 'gem build rails_semantic_logger.gemspec'
1010
end
1111

12-
task :publish => :gem do
12+
task publish: :gem do
1313
system "git tag -a v#{RailsSemanticLogger::VERSION} -m 'Tagging #{RailsSemanticLogger::VERSION}'"
1414
system 'git push --tags'
1515
system "gem push rails_semantic_logger-#{RailsSemanticLogger::VERSION}.gem"
@@ -23,7 +23,7 @@ Rake::TestTask.new(:test) do |t|
2323
end
2424

2525
# By default run tests against all appraisals
26-
if !ENV["APPRAISAL_INITIALIZED"] && !ENV["TRAVIS"]
26+
if !ENV['APPRAISAL_INITIALIZED'] && !ENV['TRAVIS']
2727
require 'appraisal'
2828
task default: :appraisal
2929
else

‎gemfiles/rails_4.2.gemfile

+5-7
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
source "https://rubygems.org"
44

5-
gem "rake"
5+
gem "active_model_serializers"
6+
gem "awesome_print"
67
gem "minitest"
78
gem "minitest-rails"
8-
gem "minitest-reporters"
9-
gem "minitest-stub_any_instance"
10-
gem "awesome_print"
11-
gem "active_model_serializers"
12-
gem "sqlite3", platform: :ruby
13-
gem "jdbc-sqlite3", platform: :jruby
9+
gem "rake"
1410
gem "activerecord-jdbcsqlite3-adapter", "~> 1.0", platform: :jruby
1511
gem "appraisal"
12+
gem "jdbc-sqlite3", platform: :jruby
1613
gem "puma"
14+
gem "sqlite3", platform: :ruby
1715
gem "rails", "~> 4.2.0"
1816

1917
gemspec path: "../"

‎gemfiles/rails_5.0.2.gemfile

+5-7
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
source "https://rubygems.org"
44

5-
gem "rake"
5+
gem "active_model_serializers"
6+
gem "awesome_print"
67
gem "minitest", "5.10.1"
78
gem "minitest-rails"
8-
gem "minitest-reporters"
9-
gem "minitest-stub_any_instance"
10-
gem "awesome_print"
11-
gem "active_model_serializers"
12-
gem "sqlite3", platform: :ruby
13-
gem "jdbc-sqlite3", platform: :jruby
9+
gem "rake"
1410
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
1511
gem "appraisal"
12+
gem "jdbc-sqlite3", platform: :jruby
1613
gem "puma"
14+
gem "sqlite3", platform: :ruby
1715
gem "rails", "5.0.2"
1816

1917
gemspec path: "../"

‎gemfiles/rails_5.0.6.gemfile

+5-7
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
source "https://rubygems.org"
44

5-
gem "rake"
5+
gem "active_model_serializers"
6+
gem "awesome_print"
67
gem "minitest"
78
gem "minitest-rails"
8-
gem "minitest-reporters"
9-
gem "minitest-stub_any_instance"
10-
gem "awesome_print"
11-
gem "active_model_serializers"
12-
gem "sqlite3", platform: :ruby
13-
gem "jdbc-sqlite3", platform: :jruby
9+
gem "rake"
1410
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
1511
gem "appraisal"
12+
gem "jdbc-sqlite3", platform: :jruby
1613
gem "puma"
14+
gem "sqlite3", platform: :ruby
1715
gem "rails", "5.0.6"
1816

1917
gemspec path: "../"

‎gemfiles/rails_5.0.7.gemfile

+5-7
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
source "https://rubygems.org"
44

5-
gem "rake"
5+
gem "active_model_serializers"
6+
gem "awesome_print"
67
gem "minitest"
78
gem "minitest-rails"
8-
gem "minitest-reporters"
9-
gem "minitest-stub_any_instance"
10-
gem "awesome_print"
11-
gem "active_model_serializers"
12-
gem "sqlite3", platform: :ruby
13-
gem "jdbc-sqlite3", platform: :jruby
9+
gem "rake"
1410
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
1511
gem "appraisal"
12+
gem "jdbc-sqlite3", platform: :jruby
1613
gem "puma"
14+
gem "sqlite3", platform: :ruby
1715
gem "rails", "~> 5.0.7"
1816

1917
gemspec path: "../"

‎gemfiles/rails_5.1.4.gemfile

+5-7
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
source "https://rubygems.org"
44

5-
gem "rake"
5+
gem "active_model_serializers"
6+
gem "awesome_print"
67
gem "minitest"
78
gem "minitest-rails"
8-
gem "minitest-reporters"
9-
gem "minitest-stub_any_instance"
10-
gem "awesome_print"
11-
gem "active_model_serializers"
12-
gem "sqlite3", platform: :ruby
13-
gem "jdbc-sqlite3", platform: :jruby
9+
gem "rake"
1410
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
1511
gem "appraisal"
12+
gem "jdbc-sqlite3", platform: :jruby
1613
gem "puma"
14+
gem "sqlite3", platform: :ruby
1715
gem "rails", "5.1.4"
1816

1917
gemspec path: "../"

‎gemfiles/rails_5.1.5.gemfile

+5-7
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
source "https://rubygems.org"
44

5-
gem "rake"
5+
gem "active_model_serializers"
6+
gem "awesome_print"
67
gem "minitest"
78
gem "minitest-rails"
8-
gem "minitest-reporters"
9-
gem "minitest-stub_any_instance"
10-
gem "awesome_print"
11-
gem "active_model_serializers"
12-
gem "sqlite3", platform: :ruby
13-
gem "jdbc-sqlite3", platform: :jruby
9+
gem "rake"
1410
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
1511
gem "appraisal"
12+
gem "jdbc-sqlite3", platform: :jruby
1613
gem "puma"
14+
gem "sqlite3", platform: :ruby
1715
gem "rails", "~> 5.1.5"
1816

1917
gemspec path: "../"

‎gemfiles/rails_5.2.gemfile

+5-7
Original file line numberDiff line numberDiff line change
@@ -2,18 +2,16 @@
22

33
source "https://rubygems.org"
44

5-
gem "rake"
5+
gem "active_model_serializers"
6+
gem "awesome_print"
67
gem "minitest"
78
gem "minitest-rails"
8-
gem "minitest-reporters"
9-
gem "minitest-stub_any_instance"
10-
gem "awesome_print"
11-
gem "active_model_serializers"
12-
gem "sqlite3", platform: :ruby
13-
gem "jdbc-sqlite3", platform: :jruby
9+
gem "rake"
1410
gem "activerecord-jdbcsqlite3-adapter", platform: :jruby
1511
gem "appraisal"
12+
gem "jdbc-sqlite3", platform: :jruby
1613
gem "puma"
14+
gem "sqlite3", platform: :ruby
1715
gem "rails", "~> 5.2.0"
1816

1917
gemspec path: "../"

‎lib/rails_semantic_logger.rb

+2-4
Original file line numberDiff line numberDiff line change
@@ -18,14 +18,12 @@ module Rack
1818

1919
# Swap an existing subscriber with a new one
2020
def self.swap_subscriber(old_class, new_class, notifier)
21-
subscribers = ActiveSupport::LogSubscriber.subscribers.select { |s| s.kind_of?(old_class) }
21+
subscribers = ActiveSupport::LogSubscriber.subscribers.select { |s| s.is_a?(old_class) }
2222
subscribers.each { |subscriber| unattach(subscriber) }
2323

2424
new_class.attach_to(notifier)
2525
end
2626

27-
private
28-
2927
def self.unattach(subscriber)
3028
subscriber.patterns.each do |event|
3129
ActiveSupport::Notifications.notifier.listeners_for(event).each do |sub|
@@ -36,5 +34,5 @@ def self.unattach(subscriber)
3634

3735
ActiveSupport::LogSubscriber.subscribers.delete(subscriber)
3836
end
39-
37+
private_class_method :unattach
4038
end

0 commit comments

Comments
 (0)