brick 1.0.84 → 1.0.86

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07b4deda161c3a94822dd4c953d1c3983eb7c4eeed3106c7037a5f6b5c006f9d
-  data.tar.gz: bd5bcd1255bd5e3c13da8abca6bc9b73b5cd17880f90bbbb6b3b6e01c7f9331d
+  metadata.gz: 67cdd41b9c4a3a235e4d88a151149a7c2c9345a4280efe31c3fbd983b65fbdd4
+  data.tar.gz: 12f80d33a0360cfa67fb703ed59b65b9216cafa07a18d9283baf9df584067896
 SHA512:
-  metadata.gz: 0da12600c16ad515c1be1129940eba12e99754afebb206784384084dfee66c657ee2e6c9319f3b8f5d3a57c42f0f501ae55d967dd51b3f12b608579f98b5141d
-  data.tar.gz: 75a9e6de7852fb5aab7c6b7a4a72e2e2af733ad18432fe91f04207138e6192dcbc716e5a38e18819d22cfe2370acdd55c87d25e54b49f86493e52b1f3625dfa3
+  metadata.gz: e95aefd208502dfa2ae724d178a29d15ccad4d00522ecbb865019823ba331c0d9f6e4026aea1b634f57f1d7945d8f522e35361d42d9de972698de91c0b9bd129
+  data.tar.gz: 99d0df87ae591bf836f6040aa237863fb1535774cb6fae515bb1c25edd284b4f37d5a1c01584138df81cfbb66a535ef8bec9aaf2550c96a42c02dee7e48aada1

data/lib/brick/compatibility.rb

@@ -10,12 +10,27 @@ unless ActiveRecord.respond_to?(:version)
   end
 end
 
-require 'action_view'
-# Older ActionView didn't have #version
-unless ActionView.respond_to?(:version)
-  module ActionView
+# ActiveSupport, ActionPack, and ActionView before 4.0 didn't have #version
+unless ActiveSupport.respond_to?(:version)
+  module ActiveSupport
     def self.version
-      ActionPack.version
+      ::Gem::Version.new(ActiveSupport::VERSION::STRING)
+    end
+  end
+end
+if Object.const_defined?('ActionPack')
+  unless ActionPack.respond_to?(:version)
+    module ActionPack
+      def self.version
+        ::Gem::Version.new(ActionPack::VERSION::STRING)
+      end
+    end
+  end
+  if Object.const_defined?('ActionView') && !ActionView.respond_to?(:version)
+    module ActionView
+      def self.version
+        ActionPack.version
+      end
     end
   end
 end

data/lib/brick/config.rb

@@ -20,6 +20,23 @@ module Brick
       @serializer = Brick::Serializers::YAML
     end
 
+    def mode
+      @mutex.synchronize do
+        case @brick_mode
+        when nil, :development
+          (::Rails.env == 'development' || ENV.key?('BRICK')) ? :on : nil
+        when :diag_env
+          ENV.key?('BRICK') ? :on : nil
+        else
+          @brick_mode
+        end
+      end
+    end
+
+    def mode=(setting)
+      @mutex.synchronize { @brick_mode = setting unless @brick_mode == :on }
+    end
+
     # Any path prefixing to apply to all auto-generated Brick routes
     def path_prefix
       @mutex.synchronize { @path_prefix }
@@ -31,7 +48,8 @@ module Brick
 
     # Indicates whether Brick models are on or off. Default: true.
     def enable_models
-      @mutex.synchronize { !!@enable_models }
+      brick_mode = mode
+      @mutex.synchronize { brick_mode == :on && (@enable_models.nil? || @enable_models) }
     end
 
     def enable_models=(enable)
@@ -40,7 +58,8 @@ module Brick
 
     # Indicates whether Brick controllers are on or off. Default: true.
     def enable_controllers
-      @mutex.synchronize { !!@enable_controllers }
+      brick_mode = mode
+      @mutex.synchronize { brick_mode == :on && (@enable_controllers.nil? || @enable_controllers) }
     end
 
     def enable_controllers=(enable)
@@ -49,7 +68,8 @@ module Brick
 
     # Indicates whether Brick views are on or off. Default: true.
     def enable_views
-      @mutex.synchronize { !!@enable_views }
+      brick_mode = mode
+      @mutex.synchronize { brick_mode == :on && (@enable_views.nil? || @enable_views) }
     end
 
     def enable_views=(enable)
@@ -58,7 +78,8 @@ module Brick
 
     # Indicates whether Brick routes are on or off. Default: true.
     def enable_routes
-      @mutex.synchronize { !!@enable_routes }
+      brick_mode = mode
+      @mutex.synchronize { brick_mode == :on && (@enable_routes.nil? || @enable_routes) }
     end
 
     def enable_routes=(enable)

data/lib/brick/extensions.rb

@@ -239,7 +239,7 @@ module ActiveRecord
         pk_alias = [pk_alias] unless pk_alias.is_a?(Array)
         id = []
         pk_alias.each do |pk_alias_part|
-          if (pk_part = obj.send(pk_alias_part))
+          if (pk_part = obj.respond_to?(pk_alias_part) ? obj.send(pk_alias_part) : nil)
             id << pk_part
           end
         end
@@ -608,7 +608,11 @@ module ActiveRecord
           # %%% Need to support {user: :profile}
           next unless assoc_name.is_a?(Symbol)
 
-          table_alias = shift_or_first(chains[klass = reflect_on_association(assoc_name)&.klass])
+          table_alias = if (chain = chains[klass = reflect_on_association(assoc_name)&.klass])
+                          shift_or_first(chain)
+                        else
+                          klass.table_name # ActiveRecord < 4.2 can't (yet) use the cool chains thing
+                        end
           _assoc_names[assoc_name] = [table_alias, klass]
         end
       end
@@ -706,7 +710,7 @@ module ActiveRecord
         join_clause = "LEFT OUTER
 JOIN (SELECT #{hm_selects.map { |s| "#{'br_t0.' if from_clause}#{s}" }.join(', ')}, COUNT(#{'DISTINCT ' if hm.options[:through]}#{count_column
           }) AS c_t_ FROM #{from_clause || hm_table_name} GROUP BY #{group_bys.join(', ')}) #{tbl_alias}"
-        joins!("#{join_clause} ON #{on_clause.join(' AND ')}")
+        self.joins_values |= ["#{join_clause} ON #{on_clause.join(' AND ')}"] # Same as:  joins!(...)
       end
       while (n = nix.pop)
         klass._br_hm_counts.delete(n)
