brick 1.0.17 → 1.0.20

data/lib/brick.rb

@@ -102,14 +102,37 @@ 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|
+        # So that we can map an association name to any special alias name used in an AREL query
+        ans = (model._assoc_names[a.name] ||= [])
+        next if !const_defined?(a.name.to_s.singularize.camelize) && ::Brick.config.exclude_tables.include?(a.plural_name)
+
+        ans << a.klass unless ans.include?(a.klass)
         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
@@ -254,6 +277,17 @@ module Brick
         ars.each { |fk| ::Brick._add_bt_and_hm(fk[0..2]) }
         @_additional_references_loaded = true
       end
+
+      # Find associative tables that can be set up for has_many :through
+      ::Brick.relations.each do |_key, tbl|
+        tbl_cols = tbl[:cols].keys
+        fks = tbl[:fks].each_with_object({}) { |fk, s| s[fk.last[:fk]] = [fk.last[:assoc_name], fk.last[:inverse_table]] if fk.last[:is_bt]; s }
+        # Aside from the primary key and the metadata columns created_at, updated_at, and deleted_at, if this table only has
+        # foreign keys then it can act as an associative table and thus be used with has_many :through.
+        if fks.length > 1 && (tbl_cols - fks.keys - (::Brick.config.metadata_columns || []) - (tbl[:pkey].values.first || [])).length.zero?
+          fks.each { |fk| tbl[:hmt_fks][fk.first] = fk.last }
+        end
+      end
     end
 
 

data/lib/generators/brick/install_generator.rb

@@ -18,7 +18,7 @@ module Brick
     desc 'Generates an initializer file for configuring Brick'
 
     def create_initializer_file
-      unless File.exists?(filename = 'config/initializers/brick.rb')
+      unless File.exist?(filename = 'config/initializers/brick.rb')
         # See if we can make suggestions for additional_references
         resembles_fks = []
         possible_additional_references = (relations = ::Brick.relations).each_with_object([]) do |v, s|
@@ -47,7 +47,7 @@ module Brick
               if (relations.fetch(f_table = col_down, nil) ||
                  relations.fetch(f_table = ActiveSupport::Inflector.pluralize(col_down), nil)) &&
                  # Looks pretty promising ... just make sure a model file isn't present
-                 !File.exists?("app/models/#{ActiveSupport::Inflector.singularize(v.first)}.rb")
+                 !File.exist?("app/models/#{ActiveSupport::Inflector.singularize(v.first)}.rb")
                 s << "['#{v.first}', '#{col}', '#{f_table}']"
               else
                 resembles_fks << "#{v.first}.#{col}"
@@ -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.)
@@ -159,7 +159,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.17
+  version: 1.0.20
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-27 00:00:00.000000000 Z
+date: 2022-04-29 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