trains 0.0.15 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 793494738c9807ca77e8f6fa6760d73e65a09928b9ea35be00d19ac95c5fbd74
-  data.tar.gz: 98c93cd01f794a2e64bc00eeffc93d23c57f65226d95cfa74785d0fcfface8a3
+  metadata.gz: d9b0cdd1bee0a6ed5d222184662bb45dced14a141f00c166633ee177c3f83501
+  data.tar.gz: 75132b13c33a5cc68005cdbc6d525dfda2b3d97aad8144cbb923f759c299bd1e
 SHA512:
-  metadata.gz: 8e2367c104b13db5218354dbf84fb52af8a386dfd40a40469b2e8ad41bf85a4ffdb1b3d147da60171c102472024d10202b7fb4650499ec6ef2b0149124f3dc7f
-  data.tar.gz: a95c4312868e0ec5292e8bbed3580ee9abad8c7275e2ed8311f007f03c2d028f3fc9450c9f2e5231d814651a1b3875705230031a1fada3fab1ce341f243b063e
+  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.15'.freeze
+  VERSION = '0.0.17'.freeze
 end

data/lib/trains/visitor/controller.rb

@@ -53,7 +53,7 @@ module Trains
       end
 
       def controller?(parent_class)
-        %w[ActionController::Base ApplicationController].include? parent_class
+        parent_class.include? 'Controller'
       end
 
       def parse_method(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,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: trains
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.17
 platform: ruby
 authors:
 - Syed Faraaz Ahmad