brick 1.0.19 → 1.0.22

data/lib/brick.rb

@@ -102,14 +102,34 @@ module Brick
     end
 
     def get_bts_and_hms(model)
-      model.reflect_on_all_associations.each_with_object([{}, {}]) do |a, s|
+      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)
+
         case a.macro
         when :belongs_to
           s.first[a.foreign_key] = [a.name, a.klass]
-        when :has_many, :has_one
+        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
+      # Mark has_manys that go to an associative ("join") table so that they are skipped in the UI,
+      # as well as any possible polymorphic associations
+      skip_hms = {}
+      associatives = hms.each_with_object({}) do |hmt, s|
+        if (through = hmt.last.options[:through])
+          skip_hms[through] = nil
+          s[hmt.first] = hms[through] # End up with a hash of HMT names pointing to join-table associations
+        elsif hmt.last.inverse_of.nil?
+          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 do |k, _v|
+        puts hms.delete(k).inspect
+      end
+      [bts, hms, associatives]
     end
 
     # Switches Brick auto-models on or off, for all threads
@@ -217,6 +237,12 @@ module Brick
       end
     end
 
+    # Skip showing counts for these specific has_many associations when building auto-generated #index views
+    # @api public
+    def skip_index_hms=(value)
+      Brick.config.skip_index_hms = value
+    end
+
     # Associations to treat as a has_one
     # @api public
     def has_ones=(hos)
@@ -398,9 +424,7 @@ ActiveSupport.on_load(:active_record) do
               end
 
               result = result.map do |attributes|
-                values = klass.initialize_attributes(attributes).values
-
-                columns.zip(values).map do |column, value|
+                columns.zip(klass.initialize_attributes(attributes).values).map do |column, value|
                   column.type_cast(value)
                 end
               end

data/lib/generators/brick/install_generator.rb

@@ -58,24 +58,24 @@ module Brick
         end
 
         bar = case possible_additional_references.length
-      when 0
+              when 0
 +"# Brick.additional_references = [['orders', 'customer_id', 'customer'],
 #                                ['customer', 'region_id', 'regions']]"
-      when 1
-        +"# # Here is a possible additional reference that has been auto-identified for the #{ActiveRecord::Base.connection.current_database} database:
+              when 1
++"# # Here is a possible additional reference that has been auto-identified for the #{ActiveRecord::Base.connection.current_database} database:
 # Brick.additional_references = [[#{possible_additional_references.first}]"
-      else
-        +"# # Here are possible additional references that have been auto-identified for the #{ActiveRecord::Base.connection.current_database} database:
+              else
++"# # Here are possible additional references that have been auto-identified for the #{ActiveRecord::Base.connection.current_database} database:
 # Brick.additional_references = [
 #   #{possible_additional_references.join(",\n#   ")}
 # ]"
-      end
+              end
       if resembles_fks.length > 0
         bar << "\n# # Columns named somewhat like a foreign key which you may want to consider:
 # #   #{resembles_fks.join(', ')}"
       end
 
-        create_file filename, "# frozen_string_literal: true
+      create_file(filename, "# frozen_string_literal: true
 
 # # Settings for the Brick gem
 # # (By default this auto-creates models, controllers, views, and routes on-the-fly.)
@@ -111,11 +111,16 @@ module Brick
 # # to be the primary key.)
 #{bar}
 
-# # Skip creating a has_many association for these
+# # Skip creating a has_many association for these (only retain the belongs_to built from this additional_reference).
 # # (Uses the same exact three-part format as would define an additional_reference)
 # # Say for instance that we didn't care to display the favourite colours that users have:
 # Brick.exclude_hms = [['users', 'favourite_colour_id', 'colours']]
 
+# # Skip showing counts for these specific has_many associations when building auto-generated #index views.
+# # When there are related tables with a significant number of records, this can lessen the load on the database
+# # considerably, sometimes fixing what might appear to be an index page that just \"hangs\" for no apparent reason.
+Brick.skip_index_hms = ['User.litany_of_woes']
+
 # # By default primary tables involved in a foreign key relationship will indicate a \"has_many\" relationship pointing
 # # back to the foreign table.  In order to represent a \"has_one\" association instead, an override can be provided
 # # using the primary model name and the association name which you instead want to have treated as a \"has_one\":
@@ -159,7 +164,7 @@ module Brick
 # Brick.default_route_fallback = 'customers' # This defaults to \"customers/index\"
 # Brick.default_route_fallback = 'orders/outstanding' # Example of a non-RESTful route
 # Brick.default_route_fallback = '' # Omits setting a default route in the absence of any other
-"
+")
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.19
+  version: 1.0.22
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-09 00:00:00.000000000 Z
+date: 2022-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -221,6 +221,7 @@ files:
 - lib/brick/frameworks/rails/controller.rb
 - lib/brick/frameworks/rails/engine.rb
 - lib/brick/frameworks/rspec.rb
+- lib/brick/join_array.rb
 - lib/brick/serializers/json.rb
 - lib/brick/serializers/yaml.rb
 - lib/brick/util.rb