brick 1.0.38 → 1.0.39

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4fcc487d2177c77f487d6d7ec910d0cb1ec61e1a9da77fdbd7e7bd413ebe7373
-  data.tar.gz: 618bb20e4ff8aea7a81f02191100cb9bf15905a69099a8bbaec56cea6f27e882
+  metadata.gz: 965d31143248d85fd47cf2445a266fb9d26cc5eb814330cbdbfb37d50570b5a0
+  data.tar.gz: d4f070e1c01b3922a610a4385fde6f6b4f345892d68d6b872e1294a33f4b1e61
 SHA512:
-  metadata.gz: 4d71c229f3c9ae97866aeeb5f852504f593136de06dbb5b500917454d38a1f9b3afb17ab7ba0b1bfc21e9371739f37af0b4d88534d6db5332c88c4dafbccf67a
-  data.tar.gz: e1354cc5c4fb808aea3eb2a3b4580cdc31a37e51c799581d8461de21af520e1dab66793815e7a3ea8b3fc31b39b1e520ffb5150e7e6646279a2e3fe10933b770
+  metadata.gz: 70ea705efad428abb335e05569284caabe908c65efd679fffcd044894083626ca432366a65305bcd50506a7ca13169bac9cc2f7354728c3b8f23e4ed0aba7094
+  data.tar.gz: b61096e6deadf323cc8784bcf93ae5faf72eae02fef3059b002c57bac035b30858da73bb59bd2f0572168a90b39062645580cd120e1d78665f5c909258727ad8

data/lib/brick/compatibility.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'active_record/version'
-
 # ActiveRecord before 4.0 didn't have #version
 unless ActiveRecord.respond_to?(:version)
   module ActiveRecord
@@ -11,6 +10,16 @@ unless ActiveRecord.respond_to?(:version)
   end
 end
 
+require 'action_view'
+# Older ActionView didn't have #version
+unless ActionView.respond_to?(:version)
+  module ActionView
+    def self.version
+      ActionPack.version
+    end
+  end
+end
+
 # In ActiveSupport older than 5.0, the duplicable? test tries to new up a BigDecimal,
 # and Ruby 2.6 and later deprecates #new.  This removes the warning from BigDecimal.
 # This compatibility needs to be put into place in the application's "config/boot.rb"

data/lib/brick/extensions.rb

@@ -204,7 +204,7 @@ module ActiveRecord
       assoc_name = CGI.escapeHTML(assoc_name.to_s)
       model_path = Rails.application.routes.url_helpers.send("#{model_underscore.tr('/', '_').pluralize}_path".to_sym)
       av_class = Class.new.extend(ActionView::Helpers::UrlHelper)
-      av_class.extend(ActionView::Helpers::TagHelper) if ActionView.version < ::Gem::Version.new('6.1')
+      av_class.extend(ActionView::Helpers::TagHelper) if ActionView.version < ::Gem::Version.new('7')
       link = av_class.link_to(name, model_path)
       model_underscore == assoc_name ? link : "#{assoc_name}-#{link}".html_safe
     end
@@ -552,7 +552,7 @@ Module.class_exec do
     #   return my_const
     end
 
-    relations = ::Brick.instance_variable_get(:@relations)[ActiveRecord::Base.connection_pool.object_id] || {}
+    relations = ::Brick.relations
     # puts "ON OBJECT: #{args.inspect}" if self.module_parent == Object
     result = if ::Brick.enable_controllers? && class_name.end_with?('Controller') && (plural_class_name = class_name[0..-11]).length.positive?
                # Otherwise now it's up to us to fill in the gaps
@@ -627,8 +627,8 @@ Module.class_exec do
 #         module_prefixes.unshift('') unless module_prefixes.first.blank?
 #         candidate_file = Rails.root.join('app/models' + module_prefixes.map(&:underscore).join('/') + '.rb')
       self._brick_const_missing(*args)
-    elsif self != Object
-      module_parent.const_missing(*args)
+    # elsif self != Object
+    #   module_parent.const_missing(*args)
     else
       puts "MISSING! #{self.name} #{args.inspect} #{table_name}"
       self._brick_const_missing(*args)
@@ -1188,8 +1188,13 @@ module ActiveRecord::ConnectionHandling
       case ActiveRecord::Base.connection.adapter_name
       when 'PostgreSQL', 'SQLite' # These bring back a hash for each row because the query uses column aliases
         # schema ||= 'public' if ActiveRecord::Base.connection.adapter_name == 'PostgreSQL'
+        ar_smtn = if ActiveRecord::Base.respond_to?(:schema_migrations_table_name)
+                    ActiveRecord::Base.schema_migrations_table_name
+                  else
+                    'schema_migrations'
+                  end
         ar_imtn = ActiveRecord.version >= ::Gem::Version.new('5.0') ? ActiveRecord::Base.internal_metadata_table_name : ''
-        ActiveRecord::Base.execute_sql(sql, ActiveRecord::Base.schema_migrations_table_name, ar_imtn).each do |r|
+        ActiveRecord::Base.execute_sql(sql, ar_smtn, ar_imtn).each do |r|
           # If Apartment gem lists the table as being associated with a non-tenanted model then use whatever it thinks
           # is the default schema, usually 'public'.
           schema_name = if ::Brick.config.schema_behavior[:multitenant]

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

@@ -50,23 +50,26 @@ module Brick
         # ====================================
         if ::Brick.enable_views?
           ActionView::LookupContext.class_exec do
+            # Used by Rails 5.0 and above
             alias :_brick_template_exists? :template_exists?
             def template_exists?(*args, **options)
-              unless (is_template_exists = _brick_template_exists?(*args, **options))
-                # Need to return true if we can fill in the blanks for a missing one
-                # args will be something like:  ["index", ["categories"]]
-                args[1] = args[1].each_with_object([]) { |a, s| s.concat(a.split('/')) }
-                args[1][args[1].length - 1] = args[1].last.singularize # Make sure the last item, defining the class name, is singular
-                model = args[1].map(&:camelize).join('::').constantize
-                if is_template_exists = model && (
-                     ['index', 'show'].include?(args.first) || # Everything has index and show
+              _brick_template_exists?(*args, **options) || set_brick_model(args)
+            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"]]
+              find_args[1] = find_args[1].each_with_object([]) { |a, s| s.concat(a.split('/')) }
+              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?(args.first))
+                     (!model.is_view? && ['new', 'create', 'edit', 'update', 'destroy'].include?(find_args.first))
                    )
                   @_brick_model = model
                 end
               end
-              is_template_exists
             end
 
             def path_keys(hm_assoc, fk_name, obj_name, pk)
@@ -82,9 +85,13 @@ module Brick
 
             alias :_brick_find_template :find_template
             def find_template(*args, **options)
-              return  _brick_find_template(*args, **options) unless @_brick_model
+              unless (model_name = (
+                       @_brick_model ||
+                       (ActionView.version < ::Gem::Version.new('5.0') && args[1].is_a?(Array) ? set_brick_model(args) : nil)
+                     )&.name)
+                return _brick_find_template(*args, **options)
+              end
 
-              model_name = @_brick_model.name
               pk = @_brick_model._brick_primary_key(::Brick.relations.fetch(model_name, nil))
               obj_name = model_name.split('::').last.underscore
               path_obj_name = model_name.underscore.tr('/', '_')
