brick 1.0.47 → 1.0.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4180c0164d7f086112339696df9d8fef2aeebcd32d9b81faf22d76ddc11815bc
-  data.tar.gz: 823673bcbecc342f5df15e196ee65ad6f6ac0b75415514079c055af06d0ac7f6
+  metadata.gz: c9c3989f395bc81df36b3f295c72029e92911bd24f8d146db5627fb29c1875f4
+  data.tar.gz: 97ae12a1562f9f9bae5f401016e219a5ad58218068f80d7fc0e732d61c4f3f90
 SHA512:
-  metadata.gz: 1d17b1abd64051066b71839095be1e672b897ad707a2d10f4ca4429131c894ee178711c873cef59957111704437b86b6322b8909ab5cc41cc955547146377dd8
-  data.tar.gz: e210becff69096e73b9b7fa09bb4e1be6c36cd2982305b2c803c9c00e9d2b5b085857ea6edacc62498557cde928e2afbbb42ebbd137180385ec3a8a0c5efdf85
+  metadata.gz: c64d02f90b992640698523190a920467204a2fbb40fb9e21a3e7872ae469db3506bdf7fb535e54cd33157feb93ed43c2d1c11b2bea952bc9f034ac7e7dfb6b06
+  data.tar.gz: 6c01156b2b35f387e531ed6835a7517f5249b72ec53bb23d5d965c4b298a443d9a62e5694f9c1b4587f6ab04ef30590d7d9077e13c66b651ee8ed12b76282932

data/lib/brick/extensions.rb

@@ -619,7 +619,7 @@ Module.class_exec do
                               else
                                 ActiveSupport::Inflector.pluralize(singular_table_name)
                               end
-                 if ::Brick.config.schema_behavior[:multitenant] && Object.const_defined?('Apartment') &&
+                 if ::Brick.apartment_multitenant &&
                     Apartment.excluded_models.include?(table_name.singularize.camelize)
                    schema_name = Apartment.default_schema
                  end
@@ -654,7 +654,7 @@ class Object
   private
 
     def build_model(schema_name, inheritable_name, model_name, singular_table_name, table_name, relations, matching)
-      if ::Brick.config.schema_behavior[:multitenant] && Object.const_defined?('Apartment') &&
+      if ::Brick.apartment_multitenant &&
          schema_name == Apartment.default_schema
         relation = relations["#{schema_name}.#{matching}"]
       end
@@ -665,7 +665,7 @@ class Object
                                       schema_name
                                     else
                                       matching = "#{schema_name}.#{matching}"
-                                      (Brick.db_schemas[schema_name] ||= self.const_get(schema_name.singularize.camelize))
+                                      (Brick.db_schemas[schema_name] ||= self.const_get(schema_name.camelize))
                                     end
                     "#{schema_module&.name}::#{inheritable_name || model_name}"
                   end
@@ -846,7 +846,7 @@ class Object
                 if (inverse = assoc[:inverse])
                   # If it's multitenant with something like:  public.____ ...
                   if (it_parts = inverse_table.split('.')).length > 1 &&
-                     ::Brick.config.schema_behavior[:multitenant] && Object.const_defined?('Apartment') &&
+                     ::Brick.apartment_multitenant &&
                      it_parts.first == Apartment.default_schema
                     it_parts.shift # ... then ditch the generic schema name
                   end
@@ -1142,7 +1142,8 @@ module ActiveRecord::ConnectionHandling
       end
       # Load the initializer for the Apartment gem a little early so that if .excluded_models and
       # .default_schema are specified then we can work with non-tenanted models more appropriately
-      if Object.const_defined?('Apartment') && File.exist?(apartment_initializer = Rails.root.join('config/initializers/apartment.rb'))
+      apartment = Object.const_defined?('Apartment')
+      if apartment && File.exist?(apartment_initializer = Rails.root.join('config/initializers/apartment.rb'))
         load apartment_initializer
         apartment_excluded = Apartment.excluded_models
       end
@@ -1345,17 +1346,20 @@ module ActiveRecord::ConnectionHandling
       end
     end
 
-    apartment = Object.const_defined?('Apartment') && Apartment
     tables = []
     views = []
     relations.each do |k, v|
       name_parts = k.split('.')
+      idx = 1
+      name_parts = name_parts.map do |x|
+        ((idx += 1) < name_parts.length ? x.singularize : x).camelize
+      end
       if v.key?(:isView)
         views
       else
         name_parts.shift if apartment && name_parts.length > 1 && name_parts.first == Apartment.default_schema
         tables
