brick 1.0.89 → 1.0.91

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a94d71d50a84c847db5f2c34e5aba600502ecb60d4dc7752dc65ac21f4ffe41b
-  data.tar.gz: 6f337f6220cf5989669497e85da0d4620861b1be6e4a35720a072698d866ebe2
+  metadata.gz: 81eaa518a99452286bdaf1e5ed33b83962ede9f9c6509f0b472fd0fe19a8eceb
+  data.tar.gz: 06f5653ce40eb6ee1568b380cf3063073ac7735add8aab6c5873a343e8018a70
 SHA512:
-  metadata.gz: 703fa83ad63f9da5f4431c05db9fee57843419b62283f92f39b7b4cf9397848177f10f57af7fc03f08cf503a392676adac272a04fe4ae6becbf0e0a5eb62c550
-  data.tar.gz: 686c752bd2ed92de4f12c4afe27389d8a6cced25b47c5a18564c5afdf51199bd148f66ec5636ee8094a0cda5ae1ccafce31bc532a9d7d6a64c4cc968013f6af3
+  metadata.gz: 7e0a678885c927a7a80c8758d265c2ff351f67ea44e8e1b2c128e123df441f4f72a62f775b9785615eeacbdbff99427e9d1590890bdffd06165ae7b2339fe1af
+  data.tar.gz: 7bd3e424225e435bab4517fb14aeaa3ca128041a746aaf413ecdb17a771444c3413f058ff28cc5e303d074fdd7cc7d21ff66f842667c14226d1849e96d4b3a98

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?
@@ -308,9 +309,15 @@ module ActiveRecord
     def self._brick_calculate_bts_hms(translations, join_array)
       # Add any custom columns
       ::Brick.config.custom_columns&.fetch(table_name, nil)&.each do |k, cc|
+        if cc.is_a?(Array)
+          fk_col = cc.last unless cc.last.blank?
+          cc = cc.first
+        else
+          fk_col = true
+        end
         # false = not polymorphic, and true = yes -- please emit_dsl
         pieces, my_dsl = brick_parse_dsl(join_array, [], translations, false, cc, true)
-        _br_cust_cols[k] = [pieces, my_dsl]
+        _br_cust_cols[k] = [pieces, my_dsl, fk_col]
       end
       bts, hms, associatives = ::Brick.get_bts_and_hms(self)
       bts.each do |_k, bt|
@@ -382,6 +389,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
 
@@ -539,6 +563,10 @@ module ActiveRecord
             next
           end
 
+          key_klass = nil
+          key_tbl_name = nil
+          dest_pk = nil
+          key_alias = nil
           cc.first.each do |cc_part|
             dest_klass = cc_part[0..-2].inject(klass) { |kl, cc_part_term| kl.reflect_on_association(cc_part_term).klass }
             tbl_name = (field_tbl_names[k][cc_part.last] ||= shift_or_first(chains[dest_klass])).split('.').last
@@ -551,10 +579,29 @@ module ActiveRecord
                   used_col_aliases.key?(col_alias)
               cc_part_idx -= 1
             end
+            used_col_aliases[col_alias] = nil
+            # Set up custom column links by preparing key_klass and key_alias
+            # (If there are multiple different tables referenced in the DSL, we end up creating a link to the last one)
+            if cc[2] && (dest_pk = dest_klass.primary_key)
+              key_klass = dest_klass
+              key_tbl_name = tbl_name
+              cc_part_idx = cc_part.length - 1
+              while cc_part_idx > 0 &&
+                    (key_alias = "br_cc_#{k}__#{(cc_part[cc_part_idx..-2] + [dest_pk]).map(&:to_s).join('__')}") &&
+                    key_alias != col_alias && # We break out if this key alias does exactly match the col_alias
+                    used_col_aliases.key?(key_alias)
+                cc_part_idx -= 1
+              end
+            end
             selects << "#{tbl_name}.#{cc_part.last} AS #{col_alias}"
             cc_part << col_alias
-            used_col_aliases[col_alias] = nil
           end
+          # Add a key column unless we've already got it
+          if key_alias && !used_col_aliases.key?(key_alias)
+            selects << "#{key_tbl_name}.#{dest_pk} AS #{key_alias}"
+            used_col_aliases[key_alias] = nil
+          end
+          cc[2] = key_alias ? [key_klass, key_alias] : nil
         end
 
         klass._br_bt_descrip.each do |v|
@@ -1058,7 +1105,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))
@@ -1149,7 +1196,7 @@ class Object
       if (base_model = ::Brick.sti_models[full_model_name]&.fetch(:base, nil) || ::Brick.existing_stis[full_model_name]&.constantize)
         is_sti = true
       else
-        base_model = ::Brick.config.models_inherit_from || ActiveRecord::Base
+        base_model = ::Brick.config.models_inherit_from
       end
       hmts = nil
       code = +"class #{full_name} < #{base_model.name}\n"
@@ -1268,7 +1315,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 +1736,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

@@ -19,7 +19,12 @@ module Brick
         ::Brick.exclude_tables = app.config.brick.fetch(:exclude_tables, [])
 
         # Class for auto-generated models to inherit from
-        ::Brick.models_inherit_from = app.config.brick.fetch(:models_inherit_from, ActiveRecord::Base)
+        ::Brick.models_inherit_from = app.config.brick.fetch(:models_inherit_from, nil) ||
+                                      begin
+                                        ::ApplicationRecord
+                                      rescue StandardError => ex
+                                        ::ActiveRecord::Base
+                                      end
 
         # When table names have specific prefixes, automatically place them in their own module with a table_name_prefix.
         ::Brick.table_name_prefixes = app.config.brick.fetch(:table_name_prefixes, [])
@@ -818,7 +823,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 +840,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
@@ -976,7 +990,12 @@ erDiagram
     %><%=  display_value(col_type || col&.sql_type, val) %><%
          elsif cust_col
            data = cust_col.first.map { |cc_part| #{obj_name}.send(cc_part.last) }
-    %><%=  #{model_name}.brick_descrip(cust_col.last, data) %><%
+           cust_txt = #{model_name}.brick_descrip(cust_col[-2], data)
+           if (link_id = #{obj_name}.send(cust_col.last[1]) if cust_col.last)
+    %><%=    link_to(cust_txt, send(\"#\{cust_col.last.first._brick_index(:singular)}_path\", link_id)) %><%
+           else
+    %><%=    cust_txt %><%
+           end
          else # Bad column name!
       %>?<%
          end
@@ -988,7 +1007,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 +1083,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 +1101,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
@@ -1236,7 +1265,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 = 89
+    TINY = 91
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

data/lib/brick.rb

@@ -186,10 +186,10 @@ module Brick
 
     def get_bts_and_hms(model)
       bts, hms = model.reflect_on_all_associations.each_with_object([{}, {}]) do |a, s|
-        next if !a.polymorphic? && (a.klass.nil? || ::Brick.config.exclude_tables.include?(a.klass.table_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)
@@ -205,8 +205,24 @@ module Brick
           else
             s.first[a.foreign_key.to_s] = [a.name, a.klass]
           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
+        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
           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) }

data/lib/generators/brick/install_generator.rb

@@ -139,7 +139,7 @@ module Brick
 # Settings for the Brick gem
 # (By default this auto-creates models, controllers, views, and routes on-the-fly.)
 
-if Object.const_defined?('Brick')
+if ActiveRecord::Base.respond_to?(:brick_select)
   # Mode -- generally :on or :off, or only in :development.  Also available is :diag_env which enables only
   # when the environment variable BRICK is set.
   Brick.mode = :development

metadata

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