brick 1.0.129 → 1.0.131

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3b46bf80d393c0d6e4ffea3e8bfc1fbc03dc667902077efc9a887c8ab046a817
-  data.tar.gz: 927828e46dfd9ae6b7c14aced0f814bbc1d876e5af14aa872a13d2c13af85083
+  metadata.gz: 6e9356edd43a6af6120f30bfbcd520383f3ae700e6ff04be11ebdd3493852ef4
+  data.tar.gz: a099075c53acc9bf29c718043cc619b5ab4f895366f9c7ddd14d53c8f7f432b8
 SHA512:
-  metadata.gz: 49073fb48479c8df6805a35632ef321efa3144556feb1e2da701044ce110aa6cfcb8ced12186408929b8c3d6280ca6e393e886ba54eea87f0a622a58f9216e8e
-  data.tar.gz: eaccf857c54a108c764e786b5e8abd0f54ff5abbcadec558138dc947a5d7e3015fc1a5510a311301947cee815d086018e535a15958357abd3463ab59ee375908
+  metadata.gz: 9f9df598bad9ce128a88f4fe364d568be8c38eee57e595024866d39a255b42f513a26adc68d64d14cdecd4b5d13fb7424935f17df7dbb41c3bda2ae31057a4c7
+  data.tar.gz: 845e5747a916a338ee494426e4ef0ac6fd5c65c3579df0210c8a80468887fac12103407acfbaee3659b3b45763f98ef0bd109935d70920b932b4fd41cc15fdc5

data/lib/brick/extensions.rb

@@ -148,7 +148,8 @@ module ActiveRecord
                 translations[parts[0..-2].join('.')] = klass
               end
               if klass&.column_names.exclude?(parts.last) &&
-                 (klass = (orig_class = klass).reflect_on_association(possible_dsl = parts.pop.to_sym)&.klass)
+                 (klass = (orig_class = klass).reflect_on_association(possible_dsl = parts.last&.to_sym)&.klass)
+                parts.pop
                 if prefix.empty? # Custom columns start with an empty prefix
                   prefix << parts.shift until parts.empty?
                 end
@@ -162,6 +163,7 @@ module ActiveRecord
                 if emit_dsl
                   dsl3 << "[#{prefix[1..-1].map { |p| "#{p.to_s}." }.join if prefix.length > 1}#{bracket_name}]"
                 end
+                parts[-1] = column_names.first if parts[-1].nil? # No primary key to be found?  Grab something to display!
                 members << parts
               end
             end
@@ -231,7 +233,8 @@ module ActiveRecord
                         if this_obj.is_a?(ActiveRecord::Base) && (obj_descrip = this_obj.class.brick_descrip(this_obj))
                           this_obj = obj_descrip
                         end
-                        if this_obj.is_a?(ActiveStorage::Filename) && this_obj.instance_variable_get(:@filename).nil?
+                        if Object.const_defined?('ActiveStorage') && this_obj.is_a?(::ActiveStorage::Filename) &&
+                           this_obj.instance_variable_get(:@filename).nil?
                           this_obj.instance_variable_set(:@filename, '')
                         end
                         this_obj&.to_s || ''
@@ -667,6 +670,7 @@ module ActiveRecord
                          link_back = []
                          # Track polymorphic type field if necessary
                          if hm.source_reflection.options[:as]
+                           # Might be able to simplify as:  hm.source_reflection.type
                            poly_ft = [hm.source_reflection.inverse_of.foreign_type, hmt_assoc.source_reflection.class_name]
                          end
                          # link_back << hm.source_reflection.inverse_of.name
@@ -741,12 +745,21 @@ module ActiveRecord
                          end
                        else
                          fk_col = (inv = hm.inverse_of)&.foreign_key || hm.foreign_key
-                         poly_type = inv.foreign_type if hm.options.key?(:as)
+                         # %%% Might only need hm.type and not the first part :)
+                         poly_type = inv&.foreign_type || hm.type if hm.options.key?(:as)
                          pk = hm.klass.primary_key
                          (pk.is_a?(Array) ? pk.first : pk) || '*'
                        end
         next unless count_column # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
 
+        pri_tbl = hm.active_record
+        pri_key = hm.options[:primary_key] || pri_tbl.primary_key
+        unless hm.active_record.column_names.include?(pri_key)
+          # %%% When this gets hit then if an attempt is made to display the ERD, it might end up being blank
+          nix << k
+          next
+        end
+
         tbl_alias = if is_mysql
                       "`b_r_#{hm.name}`"
                     elsif is_postgres
