trains 0.0.16 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ec81a397d70c4affd856766de4b471fb2f6dbe40a545a089075b3f1e8361c43
-  data.tar.gz: e59cb748ec77bddab7fd5ea61f216050485d773c618e568bff37f4b3eab68d16
+  metadata.gz: 7a1893b50977fd1adda92c2268df81b65f47fa4218961835c11c5534274774db
+  data.tar.gz: aa0c28905214fa2d776d144e3e58bfa952ad154b91a4f007e0f9d506e6fe723d
 SHA512:
-  metadata.gz: b194c73de6398aa702a487e4c5aaf182bbb3075a7580dcd15bbee2ec67e37a3743dd7abc08aeb8fd5c78612d2e220812c0c75df1d01db78d1954565152aa60b3
-  data.tar.gz: f0b4abdd5ef3824e9e46000e53914d093240d4e919d551608a7e256860f5c0dd0cf5036f503560674de5928a46427355f526b61a80576d145fe2228a9fa242cd
+  metadata.gz: 87bf0d7266a6347d452434b83f19f3798ed68f97b0be036baed26390442894ccf725a0e54bb233cbb25523b9864e9bbc3d246bae5341c489121e1ef80b7195b4
+  data.tar.gz: 377afeb54297eca4feb98a5c482a348250319f7d61b84650fb33910c91faa86d1c9eade41c34b82cf217c9833ebc5e238af7cc04c86c53255e29480fa4e0d605

data/lib/trains/scanner.rb

@@ -46,9 +46,12 @@ module Trains
 
     # Stitch together migrations to create models
     def generate_models
+      # Parse models from schema.rb (used when brownfield project)
+      schema_models = parse_schema
+
       migrations = get_migrations.flatten.reject(&:nil?)
       migrations = [*migrations, *parse_models.flatten.reject(&:nil?)]
-      Utils::MigrationTailor.stitch(migrations)
+      Utils::MigrationTailor.stitch(schema_models, migrations)
     end
 
     def get_routes
@@ -63,9 +66,10 @@ module Trains
 
     def parse_schema
       result_hash = {}
-      schema_file = [File.join(@dir, 'db', 'schema.rb')]
-      models_results = parse_util(schema_file, Visitor::Schema)
+      schema_file = File.join(@dir, 'db', 'schema.rb')
+      return result_hash unless File.exist? schema_file
 
+      models_results = parse_util([schema_file], Visitor::Schema)
       models_results
         .select { |result| result.error.nil? }
         .map(&:data)

data/lib/trains/utils/migration_tailor.rb

@@ -1,18 +1,19 @@
 module Trains
   module Utils
     module MigrationTailor
-      def self.stitch(migrations)
-        models = {}
-
+      def self.stitch(models = {}, migrations)
         migrations.each do |mig|
           case mig.modifier
           when :create_table, :create_join_table
-            models[mig.table_name] = {}
-            models[mig.table_name] = Trains::DTO::Model.new(
-              name: mig.table_name,
-              fields: mig.fields,
-              version: mig.version
-            )
+            if models.key?(mig.table_name)
+              models[mig.table_name].fields.push(*mig.fields)
+            else
+              models[mig.table_name] = Trains::DTO::Model.new(
+                name: mig.table_name,
+                fields: mig.fields,
+                version: mig.version
+              )
+            end
           when :add_column, :add_column_with_default, :add_reference
             models[mig.table_name].fields.push(*mig.fields)
           when :remove_column

data/lib/trains/version.rb

@@ -1,3 +1,3 @@
 module Trains
-  VERSION = '0.0.16'.freeze
+  VERSION = '0.0.18'.freeze
 end

data/lib/trains/visitor/model.rb

@@ -9,7 +9,11 @@ module Trains
         belongs_to
         has_one
         has_and_belongs_to_many
-      ]
+      ].freeze
+      MODEL_PARENT_CLASSES = %w[
+        ApplicationRecord
+        ActiveRecord::Base
+      ].freeze
       attr_reader :result
 
       # skipcq: RB-LI1087
@@ -19,7 +23,7 @@ module Trains
 
       def on_class(node)
         return unless node.parent_class
-        return unless node.parent_class.source == 'ApplicationRecord'
+        return unless MODEL_PARENT_CLASSES.include? node.parent_class.source
 
         @model_class = node.identifier.source
         node.each_descendant(:send) { |send_node| parse_model(send_node) }

data/lib/trains/visitor/schema.rb

@@ -9,9 +9,9 @@ module Trains
       PATTERN
 
       def_node_matcher :unversioned_schema?, <<~PATTERN
-       (block
-        (send (const (const nil? :ActiveRecord) :Schema) :define ...)
-       ...)
+        (block
+         (send (const (const nil? :ActiveRecord) :Schema) :define ...)
+        ...)
       PATTERN
 
       def initialize
@@ -64,7 +64,7 @@ module Trains
             next if child.method?(:index)
 
             DTO::Field.new(
-              name: child.first_argument.str_content,
+              name: child.first_argument.str_content.to_sym,
               type: child.method_name
             )
           end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: trains
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.18
 platform: ruby
 authors:
 - Syed Faraaz Ahmad
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-07-12 00:00:00.000000000 Z
+date: 2023-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.3
+rubygems_version: 3.4.16
 signing_key:
 specification_version: 4
 summary: Collect metadata about your Rails app by statically analyzing it