spoom 1.3.3 → 1.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e839292b23e8582e1e7b4317c6431de9b7d59e68b2c4dbb4015f75619a995601
-  data.tar.gz: 4853e7e2df4398e635e616df0f7354b8d37c67bef76ed12a0ec6efc16de1edc0
+  metadata.gz: 37744936fdd46ee10ee1bc3e85950a6028e78dc5c2c01b7a9308a478f19bd98a
+  data.tar.gz: 5f92d0f181c1fa1191a808dc550bbb8a17b5f1f299586c1233bfd210c00faf0a
 SHA512:
-  metadata.gz: 940d6b9ec69c6eb767a1ccf2fc33767e552080010f94b14a77301f66b57a113f0619efb1e3ca357b04af782b3d9cbe07ff81f349adb814aef8c4d3fc8ea65de1
-  data.tar.gz: 7de4600f896698ea578887b0f417fd9a7f31d3689e6b69e514905b671197c62abf5f232c9471b364f0e4c3509c81848a7ca08d09c73c4cba4cba036963e34192
+  metadata.gz: dad03df8edb54fa5cc4f798b1654e22940d91bc063b2d7be3721d9b7bc1e97c0654589b78f632d4c7272e06fa4f85baab6d713f330da7de6c14b62d3b4e38caf
+  data.tar.gz: c8c98e4fe0dd941ee9c9f4d9cdd77fc37686a455fa5d0e849bfab9dceac3ea5ef5bbbde3282e144159df611225790c19d3df29b2fd5b2d995378a5f53809b3f6

data/lib/spoom/deadcode/plugins/active_model.rb

@@ -8,7 +8,7 @@ module Spoom
         extend T::Sig
 
         ignore_classes_inheriting_from("ActiveModel::EachValidator")
-        ignore_methods_named("validate_each")
+        ignore_methods_named("validate_each", "persisted?")
 
         sig { override.params(send: Send).void }
         def on_send(send)

data/lib/spoom/deadcode/plugins/minitest.rb

@@ -8,20 +8,39 @@ module Spoom
         extend T::Sig
 
         ignore_classes_named(/Test$/)
+        ignore_classes_inheriting_from("Minitest::Test")
 