@@ -754,7 +767,6 @@ module ActiveRecord
                     else
                       "b_r_#{hm.name}"
                     end
-        pri_tbl = hm.active_record
         pri_tbl_name = is_mysql ? "`#{pri_tbl.table_name}`" : "\"#{pri_tbl.table_name.gsub('.', '"."')}\""
         pri_tbl_name = if is_mysql
                          "`#{pri_tbl.table_name}`"
@@ -765,10 +777,10 @@ module ActiveRecord
                        end
         on_clause = []
         hm_selects = if fk_col.is_a?(Array) # Composite key?
-                       fk_col.each_with_index { |fk_col_part, idx| on_clause << "#{tbl_alias}.#{fk_col_part} = #{pri_tbl_name}.#{pri_tbl.primary_key[idx]}" }
+                       fk_col.each_with_index { |fk_col_part, idx| on_clause << "#{tbl_alias}.#{fk_col_part} = #{pri_tbl_name}.#{pri_key[idx]}" }
                        fk_col.dup
                      else
-                       on_clause << "#{tbl_alias}.#{fk_col} = #{pri_tbl_name}.#{pri_tbl.primary_key}"
+                       on_clause << "#{tbl_alias}.#{fk_col} = #{pri_tbl_name}.#{pri_key}"
                        [fk_col]
                      end
         if poly_type
@@ -864,6 +876,12 @@ JOIN (SELECT #{hm_selects.map { |s| "#{'br_t0.' if from_clause}#{s}" }.join(', '
     def brick_list
       pks = klass.primary_key.is_a?(String) ? [klass.primary_key] : klass.primary_key
       selects = pks.each_with_object([]) { |pk, s| s << pk unless s.include?(pk) }
+      # Get foreign keys for anything marked to be auto-preloaded, or a self-referencing JOIN
+      klass_cols = klass.column_names
+      reflect_on_all_associations.each do |a|
+        selects << a.foreign_key if a.belongs_to? && (preload_values.include?(a.name) ||
+                                    (!a.options[:polymorphic] && a.klass == klass && klass_cols.include?(a.foreign_key)))
+      end
       # ActiveStorage compatibility
       selects << 'service_name' if klass.name == 'ActiveStorage::Blob' && ActiveStorage::Blob.columns_hash.key?('service_name')
       selects << 'blob_id' if klass.name == 'ActiveStorage::Attachment' && ActiveStorage::Attachment.columns_hash.key?('blob_id')
@@ -1003,16 +1021,17 @@ Module.class_exec do
     is_controller = requested.end_with?('Controller')
     # self.name is nil when a model name is requested in an .erb file
     if self.name && ::Brick.config.path_prefix
-      camelize_prefix = ::Brick.config.path_prefix.camelize
+      split_self_name.shift if (split_self_name = self.name.split('::')).first.blank?
       # Asking for the prefix module?
+      camelize_prefix = ::Brick.config.path_prefix.camelize
       if self == Object && requested == camelize_prefix
         Object.const_set(args.first, (built_module = Module.new))
         puts "module #{camelize_prefix}; end\n"
         return built_module
-      end
-      split_self_name.shift if (split_self_name = self.name.split('::')).first.blank?
-      if split_self_name.first == camelize_prefix
+      elsif module_parent == Object && self.name == camelize_prefix ||
+            module_parent.name == camelize_prefix && module_parent.module_parent == Object
         split_self_name.shift # Remove the identified path prefix from the split name
+        is_brick_prefix = true
         if is_controller
           brick_root = split_self_name.empty? ? self : camelize_prefix.constantize
         end
@@ -1045,26 +1064,30 @@ Module.class_exec do
                     self
                   end
     # puts "#{self.name} - #{args.first}"
-    desired_classname = (self == Object || !name) ? requested : "#{name}::#{requested}"
-    if ((is_defined = self.const_defined?(args.first)) && (possible = self.const_get(args.first)) &&
-        # Reset `possible` if it's a controller request that's not a perfect match
-        # Was:  (possible = nil)  but changed to #local_variable_set in order to suppress the "= should be ==" warning
-        (possible&.name == desired_classname || (is_controller && binding.local_variable_set(:possible, nil)))) ||
-       # Try to require the respective Ruby file
-       ((filename = ActiveSupport::Dependencies.search_for_file(desired_classname.underscore) ||
-                    (self != Object && ActiveSupport::Dependencies.search_for_file((desired_classname = requested).underscore))
-        ) && (require_dependency(filename) || true) &&
-        ((possible = self.const_get(args.first)) && possible.name == desired_classname)
-       ) ||
-       # If any class has turned up so far (and we're not in the middle of eager loading)
-       # then return what we've found.
-       (is_defined && !::Brick.is_eager_loading) # Used to also have:   && possible != self
-      if ((!brick_root && (filename || possible.instance_of?(Class))) ||
-          (possible.instance_of?(Module) && possible&.module_parent == self) ||
-          (possible.instance_of?(Class) && possible == self)) && # Are we simply searching for ourselves?
-         # Skip when what we found as `possible` is not related to the base class of an STI model
-         (!sti_base || possible.is_a?(sti_base))
-        return possible
+    # Unless it's a Brick prefix looking for a TNP that should create a module ...
+    unless (is_tnp_module = (is_brick_prefix && !is_controller && ::Brick.config.table_name_prefixes.values.include?(requested)))
+      # ... first look around for an existing module or class.
+      desired_classname = (self == Object || !name) ? requested : "#{name}::#{requested}"
+      if ((is_defined = self.const_defined?(args.first)) && (possible = self.const_get(args.first)) &&
+          # Reset `possible` if it's a controller request that's not a perfect match
+          # Was:  (possible = nil)  but changed to #local_variable_set in order to suppress the "= should be ==" warning
+          (possible&.name == desired_classname || (is_controller && binding.local_variable_set(:possible, nil)))) ||
+         # Try to require the respective Ruby file
+         ((filename = ActiveSupport::Dependencies.search_for_file(desired_classname.underscore) ||
+                      (self != Object && ActiveSupport::Dependencies.search_for_file((desired_classname = requested).underscore))
+          ) && (require_dependency(filename) || true) &&
+          ((possible = self.const_get(args.first)) && possible.name == desired_classname)
+         ) ||
+         # If any class has turned up so far (and we're not in the middle of eager loading)
+         # then return what we've found.
+         (is_defined && !::Brick.is_eager_loading) # Used to also have:   && possible != self
+        if ((!brick_root && (filename || possible.instance_of?(Class))) ||
+            (possible.instance_of?(Module) && possible&.module_parent == self) ||
+            (possible.instance_of?(Class) && possible == self)) && # Are we simply searching for ourselves?
+           # Skip when what we found as `possible` is not related to the base class of an STI model
+           (!sti_base || possible.is_a?(sti_base))
+          return possible
+        end
       end
     end
     class_name = ::Brick.namify(requested)
@@ -1099,7 +1122,7 @@ Module.class_exec do
                                    (plural_class_name = class_name.pluralize)].find { |s| Brick.db_schemas&.include?(s) }&.camelize ||
                                   (::Brick.config.sti_namespace_prefixes&.key?("::#{class_name}::") && class_name) ||
                                   (::Brick.config.table_name_prefixes.values.include?(class_name) && class_name))
-               return self.const_get(schema_name) if self.const_defined?(schema_name)
+               return self.const_get(schema_name) if !is_tnp_module && self.const_defined?(schema_name)
 
                # Build out a module for the schema if it's namespaced
                # schema_name = schema_name.camelize
@@ -1869,7 +1892,7 @@ class Object
               # Convert any Filename objects with nil into an empty string so that #encode can be called on them
               new_obj.serializable_hash.each do |k, v|
                 new_obj.send("#{k}=", ActiveStorage::Filename.new('')) if v.is_a?(ActiveStorage::Filename) && !v.instance_variable_get(:@filename)
-              end
+              end if Object.const_defined?('ActiveStorage')
             end
             instance_variable_set("@#{singular_table_name}".to_sym, new_obj)
           end
@@ -2441,7 +2464,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
         singular = rel_name.last
       end
       name_parts = if (tnp = ::Brick.config.table_name_prefixes
-                                    .find { |k1, _v1| singular.start_with?(k1) && singular.length > k1.length }
+                                    &.find { |k1, _v1| singular.start_with?(k1) && singular.length > k1.length }
                       ).present?
                      v[:auto_prefixed_schema] = tnp.first
                      v[:resource] = rel_name.last[(tnp_length = tnp.first.length)..-1]

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

@@ -225,7 +225,7 @@ function linkSchemas() {
                                       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, {})
+        ::Brick.config.table_name_prefixes ||= app.config.brick.fetch(:table_name_prefixes, {})
 
         # Columns to treat as being metadata for purposes of identifying associative tables for has_many :through
         ::Brick.metadata_columns = app.config.brick.fetch(:metadata_columns, ['created_at', 'updated_at', 'deleted_at'])
@@ -625,6 +625,7 @@ window.addEventListener(\"popstate\", linkSchemas);
                 if (class_name = (resource_parts = resource_name.split('/')).last&.singularize)
                   resource_parts[-1] = class_name # Make sure the last part, defining the class name, is singular
                   begin
+                    resource_parts.shift if resource_parts.first == ::Brick.config.path_prefix
                     if (model = Object.const_get(resource_parts.map(&:camelize).join('::')))&.is_a?(Class) && (
                          ['index', 'show'].include?(find_args.first) || # Everything has index and show
                          # Only CUD stuff has create / update / destroy
@@ -652,7 +653,9 @@ window.addEventListener(\"popstate\", linkSchemas);
                             else
                               hm_assoc.active_record.name
                             end
-                keys << [hm_assoc.inverse_of.foreign_type, poly_type]
+                # %%% Might only need hm_assoc.type and not the first part :)
+                type_col = hm_assoc.inverse_of&.foreign_type || hm_assoc.type
+                keys << [type_col, poly_type]
               end
               keys.to_h
             end
@@ -1667,7 +1670,7 @@ end
         <% if (assoc = @#{obj_name}.class.reflect_on_association(:#{hm_name})).macro == :has_one &&
               assoc.options&.fetch(:through, nil).nil?
              # In order to apply DSL properly, evaluate this HO the other way around as if it were as a BT
-             collection = assoc.klass.where(assoc.foreign_key => @#{obj_name}.#{pk})
+             collection = assoc.klass.where(assoc.foreign_key => #{pk.is_a?(String) ? "@#{obj_name}.#{pk}" : pk.map { |pk_part| "@#{obj_name}.#{pk_part}" }.inspect})
              collection = collection.instance_exec(&assoc.scopes.first) if assoc.scopes.present?
              if assoc.klass.name == 'ActiveStorage::Attachment'
                br_descrip = begin

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -125,6 +125,7 @@ if Gem::Specification.all_names.any? { |g| g.start_with?('rails-') }
 end
 module Brick
   ALL_API_ACTIONS = [:index, :show, :create, :update, :destroy]
+  CURRENCY_SYMBOLS = '$£¢₵€₠ƒ¥₿₩₪₹₫₴₱₲₳₸₺₼₽៛₡₢₣₤₥₦₧₨₭₮₯₰₶₷₻₾'
 
   class << self
     def sti_models
@@ -200,9 +201,20 @@ module Brick
     end
 
     def get_bts_and_hms(model)
+      model_cols = model.columns_hash
+      pk_type = if (mpk = model.primary_key).is_a?(Array)
+                  # Composite keys should really use:  model.primary_key.map { |pk_part| model_cols[pk_part].type }
+                  model_cols[mpk.first].type
+                else
+                  mpk && model_cols[mpk].type
+                end
       bts, hms = model.reflect_on_all_associations.each_with_object([{}, {}]) do |a, s|
+        # %%% The time will come when we will support type checking of composite foreign keys!
+        # binding.pry if a.foreign_key.is_a?(Array)
         next unless a.polymorphic? || (!a.belongs_to? && (through = a.options[:through])) ||
-                    (a.klass && ::Brick.config.exclude_tables.exclude?(a.klass.table_name))
+                    (a.klass && ::Brick.config.exclude_tables.exclude?(a.klass.table_name) &&
+                     (!a.belongs_to? || model_cols[a.foreign_key]&.type == pk_type)
+                    )
 
         if a.belongs_to?
           if a.polymorphic?
@@ -239,6 +251,15 @@ module Brick
               puts "WARNING:  HMT relationship :#{a.name} in model #{model.name} has invalid source :#{a.source_reflection_name}."
               next
             end
+          else
+            if !a.options.key?(:as) && a.klass.column_names.exclude?(a.foreign_key)
+              options = ", #{a.options.map { |k, v| "#{k.inspect} => #{v.inspect}" }.join(', ')}" if a.options.present?
+              puts "WARNING:  Model #{model.name} has this association:
+            has_many :#{a.name}#{options}
+          which expects column #{a.foreign_key} to exist in table #{a.klass.table_name}.  This column is missing."
+              next
+
+            end
           end
           s.last[a.name] = a
         end
@@ -1661,7 +1682,8 @@ module ActiveRecord
               relation.brick_links[link_path] = if child.table.is_a?(Arel::Nodes::TableAlias)
                                                   child.table.right
                                                 else
-                                                  result.first&.left&.table_alias || child.table_name
+                                                  # Was:  result.first&.left&.table_alias || child.table_name
+                                                  child.table.table_alias || child.table_name
                                                 end
             end
             result

metadata

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