brick 1.0.179 → 1.0.181

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 54b14ce2c9b998599c3fd529f0a718a85365c49f7405a97e698155e2b9cf22be
-  data.tar.gz: e1337a86afb957dc8a5545090dc667534bbf792266e82f4654a55611b92b7e18
+  metadata.gz: 322ed139c5ec7c48572ab2ea87830998fe742c32ac56e91d2eed97084f7d8c42
+  data.tar.gz: 836c21610811fb2322bdfd572d2b1ccce0a23464bf54512ae160149a6bfdb972
 SHA512:
-  metadata.gz: c0bee060354c43c662e41e247957f896d7680af9b11cd4109e4ad32ef4b5b8bf907f64d2ed66d32bb59522addb540d1dc3a9e4812f2fdfc1dd6eb6a4da6e516a
-  data.tar.gz: a44dc906d317e74100463a1ffb18935e91ee7a818727131fa4813f5329cbc0db07f7995d08246d32052239d4a6bae15db8db4de51cfcdb0c3d250b08e341d4ee
+  metadata.gz: 034b252fc08bc09216a33d8cd34a97c4afa81a86943d319e0bccd26a387060d69a3d1e0b80de2ba29e9f57c06e7eff3b41cbdfa92354f8a754e350b0ab8daacf
+  data.tar.gz: 0ba1422cb56af76c4e0eb89de5fd940a90dcfb93fd90016852cb9631d71542825dea0187fd44ac66fa65a79905583b9dec92b3615b67db1f16d4ad5e5357f1ac

data/lib/brick/compatibility.rb

@@ -115,14 +115,30 @@ if Object.const_defined?('ActionPack') && !ActionPack.respond_to?(:version)
     end
   end
 end
-if Bundler.locked_gems&.dependencies.key?('action_view')
+if Object.const_defined?('Bundler') && Bundler.locked_gems&.dependencies.key?('action_view')
   require 'action_view' # Needed for Rails <= 4.0
-  if Object.const_defined?('ActionView') && !ActionView.respond_to?(:version)
-    module ActionView
+  module ::ActionView
+    if Object.const_defined?('ActionView') && !ActionView.respond_to?(:version)
       def self.version
         ActionPack.version
       end
     end
+    if self.version < ::Gem::Version.new('5.2')
+      module Helpers
+        module TextHelper
+          # Older versions of #pluralize lack the all-important .to_s
+          def pluralize(count, singular, plural_arg = nil, plural: plural_arg, locale: I18n.locale)
+            word = if (count == 1 || count.to_s =~ /^1(\.0+)?$/)
+              singular
+            else
+              plural || singular.pluralize(locale)
+            end
+
+            "#{count || 0} #{word}"
+          end
+        end
+      end
+    end
   end
 end
 

data/lib/brick/extensions.rb

@@ -1189,7 +1189,7 @@ if Object.const_defined?('ActionView')
         # not let Brick have any fun.  So just call this right before any wildcard routes, and
         # you'll be in business!
         def mount_brick_routes
-          add_brick_routes unless ::Brick.routes_done
+          add_brick_routes if !::Brick.routes_done && respond_to?(:add_brick_routes)
         end
       end
     end

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

@@ -1404,12 +1404,6 @@ end
 #{erd_markup}
 
 <%= # Consider getting the name from the association -- hm.first.name -- if a more \"friendly\" alias should be used for a screwy table name
-    cols = {#{hms_keys = []
-              hms_headers.map do |hm|
-                hms_keys << (assoc_name = (assoc = hm.first).name.to_s)
-                "#{assoc_name.inspect} => [#{(assoc.options[:through] && !assoc.through_reflection).inspect}, #{assoc.klass.name}, #{hm[1].inspect}, #{hm[2].inspect}]"
-              end.join(', ')}}
-
     # If the resource is missing, has the user simply created an inappropriately pluralised name for a table?
     @#{table_name} ||= if (dym_list = instance_variables.reject do |entry|
                              entry.to_s.start_with?('@_') ||
@@ -1429,6 +1423,13 @@ end
                          end
                        end
 
+    # Starts as being just has_many columns, and will be augmented later with all the other columns
+    cols = {#{hms_keys = []
+              hms_headers.map do |hm|
+                hms_keys << (assoc_name = (assoc = hm.first).name.to_s)
+                "#{assoc_name.inspect} => [#{(assoc.options[:through] && !assoc.through_reflection).inspect}, #{assoc.klass.name}, #{hm[1].inspect}, #{hm[2].inspect}]"
+              end.join(', ')}}
+
     # %%% Why in the Canvas LMS app does ActionView::Helpers get cleared / reloaded, or otherwise lose access to #brick_grid ???
     # Possible fix if somewhere we can implement the #include with:
     # (ActiveSupport.const_defined?('Reloader') ? ActiveSupport : ActionDispatch)::Reloader.to_prepare do ... end
@@ -1436,8 +1437,8 @@ end
     # Rails.application.reloader.to_prepare do ... end
     self.class.class_exec { include ::Brick::Rails::FormTags } unless respond_to?(:brick_grid)
     # Write out the mega-grid
-    brick_grid(@#{table_name}, @_brick_bt_descrip, @_brick_sequence, @_brick_incl, @_brick_excl,
-               cols, poly_cols, bts, #{hms_keys.inspect}, {#{hms_columns.join(', ')}}) %>
+    brick_grid(@#{table_name}, @_brick_sequence, @_brick_incl, @_brick_excl,
+               cols, bt_descrip: @_brick_bt_descrip, poly_cols: poly_cols, bts: bts, hms_keys: #{hms_keys.inspect}, hms_cols: {#{hms_columns.join(', ')}}) %>
 
 #{"<hr><%= link_to(\"New #{new_path_name = "new_#{path_obj_name}_path"
                            obj_name}\", #{new_path_name}, { class: '__brick' }) if respond_to?(:#{new_path_name}) %>" unless @_brick_model.is_view?}
@@ -1803,7 +1804,7 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
             gErd.addEventListener(\"click\",
               function (evt) {
                 location.href = changeout(changeout(
-                  changeout(location.href, '_brick_order', null), // Remove any ordering
+                  changeout(location.href, \"_brick_order\", null), // Remove any ordering
                 -1, cbs[this.id].replace(/^[\/]+/, \"\")), \"_brick_erd\", \"1\");
               }
             );
@@ -1811,6 +1812,7 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
         }}
       });
       mermaid.contentLoaded();
+      window.history.replaceState({}, \"\", changeout(location.href, \"_brick_erd\", \"1\"));
       // Add <span> at the end
       var span = document.createElement(\"SPAN\");
       span.className = \"exclude\";
@@ -1819,7 +1821,7 @@ flatpickr(\".timepicker\", {enableTime: true, noCalendar: true});
         e.stopPropagation();
         imgErd.style.display = \"table-cell\";
         mermaidErd.style.display = \"none\";
-        window.history.pushState({}, '', changeout(location.href, '_brick_erd', null));
+        window.history.replaceState({}, \"\", changeout(location.href, \"_brick_erd\", null));
       });
       mermaidErd.appendChild(span);
     }

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

@@ -1,7 +1,7 @@
 module Brick::Rails::FormTags
   # Our super speedy grid
-  def brick_grid(relation = nil, bt_descrip = nil, sequence = nil, inclusions = nil, exclusions = nil,
-                 cols = {}, poly_cols = nil, bts = {}, hms_keys = [], hms_cols = {},
+  def brick_grid(relation = nil, sequence = nil, inclusions = nil, exclusions = nil,
+                 cols = {}, bt_descrip: nil, poly_cols: nil, bts: {}, hms_keys: [], hms_cols: {},
                  show_header: nil, show_row_count: nil, show_erd_button: nil, show_new_button: nil, show_avo_button: nil, show_aa_button: nil)
     # When a relation is not provided, first see if one exists which matches the controller name
     unless (relation ||= instance_variable_get("@#{controller_name}".to_sym))

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -910,7 +910,7 @@ In config/initializers/brick.rb appropriate entries would look something like:
 
         object_name = k.split('.').last # Take off any first schema part
 
-        full_schema_prefix = if (aps = v.fetch(:auto_prefixed_schema, nil))
+        full_schema_prefix = if (full_aps = aps = v.fetch(:auto_prefixed_schema, nil))
                                 aps = aps[0..-2] if aps[-1] == '_'
                                 (schema_prefix&.dup || +'') << "#{aps}."
                               else
@@ -925,7 +925,7 @@ In config/initializers/brick.rb appropriate entries would look something like:
           else
             table_class_length = class_name.length if class_name.length > table_class_length
             tables
-          end << [class_name, aps, k.tr('.', '/')]
+          end << [class_name, aps, k.tr('.', '/')[full_aps&.length || 0 .. -1]]
         end
 
         options = {}
@@ -1544,7 +1544,7 @@ ActiveSupport.on_load(:active_record) do
                  else
                    {}
                  end
-        _original_initialize(klass, **kwargs)
+        _original_initialize(klass, *args, **kwargs)
       end
     end
   end
@@ -2036,11 +2036,13 @@ if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Ve
   end
 
   # AR >= 5.0 on Ruby >= 3.0
-  ::ActiveRecord::Type::AdapterSpecificRegistry.class_exec do
-    alias :_brick_add_modifier :add_modifier
-    def add_modifier(*args, **kwargs)
-      kwargs.merge!(args.pop) if args.length > 2 && args.last.is_a?(Hash)
-      _brick_add_modifier(*args, **kwargs)
+  if ActiveRecord.version >= ::Gem::Version.new('5.0')
+    ::ActiveRecord::Type::AdapterSpecificRegistry.class_exec do
+      alias :_brick_add_modifier :add_modifier
+      def add_modifier(*args, **kwargs)
+        kwargs.merge!(args.pop) if args.length > 2 && args.last.is_a?(Hash)
+        _brick_add_modifier(*args, **kwargs)
+      end
     end
   end
 

data/lib/generators/brick/install_generator.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'brick'
 require 'rails/generators'
 # require 'rails/generators/active_record'
 

data/lib/generators/brick/migrations_generator.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'brick'
 require 'rails/generators'
 require 'rails/generators/active_record'
 require 'fancy_gets'

data/lib/generators/brick/models_generator.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'brick'
 require 'rails/generators'
 require 'rails/generators/active_record'
 require 'fancy_gets'

data/lib/generators/brick/seeds_generator.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'brick'
 require 'rails/generators'
 require 'fancy_gets'
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.179
+  version: 1.0.181
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-07 00:00:00.000000000 Z
+date: 2023-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord