rubocop-obsession 0.1.5 → 0.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bfae7e0b1e495fad34ada943845fd9399fe6763dd0b6eca0a946f87754ba4a2
-  data.tar.gz: 1651b96c4cd6ace35e62dfc968ec4dd8b690118c1b7e8aa5432abd59e5e0b8ad
+  metadata.gz: 4b1e6edfacbf86e2ac264de49f2ac818af6ee693c6cabe9865894b556953e3ad
+  data.tar.gz: 9d523c4878734ef93c3b0052622ffe49e1a3913505963a91fe10327ddac17660
 SHA512:
-  metadata.gz: a0dd211e0748686195f25c2505aeef9baecae83e1648a4c7ddddf011a31e1de94e5e6cb239a6d8e67e3bf55b39c766af8e5d19f55aec70213993f7d7ae0dbea8
-  data.tar.gz: 2e427f1f22dca52e0c417b53c8e5b390aaaf801335d379e888a8131dd7b3e005abe0a32628e1efd9dbe9af4ab3ef749edb38ebb4143c634b74c5ffeff0385bd8
+  metadata.gz: eed54a03536307d0bfdda7b43b8346306420d1037068921b238f67fbd938c276d84f5802f70ce42bc0a26f3d46f399a5db9e3864ac73adfc01e6e5911f8f5f83
+  data.tar.gz: bc7e712ec48bbe05f8419754a9b9d1f443973e154ca4525dc0712a3c0576be840b66c65e67c8a206a12a628af97d703c7b84d50a15951dc8446dc1bda5c5461e

data/README.md

@@ -9,6 +9,9 @@ There are some lower-level cops as well.
 Use the provided cops as is, or as inspiration to build custom cops aligned
 with your project's best practices.
 
+Does your project have any cool custom cops that you think others might benefit
+from? Then please open a PR!
+
 ## Installation
 
 Install the gem:

data/config/default.yml

@@ -66,8 +66,6 @@ Obsession/Rails/ServiceName:
     - 'app/jobs/**/*'
   Exclude:
     - 'app/jobs/application_job.rb'
-    - 'app/jobs/scheduled/scheduled_job.rb'
-    - '**/*events/**'
 Obsession/Rails/ServicePerformMethod:
   Enabled: true
   Include:

data/lib/rubocop/cop/obsession/method_order.rb

@@ -56,7 +56,7 @@ module RuboCop
       #   def method_c; ...; end
       class MethodOrder < Base
         include Helpers
-        include RangeHelp
+        include CommentsHelp
         include VisibilityHelp
         extend AutoCorrector
 
@@ -209,40 +209,18 @@ module RuboCop
 
         def autocorrect(corrector, method, previous_method)
           previous_method_range = source_range_with_comment(previous_method)
+          if buffer.source[previous_method_range.end_pos + 1] == "\n"
+            previous_method_range = previous_method_range.adjust(end_pos: 1)
+          end
+
           method_range = source_range_with_comment(method)
+          if buffer.source[method_range.begin_pos - 1] == "\n"
+            method_range = method_range.adjust(end_pos: 1)
+          end
 
           corrector.insert_after(previous_method_range, method_range.source)
           corrector.remove(method_range)
         end
-
-        def source_range_with_comment(node)
-          range_between(start_position_with_comment(node), end_position(node) + 1)
-        end
-
-        def start_position_with_comment(node)
-          first_comment = nil
-
-          (node.first_line - 1).downto(1) do |annotation_line|
-            comment = processed_source.comment_at_line(annotation_line)
-            break if !comment
-            first_comment = comment if whole_line_comment_at_line?(annotation_line)
-          end
-
-          start_line_position(first_comment || node)
-        end
-
-        def whole_line_comment_at_line?(line)
-          /\A\s*#/.match?(processed_source.lines[line - 1])
-        end
-
-        def start_line_position(node)
-          processed_source.buffer.line_range(node.loc.line).begin_pos - 1
-        end
-
-        def end_position(node)
-          end_line = processed_source.buffer.line_for_position(node.loc.expression.end_pos)
-          processed_source.buffer.line_range(end_line).end_pos
-        end
       end
     end
   end

data/lib/rubocop/obsession/version.rb

@@ -1,5 +1,5 @@
 module Rubocop
   module Obsession
-    VERSION = '0.1.5'
+    VERSION = '0.1.6'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rubocop-obsession
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
 platform: ruby
 authors:
 - Jerome Dalbert
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-10-28 00:00:00.000000000 Z
+date: 2024-11-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport