brick 1.0.110 → 1.0.112

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3d11240139b576ead983fbe9811f4476b8819878068c46db852b515fbc0849c6
-  data.tar.gz: 2db932779fcd8517f7e5be524ce387061d4e8cab193715be76893dc1e675d1c9
+  metadata.gz: 69051263cec00b3672b8d48b0c595ff6875b81f27e7995be72a03d6699ad6d02
+  data.tar.gz: 217687ad2f6b93c33dc781f5930a0475a60fb27d782593109055beaae19f4e55
 SHA512:
-  metadata.gz: dd22a1ab8d2b13f2d289fe02262ae8aecb3be921094bbb5dd0392fe5cd46ecadda259e72a18c3ecb7daea0fd5f5a50d697383a4bb949b068976e3b6007769d04
-  data.tar.gz: 39d26f6c99511d3651003c660fed495223ebd4fb34865b1eaa3b8554e294ed0fb3672b17e7dc43ca43fecbd1b7dda2ec6b9a4371025880e12c83694f45557173
+  metadata.gz: 6eff4c8a9f59673d14be1d890b067e17e631b1d6938a22b81c1ec45c3785489195d5d9e93939a38c681d36d844df2ad9a932584d8269b0fd2ef678de428c805c
+  data.tar.gz: 723425258d449708f18e086f289147b3402f728c93fbcba3a16654c3d15b4fe715022e427cb3f87e731bf9b73d693a5d4f43a500bdbde3641b69ac61e4c35e35

data/lib/brick/extensions.rb

@@ -2019,6 +2019,21 @@ end.class_exec do
       # .default_schema are specified then we can work with non-tenanted models more appropriately
       if (apartment = Object.const_defined?('Apartment')) &&
          File.exist?(apartment_initializer = ::Rails.root.join('config/initializers/apartment.rb'))
+        require 'apartment/adapters/abstract_adapter'
+        Apartment::Adapters::AbstractAdapter.class_exec do
+          if instance_methods.include?(:process_excluded_models)
+            def process_excluded_models
+              # All other models will share a connection (at Apartment.connection_class) and we can modify at will
+              Apartment.excluded_models.each do |excluded_model|
+                begin
+                  process_excluded_model(excluded_model)
+                rescue NameError => e
+                  (@bad_models ||= []) << excluded_model
+                end
+              end
+            end
+          end
+        end
         unless @_apartment_loaded
           load apartment_initializer
           @_apartment_loaded = true
@@ -2057,13 +2072,27 @@ end.class_exec do
             schema = possible_schema
             orig_schema = ActiveRecord::Base.execute_sql('SELECT current_schemas(true)').first['current_schemas'][1..-2].split(',')
             ActiveRecord::Base.execute_sql("SET SEARCH_PATH = ?", schema)
-          elsif Rails.env == 'test' # When testing, just find the most recently-created schema
-            ::Brick.default_schema = schema = ::Brick.db_schemas.to_a.sort { |a, b| b.last[:dt] <=> a.last[:dt] }.first.first
-            puts "While running tests, had noticed in the brick.rb initializer that the line \"::Brick.schema_behavior = ...\" refers to a schema called \"#{possible_schema}\" which does not exist.  Reading table structure from the most recently-created schema, #{schema}."
+          # When testing, just find the most recently-created schema
+          elsif begin
+                  Rails.env == 'test' ||
+                    ActiveRecord::Base.execute_sql("SELECT value FROM ar_internal_metadata WHERE key='environment';").first&.fetch('value', nil) == 'test'
+                rescue
+                end
+            ::Brick.default_schema = ::Brick.apartment_default_tenant
+            ::Brick.test_schema = schema = ::Brick.db_schemas.to_a.sort { |a, b| b.last[:dt] <=> a.last[:dt] }.first.first
+            if possible_schema.blank?
+              puts "While running tests, using the most recently-created schema, #{schema}."
+            else
+              puts "While running tests, had noticed in the brick.rb initializer that the line \"::Brick.schema_behavior = ...\" refers to a schema called \"#{possible_schema}\" which does not exist.  Reading table structure from the most recently-created schema, #{schema}."
+            end
             orig_schema = ActiveRecord::Base.execute_sql('SELECT current_schemas(true)').first['current_schemas'][1..-2].split(',')
