rubocop-pixelforce 0.3 → 0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7183c2bd36b9ded637e732f10a442180c1d631946009f0e7b18947cc26c2b91
-  data.tar.gz: 767a3f22c46a45d9192211fe56f5ba0848ee10bc0a2ab1eb36e089b50ac60692
+  metadata.gz: c39237d29ba2cb32b80ca7537a40b943a217099d499cbf65dfe40da2e07e3483
+  data.tar.gz: d7d8fd1807d26e2581b871c46cdde1672058300d2bbb206ab46b4f184b1adf1d
 SHA512:
-  metadata.gz: a28e3971ac5717957d9ccf62aac47932c4b87b532c6367dbad4b4d985c183944d6559542f0553d47b5667471f2f8341f88466907c5f36afee3df91f0dfd5c1fc
-  data.tar.gz: eedf613e54c8903a8453fb11e657d93dc5500983864cf2a0407fd98db5169a52970d763fbdd86b707a8a1952adc4a9a34d561fa8d95b80daedbb70a4f70c5544
+  metadata.gz: d17544bd7582c2031329d6969ee1631ea973be725b0ba7c5b05f4c8875684ce0a8b07601204519bb499c0d976857489d323c268485340322a7883015c0faea33
+  data.tar.gz: 2e93ca8bb8f766cd4ba52adc19ffea77de99cc65274102e06d7f33b4c5b890b315045145dee5a2b8ebaef112bd4a53931aec4c47e00330af8abace65a63cfcc7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-pixelforce (0.3)
+    rubocop-pixelforce (0.4)
       rubocop (~> 0.76)
       rubocop-performance
       rubocop-rails

data/default.yml

@@ -22,7 +22,7 @@ Rails/HasManyOrHasOneDependent:
 Rails/FilePath:
   Enabled: false
 
-Pixelforce/ClassStructure:
+Layout/ClassStructure: &class_structures
   Enabled: true
   ExpectedOrder:
     - module_inclusion
@@ -76,6 +76,10 @@ Pixelforce/ClassStructure:
       - prepend
       - extend
 
+Pixelforce/EmptyLineBwteenCategories:
+  <<: *class_structures
+  Enabled: true
+
 Layout/AlignHash:
   EnforcedColonStyle: table
 

data/lib/rubocop-pixelforce.rb

@@ -1,3 +1,3 @@
 require 'rubocop'
 
-require 'rubocop/cop/pixelforce/class_structure'
+require 'rubocop/cop/pixelforce/empty_line_between_categories'

data/lib/rubocop/cop/pixelforce/{class_structure.rb → empty_line_between_categories.rb}

@@ -1,7 +1,9 @@
 module RuboCop
   module Cop
     module Pixelforce
-      class ClassStructure < Cop
+      class EmptyLineBwteenCategories < Cop
+        include RangeHelp
+
         HUMANIZED_NODE_TYPE = {
           casgn: :constants,
           defs: :class_methods,
@@ -10,8 +12,7 @@ module RuboCop
         }.freeze
 
         VISIBILITY_SCOPES = %i[private protected public].freeze
-        MSG = '`%<category>s` is supposed to appear before ' \
-              '`%<previous>s`.'
+        MSG = 'Use empty lines between categories.'
 
         def_node_matcher :visibility_block?, <<~PATTERN
           (send nil? { :private :protected :public })
@@ -20,22 +21,13 @@ module RuboCop
         # Validates code style on class declaration.
         # Add offense when find a node out of expected order.
         def on_class(class_node)
-          previous = -1
           previous_category = nil
           previous_node_end_line = -1
           previous_method_name = nil
           walk_over_nested_class_definition(class_node) do |node, category|
-            index = expected_order.index(category)
-            if index < previous
-              message = format(MSG, category: category,
-                                    previous: expected_order[previous])
-              add_offense(node, message: message)
-            end
-            previous = index
-
             next unless node.respond_to?(:method_name)
             if previous_category && category != previous_category && node.loc.first_line - previous_node_end_line < 2
-              add_offense(node, message: "Use empty lines between categories.")
+              add_offense(node, message: MSG)
             end
 
             if previous_method_name && previous_method_name == node.method_name && node.loc.first_line - previous_node_end_line > 1
@@ -45,22 +37,20 @@ module RuboCop
             previous_node_end_line = node.loc.last_line
             previous_method_name = node.method_name
           end
-        end
+        end        
 
-        # Autocorrect by swapping between two nodes autocorrecting them
         def autocorrect(node)
-          node_classification = classify(node)
-          previous = left_siblings_of(node).find do |sibling|
-            classification = classify(sibling)
-            !ignore?(classification) && node_classification != classification
-          end
+          prev_category = prev_node(node)
+          # finds position of first newline
+          end_pos = end_position_for(prev_category)
+          newline_pos = buffer.source.index("\n", end_pos)
 
-          current_range = source_range_with_comment(node)
-          previous_range = source_range_with_comment(previous)
+          count = blank_lines_count_between(prev_category, node)
 
-          lambda do |corrector|
-            corrector.insert_before(previous_range, current_range.source)
-            corrector.remove(current_range)
+          if count > 1
+            autocorrect_remove_lines(newline_pos, count)
+          else
+            autocorrect_insert_lines(newline_pos, count)
           end
         end
 
@@ -209,6 +199,16 @@ module RuboCop
           processed_source.buffer
         end
 
+        def prev_node(node)
+          return nil unless node.sibling_index.positive?
+
+          node.parent.children[node.sibling_index - 1]
+        end
+
+        def blank_lines_count_between(prev_category, node)
+          node.loc.first_line - prev_category.loc.last_line
+        end
+
         # Load expected order from `ExpectedOrder` config.
         # Define new terms in the expected order by adding new {categories}.
         def expected_order
@@ -220,6 +220,20 @@ module RuboCop
         def categories
           cop_config['Categories']
         end
+
+        def autocorrect_remove_lines(newline_pos, count)
+          range_to_remove = range_between(newline_pos, newline_pos + 1)
+          lambda do |corrector|
+            corrector.remove(range_to_remove)
+          end
+        end
+
+        def autocorrect_insert_lines(newline_pos, count)
+          where_to_insert = range_between(newline_pos, newline_pos + 1)
+          lambda do |corrector|
+            corrector.insert_after(where_to_insert, "\n")
+          end
+        end
       end
     end
   end

data/lib/rubocop/pixelforce/version.rb

@@ -1,5 +1,5 @@
 module Rubocop
   module Pixelforce
-    VERSION = "0.3"
+    VERSION = "0.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-pixelforce
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '0.4'
 platform: ruby
 authors:
 - Ben Zhang
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2019-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -113,7 +113,7 @@ files:
 - bin/setup
 - default.yml
 - lib/rubocop-pixelforce.rb
-- lib/rubocop/cop/pixelforce/class_structure.rb
+- lib/rubocop/cop/pixelforce/empty_line_between_categories.rb
 - lib/rubocop/pixelforce.rb
 - lib/rubocop/pixelforce/version.rb
 - rubocop-pixelforce.gemspec