lowkey 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7a9a4fe0baffd60656da5b3ccd8047b72b9c655a9e789797e01bdaf8950cd7a2
-  data.tar.gz: 24f2f98ec543e28105e0494605f550e37d2437829fe1c29018f7b659c55128f2
+  metadata.gz: 3f105e73eb19ec3b29ba8a8e2452071c1bf9f693fdd5dc5449374bf31315566b
+  data.tar.gz: 95680c064c4020c42a473cef33e83d9277177ab22eae60ef8180cd79928fa5db
 SHA512:
-  metadata.gz: 9949841c337d4f2bbe88f0bfaabadac171d1fb1db5a34a0ee1d8a090ac295c6f91ad87fcb8819c035e4be2bdd2d14d5eb296fb44bd5b24cf3396e0f21dcadbdd
-  data.tar.gz: 4e96b53e4a83a9f53055e9d8041b54942453506b87a5cad97b494f1a091aa4b64fa8fef4d768fe5d8429199a98e04155ed6e09f6b2cdab31840f891a825d7a55
+  metadata.gz: 6427844a8671c39e1a6e3ff7298b74d89b6b128d1243c745e65a568498efe72bfc70f5fbe2ee277e5b4b632e18056bf6301f85418fe7dd201dbbd84d5258b9d5
+  data.tar.gz: fbb67e2e9a8d69848658b6bf51d4afaa1d6c96a46b630b85b74309e20791c0e0745680090d4cb56dd25a113f1e8957db159f2eb3704f29968a5093b08c8688a0

data/lib/lowkey.rb

@@ -37,7 +37,7 @@ module Lowkey
 
     def config
       config = Struct.new(:cache)
-      @config ||= config.new(false)
+      @config ||= config.new(true)
     end
 
     def configure

data/lib/proxies/class_proxy.rb

@@ -1,18 +1,18 @@
 # frozen_string_literal: true
 
-require 'forwardable'
-
 module Lowkey
   class ClassProxy
-    attr_reader :namespace, :file_proxy, :start_line, :end_line
-    attr_accessor :private_start_line, :class_methods, :instance_methods, :method_calls
+    attr_reader :namespace, :start_line, :end_line
+    attr_writer :method_calls
+    attr_accessor :private_start_line, :class_methods, :instance_methods
 
     def initialize(node:, namespace:, file_proxy:)
       @namespace = namespace
       @file_proxy = file_proxy
 
-      @start_line = node.class_keyword_loc.start_line
-      @end_line = node.end_keyword_loc.end_line # class_keyword_loc ?
+      @start_line = node.respond_to?(:class_keyword_loc) ? node.class_keyword_loc.start_line : 0
+      @end_line = node.respond_to?(:end_keyword_loc) ? node.end_keyword_loc.end_line : @start_line
+      @end_line = file_proxy.end_line if namespace == 'Object'
       @private_start_line = nil
 
       @class_methods = {}
@@ -20,17 +20,46 @@ module Lowkey
       @method_calls = []
     end
 
-    private
+    def method_calls(method_names = nil)
+      return @method_calls if method_names.nil?
+
+      @method_calls.filter { |method_call| method_names.include?(method_call.name) }
+    end
+
+    def file_path
+      @file_proxy.path
+    end
+
+    class << self
+      # Only a lambda defined immediately after a method's parameters/block is considered a return type expression.
+      def return_type(method_node:)
+        # Method statements.
+        statements_node = method_node.compact_child_nodes.find { |node| node.is_a?(Prism::StatementsNode) }
 
-    def class_method?(node)
-      return true if node.is_a?(::Prism::DefNode) && node.receiver.instance_of?(Prism::SelfNode) # self.method_name
-      return true if node.is_a?(::Prism::SingletonClassNode) # class << self
+        # Block statements.
+        if statements_node.nil?
+          block_node = method_node.compact_child_nodes.find { |node| node.is_a?(Prism::BlockNode) }
+          statements_node = block_node.compact_child_nodes.find { |node| node.is_a?(Prism::StatementsNode) } if block_node
+        end
 
-      if (parent_node = parent_map.parent(node:))
-        return class_method?(parent_node)
+        return nil if statements_node.nil? # Sometimes developers define methods without code inside them.
+
+        node = statements_node.body.first
+        return node if node.is_a?(Prism::LambdaNode)
+
+        nil
       end
 