@@ -488,7 +495,7 @@ if (headerTop) {
                ::Brick.config.metadata_columns.include?(col_name) || poly_cols.include?(col_name)
 
        col_order << col_name
-    %><th<%= \" title = \\\"#\{col.comment}\\\"\".html_safe unless col.comment.blank? %>><%
+    %><th<%= \" title = \\\"#\{col.comment}\\\"\".html_safe if col.respond_to?(:comment) && !col.comment.blank? %>><%
        if (bt = bts[col_name]) %>
          BT <%
          bt[1].each do |bt_pair| %><%=
@@ -562,7 +569,7 @@ end
     <tr>
     <% next if (#{(pk || []).inspect}.include?(k) && !bts.key?(k)) ||
                ::Brick.config.metadata_columns.include?(k) %>
-    <th class=\"show-field\"<%= \" title = \\\"#\{col.comment}\\\"\".html_safe unless col.comment.blank? %>>
+    <th class=\"show-field\"<%= \" title = \\\"#\{col.comment}\\\"\".html_safe if col.respond_to?(:comment) && !col.comment.blank? %>>
     <% has_fields = true
       if (bt = bts[k])
         # Add a final member in this array with descriptive options to be used in <select> drop-downs

data/lib/brick/util.rb

@@ -5,7 +5,7 @@ module Brick
   module Util
     # ===================================
     # Epic require patch
-    def self._patch_require(module_filename, folder_matcher, search_text, replacement_text, autoload_symbol = nil, is_bundler = false)
+    def self._patch_require(module_filename, folder_matcher, replacements, autoload_symbol = nil, is_bundler = false)
       mod_name_parts = module_filename.split('.')
       extension = case mod_name_parts.last
                   when 'rb', 'so', 'o'
@@ -28,10 +28,13 @@ module Brick
           Dir.mkdir(new_part) unless Dir.exist?(new_part)
           new_part
         end
-        if ::Brick::Util._write_patched(folder_matcher, module_filename, extension, custom_require_dir, nil, search_text, replacement_text) &&
+        if ::Brick::Util._write_patched(folder_matcher, module_filename, extension, custom_require_dir, nil, replacements) &&
            !alp.include?(custom_require_dir)
           alp.unshift(custom_require_dir)
         end
+        # require 'pry-byebug'
+        # binding.pry
+        # z = 10
       elsif is_bundler
         puts "Bundler hack"
         require 'pry-byebug'
@@ -56,13 +59,13 @@ module Brick
             define_method(:require) do |name|
               puts name if name.to_s.include?('cucu')
               if (require_override = ::Brick::Util.instance_variable_get(:@_require_overrides)[name])
-                extension, folder_matcher, search_text, replacement_text, autoload_symbol = require_override
+                extension, folder_matcher, replacements, autoload_symbol = require_override
                 patched_filename = "/patched_#{name.tr('/', '_')}#{extension}"
                 if $LOADED_FEATURES.find { |f| f.end_with?(patched_filename) }
                   false
                 else
                   is_replaced = false
-                  if (replacement_path = ::Brick::Util._write_patched(folder_matcher, name, extension, ::Brick::Util._custom_require_dir, patched_filename, search_text, replacement_text))
+                  if (replacement_path = ::Brick::Util._write_patched(folder_matcher, name, extension, ::Brick::Util._custom_require_dir, patched_filename, replacements))
                     is_replaced = Kernel.send(:orig_require, replacement_path)
                   elsif replacement_path.nil?
                     puts "Couldn't find #{name} to require it!"
@@ -75,7 +78,7 @@ module Brick
             end
           end
         end
-        require_overrides[module_filename] = [extension, folder_matcher, search_text, replacement_text, autoload_symbol]
+        require_overrides[module_filename] = [extension, folder_matcher, replacements, autoload_symbol]
       end
     end
 
@@ -94,7 +97,7 @@ module Brick
 
     # Returns the full path to the replaced filename, or
     # false if the file already exists, and nil if it was unable to write anything.
-    def self._write_patched(folder_matcher, name, extension, dir, patched_filename, search_text, replacement_text)
+    def self._write_patched(folder_matcher, name, extension, dir, patched_filename, replacements)
       # See if our replacement file might already exist for some reason
       name = +"/#{name}" unless name.start_with?('/')
       name << extension unless name.end_with?(extension)
@@ -111,9 +114,13 @@ module Brick
         break if path.include?(folder_matcher) && (orig_as = File.open(orig_path))
       end
       puts [folder_matcher, name].inspect
-      if (orig_text = orig_as&.read)
-        File.open(replacement_path, 'w') do |replacement|
-          num_written = replacement.write(orig_text.gsub(search_text, replacement_text))
+      if (updated_text = orig_as&.read)
+        File.open(replacement_path, 'w') do |replaced_file|
+          replacements = [replacements] unless replacements.first.is_a?(Array)
+          replacements.each do |search_text, replacement_text|
+            updated_text.gsub!(search_text, replacement_text)
+          end
+          num_written = replaced_file.write(updated_text)
         end
         orig_as.close
       end

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -2,10 +2,10 @@
 
 require 'brick/compatibility'
 
-# Allow ActiveRecord 4.0 and 4.1 to work with newer Ruby (>= 2.4) by avoiding a "stack level too deep"
+# Allow ActiveRecord 4.2.7 and older to work with newer Ruby (>= 2.4) by avoiding a "stack level too deep"
 # error when ActiveSupport tries to smarten up Numeric by messing with Fixnum and Bignum at the end of:
 # activesupport-4.0.13/lib/active_support/core_ext/numeric/conversions.rb
-if ActiveRecord.version < ::Gem::Version.new('4.2') &&
+if ActiveRecord.version < ::Gem::Version.new('4.2.8') &&
    ActiveRecord.version > ::Gem::Version.new('3.2') &&
    Object.const_defined?('Integer') && Integer.superclass.name == 'Numeric'
   class OurFixnum < Integer; end
@@ -31,25 +31,78 @@ if (ruby_version = ::Gem::Version.new(RUBY_VERSION)) >= ::Gem::Version.new('2.7'
   # Remove circular reference for "now"
   ::Brick::Util._patch_require(
     'active_support/values/time_zone.rb', '/activesupport',
-    '  def parse(str, now=now)',
-    '  def parse(str, now=now())'
+    ['  def parse(str, now=now)',
+     '  def parse(str, now=now())']
   )
   # Remove circular reference for "reflection" for ActiveRecord 3.1
   if ActiveRecord.version >= ::Gem::Version.new('3.1')
     ::Brick::Util._patch_require(
       'active_record/associations/has_many_association.rb', '/activerecord',
-      'reflection = reflection)',
-      'reflection = reflection())',
+      ['reflection = reflection)',
+       'reflection = reflection())'],
       :HasManyAssociation # Make sure the path for this guy is available to be autoloaded
     )
   end
 end
 
+# Add left_outer_join! to Associations::JoinDependency and Relation::QueryMethods
+if ActiveRecord.version < ::Gem::Version.new('5')
+  is_add_left_outer_join = true
+  ::Brick::Util._patch_require(
+    'active_record/associations/join_dependency.rb', '/activerecord', # /associations
+      ["def join_constraints(outer_joins)
+        joins = join_root.children.flat_map { |child|
+          make_inner_joins join_root, child
+        }",
+      "def join_constraints(outer_joins, join_type)
+        joins = join_root.children.flat_map { |child|
+
+          if join_type == Arel::Nodes::OuterJoin
+            make_left_outer_joins join_root, child
+          else
+            make_inner_joins join_root, child
+          end
+        }"],
+    :JoinDependency # This one is in an "eager_autoload do" -- so how to handle it?
+  )
+
+  # Three changes all in the same file, query_methods.rb:
+  ::Brick::Util._patch_require(
+    'active_record/relation/query_methods.rb', '/activerecord',
+    [
+     # Change 1 - Line 904
+     ['build_joins(arel, joins_values.flatten) unless joins_values.empty?',
+    "build_joins(arel, joins_values.flatten) unless joins_values.empty?
+      build_left_outer_joins(arel, left_outer_joins_values.flatten) unless left_outer_joins_values.empty?"
+    ],
+     # Change 2 - Line 992
+     ["raise 'unknown class: %s' % join.class.name
+        end
+      end",
+   "raise 'unknown class: %s' % join.class.name
+        end
+      end
+
+      build_join_query(manager, buckets, Arel::Nodes::InnerJoin)
+   end
+
+   def build_join_query(manager, buckets, join_type)"
+     ],
+     # Change 3 - Line 1012
+    ['join_infos = join_dependency.join_constraints stashed_association_joins',
+    'join_infos = join_dependency.join_constraints stashed_association_joins, join_type'
+     ]
+    ],
+    :QueryMethods
+  )
+end
+
+
 # puts ::Brick::Util._patch_require(
 #     'cucumber/cli/options.rb', '/cucumber/cli/options', # /cli/options
-#     '  def extract_environment_variables',
-#     "  def extract_environment_variables\n
-#     puts 'Patch test!'"
+#     ['  def extract_environment_variables',
+#      "  def extract_environment_variables\n
+#     puts 'Patch test!'"]
 #   ).inspect
 
 # An ActiveRecord extension that uses INFORMATION_SCHEMA views to reflect on all
@@ -295,10 +348,11 @@ module Brick
 
       relations = ::Brick.relations
       if (ars = ::Brick.config.additional_references) || ::Brick.config.polymorphics
+        is_optional = ActiveRecord.version >= ::Gem::Version.new('5.0')
         if ars
           ars.each do |ar|
             fk = ar.length < 5 ? [nil, +ar[0], ar[1], nil, +ar[2]] : [ar[0], +ar[1], ar[2], ar[3], +ar[4], ar[5]]
-            ::Brick._add_bt_and_hm(fk, relations, false, true)
+            ::Brick._add_bt_and_hm(fk, relations, false, is_optional)
           end
         end
         if (polys = ::Brick.config.polymorphics)
@@ -311,7 +365,7 @@ module Brick
             v ||= ActiveRecord::Base.execute_sql("SELECT DISTINCT #{poly}_type AS typ FROM #{table_name}").each_with_object([]) { |result, s| s << result['typ'] if result['typ'] }
             v.each do |type|
               if relations.key?(primary_table = type.underscore.pluralize)
-                ::Brick._add_bt_and_hm([nil, table_name, poly, nil, primary_table, "(brick) #{table_name}_#{poly}"], relations, true, true)
+                ::Brick._add_bt_and_hm([nil, table_name, poly, nil, primary_table, "(brick) #{table_name}_#{poly}"], relations, true, is_optional)
               else
                 missing_stis[primary_table] = type unless ::Brick.existing_stis.key?(type)
               end
@@ -414,7 +468,19 @@ end
 
 require 'brick/version_number'
 
+# Older versions of ActiveRecord would only show more serious error information from "panic" level, which is
+# a level only available in Postgres 12 and older.  This patch will allow older and newer versions of Postgres
+# to work along with fairly old versions of Rails.
+if Object.const_defined?('PG::VERSION') && ActiveRecord.version < ::Gem::Version.new('4.2.6')
+  ::Brick::Util._patch_require(
+    'active_record/connection_adapters/postgresql_adapter.rb', '/activerecord', ["'panic'", "'error'"]
+  )
+end
+
 require 'active_record'
+require 'active_record/relation'
+require 'active_record/relation/query_methods' if is_add_left_outer_join
+
 # Major compatibility fixes for ActiveRecord < 4.2
 # ================================================
 ActiveSupport.on_load(:active_record) do
@@ -633,6 +699,62 @@ ActiveSupport.on_load(:active_record) do
           end
         end
       end
+
+      if is_add_left_outer_join
+        # Final pieces for left_outer_joins support, which was derived from this commit:
+        # https://github.com/rails/rails/commit/3f46ef1ddab87482b730a3f53987e04308783d8b
+        module Associations
+          class JoinDependency
+            def make_left_outer_joins(parent, child)
+              tables    = child.tables
+              join_type = Arel::Nodes::OuterJoin
+              info      = make_constraints parent, child, tables, join_type
+
+              [info] + child.children.flat_map { |c| make_left_outer_joins(child, c) }
+            end
+          end
+        end
+        module Querying
+          delegate :left_outer_joins, to: :all
+        end
+        class Relation
+          MULTI_VALUE_METHODS = MULTI_VALUE_METHODS + [:left_outer_joins] unless MULTI_VALUE_METHODS.include?(:left_outer_joins)
+        end
+        module QueryMethods
+          attr_writer :left_outer_joins_values
+          def left_outer_joins_values
+            @left_outer_joins_values ||= []
+          end
+
+          def left_outer_joins(*args)
+            check_if_method_has_arguments!(:left_outer_joins, args)
+
+            args.compact!
+            args.flatten!
+
+            spawn.left_outer_joins!(*args)
+          end
+
+          def left_outer_joins!(*args) # :nodoc:
+            self.left_outer_joins_values += args
+            self
+          end
+
+          def build_left_outer_joins(manager, outer_joins)
+            buckets = outer_joins.group_by do |join|
+              case join
+              when Hash, Symbol, Array
+                :association_join
+              else
+                raise ArgumentError, 'only Hash, Symbol and Array are allowed'
+              end
+            end
+
+            build_join_query(manager, buckets, Arel::Nodes::OuterJoin)
+          end
+        end
+      end
+      # (End of left_outer_joins support)
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.38
+  version: 1.0.39
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-27 00:00:00.000000000 Z
+date: 2022-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,7 +16,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'
@@ -26,7 +26,7 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.2'
     - - "<"
       - !ruby/object:Gem::Version
         version: '7.2'