brick 1.0.84 → 1.0.85

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 07b4deda161c3a94822dd4c953d1c3983eb7c4eeed3106c7037a5f6b5c006f9d
-  data.tar.gz: bd5bcd1255bd5e3c13da8abca6bc9b73b5cd17880f90bbbb6b3b6e01c7f9331d
+  metadata.gz: 9b174d2fbdbef5d71921aa28da8fe7f943eb095fc3dd3c95efb7ac752681917e
+  data.tar.gz: daf09d491031d7f30171b85e25f68ceb36e73df5b183b86ab8269474651fb4b6
 SHA512:
-  metadata.gz: 0da12600c16ad515c1be1129940eba12e99754afebb206784384084dfee66c657ee2e6c9319f3b8f5d3a57c42f0f501ae55d967dd51b3f12b608579f98b5141d
-  data.tar.gz: 75a9e6de7852fb5aab7c6b7a4a72e2e2af733ad18432fe91f04207138e6192dcbc716e5a38e18819d22cfe2370acdd55c87d25e54b49f86493e52b1f3625dfa3
+  metadata.gz: 697528d1c7445130ab1cae24b76ad154f72e1a770c26f50ab6bf6f40fe98045c775311c32460e4bfca0869567873166733f0b488eb3e67d9f1a11eb271407032
+  data.tar.gz: ba9004f32e27f8104eb3547bec82682011a2f328e6081774e6afd4485ff14ec10cc5992bcf539fbc328131a5bd5dbde5804b18bcf73f26108ab9a1f9f48b49b7

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

@@ -766,7 +766,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 +816,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 +862,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
@@ -1633,7 +1635,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 +1738,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 +1878,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 +1927,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|
@@ -2113,7 +2125,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

@@ -181,10 +181,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 +334,10 @@ a.big-arrow {
   color: red;
   white-space: nowrap;
 }
+.danger {
+  background-color: red;
+  color: white;
+}
 
 #revertTemplate {
   display: none;
@@ -446,7 +455,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); });
@@ -1163,6 +1172,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
@@ -1185,7 +1195,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 +1204,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 +1218,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 = 85
 
     # 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)
@@ -226,6 +237,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 +449,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

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.85
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-24 00:00:00.000000000 Z
+date: 2022-10-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord