leftovers 0.7.0 → 0.10.0

data/lib/leftovers/matcher_builders/node_has_argument.rb

@@ -3,71 +3,67 @@
 module Leftovers
   module MatcherBuilders
     module NodeHasArgument
-      def self.build(patterns) # rubocop:disable Metrics/MethodLength
-        ::Leftovers::MatcherBuilders::Or.each_or_self(patterns) do |pat|
-          case pat
-          when ::String
-            ::Leftovers::MatcherBuilders::NodeHasKeywordArgument.build(pat, nil)
-          when ::Integer
-            ::Leftovers::MatcherBuilders::NodeHasPositionalArgument.build(pat, nil)
-          when ::Hash
-            build_from_hash(**pat)
-          # :nocov:
-          else
-            raise
+      class << self
+        def build(patterns)
+          ::Leftovers::MatcherBuilders::Or.each_or_self(patterns) do |pat|
+            case pat
+            when ::String
+              ::Leftovers::MatcherBuilders::NodeHasKeywordArgument.build(pat, nil)
+            when ::Integer
+              ::Leftovers::MatcherBuilders::NodeHasPositionalArgument.build(pat, nil)
+            when ::Hash then build_from_hash(**pat)
             # :nocov:
+            else raise Leftovers::UnexpectedCase, "Unhandled value #{pat.inspect}"
+              # :nocov:
+            end
           end
         end
-      end
 
-      def self.separate_argument_types(at) # rubocop:disable Metrics/MethodLength
-        keys = []
-        positions = []
+        private
 
-        ::Leftovers.each_or_self(at) do |k|
-          case k
-          when '*', ::Integer
-            positions << k
-          when ::String, ::Hash
-            keys << k
-          # :nocov:
-          else raise
-            # :nocov:
-          end
-        end
+        def build_from_hash(at: nil, has_value: nil, unless_arg: nil)
+          value_matcher = ::Leftovers::MatcherBuilders::NodeValue.build(has_value)
 
-        keys = nil if keys.empty?
-        positions = nil if positions.empty?
+          ::Leftovers::MatcherBuilders::AndNot.build(
+            build_argument_matcher(value_matcher, **separate_argument_types(at)),
+            ::Leftovers::MatcherBuilders::NodeHasArgument.build(unless_arg)
+          )
+        end
 
-        [keys, positions]
-      end
+        def separate_argument_types(at)
+          groups = ::Leftovers.each_or_self(at).group_by do |index|
+            case index
+            when '*', ::Integer then :positions
+            when ::String, ::Hash then :keys
+            # :nocov:
+            else raise Leftovers::UnexpectedCase, "Unhandled value #{index.inspect}"
+              # :nocov:
+            end
+          end
 
-      def self.build_from_hash( # rubocop:disable Metrics/MethodLength
-        at: nil,
-        has_value: nil,
-        unless_arg: nil
-      )
-        keys, positions = separate_argument_types(at)
+          groups.transform_values { |v| Leftovers.unwrap_array(v) }
+        end
 
-        value_matcher = ::Leftovers::MatcherBuilders::NodeValue.build(has_value)
-        matcher = if (keys && positions) || (!keys && !positions)
-          ::Leftovers::MatcherBuilders::Or.build([
-            ::Leftovers::MatcherBuilders::NodeHasPositionalArgument.build(positions, value_matcher),
-            ::Leftovers::MatcherBuilders::NodeHasKeywordArgument.build(keys, value_matcher)
-          ])
-        elsif keys
+        def build_has_keyword_argument(keys, value_matcher)
           ::Leftovers::MatcherBuilders::NodeHasKeywordArgument.build(keys, value_matcher)
-        elsif positions
+        end
+
+        def build_has_positional_argument(positions, value_matcher)
           ::Leftovers::MatcherBuilders::NodeHasPositionalArgument.build(positions, value_matcher)
-          # :nocov:
-        else
-          raise
-          # :nocov:
         end
 
-        ::Leftovers::MatcherBuilders::AndNot.build(
-          matcher, ::Leftovers::MatcherBuilders::NodeHasArgument.build(unless_arg)
-        )
+        def build_argument_matcher(value_matcher, keys: nil, positions: nil)
+          if keys && !positions
+            build_has_keyword_argument(keys, value_matcher)
+          elsif positions && !keys
+            build_has_positional_argument(positions, value_matcher)
+          else
+            ::Leftovers::MatcherBuilders::Or.build([
+              build_has_positional_argument(positions, value_matcher),
+              build_has_keyword_argument(keys, value_matcher)
+            ])
+          end
+        end
       end
     end
   end

data/lib/leftovers/matcher_builders/node_has_keyword_argument.rb

@@ -4,22 +4,27 @@ module Leftovers
   module MatcherBuilders
     module NodeHasKeywordArgument
       class << self
-        def build(keywords, value_matcher) # rubocop:disable Metrics/MethodLength
+        def build(keywords, value_matcher)
           value_matcher = ::Leftovers::MatcherBuilders::NodePairValue.build(value_matcher)
-          keyword_matcher = if ::Leftovers.each_or_self(keywords).include?('**')
-            ::Leftovers::Matchers::NodeType.new(:pair)
-          else
-            ::Leftovers::MatcherBuilders::NodePairName.build(keywords)
-          end
+          keyword_matcher = build_keyword_matcher(keywords)
+          pair_matcher = ::Leftovers::MatcherBuilders::And.build([keyword_matcher, value_matcher])
 
-          pair_matcher = ::Leftovers::MatcherBuilders::And.build([
-            keyword_matcher, value_matcher
-          ])
-
-          return nil unless pair_matcher
+          return unless pair_matcher
 
           ::Leftovers::Matchers::NodeHasAnyKeywordArgument.new(pair_matcher)
         end
+
+        private
+
+        def build_keyword_matcher(keywords)
+          if ::Leftovers.each_or_self(keywords).include?('**')
+            ::Leftovers::Matchers::NodeType.new(:pair)
+          else
+            ::Leftovers::MatcherBuilders::NodePairKey.build(
+              ::Leftovers::MatcherBuilders::Node.build(keywords)
+            )
+          end
+        end
       end
     end
   end

data/lib/leftovers/matcher_builders/node_has_positional_argument.rb

@@ -4,22 +4,36 @@ module Leftovers
   module MatcherBuilders
     module NodeHasPositionalArgument
       class << self
-        def build(positions, value_matcher) # rubocop:disable Metrics/PerceivedComplexity, Metrics/CyclomaticComplexity, Metrics/MethodLength
-          if positions && value_matcher
-            ::Leftovers::MatcherBuilders::Or.each_or_self(positions) do |pos|
-              if pos == '*'
-                ::Leftovers::Matchers::NodeHasAnyPositionalArgumentWithValue.new(value_matcher)
-              else
-                ::Leftovers::Matchers::NodeHasPositionalArgumentWithValue.new(pos, value_matcher)
-              end
-            end
-          elsif positions
-            pos = 0 if ::Leftovers.each_or_self(positions).include?('*')
-            pos ||= ::Leftovers.each_or_self(positions).min
-
-            ::Leftovers::Matchers::NodeHasPositionalArgument.new(pos)
+        def build(positions, value_matcher)
+          if positions && !all_positions?(positions) && value_matcher
+            build_has_positional_value_matcher(positions, value_matcher)
+          elsif positions && !value_matcher
+            build_has_position_matcher(positions)
           elsif value_matcher
-            ::Leftovers::Matchers::NodeHasAnyPositionalArgumentWithValue.new(value_matcher)
+            build_has_any_positional_value_matcher(value_matcher)
+          end
+        end
+
+        private
+
+        def all_positions?(positions)
+          ::Leftovers.each_or_self(positions).include?('*')
+        end
+
+        def build_has_position_matcher(positions)
+          position = 0 if all_positions?(positions)
+          position ||= ::Leftovers.each_or_self(positions).min
+
+          ::Leftovers::Matchers::NodeHasPositionalArgument.new(position)
+        end
+
+        def build_has_any_positional_value_matcher(value_matcher)
+          ::Leftovers::Matchers::NodeHasAnyPositionalArgumentWithValue.new(value_matcher)
+        end
+
+        def build_has_positional_value_matcher(positions, value_matcher)
+          ::Leftovers::MatcherBuilders::Or.each_or_self(positions) do |position|
+            ::Leftovers::Matchers::NodeHasPositionalArgumentWithValue.new(position, value_matcher)
           end
         end
       end

data/lib/leftovers/matcher_builders/node_has_receiver.rb

@@ -4,10 +4,19 @@ module Leftovers
   module MatcherBuilders
     module NodeHasReceiver
       class << self
-        def build(pattern)
-          matcher = ::Leftovers::MatcherBuilders::NodeValue.build(pattern)
+        def build(pattern) # rubocop:disable Metrics/MethodLength
+          case pattern
+          when true
+            ::Leftovers::Matchers::NodeHasAnyReceiver
+          when false, :_leftovers_nil_value
+            ::Leftovers::Matchers::Not.new(
+              ::Leftovers::Matchers::NodeHasAnyReceiver
+            )
+          else
+            matcher = ::Leftovers::MatcherBuilders::NodeValue.build(pattern)
 
-          ::Leftovers::Matchers::NodeHasReceiver.new(matcher) if matcher
+            ::Leftovers::Matchers::NodeHasReceiver.new(matcher) if matcher
+          end
         end
       end
     end

data/lib/leftovers/matcher_builders/node_pair_key.rb

@@ -0,0 +1,16 @@
+# frozen-string-literal: true
+
+module Leftovers
+  module MatcherBuilders
+    module NodePairKey
+      def self.build(key_matcher)
+        return unless key_matcher
+
+        ::Leftovers::MatcherBuilders::And.build([
+          ::Leftovers::Matchers::NodeType.new(:pair),
+          ::Leftovers::Matchers::NodePairKey.new(key_matcher)
+        ])
+      end
+    end
+  end
+end

data/lib/leftovers/matcher_builders/node_type.rb

@@ -8,18 +8,18 @@ module Leftovers
       def self.build(types_pattern) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity
         ::Leftovers::MatcherBuilders::Or.each_or_self(types_pattern) do |type|
           case type
-          when 'Symbol' then ::Leftovers::Matchers::NodeType.new(:sym)
-          when 'String' then ::Leftovers::Matchers::NodeType.new(:str)
-          when 'Integer' then ::Leftovers::Matchers::NodeType.new(:int)
-          when 'Float' then ::Leftovers::Matchers::NodeType.new(:float)
-          when 'Array' then ::Leftovers::Matchers::NodeType.new(:array)
-          when 'Hash' then ::Leftovers::Matchers::NodeType.new(:hash)
-          when 'Proc' then ::Leftovers::Matchers::Predicate.new(:proc?)
-          when 'Method' then ::Leftovers::Matchers::NodeType.new(Set[:send, :csend, :def, :defs])
-          when 'Constant'
+          when :Symbol then ::Leftovers::Matchers::NodeType.new(:sym)
+          when :String then ::Leftovers::Matchers::NodeType.new(:str)
+          when :Integer then ::Leftovers::Matchers::NodeType.new(:int)
+          when :Float then ::Leftovers::Matchers::NodeType.new(:float)
+          when :Array then ::Leftovers::Matchers::NodeType.new(:array)
+          when :Hash then ::Leftovers::Matchers::NodeType.new(:hash)
+          when :Proc then ::Leftovers::Matchers::NodeIsProc
+          when :Method then ::Leftovers::Matchers::NodeType.new(Set[:send, :csend, :def, :defs])
+          when :Constant
             ::Leftovers::Matchers::NodeType.new(Set[:const, :class, :module, :casgn])
           # :nocov:
-          else raise "Unknown type #{type}"
+          else raise Leftovers::UnexpectedCase, "Unhandled value #{type.inspect}"
             # :nocov:
           end
         end

data/lib/leftovers/matcher_builders/node_value.rb

@@ -4,17 +4,17 @@ module Leftovers
   module MatcherBuilders
     module NodeValue
       class << self
-        def build(pattern) # rubocop:disable Metrics/MethodLength
-          ::Leftovers::MatcherBuilders::Or.each_or_self(pattern) do |pat|
-            case pat
-            when ::Integer, ::Float, true, false, nil
-              ::Leftovers::Matchers::NodeScalarValue.new(pat)
-            when ::String
-              ::Leftovers::MatcherBuilders::NodeName.build(pat)
-            when ::Hash
-              build_from_hash(**pat)
+        def build(patterns)
+          ::Leftovers::MatcherBuilders::Or.each_or_self(patterns) do |pattern|
+            case pattern
+            when ::Integer, ::Float, true, false
+              # matching scalar on nil will fall afoul of compact and each_or_self etc.
+              ::Leftovers::Matchers::NodeScalarValue.new(pattern)
+            when :_leftovers_nil_value then ::Leftovers::Matchers::NodeType.new(:nil)
+            when ::String then ::Leftovers::MatcherBuilders::NodeName.build(pattern)
+            when ::Hash then build_from_hash(**pattern)
             # :nocov:
-            else raise
+            else raise Leftovers::UnexpectedCase, "Unhandled value #{pattern.inspect}"
               # :nocov:
             end
           end
@@ -22,27 +22,48 @@ module Leftovers
 
         private
 
-        def build_from_hash( # rubocop:disable Metrics/MethodLength, Metrics/ParameterLists
-          at: nil, has_value: nil,
-          match: nil, has_prefix: nil, has_suffix: nil,
+        def build_node_name_matcher(names, match, has_prefix, has_suffix)
+          ::Leftovers::MatcherBuilders::Or.build([
+            ::Leftovers::MatcherBuilders::NodeName.build(names),
+            ::Leftovers::MatcherBuilders::NodeName.build(
+              match: match, has_prefix: has_prefix, has_suffix: has_suffix
+            )
+          ])
+        end
+
+        def build_node_has_argument_matcher(has_arguments, at, has_value)
+          ::Leftovers::MatcherBuilders::Or.build([
+            ::Leftovers::MatcherBuilders::NodeHasArgument.build(has_arguments),
+            ::Leftovers::MatcherBuilders::NodeHasArgument.build(
+              at: at, has_value: has_value
+            )
+          ])
+        end
+
+        def build_unless(unless_arg)
+          return unless unless_arg
+
+          ::Leftovers::MatcherBuilders::Unless.build(
+            ::Leftovers::MatcherBuilders::NodeValue.build(unless_arg)
+          )
+        end
+
+        def build_from_hash( # rubocop:disable Metrics/ParameterLists
+          has_arguments: nil, at: nil, has_value: nil,
+          names: nil, match: nil, has_prefix: nil, has_suffix: nil,
           type: nil,
           has_receiver: nil,
+          literal: nil,
           unless_arg: nil
         )
-          matcher = ::Leftovers::MatcherBuilders::And.build([
-            ::Leftovers::MatcherBuilders::NodeHasArgument.build(
-              at: at, has_value: has_value
-            ),
-            ::Leftovers::MatcherBuilders::NodeName.build(
-              match: match, has_prefix: has_prefix, has_suffix: has_suffix
-            ),
+          ::Leftovers::MatcherBuilders::And.build([
+            build_node_has_argument_matcher(has_arguments, at, has_value),
+            build_node_name_matcher(names, match, has_prefix, has_suffix),
             ::Leftovers::MatcherBuilders::NodeType.build(type),
-            ::Leftovers::MatcherBuilders::NodeHasReceiver.build(has_receiver)
+            ::Leftovers::MatcherBuilders::NodeHasReceiver.build(has_receiver),
+            ::Leftovers::MatcherBuilders::NodeValue.build(literal),
+            build_unless(unless_arg)
           ])
-
-          ::Leftovers::MatcherBuilders::AndNot.build(
-            matcher, ::Leftovers::MatcherBuilders::NodeValue.build(unless_arg)
-          )
         end
       end
     end

data/lib/leftovers/matcher_builders/or.rb

@@ -5,68 +5,83 @@ require 'set'
 module Leftovers
   module MatcherBuilders
     module Or
-      def self.each_or_self(value, &block)
-        case value
-        when nil then nil
-        when Array then build(value.map(&block))
-        else build([yield(value)])
+      class << self
+        def each_or_self(value, &block)
+          case value
+          when nil then nil
+          when Array then build(value.map(&block))
+          else build([yield(value)])
+          end
         end
-      end
 
-      def self.build(matchers)
-        matchers = compact(matchers)
-        case matchers.length
-          # :nocov:
-        when 0 then nil
-          # :nocov:
-        when 1 then matchers.first
-        when 2 then ::Leftovers::Matchers::Or.new(matchers.first, matchers[1])
-        else ::Leftovers::Matchers::Any.new(matchers.dup)
+        def build(matchers)
+          matchers = compact(matchers)
+          case matchers.length
+            # :nocov:
+          when 0 then nil
+            # :nocov:
+          when 1 then matchers.first
+          when 2 then ::Leftovers::Matchers::Or.new(matchers.first, matchers[1])
+          else ::Leftovers::Matchers::Any.new(matchers.dup)
+          end
         end
-      end
 
-      def self.flatten(value) # rubocop:disable Metrics/MethodLength
-        case value
-        when ::Leftovers::Matchers::Or
-          [*flatten(value.lhs), *flatten(value.rhs)]
-        when ::Leftovers::Matchers::Any
-          flatten(value.matchers)
-        when Array
-          ret = value.map { |v| flatten(v) }
-          ret.flatten!(1)
-          ret
-        else
-          value
+        private
+
+        def flatten(value)
+          case value
+          when ::Leftovers::Matchers::Or
+            [*flatten(value.lhs), *flatten(value.rhs)]
+          when ::Leftovers::Matchers::Any
+            flatten(value.matchers)
+          when Array, Set
+            value.flat_map { |v| flatten(v) }
+          else
+            [value]
+          end
         end
-      end
 
-      def self.compact(matchers) # rubocop:disable Metrics/MethodLength, Metrics/CyclomaticComplexity, Metrics/AbcSize,
-        return matchers if matchers.length <= 1
+        def group_by_compactable(matchers)
+          groups = matchers.group_by do |matcher|
+            case matcher
+            when ::Integer, ::Symbol, true, false then :set
+            when ::Regexp then :regexp
+            when nil then :nil
+            else matcher.class.to_s.to_sym
+            end
+          end
 
-        set = Set.new
-        regexps = []
-        uncompactable = []
+          groups.transform_values { |v| Leftovers.unwrap_array(v) }
+        end
 
-        matchers = flatten(matchers)
+        def mergeable?(matcher)
+          matcher.respond_to?(:matcher)
+        end
 
-        matchers.each do |matcher|
-          case matcher
-          when nil then nil
-          when ::Integer, ::Symbol then set << matcher
-          # when ::Set then set.merge(matcher) # may not be necessary
-          when ::Regexp then regexps << matcher
-          else uncompactable << matcher
-          end
+        def build_grouped_for_matcher(matchers)
+          return matchers unless matchers.is_a?(Array)
+          return matchers unless mergeable?(matchers.first)
+
+          matchers.first.class.new(build(matchers.map(&:matcher)))
         end
 
-        set = set.first if set.length <= 1
-        regexps = if regexps.length <= 1
-          regexps.first
-        else
-          Regexp.union(regexps)
+        def build_grouped(set: nil, regexp: nil, nil: nil, **matcher_classes) # rubocop:disable Lint/UnusedMethodArgument i want to throw away nils
+          set = set.to_set.compare_by_identity if set.is_a?(Array)
+          regexp = Regexp.union(regexp) if regexp.is_a?(Array)
+          matcher_classes = matcher_classes.each_value.flat_map do |matchers|
+            build_grouped_for_matcher(matchers)
+          end
+
+          [set, regexp].compact.concat(matcher_classes).uniq
         end
 
-        [set, regexps].compact.concat(uncompactable)
+        def compact(matchers)
+          matchers = flatten(matchers)
+
+          return matchers if matchers.length <= 1
+
+          build_grouped(**group_by_compactable(matchers))
+        end
       end
     end
   end

data/lib/leftovers/matcher_builders/path.rb

@@ -8,7 +8,9 @@ module Leftovers
       def self.build(path_pattern)
         return if path_pattern.nil? || path_pattern.empty?
 
-        ::FastIgnore.new(include_rules: path_pattern, gitignore: false, root: Leftovers.pwd)
+        ::Leftovers::Matchers::Path.new(
+          ::FastIgnore.new(include_rules: path_pattern, gitignore: false, root: Leftovers.pwd)
+        )
       end
     end
   end

data/lib/leftovers/matcher_builders/string_pattern.rb

@@ -3,7 +3,7 @@
 module Leftovers
   module MatcherBuilders
     module StringPattern
-      def self.build(match: nil, has_prefix: nil, has_suffix: nil) # rubocop:disable Metrics/CyclomaticComplexity, Metrics/MethodLength, Metrics/PerceivedComplexity
+      def self.build(match: nil, has_prefix: nil, has_suffix: nil) # rubocop:disable Metrics
         has_prefix = ::Regexp.escape(has_prefix) if has_prefix
         has_suffix = ::Regexp.escape(has_suffix) if has_suffix
 

data/lib/leftovers/matcher_builders.rb

@@ -12,7 +12,7 @@ module Leftovers
     autoload(:NodeHasPositionalArgument, "#{__dir__}/matcher_builders/node_has_positional_argument")
     autoload(:NodeHasReceiver, "#{__dir__}/matcher_builders/node_has_receiver")
     autoload(:NodeName, "#{__dir__}/matcher_builders/node_name")
-    autoload(:NodePairName, "#{__dir__}/matcher_builders/node_pair_name")
+    autoload(:NodePairKey, "#{__dir__}/matcher_builders/node_pair_key")
     autoload(:NodePairValue, "#{__dir__}/matcher_builders/node_pair_value")
     autoload(:NodePath, "#{__dir__}/matcher_builders/node_path")
     autoload(:NodePrivacy, "#{__dir__}/matcher_builders/node_privacy")

data/lib/leftovers/matchers/all.rb

@@ -3,6 +3,10 @@
 module Leftovers
   module Matchers
     class All
+      include ComparableInstance
+
+      attr_reader :matchers
+
       def initialize(matchers)
         @matchers = matchers
 

data/lib/leftovers/matchers/and.rb

@@ -3,6 +3,10 @@
 module Leftovers
   module Matchers
     class And
+      include ComparableInstance
+
+      attr_reader :lhs, :rhs
+
       def initialize(lhs, rhs)
         @lhs = lhs
         @rhs = rhs

data/lib/leftovers/matchers/any.rb

@@ -3,6 +3,8 @@
 module Leftovers
   module Matchers
     class Any
+      include ComparableInstance
+
       attr_reader :matchers
 
       def initialize(matchers)

data/lib/leftovers/matchers/node_has_any_keyword_argument.rb

@@ -3,17 +3,20 @@
 module Leftovers
   module Matchers
     class NodeHasAnyKeywordArgument
-      def initialize(pair_matcher)
-        @pair_matcher = pair_matcher
+      include ComparableInstance
+
+      attr_reader :matcher
+
+      def initialize(matcher)
+        @matcher = matcher
 
         freeze
       end
 
       def ===(node)
         kwargs = node.kwargs
-        return false unless kwargs
 
-        kwargs.children.any?(@pair_matcher)
+        kwargs.children.any?(@matcher) if kwargs # rubocop:disable Style/SafeNavigation because there are multiple steps and this should be a configuration option
       end
 
       freeze

data/lib/leftovers/matchers/node_has_any_positional_argument_with_value.rb

@@ -3,6 +3,10 @@
 module Leftovers
   module Matchers
     class NodeHasAnyPositionalArgumentWithValue
+      include ComparableInstance
+
+      attr_reader :matcher
+
       def initialize(matcher)
         @matcher = matcher
 
@@ -10,10 +14,7 @@ module Leftovers
       end
 
       def ===(node)
-        args = node.positional_arguments
-        return false unless args
-
-        args.any?(@matcher)
+        node.positional_arguments&.any?(@matcher)
       end
 
       freeze

data/lib/leftovers/matchers/node_has_any_receiver.rb

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+module Leftovers
+  module Matchers
+    module NodeHasAnyReceiver
+      def self.===(node)
+        node.receiver
+      end
+
+      freeze
+    end
+  end
+end

data/lib/leftovers/matchers/node_has_positional_argument.rb

@@ -3,6 +3,8 @@
 module Leftovers
   module Matchers
     class NodeHasPositionalArgument
+      include ComparableInstance
+
       def initialize(position)
         @position = position
 
@@ -10,7 +12,9 @@ module Leftovers
       end
 
       def ===(node)
-        node.positional_arguments[@position]
+        args = node.positional_arguments
+
+        args.length > @position if args
       end
 
       freeze