brick 1.0.88 → 1.0.90

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9e346878b216d9e54ee0ca15be13ec0c2348f8cdf81d14a1eb4bc24ccb07aadb
-  data.tar.gz: 92b54e7227fad318508104690158b5c756cc37171e7eeaaaba41d7da97c5518f
+  metadata.gz: eca72d418715811a100a44a45b3cd054ca511ed280f1d1a6f344ddaa972c220c
+  data.tar.gz: d712ebb5dedf75da99d8d8720f4b89e29ea2e96b498b4a59540811f5e087231c
 SHA512:
-  metadata.gz: a8797a5e8924e3a89fd958f05d1bd442cf457428257cd697e438e1e6fe93427bc035177cea79fad47c6484427b30d2e3dc778f7a2166bc0fe27d383ce8659c1c
-  data.tar.gz: 0bd6d3cc1ad92a1ec897b1524fde2e3f6849c783705312908d206460f9060677c93c295f3f3b89ddd514e2b3d5faeae4900472b0f4a1419e57e91046a190b3f7
+  metadata.gz: 1b3d3941f4905b7a3ce1489a6f018d958331bd4c2970a5ba5034eb0fb81683febdc8a93562be5a1505afe6d6479fb1ed068a0f21d6ea80f24460e9e9267b8ea3
+  data.tar.gz: c3f61b68cd2ca5790f93b82010909f65913ccecb46df24786c83db362241092824db66833b72f03708560f23b7e87f64f12b180d8e4fb9ababba32bdb9b3f9df

data/lib/brick/extensions.rb

@@ -127,13 +127,14 @@ module ActiveRecord
         if bracket_name
           if ch == ']' # Time to process a bracketed thing?
             parts = bracket_name.split('.')
-            first_parts = parts[0..-2].map do |part|
-              klass = (orig_class = klass).reflect_on_association(part_sym = part.to_sym)&.klass
-              puts "Couldn't reference #{orig_class.name}##{part} that's part of the DSL \"#{dsl}\"." if klass.nil?
-              part_sym
+            first_parts = parts[0..-2].each_with_object([]) do |part, s|
+              unless (klass = (orig_class = klass).reflect_on_association(part_sym = part.to_sym)&.klass)
+                puts "Couldn't reference #{orig_class.name}##{part} that's part of the DSL \"#{dsl}\"."
+                break
+              end
+              s << part_sym
             end
-            parts = prefix + first_parts + [parts[-1]]
-            if parts.length > 1
+            if (parts = prefix + first_parts + [parts[-1]]).length > 1 && klass
               unless is_polymorphic
                 s = build_array
                 parts[0..-3].each { |v| s = s[v.to_sym] }
@@ -141,7 +142,7 @@ module ActiveRecord
               end
               translations[parts[0..-2].join('.')] = klass
             end
-            if klass.column_names.exclude?(parts.last) &&
+            if klass&.column_names.exclude?(parts.last) &&
                (klass = (orig_class = klass).reflect_on_association(possible_dsl = parts.pop.to_sym)&.klass)
               if prefix.empty? # Custom columns start with an empty prefix
                 prefix << parts.shift until parts.empty?
@@ -382,6 +383,23 @@ module ActiveRecord
     end
   end
 
+  module AttributeMethods
+    module ClassMethods
+      alias _brick_dangerous_attribute_method? dangerous_attribute_method?
+      # Bypass the error "ActiveRecord::DangerousAttributeError" if this object comes from a view.
+      # (Allows for column names such as 'attribute', 'delete', and 'update' to still work.)
+      def dangerous_attribute_method?(name)
+        if (is_dangerous = _brick_dangerous_attribute_method?(name)) && is_view?
+          if column_names.include?(name.to_s)
+            puts "WARNING:  Column \"#{name}\" in view #{table_name} conflicts with a reserved ActiveRecord method name."
+          end
+          return false
+        end
+        is_dangerous
+      end
+    end
+  end
+
   class Relation
     attr_reader :_brick_chains, :_arel_applied_aliases
 
@@ -1058,7 +1076,7 @@ Module.class_exec do
     # elsif base_module != Object
     #   module_parent.const_missing(*args)
     elsif Rails.respond_to?(:autoloaders) && # After finding nothing else, if Zeitwerk is enabled ...
-        (Rails::Autoloaders.respond_to?(:zeitwerk_enabled?) ? Rails::Autoloaders.zeitwerk_enabled? : true)
+          (Rails::Autoloaders.respond_to?(:zeitwerk_enabled?) ? Rails::Autoloaders.zeitwerk_enabled? : true)
       self._brick_const_missing(*args) # ... rely solely on Zeitwerk.
     else # Classic mode
       unless (found = base_module._brick_const_missing(*args))
@@ -1268,7 +1286,7 @@ class Object
                                # hm.first[:inverse][:assoc_name].to_sym
                                options[:source] = hm.last.to_sym
                              else
