lowkey 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a2bcc0b4b60c158051ab7da59abb915078011d30cf4a231db29ddc03f87a9af4
-  data.tar.gz: 50ed70e6d38d529f0b9d8c39cd31e3af9df2fd0f04100bf4739235d81daadb59
+  metadata.gz: 0c3c9495f9a78f72d1c42103c7feca2dd8bc07aee9621658e20849f9aca22952
+  data.tar.gz: 3a9f9940d723fadc08d8f6ac552eb79f2cdfc56b4b01316498b18fd327b5ebed
 SHA512:
-  metadata.gz: 2585284e511997be690bffcee538d8e8e97150ce9338b803867aafc4680f1e8caa70b4d34d8d8c4952cf8ba2cd141462ae74d7b0fad0194b5e22d3cb90ed7fb5
-  data.tar.gz: eb4a250a62dfd1cf13110095f8a4b831b9b47c282944c38f2edd642bb3f4817ddfd9fe838acd5241d0088ab93ec3d2e56c3ae6cec45dfbda2de0b84b389c019b
+  metadata.gz: d1e42a9e1d4dbdd21dcf869d6c2862724b5e609c1e8f5c8716ae530edaca518f655de6d04aff0b9686746a7cd06e00665a243bd60d3a5f8bdc7a3b57435f8912
+  data.tar.gz: d0ccec589e58a7a1f379e683689f52fbc2cd8b1ea71dce3bb809a3f3267ae4427f1f83885d08231fadc56b567ecefb9820a5a1438ca797510a35fd5549d282c6

data/lib/factories/source_factory.rb

@@ -6,13 +6,13 @@ module Lowkey
   class SourceFactory
     class << self
       def file_source(root_node:, file_path:)
-        end_line = root_node.respond_to?(:end_line) ? root_node.end_line : nil
+        end_line = root_node.respond_to?(:end_line) ? root_node.end_line : nil # TODO: Get file line count.
 
-        Source.new(file_path:, scope: 'file', lines: root_node.script_lines, start_line: 0, end_line:)
+        Source.new(file_path:, scope: 'file', lines: root_node.script_lines, start_line: 1, end_line:)
       end
 
       def module_source(node:, namespace:, file_path:, lines:)
-        start_line = node.respond_to?(:class_keyword_loc) ? node.class_keyword_loc.start_line : 0
+        start_line = node.respond_to?(:class_keyword_loc) ? node.class_keyword_loc.start_line : 1
         end_line = node.respond_to?(:end_keyword_loc) ? node.end_keyword_loc.end_line : start_line
         end_line = node.end_line if namespace == 'Object'
         scope = node.respond_to?(:name) ? node.name : 'Object'
@@ -21,7 +21,7 @@ module Lowkey
       end
 
       def class_source(node:, file_path:, lines:)
-        start_line = node.respond_to?(:class_keyword_loc) ? node.class_keyword_loc.start_line : 0
+        start_line = node.respond_to?(:class_keyword_loc) ? node.class_keyword_loc.start_line : 1
         end_line = node.respond_to?(:end_keyword_loc) ? node.end_keyword_loc.end_line : start_line
 
         Source.new(file_path:, scope: node.name, lines:, start_line:, end_line:)
@@ -31,7 +31,8 @@ module Lowkey
         scope = method_node.name
         start_line = method_node.start_line
         end_line = method_node.end_line
-        end_line = end_line_from_indent(method_node:, lines:) if end_line > lines.count
+        # TODO: Brittle conditional. What we really want to identify is if the method/rest of file was able to be parsed into an AST.
+        end_line = end_line_from_indent(method_node:, lines:) if end_line >= lines.count
 
         Source.new(file_path:, scope:, lines:, start_line:, end_line:)
       end

data/lib/interfaces/proxy.rb

@@ -10,7 +10,7 @@ module Lowkey
 
     attr_reader :name
 
-    def_delegators :@source, :file_path, :lines, :start_line, :end_line, :scope
+    def_delegators :@source, :file_path, :lines, :lines=, :start_line, :end_line, :scope
     def_delegators :@source, :wrap, :export
 
     def initialize(name:, source:)

data/lib/models/source.rb

@@ -1,9 +1,11 @@
 # frozen_string_literal: true
 
 module Lowkey
+  class WriteError < StandardError; end
+
   class Source
-    attr_reader :file_path, :scope
-    attr_accessor :lines, :start_line, :end_line
+    attr_reader :file_path, :scope, :lines
+    attr_accessor :start_line, :end_line
 
     def initialize(file_path:, scope:, lines:, start_line:, end_line: nil)
       @file_path = file_path
@@ -14,16 +16,26 @@ module Lowkey
       @lines = lines
     end
 
+    def lines=(new_lines)
+      raise WriteError, "More new lines than old lines, won't fit" if new_lines.count > lines.count
+
+      indent = lines[start_index][/^\s+/]
+
+      [start_index..end_index].each do |line_index|
+        lines[line_index] = indent + new_lines.pop.to_s || ''
+      end
+    end
+
     def wrap(prefix:, suffix:)
       start_line = lines[start_index]
       indent = start_line[/^\s+/]
-      lines[start_index] = indent + prefix.to_s + start_line.lstrip
 
+      lines[start_index] = indent + prefix.to_s + start_line.lstrip
       lines[end_index] = lines[end_index] + suffix.to_s
     end
 
     def export
-      lines.join
+      lines[start_index..end_index].join
     end
 
     private

data/lib/proxies/class_proxy.rb

@@ -4,12 +4,13 @@ require_relative 'module_proxy'
 
 module Lowkey
   class ClassProxy < ModuleProxy
-    attr_accessor :instance_methods
+    attr_accessor :instance_methods, :class_binding
 
     def initialize(node:, name:, namespace:, source:)
       super(node:, name:, namespace:, source:)
 
       @instance_methods = {}
+      @class_binding = nil
     end
   end
 end

data/lib/queries/query.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'prism'
+
 module Lowkey
   module Query
     # TODO: Make name a keypath.
@@ -10,6 +12,9 @@ module Lowkey
     end
 
     def namespace(node:, parent_map:, namespace: [])
+      # When inside RBX, Prism thinks we're defining a class because of "<".
+      return nil if node.respond_to?(:constant_path) && node.constant_path.is_a?(Prism::MissingNode)
+
       if parent_map[node].nil?
         namespace << 'Object' if namespace.empty?
         return namespace.reverse.join('::')

data/lib/version.rb

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

data/lib/visitors/class_visitor.rb

@@ -13,7 +13,7 @@ module Lowkey
     end
 
     def visit(node)
-      namespace = namespace(node:, parent_map:)
+      namespace = namespace(node:, parent_map:) || return
       class_proxy = ProxyFactory.class_proxy(node:, namespace:, file_path:, lines:)
       @file_proxy.upsert_definition(module_proxy: class_proxy)
     end

data/lib/visitors/method_call_visitor.rb

@@ -12,7 +12,7 @@ module Lowkey
     end
 
     def visit(node)
-      namespace = namespace(node:, parent_map:)
+      namespace = namespace(node:, parent_map:) || return
       module_proxy = file_proxy[namespace]
 
       module_proxy.method_calls << node

metadata

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