Fix code style via RuboCop

alsemyonov · Mar 5, 2018 · db7e0dd · db7e0dd
1 parent ad8d5d2
commit db7e0dd
Show file tree

Hide file tree

Showing 72 changed files with 80 additions and 122 deletions.
diff --git a/.rubocop_todo.yml b/.rubocop_todo.yml
@@ -1,6 +1,6 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2017-04-06 23:00:54 +0300 using RuboCop version 0.48.1.
+# on 2018-03-05 12:15:50 +0300 using RuboCop version 0.53.0.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
@@ -9,16 +9,34 @@
 # Offense count: 1
 # Cop supports --auto-correct.
 # Configuration parameters: Include, TreatCommentsAsGroupSeparators.
-# Include: **/Gemfile, **/gems.rb
+# Include: **/*.gemfile, **/Gemfile, **/gems.rb
 Bundler/OrderedGems:
   Exclude:
     - 'Gemfile'
 
+# Offense count: 7
+# Cop supports --auto-correct.
+Layout/EmptyLineAfterMagicComment:
+  Exclude:
+    - 'Gemfile'
+    - 'Rakefile'
+    - 'bin/console'
+    - 'bin/rake'
+    - 'bin/rubocop'
+    - 'example/atom.rb'
+    - 'example/xml.rb'
+
 # Offense count: 1
 Lint/ShadowingOuterLocalVariable:
   Exclude:
     - 'example/atom.rb'
 
+# Offense count: 1
+# Configuration parameters: CheckForMethodsWithNoSideEffects.
+Lint/Void:
+  Exclude:
+    - 'lib/xommelier/xml/schema.rb'
+
 # Offense count: 9
 Metrics/AbcSize:
   Max: 70
@@ -32,26 +50,43 @@ Metrics/BlockLength:
 Metrics/CyclomaticComplexity:
   Max: 14
 
-# Offense count: 125
-# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
-# URISchemes: http, https
-Metrics/LineLength:
-  Max: 265
-
-# Offense count: 10
+# Offense count: 9
 # Configuration parameters: CountComments.
 Metrics/MethodLength:
   Max: 46
 
 # Offense count: 1
 # Configuration parameters: CountComments.
 Metrics/ModuleLength:
-  Max: 203
+  Max: 199
 
 # Offense count: 3
 Metrics/PerceivedComplexity:
   Max: 15
 
+# Offense count: 1
+Naming/MemoizedInstanceVariableName:
+  Exclude:
+    - 'lib/xommelier/rss.rb'
+
+# Offense count: 1
+# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist, MethodDefinitionMacros.
+# NamePrefix: is_, has_, have_
+# NamePrefixBlacklist: is_, has_, have_
+# NameWhitelist: is_a?
+# MethodDefinitionMacros: define_method, define_singleton_method
+Naming/PredicateName:
+  Exclude:
+    - 'spec/**/*'
+    - 'lib/xommelier/ds.rb'
+
+# Offense count: 1
+# Configuration parameters: MinNameLength, AllowNamesEndingInNumbers, AllowedNames, ForbiddenNames.
+# AllowedNames: io, id
+Naming/UncommunicativeMethodParamName:
+  Exclude:
+    - 'lib/xommelier/xml/element/serialization.rb'
+
 # Offense count: 1
 RSpec/DescribeSymbol:
   Exclude:
@@ -84,7 +119,7 @@ RSpec/EmptyLineAfterSubject:
     - 'spec/lib/xommelier/ds/transform_spec.rb'
 
 # Offense count: 101
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Configuration parameters: EnforcedStyle.
 # SupportedStyles: is_expected, should
 RSpec/ImplicitExpect:
   Exclude:
@@ -115,6 +150,7 @@ RSpec/LeadingSubject:
     - 'spec/lib/xommelier/ds/signature_spec.rb'
 
 # Offense count: 1
+# Configuration parameters: AggregateFailuresByDefault.
 RSpec/MultipleExpectations:
   Max: 2
 
@@ -137,7 +173,13 @@ RSpec/RepeatedExample:
   Exclude:
     - 'spec/functional/xommelier/rss/rss/parsing_spec.rb'
 
+# Offense count: 1
+Security/Open:
+  Exclude:
+    - 'spec/support/fixtures.rb'
+
 # Offense count: 69
+# Configuration parameters: AllowedChars.
 Style/AsciiComments:
   Enabled: false
 
@@ -147,7 +189,8 @@ Style/CaseEquality:
     - 'lib/xommelier/xml/element/serialization.rb'
 
 # Offense count: 1
-# Configuration parameters: EnforcedStyle, SupportedStyles.
+# Cop supports --auto-correct.
+# Configuration parameters: AutoCorrect, EnforcedStyle.
 # SupportedStyles: nested, compact
 Style/ClassAndModuleChildren:
   Exclude:
@@ -168,18 +211,6 @@ Style/EachWithObject:
   Exclude:
     - 'lib/xommelier/xml/element/serialization.rb'
 
-# Offense count: 7
-# Cop supports --auto-correct.
-Style/EmptyLineAfterMagicComment:
-  Exclude:
-    - 'Gemfile'
-    - 'Rakefile'
-    - 'bin/console'
-    - 'bin/rake'
-    - 'bin/rubocop'
-    - 'example/atom.rb'
-    - 'example/xml.rb'
-
 # Offense count: 2
 # Configuration parameters: MinBodyLength.
 Style/GuardClause:
@@ -197,6 +228,11 @@ Style/MethodMissing:
   Exclude:
     - 'lib/xommelier/rss.rb'
 
+# Offense count: 1
+Style/MixinUsage:
+  Exclude:
+    - 'example/atom.rb'
+
 # Offense count: 1
 # Cop supports --auto-correct.
 Style/MultilineIfModifier:
@@ -214,16 +250,6 @@ Style/PercentLiteralDelimiters:
     - 'spec/lib/xommelier/atom/entry_spec.rb'
     - 'spec/lib/xommelier/xml/element_spec.rb'
 
-# Offense count: 1
-# Configuration parameters: NamePrefix, NamePrefixBlacklist, NameWhitelist.
-# NamePrefix: is_, has_, have_
-# NamePrefixBlacklist: is_, has_, have_
-# NameWhitelist: is_a?
-Style/PredicateName:
-  Exclude:
-    - 'spec/**/*'
-    - 'lib/xommelier/ds.rb'
-
 # Offense count: 4
 # Cop supports --auto-correct.
 Style/RedundantFreeze:
@@ -235,15 +261,21 @@ Style/RedundantFreeze:
 
 # Offense count: 3
 # Cop supports --auto-correct.
-# Configuration parameters: SupportedStyles.
+# Configuration parameters: MinSize.
 # SupportedStyles: percent, brackets
 Style/SymbolArray:
   EnforcedStyle: brackets
 
 # Offense count: 1
 # Cop supports --auto-correct.
-# Configuration parameters: EnforcedStyle, SupportedStyles, AllowSafeAssignment.
+# Configuration parameters: EnforcedStyle, AllowSafeAssignment.
 # SupportedStyles: require_parentheses, require_no_parentheses, require_parentheses_when_complex
 Style/TernaryParentheses:
   Exclude:
     - 'lib/xommelier/xml/element/serialization.rb'
+
+# Offense count: 125
+# Configuration parameters: AllowHeredoc, AllowURI, URISchemes, IgnoreCopDirectives, IgnoredPatterns.
+# URISchemes: http, https
+Metrics/LineLength:
+  Max: 265
diff --git a/bin/console b/bin/console
@@ -10,7 +10,7 @@ rescue LoadError
 end
 require 'pp'
 
-SPEC_ROOT = File.expand_path('..', __FILE__)
+SPEC_ROOT = File.expand_path(__dir__)
 
 Dir[File.join(SPEC_ROOT, 'spec/support/**/*.rb')].each { |f| require f }
 

diff --git a/lib/xommelier.rb b/lib/xommelier.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/atom.rb b/lib/xommelier/atom.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/atom/category.rb b/lib/xommelier/atom/category.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/atom/content.rb b/lib/xommelier/atom/content.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/atom/entry.rb b/lib/xommelier/atom/entry.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/atom/feed.rb b/lib/xommelier/atom/feed.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/atom/full.rb b/lib/xommelier/atom/full.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/atom/generator.rb b/lib/xommelier/atom/generator.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/atom/history.rb b/lib/xommelier/atom/history.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/atom/link.rb b/lib/xommelier/atom/link.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/atom/links_extension.rb b/lib/xommelier/atom/links_extension.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/atom/person.rb b/lib/xommelier/atom/person.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/atom/source.rb b/lib/xommelier/atom/source.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/atom/threading.rb b/lib/xommelier/atom/threading.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/common.rb b/lib/xommelier/common.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################
@@ -18,7 +17,7 @@ def self.from_xommelier(value)
         when String
           value = begin
                     rfc2822(value)
-                  rescue
+                  rescue StandardError
                     parse(value)
                   end
           at(value)

diff --git a/lib/xommelier/core_ext.rb b/lib/xommelier/core_ext.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/core_ext/boolean.rb b/lib/xommelier/core_ext/boolean.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/core_ext/date.rb b/lib/xommelier/core_ext/date.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/core_ext/float.rb b/lib/xommelier/core_ext/float.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/core_ext/numeric.rb b/lib/xommelier/core_ext/numeric.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################
@@ -10,7 +9,7 @@ class Numeric
   def self.from_xommelier(value)
     return nil if value.blank?
     begin
-      value =~ /\./ ? Float(value) : Integer(value)
+      value.match?(/\./) ? Float(value) : Integer(value)
     rescue ArgumentError
       value
     end

diff --git a/lib/xommelier/core_ext/string.rb b/lib/xommelier/core_ext/string.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/core_ext/symbol.rb b/lib/xommelier/core_ext/symbol.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/core_ext/time.rb b/lib/xommelier/core_ext/time.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/core_ext/uri.rb b/lib/xommelier/core_ext/uri.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/ds.rb b/lib/xommelier/ds.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/dsig11.rb b/lib/xommelier/dsig11.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/factory_girl.rb b/lib/xommelier/factory_girl.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/open_search.rb b/lib/xommelier/open_search.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/opml.rb b/lib/xommelier/opml.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/rss.rb b/lib/xommelier/rss.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/rss/atomic.rb b/lib/xommelier/rss/atomic.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################

diff --git a/lib/xommelier/sitemap.rb b/lib/xommelier/sitemap.rb
@@ -1,4 +1,3 @@
-# coding: utf-8
 # frozen_string_literal: true
 
 ################################################