-                               through = hm.first[:alternate_name].pluralize
+                               through = hm.first.fetch(:alternate_chosen_name, hm.first[:alternate_name])
                              end
                              singular_assoc_name = hm.first[:inverse][:assoc_name].singularize
                              "#{singular_assoc_name}_#{hmt_fk}"
@@ -1689,12 +1707,13 @@ class Object
                                    hm_assoc[:alternate_name] != (source || name.underscore)
                                   plural = "#{hm_assoc[:assoc_name]}_#{ActiveSupport::Inflector.pluralize(hm_assoc[:alternate_name])}"
                                   new_alt_name = (hm_assoc[:alternate_name] == name.underscore) ? "#{hm_assoc[:assoc_name].singularize}_#{plural}" : plural
+                                  # %%% In rare cases might even need to add a number at the end for uniqueness
                                   # uniq = 1
                                   # while same_name = relation[:fks].find { |x| x.last[:assoc_name] == hm_assoc[:assoc_name] && x.last != hm_assoc }
                                   #   hm_assoc[:assoc_name] = "#{hm_assoc_name}_#{uniq += 1}"
                                   # end
                                   # puts new_alt_name
-                                  # hm_assoc[:assoc_name] = new_alt_name
+                                  hm_assoc[:alternate_chosen_name] = new_alt_name
                                   [new_alt_name, true]
                                 else
                                   assoc_name = ::Brick.namify(hm_assoc[:inverse_table]).pluralize

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

@@ -818,7 +818,16 @@ erDiagram
                          end # DutyFree data export and import
 # %%% Instead of our current "for Janet Leverling (Employee)" kind of link we previously had this code that did a "where x = 123" thing:
 #   (where <%= @_brick_params.each_with_object([]) { |v, s| s << \"#\{v.first\} = #\{v.last.inspect\}\" }.join(', ') %>)
