brick 1.0.183 → 1.0.185

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 78c32d3b30786e5d03ea9cbc0decf042a808270fb7dc43809da36604d3fa8586
-  data.tar.gz: 9735242b6967624178bc3ed2d65368f3530fe172a27e1a7554e505d4a3ba9854
+  metadata.gz: d930911e6903179271b74220c325ba024dfebe26f87eec06111772bfe1dd6b39
+  data.tar.gz: fb0767bf7e59c56dffbe1999ee86ca3cefe66040dd26387019f2d45b8776fcd3
 SHA512:
-  metadata.gz: 7fed1dc602b5fa4420670c7cfb923870b8fefa6ae14d61ce8a72597bc29054130eb7c871de9fcfdc06af3a7fd9b7588f4ac2267b846ba92f3c49c0b233d8a640
-  data.tar.gz: c613f387851e56aaa32256cd2d8170293323df3d8f86de200bf1c350b025b516df386ce608c4bef6c8d5905d377a354cf72dc949eda617b2188ed37c441ebbc9
+  metadata.gz: d03584188eaf7ba5a41b37fd80470f6eeb8c166949f4e19f1e2a9ccf958b94d0864c25f16363fbaae1980c36d8e82ec0eacf731cd5bdee97ec819a68be4b9836
+  data.tar.gz: 5fc2966228117b7d35e5370ff64f2f46e85e8bfa8a1a4a4df8732e91fe0e0f4c0a5050cc7b77d44217538a7bc46681a24ebd03d0fc6ff69f483f7a7861f74a38

data/lib/brick/compatibility.rb

@@ -48,10 +48,14 @@ if ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('2.7')
     end
   end
 
-  unless ActiveRecord.const_defined?(:NoDatabaseError) # Generic version of NoDatabaseError for Rails <= 4.0
+  unless ActiveRecord.const_defined?(:NoDatabaseError)
     require 'active_model'
+    require 'active_record/deprecator' if ActiveRecord.version >= Gem::Version.new('7.1.0')
     require 'active_record/errors'
-    class ::ActiveRecord::NoDatabaseError < ::ActiveRecord::StatementInvalid
+    # Generic version of NoDatabaseError for Rails <= 4.0
+    unless ActiveRecord.const_defined?(:NoDatabaseError)
+      class ::ActiveRecord::NoDatabaseError < ::ActiveRecord::StatementInvalid
+      end
     end
   end
 

data/lib/brick/config.rb

@@ -164,6 +164,15 @@ module Brick
       @mutex.synchronize { @additional_references = references }
     end
 
+    # References to disregard when auto-building migrations, models, and seeds
+    def defer_references_for_generation
+      @mutex.synchronize { @defer_references_for_generation }
+    end
+
+    def defer_references_for_generation=(drfg)
+      @mutex.synchronize { @defer_references_for_generation = drfg }
+    end
+
     # Custom columns to add to a table, minimally defined with a name and DSL string
     def custom_columns
       @mutex.synchronize { @custom_columns }

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

@@ -1966,7 +1966,7 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
               def viable_models
                 return _brick_viable_models if ::RailsAdmin::Config.class_variables.include?(:@@system_models)
 
-                brick_models = ::Brick.relations.map { |_k, v| v[:class_name] }
+                brick_models = ::Brick.relations.each_with_object([]) { |rel, s| s << rel.last[:class_name] unless rel.first.is_a?(Symbol) }
 
                 # The original from RailsAdmin (now aliased as _brick_viable_models) loads all classes
                 # in the whole project. This Brick approach is a little more tame.
@@ -1999,7 +1999,7 @@ document.querySelectorAll(\"input, select\").forEach(function (inp) {
           end
 
           RailsAdmin.config do |config|
-            ::Brick.relations.select { |_k, v| v.key?(:isView) }.each do |_k, relation|
+            ::Brick.relations.select { |_k, v| v.is_a?(Hash) && v.key?(:isView) }.each do |_k, relation|
               config.model(relation[:class_name]) do # new_model_class
                 list do
                   sort_by (sort_col = relation[:cols].first.first)

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

@@ -48,7 +48,9 @@ module Brick::Rails::FormBuilder
                    col&.type
                  end
       case (col_type ||= col&.sql_type)
-      when :string, :text, :citext
+      when :string, :text, :citext,
+           :enum # Support for the activerecord-mysql-enum gem
+        spit_out_text_field = nil
         if ::Brick::Rails::FormBuilder.is_bcrypt?(val) # || .readonly?
           is_revert = false
           out << ::Brick::Rails::FormBuilder.hide_bcrypt(val, nil, 1000)
@@ -57,13 +59,20 @@ module Brick::Rails::FormBuilder
             enum_html_options = attr.kind_of?(Enumerize::Multiple) ? html_options.merge({ multiple: true, size: opts.length + 1 }) : html_options
             out << self.select(method.to_sym, [["(No #{method} chosen)", '^^^brick_NULL^^^']] + opts, { value: val || '^^^brick_NULL^^^' }, enum_html_options)
           else
-            out << self.text_field(method.to_sym, html_options)
+            spit_out_text_field = true
+          end
+        elsif col_type == :enum
+          if col.respond_to?(:limit) && col.limit.present?
+            out << self.select(method.to_sym, [["(No #{method} chosen)", '^^^brick_NULL^^^']] + col.limit, { value: val.to_s || '^^^brick_NULL^^^' }, html_options)
+          else
+            spit_out_text_field = true
           end
         else
           template.instance_variable_set(:@_text_fields_present, true)
           out << self.hidden_field(method.to_sym, html_options)
           out << "<trix-editor input=\"#{self.field_id(method)}\"></trix-editor>"
         end
+        out << self.text_field(method.to_sym, html_options) if spit_out_text_field
       when :boolean
         out << self.check_box(method.to_sym)
       when :integer, :decimal, :float

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -162,6 +162,8 @@ module Brick
                                    h[:db_name] = db_name if db_name
                                  end
                                end
+    rescue ActiveRecord::NoDatabaseError
+      {}
     end
 
     def apartment_multitenant
@@ -475,6 +477,21 @@ module Brick
       end
     end
 
+    # References to disregard when auto-building migrations, models, and seeds
+    # @api public
+    def defer_references_for_generation=(drfg)
+      if drfg
+        drfg = [drfg] unless drfg.empty? || drfg.first.is_a?(Array)
+        Brick.config.defer_references_for_generation = drfg
+      end
+    end
+
+    def drfgs
+      (::Brick.config.defer_references_for_generation || []).each_with_object({}) do |drfg, s|
+        s[drfg.first] = [drfg[1..-1]]
+      end
+    end
+
     # Custom columns to add to a table, minimally defined with a name and DSL string.
     # @api public
     def custom_columns=(cust_cols)
@@ -1901,7 +1918,7 @@ module ActiveRecord
       private
 
         # %%% Pretty much have to flat-out replace this guy (I think anyway)
-        # Good with Rails 5.24 through 7 on this
+        # Good with Rails 5.2.4 through 7.1 on this
         # Ransack gem includes Polyamorous which replaces #build in a different way (which we handle below)
         unless Gem::Specification.all_names.any? { |g| g.start_with?('ransack-') }
           def build(associations, base_klass, root = nil, path = '')
@@ -2026,15 +2043,17 @@ end
 
 # Keyword arguments updates for Rails <= 5.2.x and Ruby >= 3.0
 if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Version.new('3.0')
-  admsm = ActionDispatch::MiddlewareStack::Middleware
-  admsm.class_exec do
-    # redefine #build
-    def build(app, **kwargs)
-      if args.length > 1 && args.last.is_a?(Hash)
-        kwargs.merge!(args.pop)
+  if Object.const_defined?('ActionDispatch')
+    admsm = ActionDispatch::MiddlewareStack::Middleware
+    admsm.class_exec do
+      # redefine #build
+      def build(app, **kwargs)
+        if args.length > 1 && args.last.is_a?(Hash)
+          kwargs.merge!(args.pop)
+        end
+        # binding.pry if klass == ActionDispatch::Static # ActionDispatch::Reloader
+        klass.new(app, *args, **kwargs, &block)
       end
-      # binding.pry if klass == ActionDispatch::Static # ActionDispatch::Reloader
-      klass.new(app, *args, **kwargs, &block)
     end
   end
 
@@ -2086,16 +2105,18 @@ if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Ve
     end
   end
 
-  module ActionController::RequestForgeryProtection
-  private
+  if Object.const_defined?('ActionController')
+    module ActionController::RequestForgeryProtection
+    private
 
-    # Creates the authenticity token for the current request.
-    def form_authenticity_token(*args, form_options: {}) # :doc:
-      if method(:masked_authenticity_token).arity == 1
-        masked_authenticity_token(session) # AR <= 4.2 doesn't use form_options
-      else
-        form_options.merge!(args.pop) if args.last.is_a?(Hash)
-        masked_authenticity_token(session, form_options: form_options)
+      # Creates the authenticity token for the current request.
+      def form_authenticity_token(*args, form_options: {}) # :doc:
+        if method(:masked_authenticity_token).arity == 1
+          masked_authenticity_token(session) # AR <= 4.2 doesn't use form_options
+        else
+          form_options.merge!(args.pop) if args.last.is_a?(Hash)
+          masked_authenticity_token(session, form_options: form_options)
+        end
       end
     end
   end

data/lib/generators/brick/migration_builder.rb

@@ -26,11 +26,16 @@ module Brick
                   'SDO_GEOMETRY' => 'geometry',
                   # MSSQL data types
                   'int' => 'integer',
+                  'char' => 'string',
+                  'varchar' => 'string',
                   'nvarchar' => 'string',
                   'nchar' => 'string',
                   'datetime2' => 'timestamp',
                   'bit' => 'boolean',
                   'varbinary' => 'binary',
+                  'tinyint' => 'integer', # %%% Need to put in "limit: 2"
+                  'year' => 'date',
+                  'set' => 'string',
                   # Sqlite data types
                   'TEXT' => 'text',
                   '' => 'string',
@@ -111,8 +116,12 @@ module Brick
         while (fringe = chosen.reject do |tbl|
                           snag_fks = []
                           snags = relations.fetch(tbl, nil)&.fetch(:fks, nil)&.select do |_k, v|
-                            v[:is_bt] && !v[:polymorphic] &&
-                            tbl != v[:inverse_table] && # Ignore self-referencing associations (stuff like "parent_id")
+                            # Skip any foreign keys which should be deferred ...
+                            !Brick.drfgs[tbl]&.any? do |drfg|
+                              drfg[0] == v.fetch(:fk, nil) && drfg[1] == v.fetch(:inverse_table, nil)
+                            end &&
+                            v[:is_bt] && !v[:polymorphic] && # ... and polymorphics ...
+                            tbl != v[:inverse_table] && # ... and self-referencing associations (stuff like "parent_id")
                             !done.include?(v[:inverse_table]) &&
                             ::Brick.config.ignore_migration_fks.exclude?(snag_fk = "#{tbl}.#{v[:fk]}") &&
                             snag_fks << snag_fk

data/lib/generators/brick/seeds_generator.rb

@@ -66,8 +66,12 @@ module Brick
                         tbl = seed_model.table_name
                         snag_fks = []
                         snags = ::Brick.relations.fetch(tbl, nil)&.fetch(:fks, nil)&.select do |_k, v|
-                          v[:is_bt] && !v[:polymorphic] &&
-                          tbl != v[:inverse_table] && # Ignore self-referencing associations (stuff like "parent_id")
+                          # Skip any foreign keys which should be deferred ...
+                          !Brick.drfgs[tbl]&.any? do |drfg|
+                            drfg[0] == v.fetch(:fk, nil) && drfg[1] == v.fetch(:inverse_table, nil)
+                          end &&
+                          v[:is_bt] && !v[:polymorphic] && # ... and polymorphics ...
+                          tbl != v[:inverse_table] && # ... and self-referencing associations (stuff like "parent_id")
                           !done.any? { |done_seed_model| done_seed_model.table_name == v[:inverse_table] } &&
                           ::Brick.config.ignore_migration_fks.exclude?(snag_fk = "#{tbl}.#{v[:fk]}") &&
                           snag_fks << snag_fk
@@ -151,7 +155,7 @@ module Brick
       puts "\n*** Created seeds for #{done.length} models in db/seeds.rb ***"
       if (stuck_sorted = stuck_counts.to_a.sort { |a, b| b.last <=> a.last }).length.positive?
         puts "-----------------------------------------"
-        puts "Unable to create migrations for #{stuck_sorted.length} tables#{
+        puts "Unable to create seeds for #{stuck_sorted.length} tables#{
           ".  Here's the top 5 blockers" if stuck_sorted.length > 5
         }:"
         pp stuck_sorted[0..4]

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.183
+  version: 1.0.185
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-15 00:00:00.000000000 Z
+date: 2023-10-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord