Improve method extraction

Author: iHiD

lib/analyzer.rb

@@ -13,7 +13,7 @@
 require 'active_support/inflector'
 
 require_relative "generic/helpers"
-require_relative "generic/extract_class_method"
+require_relative "generic/extract_module_method"
 require_relative "generic/extract_instance_method"
 require_relative "generic/extract_module_or_class"
 

lib/analyzers/two_fer/analyze.rb

@@ -189,7 +189,7 @@ def target_module
 
     memoize
     def target_method
-      SA::Helpers.extract_class_method(target_module, "two_fer")
+      SA::Helpers.extract_module_method(target_module, "two_fer")
     end
 
     memoize

lib/generic/extract_class_method.rb

@@ -0,0 +1,77 @@
+module SA
+  class ExtractModuleMethod < Parser::AST::Processor
+    include Mandate
+
+    def initialize(node_to_search, name)
+      @node_to_search = node_to_search
+      @name = name.to_sym
+      @found_method = nil
+      @found_instance_method = nil
+
+      @module_function_called = false
+    end
+
+    def call
+      process(node_to_search)
+      found_method
+    end
+
+    def on_sclass(node)
+      # If we're in a class << self context
+      if node.children[0].self_type?
+        @found_method = ExtractInstanceMethod.(node.children[1], name)
+      end
+    end
+
+    def on_def(node)
+      return unless node.method_name == name
+      if @module_function_called
+        @found_method = node
+      else
+        @found_instance_method = node
+      end
+    end
+
+    def on_defs(node)
+      # Return unless the name matches
+      return unless node.method_name == name
+
+      # Is this defined as self (where there is no constant)
+      # or on a specific module, and if so is this module the 
+      # correct one?
+      defined_on = node.children[0].const_name
+      return unless defined_on.nil? || defined_on == module_name
+
+      @found_method = node
+    end
+
+    # We want to see if we have the syntax:
+    #   module_function
+    #   def foobar
+    #   end
+    def on_send(node)
+      return unless node.method_name == :module_function
+      if node.arguments?
+        return unless @found_instance_method
+
+        if node.arguments.map{|a|a.value}.include?(name)
+          @found_method = @found_instance_method
+          @found_instance_method = nil
+        end
+      else
+        @module_function_called = true
+      end
+    end
+
+    private
+    attr_reader :node_to_search, :name,
+                :found_method,
+                :found_instance_method, :module_function_called
+
+    memoize
+    def module_name
+      node_to_search.children[0].const_name
+    end
+  end
+end
+

lib/generic/extract_module_method.rb

@@ -4,8 +4,8 @@ def self.extract_module_or_class(*args)
       ExtractModuleOrClass.(*args)
     end
 
-    def self.extract_class_method(*args)
-      ExtractClassMethod.(*args)
+    def self.extract_module_method(*args)
+      ExtractModuleMethod.(*args)
     end
 
     def self.extract_first_line_from_method(method)

lib/generic/helpers.rb

@@ -1,5 +1,7 @@
-class TwoFer
+
+module TwoFer
   def self.two_fer(name = 'you')
     "One for #{name}, one for me."
   end
-end
+end
+

test/fixtures/two-fer/102/two_fer.rb

@@ -0,0 +1,4 @@
+{
+  "status": "approve_as_optimal",
+  "comments": []
+}

test/fixtures/two-fer/105/analysis.json

@@ -0,0 +1,4 @@
+{
+  "status": "approve_as_optimal",
+  "comments": []
+}

test/fixtures/two-fer/108/analysis.json

@@ -2,4 +2,4 @@ class TwoFer
   def TwoFer.two_fer(name='you')
     "One for #{name}, one for me."
   end
-end
+end