mutant 0.8.0 → 0.8.1

data/lib/mutant/matcher.rb

@@ -11,30 +11,20 @@ module Mutant
     # @return [undefined]
     #
     # @api private
-    #
     def self.build(*arguments)
       new(*arguments)
     end
 
     # Enumerate subjects
     #
-    # @api private
-    #
     # @return [self]
     #   if block given
     #
     # @return [Enumerable<Subject>]
     #   otherwise
     #
-    abstract_method :each
-
-    # Return identification
-    #
-    # @return [String
-    #
     # @api private
-    #
-    abstract_method :identification
+    abstract_method :each
 
   end # Matcher
 end # Mutant

data/lib/mutant/matcher/chain.rb

@@ -13,7 +13,6 @@ module Mutant
       #   otherwise
       #
       # @api private
-      #
       def each(&block)
         return to_enum unless block_given?
 

data/lib/mutant/matcher/compiler.rb

@@ -5,16 +5,20 @@ module Mutant
     class Compiler
       include Concord.new(:env, :config), AST::Sexp, Procto.call(:result)
 
-      # Return generated matcher
+      # Generated matcher
       #
-      # @return [Mutant::Matcher]
+      # @return [Matcher]
       #
       # @api private
-      #
       def result
         Filter.new(
           Chain.build(config.match_expressions.map(&method(:matcher))),
-          predicate
+          Morpher::Evaluator::Predicate::Boolean::And.new(
+            [
+              ignored_subjects,
+              filtered_subjects
+            ]
+          )
         )
       end
 
@@ -27,7 +31,6 @@ module Mutant
         # @return [Boolean]
         #
         # @api private
-        #
         def call(subject)
           expression.prefix?(subject.expression)
         end
@@ -36,71 +39,35 @@ module Mutant
 
     private
 
-      # Return predicate
+      # Predicate returning false on expression ignored subject
       #
       # @return [#call]
       #
       # @api private
-      #
-      # rubocop:disable MethodLength
-      #
-      def predicate
-        if subject_selector && subject_rejector
-          Morpher::Evaluator::Predicate::Boolean::And.new([
-            subject_selector,
-            Morpher::Evaluator::Predicate::Negation.new(subject_rejector)
-          ])
-        elsif subject_selector
-          subject_selector
-        elsif subject_rejector
-          Morpher::Evaluator::Predicate::Negation.new(subject_rejector)
-        else
-          Morpher::Evaluator::Predicate::Tautology.new
-        end
-      end
-
-      # Return subject selector
-      #
-      # @return [#call]
-      #   if selector is present
-      #
-      # @return [nil]
-      #   otherwise
-      #
-      # @api private
-      #
-      def subject_selector
-        selectors = config.subject_selects.map do |attribute, value|
-          Morpher.compile(s(:eql, s(:attribute, attribute), s(:static, value)))
-        end
-
-        Morpher::Evaluator::Predicate::Boolean::Or.new(selectors) if selectors.any?
+      def ignored_subjects
+        Morpher::Evaluator::Predicate::Boolean::Negation.new(
+          Morpher::Evaluator::Predicate::Boolean::Or.new(
+            config.ignore_expressions.map(&SubjectPrefix.method(:new))
+          )
+        )
       end
 
-      # Return subject rejector
+      # Predicate returning false on filtered subject
       #
       # @return [#call]
-      #   if there is a subject rejector
-      #
-      # @return [nil]
-      #   otherwise
       #
       # @api private
-      #
-      def subject_rejector
-        rejectors = config.subject_ignores.map(&SubjectPrefix.method(:new))
-
-        Morpher::Evaluator::Predicate::Boolean::Or.new(rejectors) if rejectors.any?
+      def filtered_subjects
+        Morpher::Evaluator::Predicate::Boolean::And.new(config.subject_filters)
       end
 
-      # Return a matcher from expression
+      # Matcher for expression on env
       #
       # @param [Mutant::Expression] expression
       #
       # @return [Matcher]
       #
       # @api private
-      #
       def matcher(expression)
         expression.matcher(env)
       end

data/lib/mutant/matcher/config.rb

@@ -1,16 +1,38 @@
 module Mutant
   class Matcher
-    # Match configuration
+    # Subject matcher configuration
     class Config
       include Adamantium, Anima::Update, Anima.new(
         :match_expressions,
-        :subject_ignores,
-        :subject_selects
+        :ignore_expressions,
+        :subject_filters
       )
 
+      INSPECT_FORMAT      = "#<#{self} %s>".freeze
+      ATTRIBUTE_DELIMITER = ' '.freeze
+      ATTRIBUTE_FORMAT    = '%s: [%s]'.freeze
+      ENUM_DELIMITER      = ','.freeze
+      EMPTY_ATTRIBUTES    = 'empty'.freeze
+      PRESENTATIONS       = IceNine.deep_freeze(
+        match_expressions:  :syntax,
+        ignore_expressions: :syntax,
+        subject_filters:    :inspect
+      )
+      private_constant(*constants(false))
+
       DEFAULT = new(Hash[anima.attribute_names.map { |name| [name, []] }])
 
-      # Return configuration with added value
+      # Inspection string
+      #
+      # @return [String]
+      #
+      # @api private
+      def inspect
+        INSPECT_FORMAT % inspect_attributes
+      end
+      memoize :inspect
+
+      # Add value to configurable collection
       #
       # @param [Symbol] attribute
       # @param [Object] value
@@ -18,11 +40,49 @@ module Mutant
       # @return [Config]
       #
       # @api private
-      #
       def add(attribute, value)
         update(attribute => public_send(attribute).dup << value)
       end
 
+    private
+
+      # Present attributes
+      #
+      # @return [Array<Symbol>]
+      #
+      # @api private
+      def present_attributes
+        to_h.reject { |_key, value| value.empty? }.keys
+      end
+
+      # Formatted attributes
+      #
+      # @return [String]
+      #
+      # @api private
+      def inspect_attributes
+        attributes = present_attributes
+          .map(&method(:format_attribute))
+          .join(ATTRIBUTE_DELIMITER)
+
+        attributes.empty? ? EMPTY_ATTRIBUTES : attributes
+      end
+
+      # Format attribute
+      #
+      # @param [Symbol] attribute_name
+      #
+      # @return [String]
+      def format_attribute(attribute_name)
+        ATTRIBUTE_FORMAT %
+          [
+            attribute_name,
+            public_send(attribute_name)
+              .map(&PRESENTATIONS.fetch(attribute_name))
+              .join(ENUM_DELIMITER)
+          ]
+      end
+
     end # Config
   end # Matcher
 end # Mutant

data/lib/mutant/matcher/filter.rb

@@ -4,6 +4,17 @@ module Mutant
     class Filter < self
       include Concord.new(:matcher, :predicate)
 
+      # New matcher
+      #
+      # @param [Matcher] matcher
+      #
+      # @return [Matcher]
+      #
+      # @api private
+      def self.build(matcher, &predicate)
+        new(matcher, predicate)
+      end
+
       # Enumerate matches
       #
       # @return [self]
@@ -13,7 +24,6 @@ module Mutant
       #   otherwise
       #
       # @api private
-      #
       def each(&block)
         return to_enum unless block_given?
         matcher.select(&predicate.method(:call)).each(&block)

data/lib/mutant/matcher/method.rb

@@ -3,7 +3,7 @@ module Mutant
     # Matcher for subjects that are a specific method
     class Method < self
       include Adamantium::Flat, Concord::Public.new(:env, :scope, :target_method)
-      include AST::NodePredicates, Equalizer.new(:identification)
+      include AST::NodePredicates
 
       # Methods within rbx kernel directory are precompiled and their source
       # cannot be accessed via reading source location. Same for methods created by eval.
@@ -18,7 +18,6 @@ module Mutant
       #   otherwise
       #
       # @api private
-      #
       def each
         return to_enum unless block_given?
 
@@ -36,7 +35,6 @@ module Mutant
       # @return [Boolean]
       #
       # @api private
-      #
       def skip?
         location = source_location
         if location.nil? || BLACKLIST.match(location.first)
@@ -50,67 +48,61 @@ module Mutant
         end
       end
 
-      # Return method name
+      # Target method name
       #
       # @return [String]
       #
       # @api private
-      #
       def method_name
         target_method.name
       end
 
-      # Return context
+      # Target context
       #
       # @return [Context::Scope]
       #
       # @api private
-      #
       def context
         Context::Scope.new(scope, source_path)
       end
 
-      # Return full ast
+      # Root source node
       #
       # @return [Parser::AST::Node]
       #
       # @api private
-      #
       def ast
         env.cache.parse(source_path)
       end
 
-      # Return path to source
+      # Path to source
       #
       # @return [String]
       #
       # @api private
-      #
       def source_path
         source_location.first
       end
 
-      # Return source file line
+      # Source file line
       #
-      # @return [Integer]
+      # @return [Fixnum]
       #
       # @api private
-      #
       def source_line
         source_location.last
       end
 
-      # Return source location
+      # Full source location
       #
-      # @return [Array]
+      # @return [Array{String,Fixnum}]
       #
       # @api private
-      #
       def source_location
         target_method.source_location
       end
 
-      # Return subject
+      # Matched subject
       #
       # @return [Subject]
       #   if there is a matched node
@@ -119,7 +111,6 @@ module Mutant
       #   otherwise
       #
       # @api private
-      #
       def subject
         node = matched_node_path.last
         return unless node
@@ -127,12 +118,11 @@ module Mutant
       end
       memoize :subject
 
-      # Return matched node path
+      # Matched node path
       #
       # @return [Array<Parser::AST::Node>]
       #
       # @api private
-      #
       def matched_node_path
         AST.find_last_path(ast, &method(:match?))
       end

data/lib/mutant/matcher/method/instance.rb

@@ -14,7 +14,6 @@ module Mutant
         # @return [Matcher::Method::Instance]
         #
         # @api private
-        #
         def self.build(env, scope, target_method)
           name = target_method.name
           if scope.ancestors.include?(::Memoizable) && scope.memoized?(name)
@@ -23,17 +22,6 @@ module Mutant
           super
         end
 
-        # Return identification
-        #
-        # @return [String]
-        #
-        # @api private
-        #
-        def identification
-          "#{scope.name}##{method_name}"
-        end
-        memoize :identification
-
         NAME_INDEX = 0
 
       private
@@ -45,7 +33,6 @@ module Mutant
         # @return [Boolean]
         #
         # @api private
-        #
         def match?(node)
           location   = node.location       || return
           expression = location.expression || return
@@ -61,12 +48,11 @@ module Mutant
 
         private
 
-          # Return source location
+          # Source location
           #
-          # @return [Array]
+          # @return [Array{String,Fixnum}]
           #
           # @api private
-          #
           def source_location
             scope.unmemoized_instance_method(method_name).source_location
           end

data/lib/mutant/matcher/method/singleton.rb

@@ -3,21 +3,9 @@ module Mutant
     class Method
       # Matcher for singleton methods
       class Singleton < self
-        SUBJECT_CLASS = Subject::Method::Singleton
-
-        # Return identification
-        #
-        # @return [String]
-        #
-        # @api private
-        #
-        def identification
-          "#{scope.name}.#{method_name}"
-        end
-        memoize :identification
-
-        RECEIVER_INDEX   = 0
-        NAME_INDEX       = 1
+        SUBJECT_CLASS  = Subject::Method::Singleton
+        RECEIVER_INDEX = 0
+        NAME_INDEX     = 1
 
       private
 
@@ -28,7 +16,6 @@ module Mutant
         # @return [Boolean]
         #
         # @api private
-        #
         def match?(node)
           line?(node) && name?(node) && receiver?(node)
         end
@@ -40,7 +27,6 @@ module Mutant
         # @return [Boolean]
         #
         # @api private
-        #
         def line?(node)
           expression = node.location.expression
           return false unless expression
@@ -54,7 +40,6 @@ module Mutant
         # @return [Boolean]
         #
         # @api private
-        #
         def name?(node)
           node.children[NAME_INDEX].equal?(method_name)
         end
@@ -66,7 +51,6 @@ module Mutant
         # @return [Boolean]
         #
         # @api private
-        #
         def receiver?(node)
           receiver = node.children[RECEIVER_INDEX]
           case receiver.type
@@ -87,7 +71,6 @@ module Mutant
         # @return [Boolean]
         #
         # @api private
-        #
         def receiver_name?(node)
           name = node.children[NAME_INDEX]
           name.to_s.eql?(context.unqualified_name)