@@ -723,7 +727,11 @@ JOIN (SELECT #{hm_selects.map { |s| "#{'br_t0.' if from_clause}#{s}" }.join(', '
             s["#{tbl_name}.#{v_parts.last}"] = v.last
           end
         end
-        where!(wheres2)
+        if respond_to?(:where!)
+          where!(wheres2)
+        else # AR < 4.0
+          self.where_values << build_where(wheres2)
+        end
       end
       # Must parse the order_by and see if there are any symbols which refer to BT associations
       # or custom columns as they must be expanded to find the corresponding b_r_model__column
@@ -747,9 +755,10 @@ JOIN (SELECT #{hm_selects.map { |s| "#{'br_t0.' if from_clause}#{s}" }.join(', '
             selects << v if is_distinct
           end
         end
-        order!(*final_order_by)
+        self.order_values |= final_order_by # Same as:  order!(*final_order_by)
       end
-      limit!(1000) # Don't want to get too carried away just yet
+      # Don't want to get too carried away just yet
+      self.limit_value = 1000 # Same as:  limit!(1000)
       wheres unless wheres.empty? # Return the specific parameters that we did use
     end
 
@@ -766,7 +775,7 @@ JOIN (SELECT #{hm_selects.map { |s| "#{'br_t0.' if from_clause}#{s}" }.join(', '
 
       alias _brick_find_sti_class find_sti_class
       def find_sti_class(type_name)
-        if ::Brick.sti_models.key?(type_name)
+        if ::Brick.sti_models.key?(type_name ||= name)
           _brick_find_sti_class(type_name)
         else
           # This auto-STI is more of a brute-force approach, building modules where needed
@@ -816,6 +825,8 @@ end
 if Object.const_defined?('ActionView')
   module ActionView::Helpers::FormTagHelper
     def link_to_brick(*args, **kwargs)
+      return unless ::Brick.config.mode == :on
+
       text = (args.first.is_a?(String) && args.first) || args[1]
       klass_or_obj = ((args.first.is_a?(ActiveRecord::Relation) ||
                        args.first.is_a?(ActiveRecord::Base) ||
@@ -860,7 +871,7 @@ if Object.const_defined?('ActionView')
                            pk = (klass.primary_key || ActiveRecord::Base.primary_key).to_sym
                            # Used to also have this but it's a bit too permissive to identify a primary key:  (path_params.length == 1 && path_params.values.first) ||
                            if ((id = (path_params[pk] || path_params[:id] || path_params["#{klass.name.underscore}_id".to_sym])) && (obj = klass.find_by(pk => id))) ||
-                              (['show', 'edit'].include?(action_name) && (obj = klass.first))
+                              (['show', 'edit', 'update', 'destroy'].include?(action_name) && (obj = klass.first))
                              obj
                            else
                              # %%% If there is a HMT that refers to some ___id then try to identify an appropriate filter
@@ -933,8 +944,13 @@ if ActiveSupport::Dependencies.respond_to?(:autoload_module!) # %%% Only works w
           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))
+          begin
+            # Attempt to find an existing implementation for this subclass
+            base_class.module_parent.const_get(const_name)
+          rescue
+            # Build subclass and place it in the same module as its parent
+            base_class.module_parent.const_set(const_name.to_sym, klass = Class.new(base_class))
+          end
         else
           _brick_autoload_module!(*args)
         end
@@ -1507,9 +1523,10 @@ class Object
           ordering = params['_brick_order']&.split(',')&.map(&:to_sym) || Object.send(:default_ordering, table_name, pk)
           order_by, _ = model._brick_calculate_ordering(ordering, true) # Don't do the txt part
 
-          @_brick_params = (ar_relation = model.all).brick_select(params, (selects = []), order_by,
-                                                                  translations = {},
-                                                                  join_array = ::Brick::JoinArray.new)
+          ar_relation = ActiveRecord.version < Gem::Version.new('4') ? model.preload : model.all
+          @_brick_params = ar_relation.brick_select(params, (selects = []), order_by,
+                                                             translations = {},
+                                                             join_array = ::Brick::JoinArray.new)
           # %%% Add custom HM count columns
           # %%% What happens when the PK is composite?
           counts = model._br_hm_counts.each_with_object([]) do |v, s|
@@ -1521,7 +1538,8 @@ class Object
                    "b_r_#{v.first}.c_t_ AS \"b_r_#{v.first}_ct\""
                  end
           end
-          instance_variable_set("@#{table_name.pluralize}".to_sym, ar_relation.dup._select!(*selects, *counts))
+          ar_select = ar_relation.respond_to?(:_select!) ? ar_relation.dup._select!(*selects, *counts) : ar_relation.select(selects + counts)
+          instance_variable_set("@#{table_name.pluralize}".to_sym, ar_select)
           if namespace && (idx = lookup_context.prefixes.index(table_name))
             lookup_context.prefixes[idx] = "#{namespace.name.underscore}/#{lookup_context.prefixes[idx]}"
           end
@@ -1633,7 +1651,11 @@ class Object
             code << "  end\n"
             self.define_method :destroy do
               ::Brick.set_db_schema(params)
-              instance_variable_set("@#{singular_table_name}".to_sym, find_obj.send(:destroy))
+              if (obj = find_obj).send(:destroy)
+                redirect_to send("#{model._brick_index}_path".to_sym)
+              else
+                redirect_to send("#{model._brick_index(:singular)}_path".to_sym, obj)
+              end
             end
           end
 
@@ -1732,10 +1754,16 @@ end
 # Get info on all relations during first database connection
 # ==========================================================
 
-module ActiveRecord::ConnectionHandling
+if ActiveRecord.const_defined?('ConnectionHandling')
+  ActiveRecord::ConnectionHandling
+else
+  ActiveRecord::ConnectionAdapters::ConnectionHandler
+end.class_exec do
   alias _brick_establish_connection establish_connection
   def establish_connection(*args)
     conn = _brick_establish_connection(*args)
+    return conn unless ::Brick.config.mode == :on
+
     begin
       # Overwrite SQLite's #begin_db_transaction so it opens in IMMEDIATE mode instead of
       # the default DEFERRED mode.
@@ -1866,7 +1894,7 @@ module ActiveRecord::ConnectionHandling
       case ActiveRecord::Base.connection.adapter_name
       when 'PostgreSQL', 'SQLite' # These bring back a hash for each row because the query uses column aliases
         # schema ||= 'public' if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
-        ActiveRecord::Base.retrieve_schema_and_tables(sql, is_postgres, is_mssql, schema).each do |r|
+        retrieve_schema_and_tables(sql, is_postgres, is_mssql, schema).each do |r|
           # If Apartment gem lists the table as being associated with a non-tenanted model then use whatever it thinks
           # is the default schema, usually 'public'.
           schema_name = if ::Brick.config.schema_behavior[:multitenant]
@@ -1915,7 +1943,7 @@ WHERE c.owner IN (#{::Brick.db_schemas.keys.map { |s| "'#{s}'" }.join(', ')})
 ORDER BY 1, 2, c.internal_column_id, acc.position"
                               ActiveRecord::Base.execute_sql(sql, *ar_tables)
                             else
-                              ActiveRecord::Base.retrieve_schema_and_tables(sql)
+                              retrieve_schema_and_tables(sql)
                             end
 
         schema_and_tables.each do |r|
@@ -2016,6 +2044,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
       end
       ::Brick.is_oracle = true if ActiveRecord::Base.connection.adapter_name == 'OracleEnhanced'
       # ::Brick.default_schema ||= schema ||= 'public' if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+      ::Brick.default_schema ||= 'public' if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
       fk_references&.each do |fk|
         fk = fk.values unless fk.is_a?(Array)
         # Multitenancy makes things a little more general overall, except for non-tenanted tables
@@ -2113,7 +2142,7 @@ ORDER BY 1, 2, c.internal_column_id, acc.position"
               else
                 'schema_migrations'
               end
-    ar_imtn = ActiveRecord.version >= ::Gem::Version.new('5.0') ? ActiveRecord::Base.internal_metadata_table_name : ''
+    ar_imtn = ActiveRecord.version >= ::Gem::Version.new('5.0') ? ActiveRecord::Base.internal_metadata_table_name : 'ar_internal_metadata'
     [ar_smtn, ar_imtn]
   end
 

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

@@ -8,10 +8,16 @@ module Brick
     # `brick_enabled_for_controller`.
     module Controller
       def self.included(controller)
-        controller.before_action(
-          :set_brick_enabled_for_controller,
-          :set_brick_controller_info
-        )
+        if controller.respond_to?(:before_action)
+          controller.before_action(
+            :set_brick_enabled_for_controller,
+            :set_brick_controller_info
+          )
+        else
+          controller.before_filter(
+            :set_brick_enabled_for_controller,
+            :set_brick_controller_info
+          )
       end
 
     protected

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

@@ -103,12 +103,18 @@ module Brick
               unless (model_name = @_brick_model&.name) ||
                      (is_status = ::Brick.config.add_status && args[0..1] == ['status', ['brick_gem']]) ||
                      (is_orphans = ::Brick.config.add_orphans && args[0..1] == ['orphans', ['brick_gem']])
-                if (possible_template = _brick_find_template(*args, **options))
+                if ActionView.version < ::Gem::Version.new('5.0') # %%% Not sure if this should be perhaps 4.2 instead
+                  begin
+                    if (possible_template = _brick_find_template(*args, **options))
+                      return possible_template
+                    end
+                  rescue
+                  end
+                elsif (possible_template = _brick_find_template(*args, **options))
                   return possible_template
-                else
-                  # Used to also have:  ActionView.version < ::Gem::Version.new('5.0') &&
-                  model_name = (args[1].is_a?(Array) ? set_brick_model(args) : nil)&.name
                 end
+                # Used to also have:  ActionView.version < ::Gem::Version.new('5.0') &&
+                model_name = (args[1].is_a?(Array) ? set_brick_model(args) : nil)&.name
               end
 
               if @_brick_model
@@ -154,7 +160,7 @@ module Brick
                                                  'nil'
                                                else
                                                  # Postgres column names are limited to 63 characters
-                                                 "#{obj_name}.#{"b_r_#{assoc_name}_ct"[0..62]} || 0"
+                                                 "#{obj_name}.#{"b_r_#{assoc_name}_ct"[0..62]}&.to_i || 0"
                                                end
                                      ", #{set_ct}, #{path_keys(hm_assoc, hm_fk_name, obj_name, pk)}"
                                    end
@@ -181,10 +187,15 @@ module Brick
                 end
               end
 
-              schema_options = ::Brick.db_schemas.keys.each_with_object(+'') { |v, s| s << "<option value=\"#{v}\">#{v}</option>" }.html_safe
+              apartment_default_schema = ::Brick.apartment_multitenant && Apartment.default_schema
+              schema_options = if ::Brick.apartment_multitenant &&
+                                  (cur_schema = Apartment::Tenant.current) != apartment_default_schema
+                                 "<option selected value=\"#{cur_schema}\">#{cur_schema}</option>"
+                               else
+                                 ::Brick.db_schemas.keys.each_with_object(+'') { |v, s| s << "<option value=\"#{v}\">#{v}</option>" }
+                               end.html_safe
               # %%% If we are not auto-creating controllers (or routes) then omit by default, and if enabled anyway, such as in a development
               # environment or whatever, then get either the controllers or routes list instead
-              apartment_default_schema = ::Brick.apartment_multitenant && Apartment.default_schema
               prefix = "#{::Brick.config.path_prefix}/" if ::Brick.config.path_prefix
               table_options = (::Brick.relations.keys - ::Brick.config.exclude_tables).each_with_object({}) do |tbl, s|
                                 binding.pry if tbl.is_a?(Symbol)
@@ -329,6 +340,10 @@ a.big-arrow {
   color: red;
   white-space: nowrap;
 }
+.danger {
+  background-color: red;
+  color: white;
+}
 
 #revertTemplate {
   display: none;
@@ -446,7 +461,7 @@ var #{table_name}HtColumns;
 // This PageTransitionEvent fires when the page first loads, as well as after any other history
 // transition such as when using the browser's Back and Forward buttons.
 window.addEventListener(\"pageshow\", function() {
-  if (schemaSelect) { // First drop-down is only present if multitenant
+  if (schemaSelect && schemaSelect.options.length > 1) { // First drop-down is only present if multitenant
     brickSchema = changeout(location.href, \"_brick_schema\");
     if (brickSchema) {
       [... document.getElementsByTagName(\"A\")].forEach(function (a) { a.href = changeout(a.href, \"_brick_schema\", brickSchema); });
@@ -910,12 +925,19 @@ erDiagram
              %><%= link_to(\"#\{bt_class} ##\{poly_id}\", send(\"#\{base_class_underscored}_path\".to_sym, poly_id)) if poly_id %><%
            else
              # binding.pry if @_brick_bt_descrip[bt.first][bt[1].first.first].nil?
-             bt_txt = (bt_class = bt[1].first.first).brick_descrip(
+             bt_class = bt[1].first.first
+             descrips = @_brick_bt_descrip[bt.first][bt_class]
+             bt_id_col = if descrips.length == 1
+                           [#{obj_name}.class.reflect_on_association(bt.first)&.foreign_key]
+                         else
+                           descrips.last
+                         end
+             bt_txt = bt_class.brick_descrip(
                # 0..62 because Postgres column names are limited to 63 characters
-               #{obj_name}, (descrips = @_brick_bt_descrip[bt.first][bt_class])[0..-2].map { |id| #{obj_name}.send(id.last[0..62]) }, (bt_id_col = descrips.last)
+               #{obj_name}, descrips[0..-2].map { |id| #{obj_name}.send(id.last[0..62]) }, bt_id_col
              )
              bt_txt ||= \"<span class=\\\"orphan\\\">&lt;&lt; Orphaned ID: #\{val} >></span>\".html_safe if val
-             bt_id = bt_id_col.map { |id_col| #{obj_name}.send(id_col.to_sym) } %>
+             bt_id = bt_id_col&.map { |id_col| #{obj_name}.respond_to?(id_sym = id_col.to_sym) ? #{obj_name}.send(id_sym) : id_col } %>
           <%= bt_id&.first ? link_to(bt_txt, send(\"#\{bt_class.base_class._brick_index(:singular)}_path\".to_sym, bt_id)) : bt_txt %>
         <% end
          elsif (hms_col = hms_cols[col_name])
@@ -1163,6 +1185,7 @@ end
 <%   end %>
 
 #{unless args.first == 'new'
+  confirm_are_you_sure = ActionView.version < ::Gem::Version.new('7.0') ? "data: { confirm: 'Are you sure?' }" : "form: { data: { turbo_confirm: 'Are you sure?' } }"
   hms_headers.each_with_object(+'') do |hm, s|
     # %%% Would be able to remove this when multiple foreign keys to same destination becomes bulletproof
     next if hm.first.options[:through] && !hm.first.through_reflection
@@ -1173,7 +1196,7 @@ end
       s << "<table id=\"#{hm_name}\" class=\"shadow\">
         <tr><th>#{hm[3]}</th></tr>
         <% collection = @#{obj_name}.#{hm_name}
-        collection = collection.is_a?(ActiveRecord::Associations::CollectionProxy) ? collection.order(#{pk.inspect}) : [collection].compact
+        collection = collection.is_a?(ActiveRecord::Associations::CollectionProxy) ? collection.order(#{pk.inspect}) : collection.to_a.compact
         if collection.empty? %>
           <tr><td>(none)</td></tr>
         <% else %>
@@ -1185,7 +1208,8 @@ end
     else
       s
     end
-  end
+  end +
+  "<%= button_to(\"Delete #\{@#{obj_name}.brick_descrip}\", send(\"#\{#{model_name}._brick_index(:singular)}_path\".to_sym, @#{obj_name}), { method: 'delete', class: 'danger', #{confirm_are_you_sure} }) %>"
 end}
 <% end %>
 #{script}"
@@ -1193,7 +1217,7 @@ end}
                        end
               inline << "
 <% if is_includes_dates %>
-<link rel=\"stylesheet\" href=\"https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css\">
+<link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdn.jsdelivr.net/npm/flatpickr/dist/flatpickr.min.css\">
 <style>
 .flatpickr-calendar {
   background: #A0FFA0;
@@ -1207,6 +1231,11 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
 </script>
 <% end %>
 
+<% if false # is_includes_dropdowns %>
+<script src=\"https://cdnjs.cloudflare.com/ajax/libs/slim-select/1.27.1/slimselect.min.js\"></script>
+<link rel=\"stylesheet\" type=\"text/css\" href=\"https://cdnjs.cloudflare.com/ajax/libs/slim-select/1.27.1/slimselect.min.css\">
+<% end %>
+
 <% if true # @_brick_erd
 %>
 <script>

data/lib/brick/util.rb

@@ -84,6 +84,7 @@ module Brick
 
     def self._custom_require_dir
       unless (custom_require_dir = ::Brick::Util.instance_variable_get(:@_custom_require_dir))
+        require 'tmpdir'
         ::Brick::Util.instance_variable_set(:@_custom_require_dir, (custom_require_dir = Dir.mktmpdir))
         # So normal Ruby require will now pick this one up
         $LOAD_PATH.unshift(custom_require_dir)

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -26,27 +26,38 @@ end
 require 'brick/util'
 
 # Allow ActiveRecord < 3.2 to work with Ruby 2.7 and later
-if (ruby_version = ::Gem::Version.new(RUBY_VERSION)) >= ::Gem::Version.new('2.7') &&
-   ActiveRecord.version < ::Gem::Version.new('3.2')
-  # Remove circular reference for "now"
-  ::Brick::Util._patch_require(
-    'active_support/values/time_zone.rb', '/activesupport',
-    ['  def parse(str, now=now)',
-     '  def parse(str, now=now())']
-  )
-  # Remove circular reference for "reflection" for ActiveRecord 3.1
-  if ActiveRecord.version >= ::Gem::Version.new('3.1')
+if (ruby_version = ::Gem::Version.new(RUBY_VERSION)) >= ::Gem::Version.new('2.7')
+  if ActiveRecord.version < ::Gem::Version.new('3.2')
+    # Remove circular reference for "now"
     ::Brick::Util._patch_require(
-      'active_record/associations/has_many_association.rb', '/activerecord',
-      ['reflection = reflection)',
-       'reflection = reflection())'],
-      :HasManyAssociation # Make sure the path for this guy is available to be autoloaded
+      'active_support/values/time_zone.rb', '/activesupport',
+      ['  def parse(str, now=now)',
+      '  def parse(str, now=now())']
     )
+    # Remove circular reference for "reflection" for ActiveRecord 3.1
+    if ActiveRecord.version >= ::Gem::Version.new('3.1')
+      ::Brick::Util._patch_require(
+        'active_record/associations/has_many_association.rb', '/activerecord',
+        ['reflection = reflection)',
+        'reflection = reflection())'],
+        :HasManyAssociation # Make sure the path for this guy is available to be autoloaded
+      )
+    end
   end
+
+  # # Create unfrozen route path in Rails 3.2
+  # if ActiveRecord.version < ::Gem::Version.new('4')
+  #   ::Brick::Util._patch_require(
+  #     'action_dispatch/routing/route_set.rb', '/actiondispatch',
+  #     ["script_name.chomp('/')).to_s",
+  #      "script_name.chomp('/')).to_s.dup"],
+  #     :RouteSet # Make sure the path for this guy is available to be autoloaded
+  #   )
+  # end
 end
 
 # Add left_outer_join! to Associations::JoinDependency and Relation::QueryMethods
-if ActiveRecord.version < ::Gem::Version.new('5')
+if ActiveRecord.version >= ::Gem::Version.new('4') && ActiveRecord.version < ::Gem::Version.new('5')
   ::Brick::Util._patch_require(
     'active_record/associations/join_dependency.rb', '/activerecord', # /associations
       ["def join_constraints(outer_joins)
@@ -126,7 +137,7 @@ module Brick
 
     def set_db_schema(params = nil)
       schema = (params ? params['_brick_schema'] : ::Brick.default_schema)
-      if schema && ::Brick.db_schemas&.key?(schema)
+      chosen = if schema && ::Brick.db_schemas&.key?(schema)
         ActiveRecord::Base.execute_sql("SET SEARCH_PATH = ?;", schema)
         schema
       elsif ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
@@ -135,6 +146,7 @@ module Brick
         # ::Brick.apartment_multitenant && tbl_parts.first == Apartment.default_schema
         (orig_schema - ['pg_catalog']).first
       end
+      chosen == ::Brick.default_schema ? nil : chosen
     end
 
     # All tables and views (what Postgres calls "relations" including column and foreign key info)
@@ -207,7 +219,7 @@ module Brick
           skip_hms[through] = nil if hms[through] && model.is_brick?
           # End up with a hash of HMT names pointing to join-table associations
           model._br_associatives[hmt.first] = hms[through] # || hms["#{(opt = hmt.last.options)[:through].to_s.singularize}_#{opt[:source].to_s.pluralize}".to_sym]
-        elsif hmt.last.inverse_of.nil?
+        elsif hmt.last.inverse_of.nil? && ActiveRecord.version >= ::Gem::Version.new('4.2')
           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
@@ -226,6 +238,11 @@ module Brick
       true
     end
 
+    # @api public
+    def mode=(setting)
+      Brick.config.mode = setting
+    end
+
     # Any path prefixing to apply to all auto-generated Brick routes
     # @api public
     def path_prefix=(path)
@@ -433,7 +450,7 @@ module Brick
     # This is attempted early if a brick initialiser file is found, and then again as a failsafe at the end of our engine's initialisation
     # %%% Maybe look for differences the second time 'round and just add new stuff instead of entirely deferring
     def load_additional_references
-      return if @_additional_references_loaded
+      return if @_additional_references_loaded || ::Brick.config.mode != :on
 
       relations = ::Brick.relations
       if (ars = ::Brick.config.additional_references) || ::Brick.config.polymorphics
@@ -524,7 +541,11 @@ In config/initializers/brick.rb appropriate entries would look something like:
       ::Brick.is_eager_loading = true
       if ::ActiveSupport.version < ::Gem::Version.new('6') ||
          ::Rails.configuration.instance_variable_get(:@autoloader) == :classic
-        ::Rails.configuration.eager_load_namespaces.select { |ns| ns < ::Rails::Application }.each(&:eager_load!)
+        if ::ActiveSupport.version < ::Gem::Version.new('4')
+          ::Rails.application.eager_load!
+        else
+          ::Rails.configuration.eager_load_namespaces.select { |ns| ns < ::Rails::Application }.each(&:eager_load!)
+        end
       else
         Zeitwerk::Loader.eager_load_all
       end
@@ -546,7 +567,8 @@ In config/initializers/brick.rb appropriate entries would look something like:
 
   module RouteSet
     def finalize!
-      unless ::Rails.application.routes.named_routes.route_defined?(:brick_status_path)
+      # %%% Was: ::Rails.application.routes.named_routes.route_defined?(:brick_status_path)
+      unless ::Rails.application.routes.named_routes.names.include?(:brick_status)
         path_prefix = ::Brick.config.path_prefix
         existing_controllers = routes.each_with_object({}) do |r, s|
           c = r.defaults[:controller]
@@ -821,13 +843,21 @@ ActiveSupport.on_load(:active_record) do
         end
       end
 
-      # This only gets added for ActiveRecord < 3.2
       module Reflection
+        # This only gets added for ActiveRecord < 3.2
         unless AssociationReflection.instance_methods.include?(:foreign_key)
           class AssociationReflection < MacroReflection
             alias foreign_key association_foreign_key
           end
         end
+        # And this for ActiveRecord < 4.0
+        unless AssociationReflection.instance_methods.include?(:polymorphic?)
+          class AssociationReflection < MacroReflection
+            def polymorphic?
+              options[:polymorphic]
+            end
+          end
+        end
       end
 
       # ActiveRecord 3.1 and 3.2 didn't try to bring in &block for the .extending() convenience thing
@@ -1006,6 +1036,7 @@ ActiveSupport.on_load(:active_record) do
         delegate :left_outer_joins, to: :all
       end
       class Relation
+        alias :model :klass unless respond_to?(:model) # To support AR < 4.2
         unless MULTI_VALUE_METHODS.include?(:left_outer_joins)
           _multi_value_methods = MULTI_VALUE_METHODS + [:left_outer_joins]
           send(:remove_const, :MULTI_VALUE_METHODS)

data/lib/generators/brick/install_generator.rb

@@ -136,10 +136,16 @@ module Brick
 
       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.)
+# Settings for the Brick gem
+# (By default this auto-creates models, controllers, views, and routes on-the-fly.)
 
 if Object.const_defined?('Brick')
+  # Mode -- generally :on or :off, or only in :development.  Also available is :diag_env which enables only
+  # when the environment variable BRICK is set.
+  Brick.mode = :development
+  # Can be further overridden by placing this line in development.rb / test.rb / production.rb:
+  # # Brick.mode = :on # (or :off to entirely disable)
+
   # # Custom path prefix to apply to all auto-generated Brick routes.  Also causes auto-generated controllers
   # # to be created inside a module with the same name.
   # ::Brick.path_prefix = 'admin'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.84
+  version: 1.0.86
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2022-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.1'
+        version: '3.0'
 - !ruby/object:Gem::Dependency
   name: fancy_gets
   requirement: !ruby/object:Gem::Requirement