brick 1.0.182 → 1.0.184

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 390cb3f8a466f1d94c0e8e7472017753fb09f8c9909a71134545e25b47edfb21
-  data.tar.gz: 9398ee17aa8a5b8741adf784ebde9421f6419f93a421ec0ba5893f028b192383
+  metadata.gz: 78b2c6e3f1da384e5310953f39a9bb08f85bdeabf7d2cf4143e483ad4df9f146
+  data.tar.gz: e3bb0fc597cfb9908a87667b6e785f41dc73337fd834151dd8ce41af8aabca02
 SHA512:
-  metadata.gz: 75c2d9f206d58f5296862fcdec776b3a5daa82e2c7405ff3fa46bf386e61cfac39ddf9cf55d7ab3eb54ddf23434c5086fd99e6d9eca0543ed63d9946892ea140
-  data.tar.gz: 1818e986519622fd6c51c25e0153e003a476c7e823f14ff4cc9aabdf4cfb1adae7fe8f67ff1e9ca1a181694e028aa3b0c985afad8ab88b5c1d839be3aba70ed0
+  metadata.gz: d1f52d74e8feca2255c86423b4108ddad31daa3b49c4f54ae0c25080542e51e1b1a812238ea6313de51c2644f67ac4ab5ad7c9759fbfb535a07e8c3134010f39
+  data.tar.gz: 9b21a929ef26076909595907bfda0d74b73d274bb6442d58eb80beb4b152b6aaf97ec8a8177dc0057df9188dcfde9e9540f1573c6b59ae6be62b40ac0a7541d8

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/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 = 182
+    TINY = 184
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

data/lib/brick.rb

@@ -282,7 +282,7 @@ module Brick
               next
             end
           else
-            this_fks = this_fk.is_a?(Array) ? this_fk : [this_fk.to_s]
+            this_fks = (this_fk = a.foreign_key).is_a?(Array) ? this_fk.uniq : [this_fk.to_s]
             if !a.options.key?(:as) && (this_fks - a.klass.column_names).length.positive?
               options = ", #{a.options.map { |k, v| "#{k.inspect} => #{v.inspect}" }.join(', ')}" if a.options.present?
               puts "WARNING:  Model #{model.name} has this association:
@@ -475,6 +475,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)
@@ -2026,15 +2041,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 +2103,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.182
+  version: 1.0.184
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-14 00:00:00.000000000 Z
+date: 2023-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord