Updated rubocop rules.

pganalyze · May 24, 2015 · f9c73ba · f9c73ba
1 parent 7f242b8
commit f9c73ba
Show file tree

Hide file tree

Showing 8 changed files with 16 additions and 10 deletions.
diff --git a/.rubocop.yml b/.rubocop.yml
@@ -16,5 +16,11 @@ MethodLength:
 ClassLength:
   Enabled: false
 
-Style/BlockNesting:
+Metrics/AbcSize:
+  Enabled: false
+
+Metrics/BlockNesting:
+  Enabled: false
+
+Metrics/PerceivedComplexity:
   Enabled: false
diff --git a/Gemfile b/Gemfile
@@ -1,3 +1,3 @@
 source 'https://rubygems.org'
 
-gemspec
+gemspec
diff --git a/ext/pg_query/extconf.rb b/ext/pg_query/extconf.rb
@@ -42,7 +42,7 @@
   system("cd #{pgdir}; CFLAGS=-fPIC ./configure -q") || fail('ERROR')
   system("cd #{pgdir}; make -C src/backend lib-recursive") # Ensures headers are generated
   PG_OBJS.each do |directory, objs|
-    system("cd #{pgdir}; make -C src/#{directory} #{objs.join(' ')}")  || fail('ERROR')
+    system("cd #{pgdir}; make -C src/#{directory} #{objs.join(' ')}") || fail('ERROR')
   end
 end
 

diff --git a/lib/pg_query/deparse.rb b/lib/pg_query/deparse.rb
@@ -9,7 +9,7 @@ def deparse
 
   private
 
-  def deparse_item(item, context = nil) # rubocop:disable Style/CyclomaticComplexity
+  def deparse_item(item, context = nil) # rubocop:disable Metrics/CyclomaticComplexity
     return if item.nil?
 
     type = item.keys[0]

diff --git a/lib/pg_query/filter_columns.rb b/lib/pg_query/filter_columns.rb
@@ -3,7 +3,7 @@ class PgQuery
   # target list, but includes things like JOIN condition and WHERE clause.
   #
   # Note: This also traverses into sub-selects.
-  def filter_columns # rubocop:disable Style/CyclomaticComplexity
+  def filter_columns # rubocop:disable Metrics/CyclomaticComplexity
     load_tables_and_aliases! if @aliases.nil?
 
     # Get condition items from the parsetree

diff --git a/lib/pg_query/fingerprint.rb b/lib/pg_query/fingerprint.rb
@@ -1,7 +1,7 @@
 require 'digest'
 
 class PgQuery
-  def fingerprint # rubocop:disable Style/CyclomaticComplexity
+  def fingerprint # rubocop:disable Metrics/CyclomaticComplexity
     normalized_parsetree = deep_dup(parsetree)
 
     # First delete all simple elements and attributes that can be removed
@@ -23,11 +23,11 @@ def fingerprint # rubocop:disable Style/CyclomaticComplexity
       elsif k == 'targetList' && v.is_a?(Array)
         # Remove SELECT target list names & ignore order
         v.each { |v2| v2['RESTARGET']['name'] = nil if v2['RESTARGET'] } # Remove names
-        v.sort_by! { |v2| v2.to_s }
+        v.sort_by!(&:to_s)
         expr[k] = v
       elsif k == 'cols' && v.is_a?(Array)
         # Ignore INSERT cols order
-        v.sort_by! { |v2| v2.to_s }
+        v.sort_by!(&:to_s)
         expr[k] = v
       end
     end

diff --git a/lib/pg_query/param_refs.rb b/lib/pg_query/param_refs.rb
@@ -1,5 +1,5 @@
 class PgQuery
-  def param_refs # rubocop:disable Style/CyclomaticComplexity
+  def param_refs # rubocop:disable Metrics/CyclomaticComplexity
     results = []
 
     treewalker! parsetree do |_, _, v|

diff --git a/lib/pg_query/parse.rb b/lib/pg_query/parse.rb
@@ -41,7 +41,7 @@ def aliases
 
   protected
 
-  def load_tables_and_aliases! # rubocop:disable Style/CyclomaticComplexity
+  def load_tables_and_aliases! # rubocop:disable Metrics/CyclomaticComplexity
     @tables = []
     @aliases = {}