-      false
+      def class_method?(node:, parent_map:)
+        return true if node.is_a?(::Prism::DefNode) && node.receiver.instance_of?(Prism::SelfNode) # self.method_name
+        return true if node.is_a?(::Prism::SingletonClassNode) # class << self
+
+        if (parent_node = parent_map[node])
+          return class_method?(node: parent_node, parent_map:)
+        end
+
+        false
+      end
     end
   end
 end

data/lib/proxies/file_proxy.rb

@@ -17,8 +17,9 @@ module Lowkey
       @dependencies = []
     end
 
-    def class_proxy(node:, parent_map:)
+    def upsert_class_proxy(node:, parent_map:)
       namespace = namespace(node:, parent_map:).reverse.join('::')
+      namespace = 'Object' if namespace.empty?
       @definitions[namespace] ||= ClassProxy.new(node:, namespace:, file_proxy: self)
     end
 

data/lib/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Lowkey
-  VERSION = '0.2.0'
+  VERSION = '0.2.1'
 end

data/lib/visitors/method_call_visitor.rb

@@ -1,20 +1,22 @@
 # frozen_string_literal: true
 
-class MethodCallVisitor
-  attr_reader :parent_map
+module Lowkey
+  class MethodCallVisitor
+    attr_reader :parent_map
 
-  def initialize(file_proxy:, parent_map:)
-    @file_proxy = file_proxy
-    @parent_map = parent_map
-  end
+    def initialize(file_proxy:, parent_map:)
+      @file_proxy = file_proxy
+      @parent_map = parent_map
+    end
 
-  def visit(node)
-    class_proxy = @file_proxy.class_proxy(node:, parent_map:)
-    class_proxy.method_calls << node
+    def visit(node)
+      class_proxy = @file_proxy.upsert_class_proxy(node:, parent_map:)
+      class_proxy.method_calls << node
 
-    return unless node.name == :private && node.respond_to?(:start_line) && class_proxy.start_line && class_proxy.end_line
-    return unless node.start_line > class_proxy.start_line && node.start_line < class_proxy.end_line
+      return unless node.name == :private && node.respond_to?(:start_line) && class_proxy.start_line && class_proxy.end_line
+      return unless node.start_line > class_proxy.start_line && node.start_line < class_proxy.end_line
 
-    class_proxy.private_start_line = node.start_line
+      class_proxy.private_start_line = node.start_line
+    end
   end
 end

data/lib/visitors/method_class_visitor.rb

@@ -1,14 +1,16 @@
 # frozen_string_literal: true
 
-class MethodClassVisitor
-  attr_reader :parent_map
+module Lowkey
+  class MethodClassVisitor
+    attr_reader :parent_map
 
-  def initialize(file_proxy:, parent_map:)
-    @file_proxy = file_proxy
-    @parent_map = parent_map
-  end
+    def initialize(file_proxy:, parent_map:)
+      @file_proxy = file_proxy
+      @parent_map = parent_map
+    end
 
-  def visit(node)
-    @file_proxy.class_proxy(node:, parent_map:)
+    def visit(node)
+      @file_proxy.upsert_class_proxy(node:, parent_map:)
+    end
   end
 end

data/lib/visitors/method_def_visitor.rb

@@ -1,20 +1,22 @@
 # frozen_string_literal: true
 
-class MethodDefVisitor
-  attr_reader :parent_map
+module Lowkey
+  class MethodDefVisitor
+    attr_reader :parent_map
 
-  def initialize(file_proxy:, parent_map:)
-    @file_proxy = file_proxy
-    @parent_map = parent_map
-  end
+    def initialize(file_proxy:, parent_map:)
+      @file_proxy = file_proxy
+      @parent_map = parent_map
+    end
 
-  def visit(node)
-    class_proxy = @file_proxy.class_proxy(node:, parent_map:)
+    def visit(node)
+      class_proxy = @file_proxy.upsert_class_proxy(node:, parent_map:)
 
-    if class_proxy.class_method?(node:, parent_map:)
-      class_proxy.class_methods[node.name] = node
-    else
-      class_proxy.instance_methods[node.name] = node
+      if ClassProxy.class_method?(node:, parent_map:)
+        class_proxy.class_methods[node.name] = node
+      else
+        class_proxy.instance_methods[node.name] = node
+      end
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lowkey
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - maedi