Schema by default (#45)

* ci: Update .deepsource.toml

* pass in models from schema

* version bump

---------

Co-authored-by: deepsource-totalanarchy[bot] <107136100+deepsource-totalanarchy[bot]@users.noreply.github.com>

lib/trains/scanner.rb

@@ -46,9 +46,12 @@ def scan
 
     # 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

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

lib/trains/version.rb

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

lib/trains/visitor/schema.rb

@@ -9,9 +9,9 @@ class Schema < Base
       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 @@ def build_columns(node)
             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

spec/lib/trains/utils/migration_tailor_spec.rb

@@ -2,6 +2,17 @@
 
 describe Trains::Utils::MigrationTailor do
   context 'when migrations create_table, add_column' do
+    let(:models_from_schema) do
+      {
+        'Post' => Trains::DTO::Model.new(
+          name: 'Post',
+          fields: [
+            Trains::DTO::Field.new(:name, :string),
+          ],
+          version: 6.3
+        )
+      }
+    end
     let(:create_add_migs) do
       [
         Trains::DTO::Migration.new(
@@ -25,18 +36,19 @@
     end
 
     it 'creates a model and adds a column to it' do
-      models = Trains::Utils::MigrationTailor.stitch(create_add_migs)
+      models = Trains::Utils::MigrationTailor.stitch(models_from_schema, create_add_migs)
       expect(models).to eq(
         {
           'Post' =>
         Trains::DTO::Model.new(
           name: 'Post',
           fields: [
+            Trains::DTO::Field.new(:name, :string),
             Trains::DTO::Field.new(:title, :string),
             Trains::DTO::Field.new(:more, :text),
             Trains::DTO::Field.new(:user_name, :string)
           ],
-          version: 5.2
+          version: 6.3
         )
         }
       )