brick 1.0.166 → 1.0.168

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 04daac2a29417d6243839a369b82f47ce12b380e53751a8f2374239962af887e
-  data.tar.gz: ff3c520f128963490cfbae81aee29ac3875bc819df113ad29cef09b625d0275b
+  metadata.gz: 244666e6b15c99925b2d00706654b1bd57a52e318d067bdd47c67113962a4745
+  data.tar.gz: 1b5a82fc567786def9d838060b9cdd1c490e5b11f722e15bac8c972a9a3e8f90
 SHA512:
-  metadata.gz: 10e4983d3ebcc5e965e85784b38e3eff05b30a05fb46dd442560fc8845d097f95b3b3f4b4662e70238983b3f948c83647acc4919f521f49f9405b7f5bd71895d
-  data.tar.gz: 56e5e5afa63fa991321881dc0b2c703ddd2d4a0b88d5856db3b272e36ad66abdfe1ea89e8d203ba6c56851a3ca4727c3e8c68daadc43888d59fea2ff095961ae
+  metadata.gz: be486b872b89de6367a624cc56898e2add0f37f840365a2e0f824a0af1f0e5c6a34d08645c85a4e1d8c143de5389ac324d60631fd01100d06dd0ceda2ff79cc1
+  data.tar.gz: f7ddd11bcc08402c9ce8152274a2ee1d6106c539b2751e0d4e9c23c6ee4da1bcc11a0485035cfdf07c5e81f696b11a417266e48c45245b58b976645c13f39c98

data/lib/brick/compatibility.rb

@@ -10,6 +10,24 @@ unless ActiveRecord.respond_to?(:version)
   end
 end
 
+# Allow ActiveRecord < 6.0 to work with Ruby 3.1 and later
+if ActiveRecord.version < ::Gem::Version.new('6.0a') && ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('3.1')
+  require 'active_record/type'
+  ::ActiveRecord::Type.class_exec do
+    class << self
+      alias _brick_add_modifier add_modifier
+      def add_modifier(options, klass, *args)
+        kwargs = if args.length > 2 && args.last.is_a?(Hash)
+                   args.pop
+                 else
+                   {}
+                 end
+        _brick_add_modifier(options, klass, **kwargs)
+      end
+    end
+  end
+end
+
 # Allow ActiveRecord < 3.2 to work with Ruby 2.7 and later
 if ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('2.7')
   if ActiveRecord.version < ::Gem::Version.new('3.2')
@@ -114,34 +132,32 @@ end
 # file by having the line "require 'brick/compatibility'" to be the last line in that
 # file.
 require 'bigdecimal'
-if ActiveRecord.version < ::Gem::Version.new('5.0')
-  if ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('2.6')
-    def BigDecimal.new(*args, **kwargs)
-      BigDecimal(*args, **kwargs)
-    end
+if ActiveRecord.version < ::Gem::Version.new('5.0') && ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('2.6')
+  def BigDecimal.new(*args, **kwargs)
+    BigDecimal(*args, **kwargs)
+  end
 
-    if ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('3.1')
-      # @@schemes fix for global_id gem < 1.0
-      URI.class_variable_set(:@@schemes, {}) unless URI.class_variables.include?(:@@schemes)
-      if Gem::Specification.all_names.find { |g| g.start_with?('puma-') }
-        require 'rack/handler/puma'
-        module Rack::Handler::Puma
-          class << self
-            alias _brick_run run
-            def run(app, *args, **options)
-              options.merge!(args.pop) if args.last.is_a?(Hash)
-              _brick_run(app, **options)
-            end
+  if ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('3.1')
+    # @@schemes fix for global_id gem < 1.0
+    URI.class_variable_set(:@@schemes, {}) unless URI.class_variables.include?(:@@schemes)
+    if Gem::Specification.all_names.find { |g| g.start_with?('puma-') }
+      require 'rack/handler/puma'
+      module Rack::Handler::Puma
+        class << self
+          alias _brick_run run
+          def run(app, *args, **options)
+            options.merge!(args.pop) if args.last.is_a?(Hash)
+            _brick_run(app, **options)
           end
         end
       end
+    end
 
-      require 'json'
-      if JSON::Parser.method(:initialize).parameters.length < 2 && JSON.method(:parse).arity == -2
-        JSON.class_exec do
-          def self.parse(source, opts = {})
-            ::JSON::Parser.new(source, **opts).parse
-          end
+    require 'json'
+    if JSON::Parser.method(:initialize).parameters.length < 2 && JSON.method(:parse).arity == -2
+      JSON.class_exec do
+        def self.parse(source, opts = {})
+          ::JSON::Parser.new(source, **opts).parse
         end
       end
     end

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

@@ -66,7 +66,7 @@ module Brick::Rails::FormTags
                s << " title=\"#{col.comment}\"" if col.respond_to?(:comment) && !col.comment.blank?
                s << if (bt = bts[col_name])
                       # Allow sorting for any BT except polymorphics
-                      x_order = " x-order=\"#{bt.first.to_s + '"'}" unless bt[2]
+                      x_order = " x-order=\"#{bt.first}\"" unless bt[2]
                       "#{x_order}>BT #{bt[1].map { |bt_pair| bt_pair.first.bt_link(bt.first) }.join(' ')}"
                     else # Normal column
                       col_name_humanised = klass.human_attribute_name(col_name, { default: col_name })
@@ -83,11 +83,11 @@ module Brick::Rails::FormTags
                x_order = " x-order=\"#{col_name}\"" if true
                s << "#{x_order}>#{col_name}"
              elsif col_name.is_a?(Symbol) && (hot = bts[col_name]) # has_one :through
-               x_order = " x-order=\"#{hot.first.to_s}\"" if true
+               x_order = " x-order=\"#{hot.first}\"" if true
                s << "#{x_order}>HOT " +
                     hot[1].map { |hot_pair| hot_pair.first.bt_link(col_name) }.join(' ')
              elsif (bt = composite_bt_names[col_name])
-               x_order = " x-order=\"#{bt.first.to_s}\"" unless bt[2]
+               x_order = " x-order=\"#{bt.first}\"" unless bt[2]
                s << "#{x_order}>BT comp " +
                     bt[1].map { |bt_pair| bt_pair.first.bt_link(bt.first) }.join(' ')
              else # Bad column name!

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -1487,6 +1487,21 @@ ActiveSupport.on_load(:active_record) do
     end
   end
 
+  # Allow ActiveRecord < 6.0 to work with Ruby 3.1 and later
+  if ActiveRecord.version < ::Gem::Version.new('6.0a') && ::Gem::Version.new(RUBY_VERSION) >= ::Gem::Version.new('3.1')
+    ::ActiveRecord::Relation.class_exec do
+      alias _original_initialize initialize
+      def initialize(klass, *args)
+        kwargs = if args.last.is_a?(Hash)
+                   args.pop
+                 else
+                   {}
+                 end
+        _original_initialize(klass, **kwargs)
+      end
+    end
+  end
+
   if ActiveRecord.version < ::Gem::Version.new('6.1.4') &&
      Psych.method(:load).parameters.any? { |param| param.first == :key && param.last == :aliases }
     Psych.class_exec do
@@ -1965,7 +1980,6 @@ if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Ve
   admsm.class_exec do
     # redefine #build
     def build(app, **kwargs)
-      # puts klass.name
       if args.length > 1 && args.last.is_a?(Hash)
         kwargs.merge!(args.pop)
       end

metadata

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