-        ignore_methods_named(
-          "after_all",
-          "around",
-          "around_all",
-          "before_all",
-          "setup",
-          "teardown",
+        MINITEST_METHODS = T.let(
+          Set.new([
+            "after_all",
+            "around",
+            "around_all",
+            "before_all",
+            "setup",
+            "teardown",
+          ]),
+          T::Set[String],
         )
 
         sig { override.params(definition: Model::Method).void }
         def on_define_method(definition)
-          file = definition.location.file
-          @index.ignore(definition) if file.match?(%r{test/.*test\.rb$}) && definition.name.match?(/^test_/)
+          return unless definition.name.start_with?("test_") || MINITEST_METHODS.include?(definition.name)
+
+          owner = definition.owner
+          return unless owner.is_a?(Model::Class)
+
+          @index.ignore(definition) if ignored_subclass?(owner)
+        end
+
+        sig { override.params(send: Send).void }
+        def on_send(send)
+          case send.name
+          when "assert_predicate", "refute_predicate"
+            name = send.args[1]&.slice
+            return unless name
+
+            @index.reference_method(name.delete_prefix(":"), send.location)
+          end
         end
       end
     end

data/lib/spoom/location.rb

@@ -15,42 +15,73 @@ module Spoom
       sig { params(location_string: String).returns(Location) }
       def from_string(location_string)
         file, rest = location_string.split(":", 2)
-        raise LocationError, "Invalid location string: #{location_string}" unless file && rest
+        raise LocationError, "Invalid location string `#{location_string}`: missing file name" unless file
+
+        return new(file) if rest.nil?
 
         start_line, rest = rest.split(":", 2)
-        raise LocationError, "Invalid location string: #{location_string}" unless start_line && rest
+        if rest.nil?
+          start_line, end_line = T.must(start_line).split("-", 2)
+          raise LocationError, "Invalid location string `#{location_string}`: missing end line" unless end_line
+
+          return new(file, start_line: start_line.to_i, end_line: end_line.to_i) if end_line
+        end
 
         start_column, rest = rest.split("-", 2)
-        raise LocationError, "Invalid location string: #{location_string}" unless start_column && rest
+        raise LocationError, "Invalid location string `#{location_string}`: missing end line and column" if rest.nil?
 
         end_line, end_column = rest.split(":", 2)
-        raise LocationError, "Invalid location string: #{location_string}" unless end_line && end_column
-
-        new(file, start_line.to_i, start_column.to_i, end_line.to_i, end_column.to_i)
+        raise LocationError,
+          "Invalid location string `#{location_string}`: missing end column" unless end_line && end_column
+
+        new(
+          file,
+          start_line: start_line.to_i,
+          start_column: start_column.to_i,
+          end_line: end_line.to_i,
+          end_column: end_column.to_i,
+        )
       end
 
       sig { params(file: String, location: Prism::Location).returns(Location) }
       def from_prism(file, location)
-        new(file, location.start_line, location.start_column, location.end_line, location.end_column)
+        new(
+          file,
+          start_line: location.start_line,
+          start_column: location.start_column,
+          end_line: location.end_line,
+          end_column: location.end_column,
+        )
       end
     end
 
     sig { returns(String) }
     attr_reader :file
 
-    sig { returns(Integer) }
+    sig { returns(T.nilable(Integer)) }
     attr_reader :start_line, :start_column, :end_line, :end_column
 
     sig do
       params(
         file: String,
-        start_line: Integer,
-        start_column: Integer,
-        end_line: Integer,
-        end_column: Integer,
+        start_line: T.nilable(Integer),
+        start_column: T.nilable(Integer),
+        end_line: T.nilable(Integer),
+        end_column: T.nilable(Integer),
       ).void
     end
-    def initialize(file, start_line, start_column, end_line, end_column)
+    def initialize(file, start_line: nil, start_column: nil, end_line: nil, end_column: nil)
+      raise LocationError,
+        "Invalid location: end line is required if start line is provided" if start_line && !end_line
+      raise LocationError,
+        "Invalid location: start line is required if end line is provided" if !start_line && end_line
+      raise LocationError,
+        "Invalid location: end column is required if start column is provided" if start_column && !end_column
+      raise LocationError,
+        "Invalid location: start column is required if end column is provided" if !start_column && end_column
+      raise LocationError,
+        "Invalid location: lines are required if columns are provided" if start_column && !start_line
+
       @file = file
       @start_line = start_line
       @start_column = start_column
@@ -61,10 +92,12 @@ module Spoom
     sig { params(other: Location).returns(T::Boolean) }
     def include?(other)
       return false unless @file == other.file
-      return false if @start_line > other.start_line
-      return false if @start_line == other.start_line && @start_column > other.start_column
-      return false if @end_line < other.end_line
-      return false if @end_line == other.end_line && @end_column < other.end_column
+      return false if (@start_line || -Float::INFINITY) > (other.start_line || -Float::INFINITY)
+      return false if @start_line == other.start_line &&
+        (@start_column || -Float::INFINITY) > (other.start_column || -Float::INFINITY)
+      return false if (@end_line || Float::INFINITY) < (other.end_line || Float::INFINITY)
+      return false if @end_line == other.end_line &&
+        (@end_column || Float::INFINITY) < (other.end_column || Float::INFINITY)
 
       true
     end
@@ -73,12 +106,34 @@ module Spoom
     def <=>(other)
       return unless Location === other
 
-      to_s <=> other.to_s
+      comparison_array_self = [
+        @file,
+        @start_line || -Float::INFINITY,
+        @start_column || -Float::INFINITY,
+        @end_line || Float::INFINITY,
+        @end_column || Float::INFINITY,
+      ]
+
+      comparison_array_other = [
+        other.file,
+        other.start_line || -Float::INFINITY,
+        other.start_column || -Float::INFINITY,
+        other.end_line || Float::INFINITY,
+        other.end_column || Float::INFINITY,
+      ]
+
+      comparison_array_self <=> comparison_array_other
     end
 
     sig { returns(String) }
     def to_s
-      "#{@file}:#{@start_line}:#{@start_column}-#{@end_line}:#{@end_column}"
+      if @start_line && @start_column
+        "#{@file}:#{@start_line}:#{@start_column}-#{@end_line}:#{@end_column}"
+      elsif @start_line
+        "#{@file}:#{@start_line}-#{@end_line}"
+      else
+        @file
+      end
     end
   end
 end

data/lib/spoom/version.rb

@@ -2,5 +2,5 @@
 # frozen_string_literal: true
 
 module Spoom
-  VERSION = "1.3.3"
+  VERSION = "1.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spoom
 version: !ruby/object:Gem::Version
-  version: 1.3.3
+  version: 1.4.1
 platform: ruby
 authors:
 - Alexandre Terrasa
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-07-09 00:00:00.000000000 Z
+date: 2024-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -233,7 +233,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.14
+rubygems_version: 3.5.16
 signing_key:
 specification_version: 4
 summary: Useful tools for Sorbet enthusiasts.