rewrite parse_ruby helper

Author: flyerhzm

lib/helpers/parse_ruby.rb

@@ -7,7 +7,7 @@
   with_configurations(number_of_workers: 1) do
     definitions = { modules: [], classes: [], constants: [] }
     current_context = definitions
-    context_stack = []
+    context_stack = [current_context]
 
     helper_method :find_in_definitions do |names, definitions|
       return nil if names.empty? || definitions.nil?
@@ -48,16 +48,17 @@
           new_context = existing_module
         else
           full_name = [current_context[:full_name], name].compact.join('::')
-          new_context = { name: name, full_name: full_name, modules: [], classes: [], methods: [], static_methods: [], singleton: [], constants: [] }
+          new_context = { name: name, full_name: full_name, type: "module", modules: [], classes: [], methods: [], static_methods: [], singleton: {}, constants: [] }
           current_context[:modules] << new_context
         end
 
-        context_stack.push(current_context)
+        context_stack.push(new_context)
         current_context = new_context
       end
 
       add_callback :module_node, at: 'end' do |node|
-        current_context = context_stack.pop
+        context_stack.pop
+        current_context = context_stack.last
       end
 
       add_callback :class_node, at: 'start' do |node|
@@ -68,66 +69,79 @@
           new_context = existing_class
         else
           full_name = [current_context[:full_name], name].compact.join('::')
-          new_context = { name: name, full_name: full_name, superclass: superclass, modules: [], classes: [], methods: [], static_methods: [], singleton: {}, constants: [], included_modules: [] }
+          new_context = { name: name, full_name: full_name, type: "class", superclass: superclass, modules: [], classes: [], methods: [], static_methods: [], singleton: {}, constants: [], included_modules: [] }
           current_context[:classes] << new_context
         end
 
-        context_stack.push(current_context)
+        context_stack.push(new_context)
         current_context = new_context
       end
 
       add_callback :class_node, at: 'end' do |node|
-        current_context = context_stack.pop
+        context_stack.pop
+        current_context = context_stack.last
       end
 
       add_callback :singleton_class_node, at: 'start' do |node|
         existing_singleton = current_context[:singleton]
         if !existing_singleton.empty?
           new_context = existing_singleton
         else
-          new_context = { methods: [], constants: [] }
+          new_context = { type: 'singleton', methods: [], constants: [] }
           current_context[:singleton] = new_context
         end
 
-        context_stack.push(current_context)
+        context_stack.push(new_context)
         current_context = new_context
       end
 
       add_callback :singleton_class_node, at: 'end' do |node|
-        current_context = context_stack.pop
+        context_stack.pop
+        current_context = context_stack.last
       end
 
       add_callback :constant_write_node do |node|
         current_context[:constants] << { name: node.name.to_s }
       end
 
       add_callback :call_node, at: 'start' do |node|
-        if node.receiver.nil? && node.name == :include
+        if node.receiver.nil? && node.name == :include && current_context[:type] == "class" && !node.arguments.nil? && %i[constant_read_node constant_path_node].include?(node.arguments.arguments.first.type)
           current_context[:included_modules] << node.arguments.arguments.first.to_source
         end
+      end
 
-        if node.name == :class_eval
-          klass_definition = find_class(node.receiver.to_source, definitions)
-          current_context = klass_definition if klass_definition
+      add_callback :call_node, at: 'start' do |node|
+        # we can't handle the class_eval / included / class_methods
+        if !node.receiver.nil? && %i[class_eval included class_methods].include?(node.name)
+          throw(:abort)
         end
       end
 
       add_callback :def_node, at: 'start' do |node|
-        name = node.name.to_s
+        # we can't handle `def self.inclueded` method
+        if !node.receiver.nil? && node.name == :included
+          throw(:abort)
+        end
+      end
+
+      add_callback :def_node, at: 'start' do |node|
+        throw(:abort) unless context_stack.last[:type]
 
+        name = node.name.to_s
         new_context = { name: name }
         if node.receiver.nil?
           current_context[:methods] << new_context
         else
           current_context[:static_methods] << new_context
         end
 
-        context_stack.push(current_context)
+        context_stack.push(new_context)
         current_context = new_context
       end
 
       add_callback :def_node, at: 'end' do |node|
-        current_context = context_stack.pop
+        context_stack.pop
+        current_context = context_stack.last
       end
     end
 
@@ -168,11 +182,12 @@ def add_ancestors(definitions)
         superclass = klass[:superclass]
         while superclass
           superclass_class = find_class(superclass, definitions)
-          ancestors << superclass_class[:full_name]
           if superclass_class
+            ancestors << superclass_class[:full_name]
             ancestors.concat(superclass_class[:included_modules]) if superclass_class[:included_modules]
             superclass = superclass_class[:superclass]
           else
+            ancestors << superclass
             superclass = nil
           end
         end

spec/helpers/parse_ruby_spec.rb

@@ -14,6 +14,8 @@
     File.write('app/models/user.rb', <<~EOF)
       module Synvert
         class User
+          include Trackable
+
           ROLES = %w[user admin].freeze
 
           class << self
@@ -42,14 +44,6 @@ def user_type
         end
       end
     EOF
-    FileUtils.mkdir_p('config/initializers')
-    File.write('config/initializers/trackable.rb', <<~EOF)
-      Rails.config.application.after_initialize do
-        Synvert::User.class_eval do
-          include Trackable
-        end
-      end
-    EOF
 
     rewriter.process
 
@@ -59,11 +53,13 @@ def user_type
         {
           name: "Synvert",
           full_name: "Synvert",
+          type: "module",
           classes: [
             {
               name: "Admin",
               full_name: "Synvert::Admin",
               superclass: "User",
+              type: "class",
               singleton: {},
               classes: [],
               constants: [],
@@ -77,8 +73,10 @@ def user_type
             {
               name: "User",
               full_name: "Synvert::User",
+              type: "class",
               superclass: nil,
               singleton: {
+                type: 'singleton',
                 constants: [],
                 methods: [
                   { name: 'system' },
@@ -97,7 +95,7 @@ def user_type
           ],
           modules: [],
           methods: [],
-          singleton: [],
+          singleton: {},
           static_methods: [],
           constants: []
         }