+            ::Brick.config.schema_behavior = { multitenant: {} } # schema_to_analyse: [schema]
             ActiveRecord::Base.execute_sql("SET SEARCH_PATH = ?", schema)
           else
             puts "*** In the brick.rb initializer the line \"::Brick.schema_behavior = ...\" refers to schema(s) called #{possible_schemas.map { |s| "\"#{s}\"" }.join(', ')}.  No mentioned schema exists. ***"
+            if ::Brick.db_schemas.key?(::Brick.apartment_default_tenant)
+              ::Brick.default_schema = schema = ::Brick.apartment_default_tenant
+            end
           end
         end
       when 'Mysql2', 'Trilogy'

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

@@ -36,11 +36,12 @@ module Brick
 // 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\", linkSchemas);
-var brickSchema;
+var brickSchema,
+    brickTestSchema;
 function linkSchemas() {
   var schemaSelect = document.getElementById(\"schema\");
   var tblSelect = document.getElementById(\"tbl\");
-  if (tblSelect) { // Always present
+  if (tblSelect) { // Always present for Brick pages
     // Used to be:  var i = # {::Brick.config.path_prefix ? '0' : 'schemaSelect ? 1 : 0'},
     var changeoutList = changeout(location.href);
     for (var i = 0; i < changeoutList.length; ++i) {
@@ -53,32 +54,32 @@ function linkSchemas() {
       if (brickSchema) lhr = changeout(lhr, \"_brick_schema\", schemaSelect.value);
       location.href = lhr;
     });
-  }
 
-  if (schemaSelect) { // First drop-down is only present if multitenant
-    if (brickSchema = changeout(location.href, \"_brick_schema\")) {
-      [... document.getElementsByTagName(\"A\")].forEach(function (a) { a.href = changeout(a.href, \"_brick_schema\", brickSchema); });
-    }
-    if (schemaSelect.options.length > 1) {
-      schemaSelect.value = brickSchema || \"public\";
-      schemaSelect.addEventListener(\"change\", function () {
-        // If there's an ID then remove it (trim after selected table)
-        location.href = changeout(location.href, \"_brick_schema\", this.value, tblSelect.value);
-      });
+    if (schemaSelect) { // First drop-down is only present if multitenant
+      if (brickSchema = changeout(location.href, \"_brick_schema\")) {
+        [... document.getElementsByTagName(\"A\")].forEach(function (a) { a.href = changeout(a.href, \"_brick_schema\", brickSchema); });
+      }
+      if (schemaSelect.options.length > 1) {
+        schemaSelect.value = brickSchema || brickTestSchema || \"public\";
+        schemaSelect.addEventListener(\"change\", function () {
+          // If there's an ID then remove it (trim after selected table)
+          location.href = changeout(location.href, \"_brick_schema\", this.value, tblSelect.value);
+        });
+      }
     }
-  }
-  tblSelect.focus();
-
-  [... document.getElementsByTagName(\"FORM\")].forEach(function (form) {
-    if (brickSchema)
-      form.action = changeout(form.action, \"_brick_schema\", brickSchema);
-    form.addEventListener('submit', function (ev) {
-      [... ev.target.getElementsByTagName(\"SELECT\")].forEach(function (select) {
-        if (select.value === \"^^^brick_NULL^^^\") select.value = null;
+    tblSelect.focus();
+
+    [... document.getElementsByTagName(\"FORM\")].forEach(function (form) {
+      if (brickSchema)
+        form.action = changeout(form.action, \"_brick_schema\", brickSchema);
+      form.addEventListener('submit', function (ev) {
+        [... ev.target.getElementsByTagName(\"SELECT\")].forEach(function (select) {
+          if (select.value === \"^^^brick_NULL^^^\") select.value = null;
+        });
+        return true;
       });
-      return true;
     });
-  });
+  }
 };
 "
 
@@ -321,18 +322,26 @@ window.addEventListener(\"popstate\", linkSchemas);
             end
 
             def set_brick_model(find_args)
-              # Need to return true if we can fill in the blanks for a missing one
-              # args will be something like:  ["index", ["categories"]]
-              if (class_name = find_args[1].last&.singularize)
-                find_args[1][find_args[1].length - 1] = class_name # Make sure the last item, defining the class name, is singular
-                if (model = find_args[1].map(&:camelize).join('::').constantize) && (
-                     ['index', 'show'].include?(find_args.first) || # Everything has index and show
-                     # Only CUD stuff has create / update / destroy
-                     (!model.is_view? && ['new', 'create', 'edit', 'update', 'destroy'].include?(find_args.first))
-                   )
-                  @_brick_model = model
+              # Return an appropriate model for a given view template request.
+              # find_args will generally be something like:  ["index", ["categories"]]
+              # and must cycle through all of find_args[1] because in some cases such as with Devise we get something like:
+              # ["create", ["users/sessions", "sessions", "devise/sessions", "devise", "application"], false, []]
+              find_args[1]&.any? do |resource_name|
+                if (class_name = (resource_parts = resource_name.split('/')).last&.singularize)
+                  resource_parts[-1] = class_name # Make sure the last part, defining the class name, is singular
+                  begin
+                    if (model = Object.const_get(resource_parts.map(&:camelize).join('::')))&.is_a?(Class) && (
+                         ['index', 'show'].include?(find_args.first) || # Everything has index and show
+                         # Only CUD stuff has create / update / destroy
+                         (!model.is_view? && ['new', 'create', 'edit', 'update', 'destroy'].include?(find_args.first))
+                       )
+                      @_brick_model = model
+                    end
+                  rescue
+                  end
                 end
               end
+              @_brick_model
             end
 
             def path_keys(hm_assoc, fk_name, pk)
@@ -355,22 +364,20 @@ window.addEventListener(\"popstate\", linkSchemas);
 
             alias :_brick_find_template :find_template
             def find_template(*args, **options)
+              find_template_err = nil
               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']]) ||
                      (is_crosstab = args[0..1] == ['crosstab', ['brick_gem']])
-                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
+                begin
+                  if (possible_template = _brick_find_template(*args, **options))
+                    return possible_template
                   end
-                elsif (possible_template = _brick_find_template(*args, **options))
-                  return possible_template
+                rescue StandardError => e
+                  find_template_err = e # Can come up with stuff like Devise which has its own view templates
                 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
+                model_name = set_brick_model(args)&.name
               end
 
               if @_brick_model
@@ -851,8 +858,9 @@ document.querySelectorAll(\"input[type=submit][data-confirm]\").forEach(function
   });
 });
 
-#{JS_CHANGEOUT}
-
+#{JS_CHANGEOUT}#{
+  "\nbrickTestSchema = \"#{::Brick.test_schema}\";" if ::Brick.test_schema
+}
 // Snag first TR for sticky header
 var grid = document.getElementById(\"#{table_name}\");
 #{table_name}HtColumns = grid && [grid.getElementsByTagName(\"TR\")[0]];
@@ -1156,7 +1164,7 @@ erDiagram
        td_count += 1 %>
     <td><%= link_to_brick(
         avo_svg,
-        { index_proc: Proc.new do |avo_model, relation|
+        { index_proc: Proc.new do |_avo_model, relation|
                         path_helper = \"resources_#\{relation.fetch(:auto_prefixed_schema, nil)}#\{model.model_name.route_key}_path\".to_sym
                         ::Avo.railtie_routes_url_helpers.send(path_helper) if ::Avo.railtie_routes_url_helpers.respond_to?(path_helper)
                       end,
@@ -1438,11 +1446,9 @@ end
       <% when :boolean %>
         <%= f.check_box k.to_sym %>
       <% when :integer, :decimal, :float %>
-        <%= if col_type == :integer
-              f.text_field k.to_sym, { pattern: '\\d*', class: 'check-validity' }
-            else
-              f.number_field k.to_sym
-            end %>
+        <%= digit_pattern = col_type == :integer ? '\\d*' : '\\d*(?:\\.\\d*|)'
+            # Used to do this for float / decimal:  f.number_field k.to_sym
+            f.text_field k.to_sym, { pattern: digit_pattern, class: 'check-validity' } %>
       <% when *dt_pickers.keys
            is_includes_dates = true %>
         <%= f.text_field k.to_sym, { class: dt_pickers[col_type] } %>
@@ -1544,7 +1550,12 @@ end}
 </body>
 </html>
 "
-
+                       else # args.first isn't index / show / edit / new / orphans / status
+                         if find_template_err # Can surface when gems have their own view templates
+                           raise find_template_err
+                         else # Can surface if someone made their own controller which has a screwy action
+                           puts "Couldn't work with action #{args.first}"
+                         end
                        end
               unless is_crosstab
                 inline << "

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

@@ -201,6 +201,7 @@ module Brick::Rails::FormTags
       end
       filter = "?#{filter_parts.join('&')}" if filter_parts.present?
       app_routes = Rails.application.routes # In case we're operating in another engine, reference the application since Brick routes are placed there.
+      relation = ::Brick.relations.fetch(rel_name || args.first.table_name, nil)
       if (klass_or_obj&.is_a?(Class) && klass_or_obj < ActiveRecord::Base) ||
          (klass_or_obj&.is_a?(ActiveRecord::Base) && klass_or_obj.new_record? && (klass_or_obj = klass_or_obj.class))
         path = (proc = kwargs[:index_proc]) ? proc.call(klass_or_obj, relation) : "#{app_routes.path_for(controller: klass_or_obj.base_class._brick_index(nil, '/', relation), action: :index)}#{filter}"

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -135,7 +135,8 @@ module Brick
       @existing_stis ||= Brick.config.sti_namespace_prefixes.each_with_object({}) { |snp, s| s[snp.first[2..-1]] = snp.last unless snp.first.end_with?('::') }
     end
 
-    attr_accessor :default_schema, :db_schemas, :routes_done, :is_oracle, :is_eager_loading, :auto_models, :initializer_loaded
+    attr_accessor :default_schema, :db_schemas, :test_schema,
+                  :routes_done, :is_oracle, :is_eager_loading, :auto_models, :initializer_loaded
 
     def set_db_schema(params = nil)
       # If Apartment::Tenant.current is not still the default (usually 'public') then an elevator has brought us into
@@ -148,6 +149,10 @@ module Brick
                   ::Brick.db_schemas&.key?(schema)
                  Apartment::Tenant.switch!(schema)
                  schema
+               elsif ::Brick.test_schema
+                 is_show_schema_list = true
+                 Apartment::Tenant.switch!(::Brick.test_schema)
+                 ::Brick.test_schema
                else
                  current_schema # Just return the current schema
                end
@@ -1497,12 +1502,12 @@ module ActiveRecord
         # entry in your .select().
         # More information:  https://discuss.rubyonrails.org/t/includes-and-select-for-joined-data/81640
         def apply_column_aliases(relation)
-          if (sel_vals = relation.select_values.map(&:to_s)).first == '_brick_eager_load'
+          if !(@join_root_alias = relation.select_values.empty?) &&
+             relation.select_values.first.to_s == '_brick_eager_load'
+            relation.select_values.shift
             used_cols = {}
             # Find and expand out all column names being used in select(...)
-            new_select_values = sel_vals.each_with_object([]) do |col, s|
-              next if col == '_brick_eager_load'
-
+            new_select_values = relation.select_values.map(&:to_s).each_with_object([]) do |col, s|
               if col.include?(' ') # Some expression? (No chance for a simple column reference)
                 s << col # Just pass it through
               else

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.110
+  version: 1.0.112
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-30 00:00:00.000000000 Z
+date: 2023-02-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord