Fix Rubocop offenses

jbox-web · Aug 28, 2024 · 3ba38c2 · 3ba38c2
1 parent 0fe5457
commit 3ba38c2
Show file tree

Hide file tree

Showing 5 changed files with 195 additions and 148 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -9,14 +9,33 @@ AllCops:
   TargetRubyVersion: 3.0
   Exclude:
     - bin/*
-    - spec/**/*
 
 Gemspec/RequireMFA:
   Enabled: false
 
+#########
+# STYLE #
+#########
+
 Style/Documentation:
   Enabled: false
 
+Style/TrailingCommaInArrayLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+Style/TrailingCommaInHashLiteral:
+  EnforcedStyleForMultiline: consistent_comma
+
+Style/WordArray:
+  EnforcedStyle: brackets
+
+Style/BlockDelimiters:
+  AllowedPatterns: ['expect']
+
+##########
+# LAYOUT #
+##########
+
 Layout/EmptyLines:
   Enabled: false
 
@@ -35,3 +54,23 @@ Layout/EmptyLinesAroundModuleBody:
 Layout/HashAlignment:
   EnforcedColonStyle: table
   EnforcedHashRocketStyle: table
+  Exclude:
+    - spec/active_settings/base_spec.rb
+
+Layout/FirstHashElementIndentation:
+  EnforcedStyle: consistent
+
+#########
+# RSPEC #
+#########
+
+RSpec/NestedGroups:
+  Exclude:
+    - spec/active_settings/base_spec.rb
+
+RSpec/ExampleLength:
+  Exclude:
+    - spec/active_settings/base_spec.rb
+
+RSpec/NotToNot:
+  EnforcedStyle: to_not
diff --git a/active_settings.gemspec b/active_settings.gemspec
@@ -15,7 +15,7 @@ Gem::Specification.new do |s|
     'homepage_uri'    => 'https://github.com/jbox-web/active_settings',
     'changelog_uri'   => 'https://github.com/jbox-web/active_settings/blob/master/CHANGELOG.md',
     'source_code_uri' => 'https://github.com/jbox-web/active_settings',
-    'bug_tracker_uri' => 'https://github.com/jbox-web/active_settings/issues'
+    'bug_tracker_uri' => 'https://github.com/jbox-web/active_settings/issues',
   }
 
   s.required_ruby_version = '>= 3.0.0'

diff --git a/lib/active_settings.rb b/lib/active_settings.rb
@@ -72,7 +72,7 @@ def deep_merge_hash!(current, other)
         knockout_prefix:       ActiveSettings.knockout_prefix,
         overwrite_arrays:      ActiveSettings.overwrite_arrays,
         merge_nil_values:      ActiveSettings.merge_nil_values,
-        keep_array_duplicates: ActiveSettings.keep_array_duplicates
+        keep_array_duplicates: ActiveSettings.keep_array_duplicates,
       }
       DeepMerge.deep_merge!(other, current, options)
     end