brick 1.0.130 → 1.0.132

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 902948e0d502bc9c1b604f3e99b975ab8c7d42c378888280d84dac6aef2aa7d0
-  data.tar.gz: 82988754dcae3ccc67eb5997531b3fa218ecf364f076ecf221fac201412baff0
+  metadata.gz: '08cc0b19ab0838b667534f4de64f3a7045bf395202a3602981a20ececdc91ab5'
+  data.tar.gz: 4b976489a05bb26c3702746700025c6bad3bb930fc129ae897bc9e1596a50901
 SHA512:
-  metadata.gz: 780184ebc02c020389bc2239e115e885df056fa6895ed32bd35b5315f2e55f86deb679f2966e7290118bc54f4d50478b4240d7d77470d27a5902af22948d83f1
-  data.tar.gz: 39c37a9db2c7c392209491e1609f8ab4c2b64d27371452b60310d326bd462b5e653196697d0faf8f4bf801793400e073bf73f2ed72a38e9c66bd9b8e98d1e778
+  metadata.gz: 580db611d4ab9e2bf7ab0ed62a90940b90a4818619a9a91788802f017845c0aef3c8da1b01ea8a6a87c8e1af8378dc5c0d030396ebebba05d101b46ca0bd4495
+  data.tar.gz: fe876de91852b7213fa4d35b378935c7f18e18ae09ff5058f0d34b32dcb3c802a15d1c2cc79f63f7b5eac4177b7bbbeae43603e55499447cfee9e1d3556f64fa

data/lib/brick/extensions.rb

@@ -670,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
@@ -753,7 +754,8 @@ module ActiveRecord
 
         pri_tbl = hm.active_record
         pri_key = hm.options[:primary_key] || pri_tbl.primary_key
-        unless hm.klass.column_names.include?(pri_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
@@ -874,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')
@@ -1013,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
@@ -1055,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)
@@ -1109,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

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

@@ -3,7 +3,7 @@
 module Brick
   module Rails
     class << self
-      def display_value(col_type, val)
+      def display_value(col_type, val, lat_lng = nil)
         is_mssql_geography = nil
         # Some binary thing that really looks like a Microsoft-encoded WGS84 point?  (With the first two bytes, E6 10, indicating an EPSG code of 4326)
         if col_type == :binary && val && val.length < 31 && (val.length - 6) % 8 == 0 && val[0..5].bytes == [230, 16, 0, 0, 1, 12]
@@ -61,14 +61,19 @@ module Brick
           ::Brick::Rails.display_binary(val)
         else
           if col_type
-            ::Brick::Rails::FormBuilder.hide_bcrypt(val, col_type == :xml)
+            if lat_lng
+              # Create a link to this style of Google maps URL:  https://www.google.com/maps/place/38.7071296+-121.2810649/@38.7071296,-121.2810649,12z
+              "<a href=\"https://www.google.com/maps/place/#{lat_lng.first}+#{lat_lng.last}/@#{lat_lng.first},#{lat_lng.last},12z\" target=\"blank\">#{val}</a>"
+            else
+              ::Brick::Rails::FormBuilder.hide_bcrypt(val, col_type == :xml)
+            end
           else
             '?'
           end
         end
       end
 
-      def display_binary(val)
+      def display_binary(val, max_size = 100_000)
         return unless val
 
         @image_signatures ||= { (+"\xFF\xD8\xFF\xEE").force_encoding('ASCII-8BIT') => 'jpeg',
@@ -94,15 +99,12 @@ module Brick
           val = val[object_start...object_start + real_object_size]
         end
 
-        if (signature = @image_signatures.find { |k, _v| val[0...k.length] == k }) ||
-           (val[0..3] == 'RIFF' && val[8..11] == 'WEBP' && (signature = 'webp'))
-          if val.length < 500_000
-            "<img src=\"data:image/#{signature.last};base64,#{Base64.encode64(val)}\">"
-          else
-            "&lt;&nbsp;#{signature.last} image, #{val.length} bytes&nbsp;>"
-          end
+        if ((signature = @image_signatures.find { |k, _v| val[0...k.length] == k }&.last) ||
+            (val[0..3] == 'RIFF' && val[8..11] == 'WEBP' && binding.local_variable_set(:signature, 'webp'))) &&
+           val.length < max_size
+          "<img src=\"data:image/#{signature.last};base64,#{Base64.encode64(val)}\">"
         else
-          "&lt;&nbsp;Binary, #{val.length} bytes&nbsp;>"
+          "&lt;&nbsp;#{signature ? "#{signature} image" : 'Binary'}, #{val.length} bytes&nbsp;>"
         end
       end
     end
@@ -225,7 +227,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 +627,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
@@ -1635,10 +1638,10 @@ end
     <tr><td colspan=\"2\">(No displayable fields)</td></tr>
   <% end %>
   </table>#{
-  "<%= binary = begin
-                  ::Brick::Rails.display_binary(obj&.blob&.download)&.html_safe
-                rescue
-                end %>" if model_name == 'ActiveStorage::Attachment'}
+  "<%= begin
+         ::Brick::Rails.display_binary(obj&.blob&.download, 500_000)&.html_safe
+       rescue
+       end %>" if model_name == 'ActiveStorage::Attachment'}
 <%  end %>
 
 #{unless args.first == 'new'
@@ -1669,11 +1672,11 @@ 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
-                              ::Brick::Rails.display_binary(obj.send(assoc.name)&.blob&.download)&.html_safe
+                              ::Brick::Rails.display_binary(obj.send(assoc.name)&.blob&.download, 500_000)&.html_safe
                             rescue
                             end
              end

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

@@ -139,8 +139,19 @@ module Brick::Rails::FormTags
           out << if @_brick_monetized_attributes&.include?(col_name)
                    val ? Money.new(val.to_i).format : ''
                  else
+                   lat_lng = if [:float, :decimal].include?(col.type) &&
+                                (
+                                  ((col_name == 'latitude' && obj.respond_to?('longitude') && (lng = obj.send('longitude')) && lng.is_a?(Numeric) && (lat = val)) ||
+                                   (col_name == 'longitude' && obj.respond_to?('latitude') && (lat = obj.send('latitude')) && lat.is_a?(Numeric) && (lng = val))
+                                  ) ||
+                                  ((col_name == 'lat' && obj.respond_to?('lng') && (lng = obj.send('lng')) && lng.is_a?(Numeric) && (lat = val)) ||
+                                   (col_name == 'lng' && obj.respond_to?('lat') && (lat = obj.send('lat')) && lat.is_a?(Numeric) && (lng = val))
+                                  )
+                                )
+                               [lat, lng]
+                             end
                    col_type = col&.sql_type == 'geography' ? col.sql_type : col&.type
-                   ::Brick::Rails.display_value(col_type || col&.sql_type, val).to_s
+                   ::Brick::Rails.display_value(col_type || col&.sql_type, val, lat_lng).to_s
                  end
         elsif cust_col
           data = cust_col.first.map { |cc_part| obj.send(cc_part.last) }

data/lib/brick/version_number.rb

@@ -5,7 +5,7 @@ module Brick
   module VERSION
     MAJOR = 1
     MINOR = 0
-    TINY = 130
+    TINY = 132
 
     # 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

metadata

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