rubocop-pixelforce 0.3 → 1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f7183c2bd36b9ded637e732f10a442180c1d631946009f0e7b18947cc26c2b91
-  data.tar.gz: 767a3f22c46a45d9192211fe56f5ba0848ee10bc0a2ab1eb36e089b50ac60692
+  metadata.gz: 1588caf9ae02d875f314601fe24c5ccabf39a426d4a2a3c24d36fd77102e7038
+  data.tar.gz: 84cf2619ac8bc213caa36b050352e8422d1caeff764ac167cf260d7d6545c17a
 SHA512:
-  metadata.gz: a28e3971ac5717957d9ccf62aac47932c4b87b532c6367dbad4b4d985c183944d6559542f0553d47b5667471f2f8341f88466907c5f36afee3df91f0dfd5c1fc
-  data.tar.gz: eedf613e54c8903a8453fb11e657d93dc5500983864cf2a0407fd98db5169a52970d763fbdd86b707a8a1952adc4a9a34d561fa8d95b80daedbb70a4f70c5544
+  metadata.gz: cdbdfc01ce3d8fa70e1c7286083b0d8dc924d71fdd7a49f1f9e6b65064b29c602809708feaa6a71b513ea78bdf7b242bdc8d48ea56cce5ae3f94036fcf97482f
+  data.tar.gz: 0a008613890e9fb8d18cfc52d19300b2ff1d02c742b2e5e08cef57a35e0e2d9ae9f87138630c182d04579a09f1ca5583cd2a89d6c0bff16fd19c94a6437a6320

data/.travis.yml

@@ -3,5 +3,5 @@ sudo: false
 language: ruby
 cache: bundler
 rvm:
-  - 2.4.7
+  - 2.7.3
 before_install: gem install bundler -v 2.0.2

data/Gemfile.lock

@@ -1,23 +1,34 @@
 PATH
   remote: .
   specs:
-    rubocop-pixelforce (0.3)
-      rubocop (~> 0.76)
+    rubocop-pixelforce (1.0)
+      rubocop (~> 1.21)
       rubocop-performance
       rubocop-rails
 
 GEM
   remote: https://rubygems.org/
   specs:
-    ast (2.4.0)
+    activesupport (6.1.4.1)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (>= 1.6, < 2)
+      minitest (>= 5.1)
+      tzinfo (~> 2.0)
+      zeitwerk (~> 2.3)
+    ast (2.4.2)
+    concurrent-ruby (1.1.9)
     diff-lcs (1.3)
-    jaro_winkler (1.5.4)
-    parallel (1.18.0)
-    parser (2.6.5.0)
-      ast (~> 2.4.0)
-    rack (2.0.7)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
+    minitest (5.14.4)
+    parallel (1.21.0)
+    parser (3.0.2.0)
+      ast (~> 2.4.1)
+    rack (2.2.3)
     rainbow (3.0.0)
-    rake (10.4.2)
+    rake (13.0.1)
+    regexp_parser (2.1.1)
+    rexml (3.2.5)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -31,29 +42,38 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.0)
-    rubocop (0.76.0)
-      jaro_winkler (~> 1.5.1)
+    rubocop (1.21.0)
       parallel (~> 1.10)
-      parser (>= 2.6)
+      parser (>= 3.0.0.0)
       rainbow (>= 2.2.2, < 4.0)
+      regexp_parser (>= 1.8, < 3.0)
+      rexml
+      rubocop-ast (>= 1.9.1, < 2.0)
       ruby-progressbar (~> 1.7)
-      unicode-display_width (>= 1.4.0, < 1.7)
-    rubocop-performance (1.5.0)
-      rubocop (>= 0.71.0)
-    rubocop-rails (2.3.2)
+      unicode-display_width (>= 1.4.0, < 3.0)
+    rubocop-ast (1.11.0)
+      parser (>= 3.0.1.1)
+    rubocop-performance (1.11.5)
+      rubocop (>= 1.7.0, < 2.0)
+      rubocop-ast (>= 0.4.0)
+    rubocop-rails (2.12.2)
+      activesupport (>= 4.2.0)
       rack (>= 1.1)
-      rubocop (>= 0.72.0)
-    ruby-progressbar (1.10.1)
-    unicode-display_width (1.6.0)
+      rubocop (>= 1.7.0, < 2.0)
+    ruby-progressbar (1.11.0)
+    tzinfo (2.0.4)
+      concurrent-ruby (~> 1.0)
+    unicode-display_width (2.0.0)
+    zeitwerk (2.4.2)
 
 PLATFORMS
   ruby
 
 DEPENDENCIES
   bundler (~> 2.0)
-  rake (~> 10.0)
+  rake (~> 13.0)
   rspec (~> 3.0)
   rubocop-pixelforce!
 
 BUNDLED WITH
-   2.0.2
+   2.2.3

data/default.yml

@@ -8,6 +8,7 @@ AllCops:
     - 'Gemfile'
     - 'db/**/*'
     - 'bin/*'
+    - 'config/**/*'
 
 Rails/UnknownEnv:
   Environments:
@@ -22,7 +23,7 @@ Rails/HasManyOrHasOneDependent:
 Rails/FilePath:
   Enabled: false
 
-Pixelforce/ClassStructure:
+Layout/ClassStructure: &class_structures
   Enabled: true
   ExpectedOrder:
     - module_inclusion
@@ -76,6 +77,10 @@ Pixelforce/ClassStructure:
       - prepend
       - extend
 
+Pixelforce/EmptyLineBwteenCategories:
+  <<: *class_structures
+  Enabled: true
+
 Layout/AlignHash:
   EnforcedColonStyle: table
 

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 = "1.0"
   end
 end

data/lib/rubocop/pixelforce.rb

@@ -1,6 +1,3 @@
+require 'rubocop'
 require "rubocop/pixelforce/version"
-
-module Rubocop
-  module Pixelforce
-  end
-end
+require 'rubocop/cop/pixelforce/empty_line_between_categories'

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/rubocop-pixelforce.gemspec

@@ -26,10 +26,10 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 2.0"
-  spec.add_development_dependency "rake", "~> 10.0"
+  spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
 
-  spec.add_runtime_dependency "rubocop", "~> 0.76"
+  spec.add_runtime_dependency "rubocop", "~> 1.21"
   spec.add_runtime_dependency "rubocop-performance"
   spec.add_runtime_dependency "rubocop-rails"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-pixelforce
 version: !ruby/object:Gem::Version
-  version: '0.3'
+  version: '1.0'
 platform: ruby
 authors:
 - Ben Zhang
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2019-11-08 00:00:00.000000000 Z
+date: 2021-09-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '13.0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +58,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.76'
+        version: '1.21'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.76'
+        version: '1.21'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
@@ -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
@@ -123,7 +123,7 @@ metadata:
   homepage_uri: https://github.com/BenZhang/rubocop-pixelforce
   source_code_uri: https://github.com/BenZhang/rubocop-pixelforce
   changelog_uri: https://github.com/BenZhang/rubocop-pixelforce
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -138,9 +138,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.9
-signing_key: 
+rubygems_version: 3.2.3
+signing_key:
 specification_version: 4
 summary: Custom Rubocop cop for PixelForce.
 test_files: []