brick 1.0.180 → 1.0.181

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c5cc0c73d63cbebcbad81388f8ae444c72dafa57a38c1f2a95b3b7f5bd4a621a
-  data.tar.gz: 8670884c20ac46ee01d28c97fabe97694a2f3862761228e16c0422790a937cc8
+  metadata.gz: 322ed139c5ec7c48572ab2ea87830998fe742c32ac56e91d2eed97084f7d8c42
+  data.tar.gz: 836c21610811fb2322bdfd572d2b1ccce0a23464bf54512ae160149a6bfdb972
 SHA512:
-  metadata.gz: 62d010ea2765fe14369e18db8b123426f5ace62025b053b453656870223073b75f95add727e5cb2073f78d0f58a88cb293904bcbee08726b0ba09947c16f3709
-  data.tar.gz: 25dbb2878198256df74cc36934bb7fcaab24a3dfd0b9cac55de8d04e2fcfce8ff0158458cd2d76004e354020addd6b38de5001ab79bebecb9f8afaa1f3e5133f
+  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/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?}

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 = 180
+    TINY = 181
 
     # PRE is nil unless it's a pre-release (beta, RC, etc.)
     PRE = nil

data/lib/brick.rb

@@ -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
 

metadata

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