brick 1.0.56 → 1.0.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b696c53c9d9d359d49de147b06b5342820ca230451c860d097f44bcae3b23bb0
-  data.tar.gz: 7b0f6ff365f918a97d64305eabf70fcfe78cf764514ca22b3731b780da04b22c
+  metadata.gz: db41c2288f8bba8f3cb9c5d2d87bacd4806d1f2401ca9709f85de1886b0db377
+  data.tar.gz: 42b0a7b285a3328ce922daa442e15bf994a382ad0bfc5ed8fe4370ae6b779fbb
 SHA512:
-  metadata.gz: 43ab6db28554fb7502d0f03267d2f5bab27d310fb988701d371232f6604090cd679767a12097a7c217401b05e938c787844ae11138a2c8143c1e675b93599656
-  data.tar.gz: 8d2e592ba27bba30e100ea23a2bf951d6f3861c422ef355bad7cd38e146c20c2cf53380aa7ee440f40aa2d111c7f33eadc8dc09f73d1689432fff071e04228c4
+  metadata.gz: b8baacad02f8ba5c0d9bfe11182d8297c817ba46bef250e172f55a0ff949591abcadda790aecc2614515468a4da468415a8a0e62fd2a60232177dcd3cd63ca03
+  data.tar.gz: e84d2573ec0f95b01dfebf681cec409ec66a1e6052abbb59ebd3130728cad71015c51087f484c55e8e30f3b9a3736d3d9262b7d8cdebf23e5ab702035c0dcbfa

data/lib/brick/config.rb

@@ -230,6 +230,11 @@ module Brick
       @mutex.synchronize { @not_nullables = columns }
     end
 
+    # Add status page showing all resources and what files have been built out for them
+    def add_status
+      true
+    end
+
     # Add a special page to show references to non-existent records ("orphans")
     def add_orphans
       true

data/lib/brick/extensions.rb

@@ -646,7 +646,7 @@ Module.class_exec do
                full_class_name << "::#{self.name}" unless self == Object
                full_class_name << "::#{plural_class_name.underscore.singularize.camelize}"
                if (plural_class_name == 'BrickSwagger' ||
-                  (::Brick.config.add_orphans && plural_class_name == 'BrickGem') ||
+                  ((::Brick.config.add_status || ::Brick.config.add_orphans) && plural_class_name == 'BrickGem') ||
                   model = self.const_get(full_class_name))
                  # if it's a controller and no match or a model doesn't really use the same table name, eager load all models and try to find a model class of the right name.
                  Object.send(:build_controller, self, class_name, plural_class_name, model, relations)
@@ -667,45 +667,11 @@ Module.class_exec do
              elsif ::Brick.enable_models?
                # Custom inheritable Brick base model?
                class_name = (inheritable_name = class_name)[5..-1] if class_name.start_with?('Brick')
-               # See if a file is there in the same way that ActiveSupport::Dependencies#load_missing_constant
-               # checks for it in ~/.rvm/gems/ruby-2.7.5/gems/activesupport-5.2.6.2/lib/active_support/dependencies.rb
-
-               if (base_model = ::Brick.config.sti_namespace_prefixes&.fetch("::#{base_module.name}::", nil)&.constantize) || # Are we part of an auto-STI namespace? ...
-                  base_module != Object # ... or otherwise already in some namespace?
-                 schema_name = [(singular_schema_name = name.underscore),
-                                (schema_name = singular_schema_name.pluralize),
-                                name,
-                                name.pluralize].find { |s| Brick.db_schemas.include?(s) }
-               end
-               plural_class_name = ActiveSupport::Inflector.pluralize(model_name = class_name)
-               # If it's namespaced then we turn the first part into what would be a schema name
-               singular_table_name = ActiveSupport::Inflector.underscore(model_name).gsub('/', '.')
-
-               if base_model
-                 schema_name = name.underscore # For the auto-STI namespace models
-                 table_name = base_model.table_name
-                 Object.send(:build_model, base_module, inheritable_name, model_name, singular_table_name, table_name, relations, table_name)
-               else
-                 # Adjust for STI if we know of a base model for the requested model name
-                 # %%% Does not yet work with namespaced model names.  Perhaps prefix with plural_class_name when doing the lookups here.
-                 table_name = if (base_model = ::Brick.sti_models[model_name]&.fetch(:base, nil) || ::Brick.existing_stis[model_name]&.constantize)
-                                base_model.table_name
-                              else
-                                ActiveSupport::Inflector.pluralize(singular_table_name)
-                              end
-                 if ::Brick.apartment_multitenant &&
-                    Apartment.excluded_models.include?(table_name.singularize.camelize)
-                   schema_name = Apartment.default_schema
-                 end
-                 # Maybe, just maybe there's a database table that will satisfy this need
-                 if (matching = [table_name, singular_table_name, plural_class_name, model_name].find { |m| relations.key?(schema_name ? "#{schema_name}.#{m}" : m) })
-                   Object.send(:build_model, schema_name, inheritable_name, model_name, singular_table_name, table_name, relations, matching)
-                 end
-               end
+               Object.send(:build_model, relations, base_module, name, class_name, inheritable_name)
              end
     if result
       built_class, code = result
-      puts "\n#{code}"
+      puts "\n#{code}\n"
       built_class
     elsif ::Brick.config.sti_namespace_prefixes&.key?("::#{class_name}") && !schema_name
 #         module_prefixes = type_name.split('::')
@@ -727,7 +693,42 @@ class Object
 
   private
 
-    def build_model(schema_name, inheritable_name, model_name, singular_table_name, table_name, relations, matching)
+    def build_model(relations, base_module, base_name, class_name, inheritable_name = nil)
+      if (base_model = ::Brick.config.sti_namespace_prefixes&.fetch("::#{base_module.name}::", nil)&.constantize) || # Are we part of an auto-STI namespace? ...
+         base_module != Object # ... or otherwise already in some namespace?
+        schema_name = [(singular_schema_name = base_name.underscore),
+                       (schema_name = singular_schema_name.pluralize),
+                       base_name,
+                       base_name.pluralize].find { |s| Brick.db_schemas.include?(s) }
+      end
+      plural_class_name = ActiveSupport::Inflector.pluralize(model_name = class_name)
+      # If it's namespaced then we turn the first part into what would be a schema name
+      singular_table_name = ActiveSupport::Inflector.underscore(model_name).gsub('/', '.')
+
+      if base_model
+        schema_name = base_name.underscore # For the auto-STI namespace models
+        table_name = base_model.table_name
+        build_model_worker(base_module, inheritable_name, model_name, singular_table_name, table_name, relations, table_name)
+      else
+        # Adjust for STI if we know of a base model for the requested model name
+        # %%% Does not yet work with namespaced model names.  Perhaps prefix with plural_class_name when doing the lookups here.
+        table_name = if (base_model = ::Brick.sti_models[model_name]&.fetch(:base, nil) || ::Brick.existing_stis[model_name]&.constantize)
+                       base_model.table_name
+                     else
+                       ActiveSupport::Inflector.pluralize(singular_table_name)
+                     end
+        if ::Brick.apartment_multitenant &&
+           Apartment.excluded_models.include?(table_name.singularize.camelize)
+          schema_name = Apartment.default_schema
+        end
+        # Maybe, just maybe there's a database table that will satisfy this need
+        if (matching = [table_name, singular_table_name, plural_class_name, model_name].find { |m| relations.key?(schema_name ? "#{schema_name}.#{m}" : m) })
+          build_model_worker(schema_name, inheritable_name, model_name, singular_table_name, table_name, relations, matching)
+        end
+      end
+    end
+
+    def build_model_worker(schema_name, inheritable_name, model_name, singular_table_name, table_name, relations, matching)
       if ::Brick.apartment_multitenant &&
          schema_name == Apartment.default_schema
         relation = relations["#{schema_name}.#{matching}"]
@@ -893,7 +894,7 @@ class Object
             end
           end
         end
-        code << "end # model #{full_name}\n\n"
+        code << "end # model #{full_name}\n"
       [built_model, code]
     end
 
@@ -1002,6 +1003,9 @@ class Object
         # Brick-specific pages
         case plural_class_name
         when 'BrickGem'
+          self.define_method :status do
+            instance_variable_set(:@resources, ::Brick.get_status_of_resources)
+          end
           self.define_method :orphans do
             instance_variable_set(:@orphans, ::Brick.find_orphans(::Brick.set_db_schema(params)))
           end
@@ -1255,7 +1259,7 @@ class Object
             # Get column names for params from relations[model.table_name][:cols].keys
           end
         # end
-        code << "end # #{namespace_name}#{class_name}\n\n"
+        code << "end # #{namespace_name}#{class_name}\n"
       end # class definition
       [built_controller, code]
     end
@@ -1680,6 +1684,59 @@ module Brick
       assoc_bt[:inverse] = assoc_hm
     end
 
+    # Identify built out routes, migrations, models,
+    # (and also soon controllers and views!)
+    # for each resource
+    def get_status_of_resources
+      rails_root = ::Rails.root.to_s
+      migrations = if Dir.exist?(mig_path = ActiveRecord::Migrator.migrations_paths.first || "#{rails_root}/db/migrate")
+                     Dir["#{mig_path}/**/*.rb"].each_with_object(Hash.new { |h, k| h[k] = [] }) do |v, s|
+                       File.read(v).split("\n").each do |line|
+                         # For all non-commented lines, look for any that have "create_table", "alter_table", or "drop_table"
+                         if !line.lstrip.start_with?('#') &&
+                            (idx = (line.index('create_table ') || line.index('create_table('))&.+(13)) ||
+                            (idx = (line.index('alter_table ') || line.index('alter_table('))&.+(12)) ||
+                            (idx = (line.index('drop_table ') || line.index('drop_table('))&.+(11))
+                           tbl = line[idx..-1].match(/([:'"\w\.]+)/)&.captures&.first
+                           if tbl
+                             s[tbl.tr(':\'"', '').pluralize] << v
+                             break
+                           end
+                         end
+                       end
+                     end
+                   end
+      if ::ActiveSupport.version < ::Gem::Version.new('6') ||
+         ::Rails.configuration.instance_variable_get(:@autoloader) == :classic
+        Rails.configuration.eager_load_namespaces.select { |ns| ns < Rails::Application }.each(&:eager_load!)
+      else
+        Zeitwerk::Loader.eager_load_all
+      end
+      abstract_activerecord_bases = ActiveRecord::Base.descendants.select { |ar| ar.abstract_class? }.map(&:name)
+      # abstract_activerecord_bases << ActiveRecord::Base
+      models = if Dir.exist?(model_path = "#{rails_root}/app/models")
+                 Dir["#{model_path}/**/*.rb"].each_with_object({}) do |v, s|
+                   File.read(v).split("\n").each do |line|
+                     # For all non-commented lines, look for any that start with "class " and also "< ApplicationRecord"
+                     if line.lstrip.start_with?('class') && (idx = line.index('class'))
+                       model = line[idx + 5..-1].match(/[\s:]+([\w:]+)/)&.captures&.first
+                       if model && abstract_activerecord_bases.exclude?(model)
+                         klass = begin
+                                   model.constantize
+                                 rescue
+                                 end
+                         s[model.underscore.tr('/', '.').pluralize] = [
+                           v.start_with?(rails_root) ? v[rails_root.length + 1..-1] : v,
+                           klass
+                         ]
+                       end
+                     end
+                   end
+                 end
+               end
+      ::Brick.relations.keys.map { |v| [(r = v.pluralize), (model = models[r])&.last&.table_name || v, migrations&.fetch(r, nil), model&.first] }
+    end
+
     # Locate orphaned records
     def find_orphans(multi_schema)
       is_default_schema = multi_schema&.==(Apartment.default_schema)

data/lib/brick/frameworks/rails/engine.rb

@@ -56,6 +56,7 @@ module Brick
             # Used by Rails 5.0 and above
             alias :_brick_template_exists? :template_exists?
             def template_exists?(*args, **options)
+              (::Brick.config.add_status && args.first == 'status') ||
               (::Brick.config.add_orphans && args.first == 'orphans') ||
               _brick_template_exists?(*args, **options) ||
               # Do not auto-create a template when it's searching for an application.html.erb, which comes in like:  ["edit", ["games", "application"]]
@@ -96,11 +97,12 @@ module Brick
                        @_brick_model ||
                        (ActionView.version < ::Gem::Version.new('5.0') && args[1].is_a?(Array) ? set_brick_model(args) : nil)
                      )&.name) ||
+                     (is_status = ::Brick.config.add_status && args[0..1] == ['status', ['brick_gem']]) ||
                      (is_orphans = ::Brick.config.add_orphans && args[0..1] == ['orphans', ['brick_gem']])
                 return _brick_find_template(*args, **options)
               end
 
-              unless is_orphans
+              unless is_status || is_orphans
                 pk = @_brick_model._brick_primary_key(::Brick.relations.fetch(model_name, nil))
                 obj_name = model_name.split('::').last.underscore
                 path_obj_name = model_name.underscore.tr('/', '_')
@@ -708,6 +710,53 @@ if (headerTop) {
 
 #{"<hr><%= link_to \"New #{obj_name}\", new_#{path_obj_name}_path %>" unless @_brick_model.is_view?}
 #{script}"
+
+                       when 'status'
+# Status page - list of all resources and 5 things they do or don't have present, and what is turned on and off
+# Must load all models, and then find what table names are represented
+# Easily could be multiple files involved (STI for instance)
++"#{css}
+<p style=\"color: green\"><%= notice %></p>#{"
+<select id=\"schema\">#{schema_options}</select>" if ::Brick.config.schema_behavior[:multitenant] && ::Brick.db_schemas.length > 1}
+<select id=\"tbl\">#{table_options}</select>
+<h1>Status</h1>
+<table id=\"status\"><thead><tr>
+  <th>Resource</th>
+  <th>Table</th>
+  <th>Migration</th>
+  <th>Model</th>
+  <th>Route</th>
+  <th>Controller</th>
+  <th>Views</th>
+</tr></thead>
+<tbody>
+<% # (listing in schema.rb)
+   # Solid colour if file or route entry is present
+  @resources.each do |r|
+  %>
+  <tr>
+  <td><%= link_to(r[0], \"/#\{r[0].tr('.', '/')}\") %></td>
+  <td<%= if r[1]
+           ' class=\"orphan\"' unless ::Brick.relations.key?(r[1])
+         else
+           ' class=\"dimmed\"'
+         end&.html_safe %>><%= # Table
+          r[1] %></td>
+  <td<%= ' class=\"dimmed\"'.html_safe unless r[2] %>><%= # Migration
+          r[2]&.join('<br>')&.html_safe %></td>
+  <td<%= ' class=\"dimmed\"'.html_safe unless r[3] %>><%= # Model
+          r[3] %></td>
+  <td<%= ' class=\"dimmed\"'.html_safe unless r[4] %>><%= # Route
+               %></td>
+  <td<%= ' class=\"dimmed\"'.html_safe unless r[5] %>><%= # Controller
+               %></td>
+  <td<%= ' class=\"dimmed\"'.html_safe unless r[6] %>><%= # Views
+               %></td>
+  <tr>
+<% end %>
+</tbody><table>
+#{script}"
+
                        when 'orphans'
                          if is_orphans
 +"#{css}

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 56
+    TINY = 59
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

data/lib/brick.rb

@@ -484,6 +484,9 @@ In config/initializers/brick.rb appropriate entries would look something like:
               send(:resources, controller_name.to_sym, **options)
             end
           end
+          if ::Brick.config.add_status && instance_variable_get(:@set).named_routes.names.exclude?(:brick_status)
+            get('/brick_status', to: 'brick_gem#status', as: 'brick_status')
+          end
           if ::Brick.config.add_orphans && instance_variable_get(:@set).named_routes.names.exclude?(:brick_orphans)
             get('/brick_orphans', to: 'brick_gem#orphans', as: 'brick_orphans')
           end

data/lib/generators/brick/migrations_generator.rb

@@ -5,12 +5,14 @@ require 'rails/generators/active_record'
 require 'fancy_gets'
 
 module Brick
-  # Auto-generates migrations
+  # Auto-generates migration files
   class MigrationsGenerator < ::Rails::Generators::Base
     include FancyGets
     # include ::Rails::Generators::Migration
 
-    # SQL types that are the same as their migration data type name:  text, integer, bigint, date, boolean, decimal, float
+    # Many SQL types are the same as their migration data type name:
+    #   text, integer, bigint, date, boolean, decimal, float
+    # These however are not:
     SQL_TYPES = { 'character varying' => 'string',
                   'character' => 'string', # %%% Need to put in "limit: 1"
                   'xml' => 'text',
@@ -23,15 +25,7 @@ module Brick
                   'smallint' => 'integer' } # %%% Need to put in "limit: 2"
     # (Still need to find what "inet" and "json" data types map to.)
 
-    # # source_root File.expand_path('templates', __dir__)
-    # class_option(
-    #   :with_changes,
-    #   type: :boolean,
-    #   default: false,
-    #   desc: 'Add IMPORT_TEMPLATE to model'
-    # )
-
-    desc 'Auto-generates migrations for an existing database.'
+    desc 'Auto-generates migration files for an existing database.'
 
     def brick_migrations
       # If Apartment is active, see if a default schema to analyse is indicated
@@ -47,11 +41,14 @@ module Brick
       key_type = (ActiveRecord.version < ::Gem::Version.new('5.1') ? 'integer' : 'bigint')
       is_4x_rails = ActiveRecord.version < ::Gem::Version.new('5.0')
       ar_version = "[#{ActiveRecord.version.segments[0..1].join('.')}]" unless is_4x_rails
-      default_mig_path = (mig_path = ActiveRecord::Migrator.migrations_paths.first || "#{::Rails.root}/db/migrate")
-      if Dir.exist?(mig_path)
+      is_insert_versions = true
+      is_delete_versions = false
+      versions_to_delete_or_append = nil
+      if Dir.exist?(mig_path = ActiveRecord::Migrator.migrations_paths.first || "#{::Rails.root}/db/migrate")
         if Dir["#{mig_path}/**/*.rb"].present?
           puts "WARNING: migrations folder #{mig_path} appears to already have ruby files present."
           mig_path2 = "#{::Rails.root}/tmp/brick_migrations"
+          is_insert_versions = false unless mig_path == mig_path2
           if Dir.exist?(mig_path2)
             if Dir["#{mig_path2}/**/*.rb"].present?
               puts "As well, temporary folder #{mig_path2} also has ruby files present."
@@ -59,10 +56,15 @@ module Brick
               mig_path2 = gets_list(list: ['Cancel operation!', "Append migration files into #{mig_path} anyway", mig_path, mig_path2])
               return if mig_path2.start_with?('Cancel')
 
+              existing_mig_files = Dir["#{mig_path2}/**/*.rb"]
+              if (is_insert_versions = mig_path == mig_path2)
+                versions_to_delete_or_append = existing_mig_files.map { |ver| ver.split('/').last.split('_').first }
+              end
               if mig_path2.start_with?('Append migration files into ')
                 mig_path2 = mig_path
               else
-                Dir["#{mig_path2}/**/*.rb"].each { |rb| File.delete(rb) }
+                is_delete_versions = true
+                existing_mig_files.each { |rb| File.delete(rb) }
               end
             else
               puts "Using temporary folder #{mig_path2} for created migration files.\n\n"
@@ -82,13 +84,20 @@ module Brick
 
       # Generate a list of tables that can be chosen
       chosen = gets_list(list: tables, chosen: tables.dup)
+      schemas = chosen.each_with_object({}) do |v, s|
+        if (v_parts = v.split('.')).length > 1
+          s[v_parts.first] = nil unless [::Brick.default_schema, 'public'].include?(v_parts.first)
+        end
+      end
       # Start the timestamps back the same number of minutes from now as expected number of migrations to create
-      current_mig_time = Time.now - chosen.length.minutes
+      current_mig_time = Time.now - (schemas.length + chosen.length).minutes
       done = []
       fks = {}
       stuck = {}
       indexes = {} # Track index names to make sure things are unique
-      versions = [] # Resulting versions to be used when updating the schema_migrations table
+      built_schemas = {} # Track all built schemas so we can place an appropriate drop_schema command only in the first
+                         # migration in which that schema is referenced, thereby allowing rollbacks to function properly.
+      versions_to_create = [] # Resulting versions to be used when updating the schema_migrations table
       # Start by making migrations for fringe tables (those with no foreign keys).
       # Continue layer by layer, creating migrations for tables that reference ones already done, until
       # no more migrations can be created.  (At that point hopefully all tables are accounted for.)
@@ -113,20 +122,28 @@ module Brick
                         end
           end
           schema = if (tbl_parts = tbl.split('.')).length > 1
-                     if tbl_parts.first == 'public'
+                     if tbl_parts.first == (::Brick.default_schema || 'public')
                        tbl_parts.shift
                        nil
                      else
                        tbl_parts.first
                      end
                    end
+          unless schema.blank? || built_schemas.key?(schema)
+            mig = +"  def change\n    create_schema(:#{schema}) unless schema_exists?(:#{schema})\n  end\n"
+            migration_file_write(mig_path, "create_db_schema_#{schema}", current_mig_time += 1.minute, ar_version, mig)
+            built_schemas[schema] = nil
+          end
+
           # %%% For the moment we're skipping polymorphics
           fkey_cols = relation[:fks].values.select { |assoc| assoc[:is_bt] && !assoc[:polymorphic] }
-          mig = +"class Create#{(full_table_name = tbl_parts.join('_')).camelize} < ActiveRecord::Migration#{ar_version}\n"
+          # If the primary key is also used as a foreign key, will need to do  id: false  and then build out
+          # a column definition which includes :primary_key -- %%% also using a data type of bigserial or serial
+          # if this one has come in as bigint or integer.
+          pk_is_also_fk = fkey_cols.any? { |assoc| pkey_cols&.first == assoc[:fk] } ? pkey_cols&.first : nil
           # Support missing primary key (by adding:  ,id: false)
-          # also integer / uuid / other non-standard data types for primary key
-          id_option = unless (pkey_col_first = relation[:cols][pkey_cols&.first]&.first) == key_type
-                        unless pkey_cols&.present?
+          id_option = if pk_is_also_fk || (pkey_col_first = relation[:cols][pkey_cols&.first]&.first) != key_type
+                        if pk_is_also_fk || !pkey_cols&.present?
                           ', id: false'
                         else
                           case pkey_col_first
@@ -156,22 +173,12 @@ module Brick
           end
           # Refer to this table name as a symbol or dotted string as appropriate
           tbl_code = tbl_parts.length == 1 ? ":#{tbl_parts.first}" : "'#{tbl}'"
-          mig << "  def change\n    return unless reverting? || !table_exists?(#{tbl_code})\n\n"
-          mig << "    create_schema :#{schema} unless schema_exists?(:#{schema})\n" if schema
+          mig = +"  def change\n    return unless reverting? || !table_exists?(#{tbl_code})\n\n"
           mig << "    create_table #{tbl_code}#{id_option} do |t|\n"
           possible_ts = [] # Track possible generic timestamps
           add_fks = [] # Track foreign keys to add after table creation
           relation[:cols].each do |col, col_type|
-            next if !id_option&.end_with?('id: false') && pkey_cols.include?(col)
-
-            # See if there are generic timestamps
-            if (sql_type = SQL_TYPES[col_type.first]) == 'timestamp' &&
-               ['created_at','updated_at'].include?(col)
-              possible_ts << [col, !col_type[3]]
-              next
-            end
-
-            sql_type ||= col_type.first
+            sql_type = SQL_TYPES[col_type.first] || col_type.first
             suffix = col_type[3] ? +', null: false' : +''
             if !is_4x_rails && klass && (comment = klass.columns_hash.fetch(col, nil)&.comment)&.present?
               suffix << ", comment: #{comment.inspect}"
@@ -201,7 +208,14 @@ module Brick
                 mig << "      t.references :#{fk[:assoc_name]}#{suffix}, foreign_key: { to_table: #{to_table} }\n"
               end
             else
-              mig << emit_column(sql_type, col, suffix)
+              next if !id_option&.end_with?('id: false') && pkey_cols.include?(col)
+
+              # See if there are generic timestamps
+              if sql_type == 'timestamp' && ['created_at','updated_at'].include?(col)
+                possible_ts << [col, !col_type[3]]
+              else
+                mig << emit_column(sql_type, col, suffix)
+              end
             end
           end
           if possible_ts.length == 2 && # Both created_at and updated_at
@@ -212,6 +226,11 @@ module Brick
             possible_ts.each { |ts| emit_column('timestamp', ts.first, nil) }
           end
           mig << "    end\n"
+          if pk_is_also_fk
+            mig << "    reversible do |dir|\n"
+            mig << "      dir.up { execute('ALTER TABLE #{tbl} ADD PRIMARY KEY (#{pk_is_also_fk})') }\n"
+            mig << "    end\n"
+          end
           add_fks.each do |add_fk|
             is_commented = false
             # add_fk[2] holds the inverse relation
@@ -221,17 +240,16 @@ module Brick
               # No official PK, but if coincidentally there's a column of the same name, take a chance on it
               pk = (add_fk[2][:cols].key?(add_fk[1]) && add_fk[1]) || '???'
             end
-            #                                                            to_table               column
+            #                                                                 to_table               column
             mig << "    #{'# ' if is_commented}add_foreign_key #{tbl_code}, #{add_fk[0]}, column: :#{add_fk[1]}, primary_key: :#{pk}\n"
           end
-          mig << "  end\nend\n"
-          current_mig_time += 1.minute
-          versions << (version = current_mig_time.strftime('%Y%m%d%H%M00'))
-          File.open("#{mig_path}/#{version}_create_#{full_table_name}.rb", "w") { |f| f.write mig }
+          mig << "  end\n"
+          versions_to_create << migration_file_write(mig_path, "create_#{tbl_parts.join('_')}", current_mig_time += 1.minute, ar_version, mig)
         end
         done.concat(fringe)
         chosen -= done
       end
+
       stuck_counts = Hash.new { |h, k| h[k] = 0 }
       chosen.each do |leftover|
         puts "Can't do #{leftover} because:\n  #{stuck[leftover].map do |snag|
@@ -250,9 +268,23 @@ module Brick
         }:"
         pp stuck_sorted[0..4]
       else # Successful, and now we can update the schema_migrations table accordingly
-        ActiveRecord::Base.execute_sql("INSERT INTO #{ActiveRecord::Base.schema_migrations_table_name} (version) VALUES #{
-          versions.map { |version| "('#{version}')" }.join(', ')
-        }")
+        unless ActiveRecord::Migration.table_exists?(ActiveRecord::Base.schema_migrations_table_name)
+          ActiveRecord::SchemaMigration.create_table
+        end
+        # Remove to_delete - to_create
+        if ((versions_to_delete_or_append ||= []) - versions_to_create).present? && is_delete_versions
+          ActiveRecord::Base.execute_sql("DELETE FROM #{
+            ActiveRecord::Base.schema_migrations_table_name} WHERE version IN (#{
+            (versions_to_delete_or_append - versions_to_create).map { |vtd| "'#{vtd}'" }.join(', ')}
+          )")
+        end
+        # Add to_create - to_delete
+        if is_insert_versions && ((versions_to_create ||= []) - versions_to_delete_or_append).present?
+          ActiveRecord::Base.execute_sql("INSERT INTO #{
+            ActiveRecord::Base.schema_migrations_table_name} (version) VALUES #{
+            (versions_to_create - versions_to_delete_or_append).map { |vtc| "('#{vtc}')" }.join(', ')
+          }")
+        end
       end
     end
 
@@ -261,5 +293,14 @@ module Brick
     def emit_column(type, name, suffix)
       "      t.#{type.start_with?('numeric') ? 'decimal' : type} :#{name}#{suffix}\n"
     end
+
+    def migration_file_write(mig_path, name, current_mig_time, ar_version, mig)
+      File.open("#{mig_path}/#{version = current_mig_time.strftime('%Y%m%d%H%M00')}_#{name}.rb", "w") do |f|
+        f.write "class #{name.camelize} < ActiveRecord::Migration#{ar_version}\n"
+        f.write mig
+        f.write "end\n"
+      end
+      version
+    end
   end
 end

data/lib/generators/brick/{model_generator.rb → models_generator.rb}

@@ -6,63 +6,71 @@ require 'fancy_gets'
 
 module Brick
   # Auto-generates models, controllers, or views
-  class ModelGenerator < ::Rails::Generators::Base
+  class ModelsGenerator < ::Rails::Generators::Base
     include FancyGets
     # include ::Rails::Generators::Migration
 
-    # # source_root File.expand_path('templates', __dir__)
-    # class_option(
-    #   :with_changes,
-    #   type: :boolean,
-    #   default: false,
-    #   desc: 'Add IMPORT_TEMPLATE to model'
-    # )
-
     desc 'Auto-generates models, controllers, or views.'
 
-    def brick_model
-      # %%% If Apartment is active, ask which schema they want
+    def brick_models
+      # %%% If Apartment is active and there's no schema_to_analyse, ask which schema they want
 
       # Load all models
-      Rails.configuration.eager_load_namespaces.select { |ns| ns < Rails::Application }.each(&:eager_load!)
+      if ::ActiveSupport.version < ::Gem::Version.new('6') ||
+        ::Rails.configuration.instance_variable_get(:@autoloader) == :classic
+        Rails.configuration.eager_load_namespaces.select { |ns| ns < Rails::Application }.each(&:eager_load!)
+      else
+        Zeitwerk::Loader.eager_load_all
+      end
 
       # Generate a list of viable models that can be chosen
       longest_length = 0
       model_info = Hash.new { |h, k| h[k] = {} }
       tableless = Hash.new { |h, k| h[k] = [] }
-      models = ActiveRecord::Base.descendants.reject do |m|
-        trouble = if m.abstract_class?
-                    true
-                  elsif !m.table_exists?
-                    tableless[m.table_name] << m.name
-                    ' (No Table)'
-                  else
-                    this_f_keys = (model_info[m][:f_keys] = m.reflect_on_all_associations.select { |a| a.macro == :belongs_to }) || []
-                    column_names = (model_info[m][:column_names] = m.columns.map(&:name) - [m.primary_key, 'created_at', 'updated_at', 'deleted_at'] - this_f_keys.map(&:foreign_key))
-                    if column_names.empty? && this_f_keys && !this_f_keys.empty?
-                      fk_message = ", although #{this_f_keys.length} foreign keys"
-                      " (No columns#{fk_message})"
-                    end
-                  end
-        # puts "#{m.name}#{trouble}" if trouble&.is_a?(String)
-        trouble
+      existing_models = ActiveRecord::Base.descendants.reject do |m|
+        m.abstract_class? || !m.table_exists? || ::Brick.relations.key?(m.table_name)
       end
+      models = ::Brick.relations.keys.map do |tbl|
+        tbl_parts = tbl.split('.')
+        tbl_parts[-1] = tbl_parts[-1].singularize
+        tbl_parts.join('/').camelize
+      end - existing_models.map(&:name)
       models.sort! do |a, b| # Sort first to separate namespaced stuff from the rest, then alphabetically
-        is_a_namespaced = a.name.include?('::')
-        is_b_namespaced = b.name.include?('::')
+        is_a_namespaced = a.include?('::')
+        is_b_namespaced = b.include?('::')
         if is_a_namespaced && !is_b_namespaced
           1
         elsif !is_a_namespaced && is_b_namespaced
           -1
         else
-          a.name <=> b.name
+          a <=> b
         end
       end
       models.each do |m| # Find longest name in the list for future use to show lists on the right side of the screen
-        if longest_length < (len = m.name.length)
+        if longest_length < (len = m.length)
           longest_length = len
         end
       end
+      chosen = gets_list(list: models, chosen: models.dup)
+      relations = ::Brick.relations
+      chosen.each do |model_name|
+        # If we're in a schema then make sure the module file exists
+        base_module = if (model_parts = model_name.split('::')).length > 1
+                        "::#{model_parts.first}".constantize
+                      else
+                        Object
+                      end
+        _built_model, code = Object.send(:build_model, relations, base_module, base_module.name, model_parts.last)
+        path = ['models']
+        path.concat(model_parts.map(&:underscore))
+        dir = +"#{::Rails.root}/app"
+        path[0..-2].each do |path_part|
+          dir << "/#{path_part}"
+          Dir.mkdir(dir) unless Dir.exists?(dir)
+        end
+        File.open("#{dir}/#{path.last}.rb", 'w') { |f| f.write code }
+      end
+      puts "\n*** Created #{chosen.length} model files under app/models ***"
     end
 
   private

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.56
+  version: 1.0.59
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2022-08-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -239,7 +239,7 @@ files:
 - lib/generators/brick/USAGE
 - lib/generators/brick/install_generator.rb
 - lib/generators/brick/migrations_generator.rb
-- lib/generators/brick/model_generator.rb
+- lib/generators/brick/models_generator.rb
 - lib/generators/brick/templates/add_object_changes_to_versions.rb.erb
 - lib/generators/brick/templates/create_versions.rb.erb
 homepage: https://github.com/lorint/brick