brick 1.0.15 → 1.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2dbd4fef7ab5c2796e75a0bce86316be00ebceb02aa5a0b8053f75b27d433c57
-  data.tar.gz: daa2802b2fec6533ccfed8fa9178129c6633f92b83fb092fefa48a657cb36e9b
+  metadata.gz: 30eeeb5fb81003f790234885589b29f227b7f4f2d498accb07da5cd8ea425084
+  data.tar.gz: 1841386c2750c2aef744a7ee555b649e2fc0298367684d261faf64297b8430c0
 SHA512:
-  metadata.gz: 33f97461748561fb21900ccb1b4b39c13803e68e04fea807851b467587907577a10bd5b5a2470cde5f50bca019d3cc986b512545bf700477028f68751bb95e6a
-  data.tar.gz: 97605afbe32e2509800f510ca2984651cc196c048a6267fa31d65363815bc6f4484955aacd45fae1553fe70453f1bee283766812a2f92678bc35e516ec594738
+  metadata.gz: 64c5747800aaa5469f2ff2b0be3ae5056fa383c6d246e7aff15b19eb4a588e15e72f5d1ecb384879b3b7f175cab28961fb4984e11d5994085b215f442d722389
+  data.tar.gz: ec3418092244d97b3006086aaf0484ee1ab4342cf2c16716239f7127c8e23056dc25e1714e51523bdb8f87fb6b88c322dabefb096fe7bf0b1f695568b636d4b8

data/lib/brick/extensions.rb

@@ -176,25 +176,27 @@ module ActiveRecord
   end
 end
 
-module ActiveSupport::Dependencies
-  class << self
-    # %%% Probably a little more targeted than other approaches we've taken thusfar
-    # This happens before the whole parent check
-    alias _brick_autoload_module! autoload_module!
-    def autoload_module!(*args)
-      into, const_name, qualified_name, path_suffix = args
-      if (base_class = ::Brick.config.sti_namespace_prefixes&.fetch("::#{into.name}::", nil)&.constantize)
-        ::Brick.sti_models[qualified_name] = { base: base_class }
-        # Build subclass and place it into the specially STI-namespaced module
-        into.const_set(const_name.to_sym, klass = Class.new(base_class))
-        # %%% used to also have:  autoload_once_paths.include?(base_path) || 
-        autoloaded_constants << qualified_name unless autoloaded_constants.include?(qualified_name)
-        klass
-      elsif (base_class = ::Brick.config.sti_namespace_prefixes&.fetch("::#{const_name}", nil)&.constantize)
-        # Build subclass and place it into Object
-        Object.const_set(const_name.to_sym, klass = Class.new(base_class))
-      else
-        _brick_autoload_module!(*args)
+if ActiveSupport::Dependencies.respond_to?(:autoload_module!) # %%% Only works with previous non-zeitwerk auto-loading
+  module ActiveSupport::Dependencies
+    class << self
+      # %%% Probably a little more targeted than other approaches we've taken thusfar
+      # This happens before the whole parent check
+      alias _brick_autoload_module! autoload_module!
+      def autoload_module!(*args)
+        into, const_name, qualified_name, path_suffix = args
+        if (base_class = ::Brick.config.sti_namespace_prefixes&.fetch("::#{into.name}::", nil)&.constantize)
+          ::Brick.sti_models[qualified_name] = { base: base_class }
+          # Build subclass and place it into the specially STI-namespaced module
+          into.const_set(const_name.to_sym, klass = Class.new(base_class))
+          # %%% used to also have:  autoload_once_paths.include?(base_path) || 
+          autoloaded_constants << qualified_name unless autoloaded_constants.include?(qualified_name)
+          klass
+        elsif (base_class = ::Brick.config.sti_namespace_prefixes&.fetch("::#{const_name}", nil)&.constantize)
+          # Build subclass and place it into Object
+          Object.const_set(const_name.to_sym, klass = Class.new(base_class))
+        else
+          _brick_autoload_module!(*args)
+        end
       end
     end
   end
@@ -333,7 +335,6 @@ class Object
             singular_table_name = ActiveSupport::Inflector.singularize(assoc[:inverse_table])
             macro = if assoc[:is_bt]
                       # Try to take care of screwy names if this is a belongs_to going to an STI subclass
-                      # binding.pry if assoc[:fk] == 'issue_severity_id'
                       if (primary_class = assoc.fetch(:primary_class, nil)) &&
                          (sti_inverse_assoc = primary_class.reflect_on_all_associations.find { |a| a.macro == :has_many && a.options[:class_name] == self.name && assoc[:fk] = a.foreign_key })
                         assoc_name = sti_inverse_assoc.options[:inverse_of].to_s || assoc_name
@@ -403,12 +404,13 @@ class Object
             fks.each do |fk|
               source = nil
               this_hmt_fk = if fks.length > 1
-                              singular_assoc_name = ActiveSupport::Inflector.singularize(fk.first[:inverse][:assoc_name])
+                              singular_assoc_name = fk.first[:inverse][:assoc_name].singularize
                               source = fk.last
-                              through = ActiveSupport::Inflector.pluralize(fk.first[:alternate_name])
+                              through = fk.first[:alternate_name].pluralize
                               "#{singular_assoc_name}_#{hmt_fk}"
                             else
-                              through = fk.first[:assoc_name]
+                              source = fk.last unless hmt_fk.singularize == fk.last
+                              through = fk.first[:assoc_name].pluralize
                               hmt_fk
                             end
               code << "  has_many :#{this_hmt_fk}, through: #{(assoc_name = through.to_sym).to_sym.inspect}#{", source: :#{source}" if source}\n"

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

@@ -90,7 +90,6 @@ module Brick
 
                 schema_options = ::Brick.db_schemas.each_with_object(+'') { |v, s| s << "<option value=\"#{v}\">#{v}</option>" }.html_safe
                 hms_columns = +'' # Used for 'index'
-                # puts skip_hms.inspect
                 hms_headers = hms.each_with_object([]) do |hm, s|
                   next if skip_hms.key?(hm.last.name)
 
@@ -270,7 +269,7 @@ function changeout(href, param, value) {
     <% if (collection = @#{obj_name}.first.#{hm_name}).empty? %>
       <tr><td>(none)</td></tr>
     <% else %>
-      <% collection.order(#{pk.inspect}).uniq.each do |#{hm_singular_name = hm_name.singularize}| %>
+      <% collection.order(#{pk.inspect}).uniq.each do |#{hm_singular_name = hm_name.singularize.underscore}| %>
         <tr><td><%= link_to(#{hm_singular_name}.brick_descrip, #{hm_singular_name}_path(#{hm_singular_name}.#{pk})) %></td></tr>
       <% end %>
     <% end %>

data/lib/brick/version_number.rb

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

data/lib/generators/brick/install_generator.rb

@@ -94,7 +94,7 @@ module Brick
 # # Any tables or views you'd like to skip when auto-creating models
 # Brick.exclude_tables = ['custom_metadata', 'version_info']
 
-# # Class for auto-generated models to inherit from
+# # Class that auto-generated models should inherit from
 # Brick.models_inherit_from = ApplicationRecord
 
 # # When table names have specific prefixes automatically place them in their own module with a table_name_prefix.

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
 platform: ruby
 authors:
 - Lorin Thwaits