rubocop-pixelforce 1.1 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dd3950905695191472b8020a4ea857ee7f12f26cae3987803543a566bb951fe
-  data.tar.gz: 7ec21ef1d250bdc8b04fce5c71c2c8ccd279c3207d8b5eb9eb5ca3b0561ce957
+  metadata.gz: 5dc1398a26eafed01afb1086e384b88c2517c59aea472adf10bf00fa7a926b32
+  data.tar.gz: d34ff5b7a043877d940f5ab0a6ff23b6f6912d3107ab7dc26f0b9b3950a1b4d5
 SHA512:
-  metadata.gz: 35e350c0255da86f00bcb6f8be78ea093ffc9de5959a57af0d08c352ae56da408da7eca26f30416a3caa913734db17a5fc332a57cc620974c3903a821d8eda16
-  data.tar.gz: eea699b9a41723bdfcb6d0333bc3993457a8f1161f870f706c17498e5703e5983b617575d8c839d6518b769f0ce4cb986318d93f7d36315c2421b0d0c6d5bb3e
+  metadata.gz: ba321811d6aea779cb44df0d90043a710b0c2d59def640d93b04a41bf4556694e82492223b9cb5c2945f9ea0a11736607785a7f048b81045cdc8e72f3f3e1cc7
+  data.tar.gz: 2714bc7fda30fd45e994616096752dd2549e92dd114fd022a7d6f4c53f298973e4dee549071ce1a227210082bdfa054eea37b17a0f81f458418d28b3543a29f7

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    rubocop-pixelforce (1.1)
+    rubocop-pixelforce (2.1.0)
       rubocop (~> 1.21)
       rubocop-performance
       rubocop-rails
@@ -9,26 +9,45 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (7.1.5.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
       concurrent-ruby (~> 1.0, >= 1.0.2)
+      connection_pool (>= 2.2.5)
+      drb
       i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
       minitest (>= 5.1)
+      mutex_m
+      securerandom (>= 0.3)
       tzinfo (~> 2.0)
-      zeitwerk (~> 2.3)
-    ast (2.4.2)
-    concurrent-ruby (1.1.9)
+    ast (2.4.3)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.3)
     diff-lcs (1.3)
-    i18n (1.8.10)
+    drb (2.2.3)
+    i18n (1.14.7)
       concurrent-ruby (~> 1.0)
-    minitest (5.14.4)
-    parallel (1.21.0)
-    parser (3.0.2.0)
+    json (2.12.2)
+    language_server-protocol (3.17.0.5)
+    lint_roller (1.1.0)
+    logger (1.7.0)
+    minitest (5.25.5)
+    mutex_m (0.3.0)
+    parallel (1.27.0)
+    parser (3.3.8.0)
       ast (~> 2.4.1)
-    rack (2.2.3)
-    rainbow (3.0.0)
+      racc
+    prism (1.4.0)
+    racc (1.8.1)
+    rack (3.1.15)
+    rainbow (3.1.1)
     rake (13.0.1)
-    regexp_parser (2.1.1)
-    rexml (3.2.5)
+    regexp_parser (2.10.0)
     rspec (3.9.0)
       rspec-core (~> 3.9.0)
       rspec-expectations (~> 3.9.0)
@@ -42,29 +61,37 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.0)
-    rubocop (1.21.0)
+    rubocop (1.75.7)
+      json (~> 2.3)
+      language_server-protocol (~> 3.17.0.2)
+      lint_roller (~> 1.1.0)
       parallel (~> 1.10)
-      parser (>= 3.0.0.0)
+      parser (>= 3.3.0.2)
       rainbow (>= 2.2.2, < 4.0)
-      regexp_parser (>= 1.8, < 3.0)
-      rexml
-      rubocop-ast (>= 1.9.1, < 2.0)
+      regexp_parser (>= 2.9.3, < 3.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
       ruby-progressbar (~> 1.7)
-      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)
+      unicode-display_width (>= 2.4.0, < 4.0)
+    rubocop-ast (1.44.1)
+      parser (>= 3.3.7.2)
+      prism (~> 1.4)
+    rubocop-performance (1.25.0)
+      lint_roller (~> 1.1)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.38.0, < 2.0)
+    rubocop-rails (2.32.0)
       activesupport (>= 4.2.0)
+      lint_roller (~> 1.1)
       rack (>= 1.1)
-      rubocop (>= 1.7.0, < 2.0)
-    ruby-progressbar (1.11.0)
-    tzinfo (2.0.4)
+      rubocop (>= 1.75.0, < 2.0)
+      rubocop-ast (>= 1.44.0, < 2.0)
+    ruby-progressbar (1.13.0)
+    securerandom (0.3.2)
+    tzinfo (2.0.6)
       concurrent-ruby (~> 1.0)
-    unicode-display_width (2.1.0)
-    zeitwerk (2.4.2)
+    unicode-display_width (3.1.4)
+      unicode-emoji (~> 4.0, >= 4.0.4)
+    unicode-emoji (4.0.4)
 
 PLATFORMS
   ruby