-+"#{css}
++"<html>
+<head>
+#{css}
+<title>#{model_name} <%
+  if (description = (relation = Brick.relations[#{model_name}.table_name])&.fetch(:description, nil)).present?
+    %> - <%= description
+%><% end
+%></title>
+</head>
+<body>
 <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>
@@ -826,7 +835,7 @@ erDiagram
   <td><h1>#{model_name}</h1></td>
   <td id=\"imgErd\" title=\"Show ERD\"></td>
 </tr></table>#{template_link}<%
-   if (description = (relation = Brick.relations[#{model_name}.table_name])&.fetch(:description, nil)).present? %><%=
+   if description.present? %><%=
      description %><br><%
    end
    # FILTER PARAMETERS
@@ -988,7 +997,10 @@ erDiagram
 </table>
 
 #{"<hr><%= link_to \"New #{obj_name}\", new_#{path_obj_name}_path %>" unless @_brick_model.is_view?}
-#{script}"
+#{script}
+</body>
+</html>
+"
 
                        when 'status'
                          if is_status
@@ -1061,7 +1073,14 @@ erDiagram
                          end
 
                        when 'show', 'new', 'update'
-+"#{css}
++"<html>
+<head>
+#{css}
+<title><%=
+  page_title = (\"#{model_name}: #\{(obj = @#{obj_name})&.brick_descrip || controller_name}\")
+%></title>
+</head>
+<body>
 
 <svg id=\"revertTemplate\" version=\"1.1\" xmlns=\"http://www.w3.org/2000/svg\" xmlns:xlink=\"http://www.w3.org/1999/xlink\"
   width=\"32px\" height=\"32px\" viewBox=\"0 0 512 512\" xml:space=\"preserve\">
@@ -1072,7 +1091,7 @@ erDiagram
 <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>#{model_name}: <%= (obj = @#{obj_name})&.brick_descrip || controller_name %></h1><%
+<h1><%= page_title %></h1><%
 if (description = (relation = Brick.relations[#{model_name}.table_name])&.fetch(:description, nil)) %><%=
   description %><br><%
 end
@@ -1201,7 +1220,8 @@ end
 <%   end %>
 
 #{unless args.first == 'new'
-  confirm_are_you_sure = ActionView.version < ::Gem::Version.new('7.0') ? "data: { confirm: 'Delete #{model_name} -- Are you sure?' }" : "form: { data: { turbo_confirm: 'Delete #{model_name} -- Are you sure?' } }"
+  # Was:  confirm_are_you_sure = ActionView.version < ::Gem::Version.new('7.0') ? "data: { confirm: 'Delete #{model_name} -- Are you sure?' }" : "form: { data: { turbo_confirm: 'Delete #{model_name} -- Are you sure?' } }"
+  confirm_are_you_sure = "data: { confirm: 'Delete #{model_name} -- Are you sure?' }"
   hms_headers.each_with_object(+'') do |hm, s|
     # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
     next if hm.first.options[:through] && !hm.first.through_reflection
@@ -1212,7 +1232,14 @@ end
       s << "<table id=\"#{hm_name}\" class=\"shadow\">
         <tr><th>#{hm[3]}</th></tr>
         <% collection = @#{obj_name}.#{hm_name}
-        collection = collection.is_a?(ActiveRecord::Associations::CollectionProxy) ? collection.order(#{pk.inspect}) : collection.to_a.compact
+        collection = case collection
+                     when ActiveRecord::Associations::CollectionProxy
+                       collection.order(#{pk.inspect})
+                     when ActiveRecord::Base # Object from a has_one
+                       [collection]
+                     else # We get an array back when AR < 4.2
+                       collection.to_a.compact
+                     end
         if collection.empty? %>
           <tr><td>(none)</td></tr>
         <% else %>
@@ -1228,7 +1255,10 @@ end
   "<%= button_to(\"Delete #\{@#{obj_name}.brick_descrip}\", send(\"#\{#{model_name}._brick_index(:singular)}_path\".to_sym, @#{obj_name}), { method: 'delete', class: 'danger', #{confirm_are_you_sure} }) %>"
 end}
 <% end %>
-#{script}"
+#{script}
+</body>
+</html>
+"
 
                        end
               inline << "

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -186,15 +186,15 @@ module Brick
 
     def get_bts_and_hms(model)
       bts, hms = model.reflect_on_all_associations.each_with_object([{}, {}]) do |a, s|
-        next if !const_defined?(a.name.to_s.singularize.camelize) && ::Brick.config.exclude_tables.include?(a.plural_name)
+        next unless a.polymorphic? || (!a.belongs_to? && (through = a.options[:through])) ||
+                    (a.klass && ::Brick.config.exclude_tables.exclude?(a.klass.table_name))
 
-        case a.macro
-        when :belongs_to
+        if a.belongs_to?
           if a.polymorphic?
             rel_poly_bt = relations[model.table_name][:fks].find { |_k, fk| fk[:assoc_name] == a.name.to_s }
             if (primary_tables = rel_poly_bt&.last&.fetch(:inverse_table, [])).is_a?(Array)
               models = primary_tables&.map { |table| table.singularize.camelize.constantize }
-              s.first[a.foreign_key] = [a.name, models, true]
+              s.first[a.foreign_key.to_s] = [a.name, models, true]
             else
               # This will come up when using Devise invitable when invited_by_class_name is not
               # specified because in that circumstance it adds a polymorphic :invited_by association,
@@ -203,10 +203,26 @@ module Brick
               puts "  belongs_to :#{a.name}, polymorphic: true"
             end
           else
-            s.first[a.foreign_key] = [a.name, a.klass]
+            s.first[a.foreign_key.to_s] = [a.name, a.klass]
+          end
+        else # This gets has_many as well as has_one and has_many :through
+          if through
+            is_invalid_source = nil
+            begin
+              if a.through_reflection&.belongs_to?
+                puts "WARNING:  HMT relationship :#{a.name} in model #{model.name} tries to go through belongs_to association :#{through}.  This is not possible."
+                next
+              elsif !a.source_reflection # Had considered:  a.active_record.reflect_on_association(a.source_reflection_name).nil?
+                is_invalid_source = true
+              end
+            rescue
+              is_invalid_source = true
+            end
+            if is_invalid_source
+              puts "WARNING:  HMT relationship :#{a.name} in model #{model.name} has invalid source :#{a.source_reflection_name}."
+              next
+            end
           end
-        when :has_many, :has_one # This gets has_many as well as has_many :through
-          # %%% weed out ones that don't have an available model to reference
           s.last[a.name] = a
         end
       end
@@ -216,13 +232,10 @@ module Brick
       hms.each do |hmt|
         if (through = hmt.last.options[:through])
           # ::Brick.relations[hmt.last.through_reflection.table_name]
-          skip_hms[through] = nil if hms[through] && model.is_brick?
+          skip_hms[through] = nil if hms[through] && model.is_brick? &&
+                                     hmt.last.klass != hmt.last.active_record # Don't pull HMs for HMTs that point back to the same table
           # End up with a hash of HMT names pointing to join-table associations
           model._br_associatives[hmt.first] = hms[through] # || hms["#{(opt = hmt.last.options)[:through].to_s.singularize}_#{opt[:source].to_s.pluralize}".to_sym]
-        elsif hmt.last.inverse_of.nil? && ActiveRecord.version >= ::Gem::Version.new('4.2')
-          puts "SKIPPING #{hmt.last.name.inspect}"
-          # %%% If we don't do this then below associative.name will find that associative is nil
-          skip_hms[hmt.last.name] = nil
         end
       end
       skip_hms.each { |k, _v| hms.delete(k) }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.88
+  version: 1.0.90
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-11-02 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord