trains 0.0.16 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4ec81a397d70c4affd856766de4b471fb2f6dbe40a545a089075b3f1e8361c43
-  data.tar.gz: e59cb748ec77bddab7fd5ea61f216050485d773c618e568bff37f4b3eab68d16
+  metadata.gz: d9b0cdd1bee0a6ed5d222184662bb45dced14a141f00c166633ee177c3f83501
+  data.tar.gz: 75132b13c33a5cc68005cdbc6d525dfda2b3d97aad8144cbb923f759c299bd1e
 SHA512:
-  metadata.gz: b194c73de6398aa702a487e4c5aaf182bbb3075a7580dcd15bbee2ec67e37a3743dd7abc08aeb8fd5c78612d2e220812c0c75df1d01db78d1954565152aa60b3
-  data.tar.gz: f0b4abdd5ef3824e9e46000e53914d093240d4e919d551608a7e256860f5c0dd0cf5036f503560674de5928a46427355f526b61a80576d145fe2228a9fa242cd
+  metadata.gz: 754df75dcf500b11b1d45df65c5bfde168be9dc160912cbd4a2dc0da37f9be9a380158a078b5aafa457bf73315e10f96d47fc50d6d2b849f29c2dc0c59196aee
+  data.tar.gz: 4e8d8dbaad75395f686d5547cb633d162730858f8cc9fccb48fa4e84756ee942affdc2ec0aceaec5e755e523661bbfa944acdc6578344606630add7cbf68c767

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

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.17'.freeze
 end

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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trains
 version: !ruby/object:Gem::Version
-  version: 0.0.16
+  version: 0.0.17
 platform: ruby
 authors:
 - Syed Faraaz Ahmad