-      end << name_parts.map { |x| x.singularize.camelize }.join('::')
+      end << name_parts.join('::')
     end
     unless tables.empty?
       puts "\nClasses that can be built from tables:"
@@ -1437,7 +1441,7 @@ module Brick
       unless (cnstr_name = fk[5])
         # For any appended references (those that come from config), arrive upon a definitely unique constraint name
         pri_tbl = is_class ? fk[4][:class].underscore : pri_tbl
-        pri_tbl = "#{bt_assoc_name}_#{pri_tbl}" if pri_tbl.singularize != bt_assoc_name
+        pri_tbl = "#{bt_assoc_name}_#{pri_tbl}" if pri_tbl&.singularize != bt_assoc_name
         cnstr_base = cnstr_name = "(brick) #{for_tbl}_#{pri_tbl}"
         cnstr_added_num = 1
         cnstr_name = "#{cnstr_base}_#{cnstr_added_num += 1}" while bts&.key?(cnstr_name) || hms&.key?(cnstr_name)
@@ -1463,6 +1467,8 @@ module Brick
           return
         end
       end
+      return unless bts # Rails 5.0 and older can have bts end up being nil
+
       if (assoc_bt = bts[cnstr_name])
         if is_polymorphic
           # Assuming same fk (don't yet support composite keys for polymorphics)

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

@@ -162,7 +162,7 @@ module Brick
               schema_options = ::Brick.db_schemas.keys.each_with_object(+'') { |v, s| s << "<option value=\"#{v}\">#{v}</option>" }.html_safe
               # %%% If we are not auto-creating controllers (or routes) then omit by default, and if enabled anyway, such as in a development
               # environment or whatever, then get either the controllers or routes list instead
-              apartment_default_schema = ::Brick.config.schema_behavior[:multitenant] && Object.const_defined?('Apartment') && Apartment.default_schema
+              apartment_default_schema = ::Brick.apartment_multitenant && Apartment.default_schema
               table_options = (::Brick.relations.keys - ::Brick.config.exclude_tables).map do |tbl|
                                 if (tbl_parts = tbl.split('.')).first == apartment_default_schema
                                   tbl = tbl_parts.last
@@ -537,7 +537,7 @@ if (headerTop) {
        k, id = @_brick_params.first
        id = id.first if id.is_a?(Array) && id.length == 1
        origin = (key_parts = k.split('.')).length == 1 ? #{model_name} : #{model_name}.reflect_on_association(key_parts.first).klass
-       if (destination_fk = Brick.relations[origin.table_name][:fks].values.find { |fk| puts fk.inspect; fk[:fk] == key_parts.last }) &&
+       if (destination_fk = Brick.relations[origin.table_name][:fks].values.find { |fk| fk[:fk] == key_parts.last }) &&
           (obj = (destination = origin.reflect_on_association(destination_fk[:assoc_name])&.klass)&.find(id)) %>
          <h3>for <%= link_to \"#{"#\{obj.brick_descrip\} (#\{destination.name\})\""}, send(\"#\{destination.name.underscore.tr('/', '_')\}_path\".to_sym, id) %></h3><%
        end

data/lib/brick/version_number.rb

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

data/lib/brick.rb

@@ -47,7 +47,6 @@ 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)
@@ -140,6 +139,13 @@ module Brick
       (@relations ||= {})[ActiveRecord::Base.connection_pool.object_id] ||= Hash.new { |h, k| h[k] = Hash.new { |h, k| h[k] = {} } }
     end
 
+    def apartment_multitenant
+      if @apartment_multitenant.nil?
+        @apartment_multitenant = ::Brick.config.schema_behavior[:multitenant] && Object.const_defined?('Apartment')
+      end
+      @apartment_multitenant
+    end
+
     # If multitenancy is enabled, a list of non-tenanted "global" models
     def non_tenanted_models
       @pending_models ||= {}
@@ -451,7 +457,7 @@ In config/initializers/brick.rb appropriate entries would look something like:
         ::Brick.relations.each do |rel_name, v|
           rel_name = rel_name.split('.').map(&:underscore)
           schema_names = rel_name[0..-2]
-          schema_names.shift if ::Brick.config.schema_behavior[:multitenant] && Object.const_defined?('Apartment') && schema_names.first == Apartment.default_schema
+          schema_names.shift if ::Brick.apartment_multitenant && schema_names.first == Apartment.default_schema
           k = rel_name.last
           unless existing_controllers.key?(controller_name = k.pluralize)
             options = {}
@@ -481,7 +487,8 @@ 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')
+if (is_postgres = (Object.const_defined?('PG::VERSION') || Gem::Specification.find_all_by_name('pg').present?)) &&
+   ActiveRecord.version < ::Gem::Version.new('4.2.6')
   ::Brick::Util._patch_require(
     'active_record/connection_adapters/postgresql_adapter.rb', '/activerecord', ["'panic'", "'error'"]
   )
@@ -489,13 +496,28 @@ end
 
 require 'active_record'
 require 'active_record/relation'
-require 'active_record/relation/query_methods' if is_add_left_outer_join
+# To support adding left_outer_join
+require 'active_record/relation/query_methods' if ActiveRecord.version < ::Gem::Version.new('5')
+require 'rails/railtie' if ActiveRecord.version < ::Gem::Version.new('4.2')
 
 # Rake tasks
 class Railtie < Rails::Railtie
   Dir.glob("#{File.expand_path(__dir__)}/brick/tasks/**/*.rake").each { |task| load task }
 end
 
+# Rails < 4.2 does not have env
+module Rails
+  unless respond_to?(:env)
+    def self.env
+      @_env ||= ActiveSupport::StringInquirer.new(ENV["RAILS_ENV"] || ENV["RACK_ENV"] || "development")
+    end
+
+    def self.env=(environment)
+      @_env = ActiveSupport::StringInquirer.new(environment)
+    end
+  end
+end
+
 # Major compatibility fixes for ActiveRecord < 4.2
 # ================================================
 ActiveSupport.on_load(:active_record) do
@@ -510,6 +532,15 @@ ActiveSupport.on_load(:active_record) do
           end
         end
       end
+      # ActiveRecord < 4.2 does not have default_timezone
+      # :singleton-method:
+      # Determines whether to use Time.utc (using :utc) or Time.local (using :local) when pulling
+      # dates and times from the database. This is set to :utc by default.
+      unless respond_to?(:default_timezone)
+        puts "ADDING!!! 4.w"
+        mattr_accessor :default_timezone, instance_writer: false
+        self.default_timezone = :utc
+      end
     end
 
     # Rails < 4.0 cannot do #find_by, #find_or_create_by, or do #pluck on multiple columns, so here are the patches:
@@ -715,58 +746,60 @@ ActiveSupport.on_load(:active_record) do
         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
+      # 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
-        module Querying
-          delegate :left_outer_joins, to: :all
+      end
+      module Querying
+        delegate :left_outer_joins, to: :all
+      end
+      class Relation
+        unless MULTI_VALUE_METHODS.include?(:left_outer_joins)
+          _multi_value_methods = MULTI_VALUE_METHODS + [:left_outer_joins]
+          send(:remove_const, :MULTI_VALUE_METHODS)
+          MULTI_VALUE_METHODS = _multi_value_methods
         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
-        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)
+        def left_outer_joins(*args)
+          check_if_method_has_arguments!(:left_outer_joins, args)
 
-            args.compact!
-            args.flatten!
+          args.compact!
+          args.flatten!
 
-            spawn.left_outer_joins!(*args)
-          end
+          spawn.left_outer_joins!(*args)
+        end
 
-          def left_outer_joins!(*args) # :nodoc:
-            self.left_outer_joins_values += args
-            self
-          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
+        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
-
-            build_join_query(manager, buckets, Arel::Nodes::OuterJoin)
           end
+
+          build_join_query(manager, buckets, Arel::Nodes::OuterJoin)
         end
       end
       # (End of left_outer_joins support)
@@ -788,7 +821,8 @@ ActiveSupport.on_load(:active_record) do
 end
 
 # Do this earlier because stuff here gets mixed into JoinDependency::JoinAssociation and AssociationScope
-if ActiveRecord.version < ::Gem::Version.new('5.0') && Object.const_defined?('PG::Connection')
+if is_postgres && ActiveRecord.version < ::Gem::Version.new('5.0') # Was:  && Object.const_defined?('PG::Connection')
+  require 'pg' # For ActiveRecord < 4.2
   # Avoid pg gem deprecation warning:  "You should use PG::Connection, PG::Result, and PG::Error instead"
   PGconn = PG::Connection
   PGresult = PG::Result

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: brick
 version: !ruby/object:Gem::Version
-  version: 1.0.47
+  version: 1.0.48
 platform: ruby
 authors:
 - Lorin Thwaits
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-17 00:00:00.000000000 Z
+date: 2022-07-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,9 +17,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -27,9 +24,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: fancy_gets
   requirement: !ruby/object:Gem::Requirement