data/default.yml

@@ -1,6 +1,8 @@
-require: 
+plugins:
   - rubocop-performance
   - rubocop-rails
+
+require:
   - rubocop-pixelforce
 
 AllCops:
@@ -19,7 +21,7 @@ Rails/UnknownEnv:
     - staging
 
 Rails/HasManyOrHasOneDependent:
- Enabled: false
+  Enabled: false
 
 Rails/FilePath:
   Enabled: false
@@ -78,7 +80,7 @@ Layout/ClassStructure: &class_structures
       - prepend
       - extend
 
-Pixelforce/EmptyLineBwteenCategories:
+Pixelforce/EmptyLineBetweenCategories:
   <<: *class_structures
   Enabled: true
 
@@ -94,10 +96,10 @@ Style/NestedTernaryOperator:
 Style/FrozenStringLiteralComment:
   Enabled: false
 
-Documentation:
+Style/Documentation:
   Enabled: false
 
-Metrics/LineLength:
+Layout/LineLength:
   Enabled: false
 
 Metrics/MethodLength:
@@ -140,4 +142,4 @@ Style/GlobalVars:
   Enabled: false
 
 Metrics/ParameterLists:
-  Enabled: false
+  Enabled: false

data/lib/rubocop/cop/pixelforce/empty_line_between_categories.rb

@@ -1,18 +1,21 @@
 module RuboCop
   module Cop
     module Pixelforce
-      class EmptyLineBwteenCategories < Cop
+      class EmptyLineBetweenCategories < Base
         include RangeHelp
+        extend AutoCorrector
 
         HUMANIZED_NODE_TYPE = {
           casgn: :constants,
           defs: :class_methods,
           def: :public_methods,
-          sclass: :class_singleton
+          sclass: :class_singleton,
+          send: :method_calls
         }.freeze
 
         VISIBILITY_SCOPES = %i[private protected public].freeze
-        MSG = 'Use empty lines between categories.'
+        MSG_EMPTY_LINE_BETWEEN_CATEGORIES = 'Use empty lines between categories.'.freeze
+        MSG_EMPTY_LINE_BETWEEN_SAME_CATEGORIES = "Don't Use empty lines between same categories.".freeze
 
         def_node_matcher :visibility_block?, <<~PATTERN
           (send nil? { :private :protected :public })
@@ -22,35 +25,33 @@ module RuboCop
         # Add offense when find a node out of expected order.
         def on_class(class_node)
           previous_category = nil
-          previous_node_end_line = -1
-          previous_method_name = nil
+
           walk_over_nested_class_definition(class_node) do |node, category|
-            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: MSG)
+            if previous_category && previous_category != category
+              count = blank_lines_count_between(prev_node(node), node)
+              if count < 2
+                add_offense(node, message: MSG_EMPTY_LINE_BETWEEN_CATEGORIES) do |corrector|
+                  prev_category = prev_node(node)
+                  end_pos = end_position_for(prev_category)
+                  newline_pos = buffer.source.index("\n", end_pos)
+                  where_to_insert = range_between(newline_pos, newline_pos + 1)
+                  corrector.insert_after(where_to_insert, "\n")
+                end
+              end
+            elsif previous_category && previous_category == category
+              count = blank_lines_count_between(prev_node(node), node)
+              if count > 1
+                add_offense(node, message: MSG_EMPTY_LINE_BETWEEN_SAME_CATEGORIES) do |corrector|
+                  prev_category = prev_node(node)
+                  end_pos = end_position_for(prev_category)
+                  newline_pos = buffer.source.index("\n", end_pos)
+                  range_to_remove = range_between(newline_pos, newline_pos + 1)
+                  corrector.remove(range_to_remove)
+                end
+              end
             end
 
-            if previous_method_name && previous_method_name == node.method_name && node.loc.first_line - previous_node_end_line > 1
-              add_offense(node, message: "Don't Use empty lines between same categories.")
-            end
             previous_category = category
-            previous_node_end_line = node.loc.last_line
-            previous_method_name = node.method_name
-          end
-        end        
-
-        def autocorrect(node)
-          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)
-
-          count = blank_lines_count_between(prev_category, node)
-
-          if count > 1
-            autocorrect_remove_lines(newline_pos, count)
-          else
-            autocorrect_insert_lines(newline_pos, count)
           end
         end
 
@@ -220,21 +221,7 @@ 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
-end
+end

data/lib/rubocop/pixelforce/version.rb

@@ -1,5 +1,5 @@
 module Rubocop
   module Pixelforce
-    VERSION = "1.1"
+    VERSION = '2.1.0'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-pixelforce
 version: !ruby/object:Gem::Version
-  version: '1.1'
+  version: 2.1.0
 platform: ruby
 authors:
 - Ben Zhang
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-09-16 00:00:00.000000000 Z
+date: 2025-05-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -138,7 +138,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.3
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Custom Rubocop cop for PixelForce.