brick 1.0.176 → 1.0.178

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 281b8aaa57a588877d66c995c0c0ec718a73c6b1cfdfc733bed25df2e7bdea8b
-  data.tar.gz: f314b8580a2a45f501f8f64f23f35225571cc299f96d1cc89c6da7ecf55de523
+  metadata.gz: 888b7144102e5155a28f931b7b986a68a3eb781dee890990fae9f81ed8bf2e21
+  data.tar.gz: c5fcc9dd02f6b45025d600e9a02a16011e93559568c63c24b4acde0f603a2540
 SHA512:
-  metadata.gz: 0ad317de582d86e0b67fc4396fa3b1dab9a018fa101b7bd3265157783ebb714a936b8593086d9a749dfc54654009dc921c0f4c32476a2bcee29138a281ecb03b
-  data.tar.gz: 117990ba8e3d7a8d3dea3e7f2394ab063b6d30b224cb96b70f6c758945fb062ce398249a4107767e78088251e444c55fbd71f1df8bd0ee73a77de40574661041
+  metadata.gz: f8f32f40106be993ee33bac87ef4dad4558e7bcbae61f6f61658671b825eba6312586f75fdc329c22a3a2898a2d38e568c70e05ca173e9824637226ce28aaee3
+  data.tar.gz: e3e0fa0646201059751ecf8fdd30860d582aa3e746ceeb3c6cac276aa831dcefe6a9fc8de34f6e4a720fcd5503842192e8cd8f33ceed37cb6087000d342223ee

data/lib/brick/extensions.rb

@@ -1553,9 +1553,13 @@ class Object
                                                               end))
       end
       hmts = nil
+      if (schema_module || Object).const_defined?((chosen_name = (inheritable_name || model_name)).to_sym)
+        possible = (schema_module || Object).const_get(chosen_name)
+        return possible unless possible == schema_module
+      end
       code = +"class #{full_name} < #{base_model.name}\n"
       built_model = Class.new(base_model) do |new_model_class|
-        (schema_module || Object).const_set((chosen_name = (inheritable_name || model_name)).to_sym, new_model_class)
+        (schema_module || Object).const_set(chosen_name, new_model_class)
         @_brick_relation = relation
         if inheritable_name
           new_model_class.define_singleton_method :inherited do |subclass|
@@ -3100,7 +3104,8 @@ module Brick
         missing << fk[1] unless relations.key?(fk[1])
         missing << primary_table unless is_class || relations.key?(primary_table)
         unless missing.empty?
-          tables = relations.reject { |_k, v| v.fetch(:isView, nil) }.keys.sort
+          tables = relations.reject { |_k, v| v.is_a?(Hash) && v.fetch(:isView, nil) }.keys
+                            .select { |table_name| table_name.is_a?(String) }.sort
           puts "Brick: Additional reference #{fk.inspect} refers to non-existent #{'table'.pluralize(missing.length)} #{missing.join(' and ')}. (Available tables include #{tables.join(', ')}.)"
           return
         end

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

@@ -1489,7 +1489,8 @@ end
                            decipher = OpenSSL::Cipher::AES256.new(:CBC).decrypt
                            decipher.iv = "\xB4,\r2\x19\xF5\xFE/\aR\x1A\x8A\xCFV\v\x8C"
                            decipher.key = Digest::SHA256.hexdigest(::Brick.config.license).scan(/../).map { |x| x.hex }.pack('c*')
-                           decipher.update(File.binread("/Users/aga/brick/lib/brick/frameworks/rails/crosstab.brk"))[16..-1]
+                           brick_path = Gem::Specification.find_by_name('brick').gem_dir
+                           decipher.update(File.binread("#{brick_path}/lib/brick/frameworks/rails/crosstab.brk"))[16..-1]
                          else
                            'Crosstab Charting not yet activated -- enter a valid license key in brick.rb'
                          end

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -89,7 +89,7 @@ end
 # is first established), and then automatically creates models, controllers, views,
 # and routes based on those available relations.
 require 'brick/config'
-if Gem::Specification.all_names.any? { |g| g.start_with?('rails-') && g[6..-1] =~ /^([0-9]|\.)+$/ }
+if Gem::Specification.all_names.any? { |g| g.start_with?('rails-') && g[6..-1] =~ /^([0-9]|\.)+(?:|rc1|rc2|beta1)$/ }
   require 'rails'
   require 'brick/frameworks/rails'
 end
@@ -2026,6 +2026,28 @@ if ActiveRecord.version < ::Gem::Version.new('6.0') && ruby_version >= ::Gem::Ve
     end
   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)
+    end
+  end
+
+  # AR >= 5.0 on Ruby >= 3.0
+  arca = ::ActiveRecord::ConnectionAdapters
+  require 'active_record/connection_adapters/postgresql/column'
+  if arca.const_defined?('PostgreSQLColumn')
+    arca::PostgreSQLColumn.class_exec do
+      alias :_brick_initialize :initialize
+      def initialize(*args, **kwargs)
+        kwargs.merge!(args.pop) if args.last.is_a?(Hash)
+        _brick_initialize(*args, **kwargs)
+      end
+    end
+  end
+
   require 'active_model'
   begin
     require 'active_model/type'

metadata

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