brick 1.0.223 → 1.0.224

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7358b611b9073f3fafe55e9d3ac4b5d19ebba01604607f7aaf51eaa1b514ef6b
-  data.tar.gz: 29adea32add038493e6f65ab1d426b378214861d9e2a61c0892ffee1a65e55bd
+  metadata.gz: 571fea9051ed0e8037ba73f0d3010f22f29b417b6def200fcf63894dced9289e
+  data.tar.gz: 6bace7cf19e59ca209a9b6395a7fce3324e4ca77bf13bd8a21bf7b3f0fe6604a
 SHA512:
-  metadata.gz: c3c21da00d78d98e635c8986c939530fce1f9b18326d4c40c478cb48aa04bd52617c932eea9872f1142180de351d27936f16dd943cc955b3ad714db000800608
-  data.tar.gz: 26ddbd8d7c7378448dadae1cf6d00dad47221fe5059012fc39c0bf6b1b4745ee9fa63f88e76888ff64e873a20d6a4322099817aaadf565a32254cf0e99911dc0
+  metadata.gz: 4ed1f0d0711c39d1174cf3306dd0c698ccc832478c32432eb84ce5a01a704da9fb24e9fda05d2986fe822fe21876aa34de4a0900f5cdacb1255446a74c07b2b9
+  data.tar.gz: 3b77a0656498452157fe25fb3c8c894acb8ee17fad51e6e203123d31d9d108fe59e8a7b1f265e4e168ab82c2d85cf461983079f7e753075d54ac6366d3e6d5e5

data/lib/brick/extensions.rb

@@ -1658,7 +1658,7 @@ class Object
       end
       plural_class_name = ActiveSupport::Inflector.pluralize(model_name = class_name)
       # gsub is so that if it's namespaced then we turn the first part into what would be a schema name
-      singular_table_name = ::Brick.table_name_lookup[model_name] || ActiveSupport::Inflector.underscore(model_name).gsub('/', '.')
+      singular_table_name = ::Brick.table_name_lookup&.fetch(model_name, nil) || ActiveSupport::Inflector.underscore(model_name).gsub('/', '.')
 
       if base_model
         table_name = base_model.table_name
@@ -2518,10 +2518,11 @@ class Object
             code << "  def show\n"
             code << "    #{find_by_name = "find_#{singular_table_name}"}\n"
             code << "  end\n"
+            find_obj = "find_#{singular_table_name}"
             self.define_method :show do
               _schema, @_is_show_schema_list = ::Brick.set_db_schema(params)
               _, singular_table_name = model.real_singular(params)
-              instance_variable_set("@#{singular_table_name}".to_sym, find_obj)
+              instance_variable_set("@#{singular_table_name}".to_sym, send(find_obj))
               add_csp_hash("'unsafe-inline'")
             end
           end
@@ -2614,7 +2615,7 @@ class Object
             self.define_method :edit do
               _schema, @_is_show_schema_list = ::Brick.set_db_schema(params)
               _, singular_table_name = model.real_singular(params)
-              instance_variable_set("@#{singular_table_name}".to_sym, find_obj)
+              instance_variable_set("@#{singular_table_name}".to_sym, send(find_obj))
               add_csp_hash
             end
 
@@ -2642,7 +2643,7 @@ class Object
               end
 
               _, singular_table_name = model.real_singular(params)
-              instance_variable_set("@#{singular_table_name}".to_sym, (obj = find_obj))
+              instance_variable_set("@#{singular_table_name}".to_sym, (obj = send(find_obj)))
               upd_params = send(params_name_sym)
               json_overrides = ::Brick.config.json_columns&.fetch(table_name, nil)
               if model.respond_to?(:devise_modules)
@@ -2688,7 +2689,7 @@ class Object
             code << "  end\n"
             self.define_method :destroy do
               ::Brick.set_db_schema(params)
-              if (obj = find_obj).send(:destroy)
+              if (obj = send(find_obj)).send(:destroy)
                 redirect_to send("#{model._brick_index}_path".to_sym)
               else
                 redirect_to send("#{model._brick_index(:singular)}_path".to_sym, obj)
@@ -2699,11 +2700,11 @@ class Object
           code << "private\n" if pk.present? || is_need_params
 
           if pk.present?
-            code << "  def find_#{singular_table_name}
+            code << "  def #{find_obj}
     id = params[:id]&.split(/[\\/,_]/)
     @#{singular_table_name} = #{model.name}.find(id.is_a?(Array) && id.length == 1 ? id.first : id)
   end\n"
-            self.define_method :find_obj do
+            self.define_method(find_obj) do
               id = if pk.length == 1 # && model.columns_hash[pk.first]&.type == :string
                      params[:id].gsub('^^sl^^', '/')
                    else
@@ -2723,6 +2724,7 @@ class Object
                 model.find(id_simplified)
               end
             end
+            private find_obj
           end
 
           if is_need_params

data/lib/brick/rails/engine.rb

@@ -106,6 +106,16 @@ function linkSchemas() {
           load inflections
         end
         require 'brick/join_array'
+
+        # Load it once at the start for Rails >= 7.2 ...
+        Module.class_exec &::Brick::ADD_CONST_MISSING if ActiveRecord.version >= Gem::Version.new('7.2.0')
+        # ... and also for Rails >= 5.0, whenever the app gets reloaded
+        if ::Rails.application.respond_to?(:reloader)
+          ::Rails.application.reloader.to_prepare { Module.class_exec &::Brick::ADD_CONST_MISSING }
+        else
+          Module.class_exec &::Brick::ADD_CONST_MISSING # Older Rails -- just load at the start
+        end
+
         # Now the Brick initializer since there may be important schema things configured
         if !::Brick.initializer_loaded && File.exist?(brick_initializer = ::Rails.root&.join('config/initializers/brick.rb') || '')
           ::Brick.initializer_loaded = load brick_initializer
@@ -180,12 +190,6 @@ function linkSchemas() {
             ::Brick.established_drf = "/#{::Brick.config.path_prefix}#{action[action.index('#')..-1]}"
           end
         end
-
-        Module.class_exec &::Brick::ADD_CONST_MISSING # Load it once at the start ...
-        # ... and also for Rails >= 5.0, whenever the app gets reloaded
-        if ::Rails.application.respond_to?(:reloader)
-          ::Rails.application.reloader.to_prepare { Module.class_exec &::Brick::ADD_CONST_MISSING }
-        end
       end
 
       # After we're initialized and before running the rest of stuff, put our configuration in place
@@ -632,10 +636,17 @@ window.addEventListener(\"popstate\", linkSchemas);
 
             def path_keys(hm_assoc, fk_name, pk)
               pk.map!(&:to_sym)
-              keys = if fk_name.is_a?(Array) && pk.is_a?(Array) # Composite keys?
-                       fk_name.zip(pk)
+              keys = if hm_assoc.macro == :has_and_belongs_to_many
+                       # %%% Can a HABTM use composite keys?
+                       # (If so then this should be rewritten to do a .zip() )
+                       name_from_other_direction = hm_assoc.klass.reflect_on_all_associations.find { |a| a.join_table == hm_assoc.join_table }&.name
+                       [["#{name_from_other_direction}.#{pk.first}", pk.first]]
                      else
-                       [[fk_name, pk.length == 1 ? pk.first : pk.inspect]]
+                       if fk_name.is_a?(Array) && pk.is_a?(Array) # Composite keys?
+                         fk_name.zip(pk)
+                       else
+                         [[fk_name, pk.length == 1 ? pk.first : pk.inspect]]
+                       end
                      end
               if hm_assoc.options.key?(:as) && !(hmaar = hm_assoc.active_record).abstract_class?
                 poly_type = if hmaar.column_names.include?(hmaar.inheritance_column)
@@ -689,7 +700,14 @@ window.addEventListener(\"popstate\", linkSchemas);
                 skip_klass_hms = ::Brick.config.skip_index_hms[model_name] || {}
                 hms_headers = hms.each_with_object([]) do |hm, s|
                   hm_stuff = [(hm_assoc = hm.last),
-                              "H#{hm_assoc.macro == :has_one ? 'O' : 'M'}#{'T' if hm_assoc.options[:through]}",
+                              "H#{case hm_assoc.macro
+                                  when :has_one
+                                    'O'
+                                  when :has_and_belongs_to_many
+                                    'ABTM'
+                                  else
+                                    'M'
+                                  end}#{'T' if hm_assoc.options[:through]}",
                               (assoc_name = hm.first)]
                   hm_fk_name = if (through = hm_assoc.options[:through])
                                  next unless @_brick_model.instance_methods.include?(through) &&

data/lib/brick/rails/form_builder.rb

@@ -76,8 +76,12 @@ module Brick::Rails::FormBuilder
           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
+        if spit_out_text_field
+          # %%% Need to update the max-width with javascript when page width is adjusted?
+          html_options.merge!(style: 'min-width: 154px;field-sizing: content;') # max-width: auto;
+          out << self.text_field(method.to_sym, html_options)
+        end
+        when :boolean
         out << self.check_box(method.to_sym)
       when :integer, :decimal, :float
         if model.respond_to?(:attribute_types) && (enum_type = model.attribute_types[method]).is_a?(ActiveRecord::Enum::EnumType)

data/lib/brick/rails.rb

@@ -167,7 +167,7 @@ erDiagram
 %>    <%= \"#\{through_name} }o--|| #\{hm_name}\".html_safe %> : \"\"
     <%= \"#{model_short_name} }o..o{ #\{hm_name} : \\\"#\{hm.first}\\\"\".html_safe %><%
      else # has_many
-%>  <%= \"#{model_short_name} ||--o{ #\{hm_name} : \\\"#\{
+%>  <%= \"#{model_short_name} #\{hm.last.macro == :has_and_belongs_to_many ? '}o' : '||'}--o{ #\{hm_name} : \\\"#\{
             hm.first.to_s unless (last_hm = hm.first.to_s).downcase == hm_class.name.underscore.pluralize.tr('/', '_')
           }\\\"\".html_safe %><%
      end %>

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -297,7 +297,7 @@ module Brick
               puts "  due to invalid source #{a.source_reflection_name.inspect}."
               next
             end
-          else
+          elsif a.macro != :has_and_belongs_to_many
             this_fks = (this_fk = a.foreign_key).is_a?(Array) ? this_fk.uniq : [this_fk.to_s]
             if !a.options.key?(:as) && a.klass.table_exists? && (this_fks - a.klass.column_names).length.positive?
               options = ", #{a.options.map { |k, v| "#{k.inspect} => #{v.inspect}" }.join(', ')}" if a.options.present?

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.223
+  version: 1.0.224
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-12-13 00:00:00.000000000 Z
+date: 2024-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -257,7 +257,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: 1.3.6
 requirements: []
-rubygems_version: 3.4.19
+rubygems_version: 3.1.6
 signing_key:
 specification_version: 4
 summary: Create a Rails app from data alone