activerecord-virtual_attributes 6.1.1 → 7.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8a35d6c7665469341b76ae68e1a84180ccef887c47f56b7000efc2f0024d0a93
-  data.tar.gz: ba57d73a5034e461d3c6bd77a50eb5475d1fe0dab8c3332f91142c893fa736a2
+  metadata.gz: cf8f363320713146ad286d76999f5640a9fc44f3e139f6e5377ac8220e476217
+  data.tar.gz: cbabad277bfef0e01da4d14b8942671770eb283c9692ef9eb7a07cbac5f25b68
 SHA512:
-  metadata.gz: 55f8e509034dc3a13dae283733da176c308d25538c38595cebfd98008d07be372c0843752e547be6afb5af361fd1610900f05fc52cdcdfbd8bff834b66233060
-  data.tar.gz: c4511ba748f911a985f308bdfa61f9d6c64c57ec1245003dea509205f3aa4e0085f20f7e9adb5674d3657d750c34e6c4d64d41ee5faebb18846c9e8ef3ea4c32
+  metadata.gz: 10295799b997217903b155c7ed84e9ee82bad2cf6c208b6aa140dc94e66df9b4ed8fbcf13418a2feadf075e7f93b2c550d7a94b698aae0c08b6d29a4d5ebe159
+  data.tar.gz: 1663fd7ab8af93e3419b6a1ae608c94d55df957b45d904e38b31a3b5f93667159e6ee10e667f560174b12cc2b66e936e20bcadc4ac98a45953ed3923f21cac94

data/.codeclimate.yml

@@ -31,4 +31,4 @@ plugins:
   rubocop:
     enabled: true
     config: ".rubocop_cc.yml"
-    channel: rubocop-0-82
+    channel: rubocop-1-56-3

data/.github/workflows/ci.yaml

@@ -13,6 +13,8 @@ jobs:
       matrix:
         ruby-version:
         - '2.7'
+        - '3.0'
+        - '3.1'
     services:
       postgres:
         image: postgres:13
@@ -23,7 +25,7 @@ jobs:
         ports:
         - 5432:5432
       mysql:
-        image: mysql:8.0
+        image: mysql:8.4
         env:
           MYSQL_ROOT_PASSWORD: password
           MYSQL_DATABASE: virtual_attributes
@@ -41,7 +43,7 @@ jobs:
       MYSQL_HOST: 127.0.0.1
       MYSQL_PWD: password
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - name: Set up Ruby
         uses: ruby/setup-ruby@v1
         with:
@@ -54,7 +56,7 @@ jobs:
         run: bundle exec rake
       - name: Run PostgreSQL tests
         env:
-          DB: pg
+          DB: postgresql
           COLLATE_SYMBOLS: false
         run: bundle exec rake
       - name: Run MySQL tests
@@ -62,8 +64,8 @@ jobs:
           DB: mysql2
         run: bundle exec rake
       - name: Report code coverage
-        if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '2.7' }}
+        if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' }}
         continue-on-error: true
-        uses: paambaati/codeclimate-action@v3.0.0
+        uses: paambaati/codeclimate-action@v8
         env:
           CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}

data/CHANGELOG.md

@@ -4,6 +4,26 @@ The versioning of this gem follows ActiveRecord versioning, and does not follow
 
 ## [Unreleased]
 
+## [7.0.0] - 2024-08-01
+
+* Use Arel.literal [#154](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/154)
+* drop attribute_builder [#153](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/153)
+* dropped virtual_aggregate [#152](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/152)
+* resolve rubocops (also fix bin/console) [#151](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/151)
+* Rails 7.0 support / dropping 6.1 [#150](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/150)
+* condense includes produced by replace_virtual_fields [#149](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/149)
+* fix bin/console [#148](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/148)
+* Rails 7.0 support pt1 [#146](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/146)
+* Fix sqlite3 v2 and rails [#140](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/140)
+* Use custom Arel node [#114](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/114)
+
+## [6.1.2] - 2023-10-26
+
+* Fix bind variables for joins with static strings [#124](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/124)
+* Add `virtual_total` for `habtm` [#123](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/123)
+* Fix: `:uses` clause now works with an array and nested hashes. [#120](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/120)
+* Uses symbols in the `includes()` clause. defined by `virtual_attribute :uses` and virtual_delegate. [#128](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/128)
+
 ## [6.1.1] - 2022-08-09
 
 * fix HomogeneousIn clauses [#111](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/111)
@@ -86,7 +106,9 @@ The versioning of this gem follows ActiveRecord versioning, and does not follow
 * Initial Release
 * Extracted from ManageIQ/manageiq
 
-[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v6.1.1...HEAD
+[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v7.0.0...HEAD
+[7.0.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v6.1.2...v7.0.0
+[6.1.2]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v6.1.1...v6.1.2
 [6.1.1]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v6.1.0...v6.1.1
 [6.1.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v3.0.0...v6.1.0
 [3.0.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v2.0.0...v3.0.0

data/Gemfile

@@ -2,9 +2,9 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 6.1.4"
+gem "activerecord", "~>7.0.8"
 gem "mysql2"
 gem "pg"
-gem "sqlite3"
+gem "sqlite3", "< 2"
 
 gemspec

data/README.md

@@ -1,8 +1,8 @@
 # VirtualAttributes
 
 [![CI](https://github.com/ManageIQ/activerecord-virtual_attributes/actions/workflows/ci.yaml/badge.svg)](https://github.com/ManageIQ/activerecord-virtual_attributes/actions/workflows/ci.yaml)
-[![Maintainability](https://api.codeclimate.com/v1/badges/e1a0c26941c00f4edb55/maintainability)](https://codeclimate.com/github/ManageIQ/activerecord-virtual_attributes/maintainability)
-[![Test Coverage](https://api.codeclimate.com/v1/badges/e1a0c26941c00f4edb55/test_coverage)](https://codeclimate.com/github/ManageIQ/activerecord-virtual_attributes/test_coverage)
+[![Maintainability](https://codeclimate.com/github/ManageIQ/activerecord-virtual_attributes.svg)](https://codeclimate.com/github/ManageIQ/activerecord-virtual_attributes/maintainability)
+[![Test Coverage](https://codeclimate.com/github/ManageIQ/activerecord-virtual_attributes/coverage.svg)](https://codeclimate.com/github/ManageIQ/activerecord-virtual_attributes/test_coverage)
 
 VirtualAttributes allows you to define a ruby method that acts like an attribute or relation.
 
@@ -40,14 +40,15 @@ TODO: Write usage instructions here
 
 ## Development
 
-After checking out the repo, run `bin/setup` to install dependencies. Then, run `rake spec` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
+After checking out the repo, run `bin/setup` to install dependencies. Then, run `bundle exec rake` to run the tests. You can also run `bin/console` for an interactive prompt that will allow you to experiment.
 
 To install this gem onto your local machine, run `bundle exec rake install`. To release a new version, update the version number in `version.rb`, and then run `bundle exec rake release`, which will create a git tag for the version, push git commits and tags, and push the `.gem` file to [rubygems.org](https://rubygems.org).
 
+To test with different database adapters, set the DB environment variable:
 
-To test with different versions of ruby, use `wwtd` gem or
-
-DB=pg BUNDLE_GEMFILE=gemfiles/gemfile_${version-52}.gemfile bundle exec rake
+    DB=postgresql bundle exec rake
+    DB=mysql bundle exec rake
+    DB=sqlite3 bundle exec rake
 
 ## Contributing
 
@@ -56,4 +57,3 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/Manage
 ## License
 
 This project is available as open source under the terms of the [Apache License 2.0](http://www.apache.org/licenses/LICENSE-2.0).
-

data/activerecord-virtual_attributes.gemspec

@@ -9,28 +9,35 @@ Gem::Specification.new do |spec|
   spec.authors       = ["Keenan Brock"]
   spec.email         = ["keenan@thebrocks.net"]
 
-  spec.summary       = %q{Access non-sql attributes from sql}
-  spec.description   = %q{Define attributes in arel}
+  spec.summary       = "Access non-sql attributes from sql"
+  spec.description   = "Define attributes in arel"
   spec.homepage      = "https://github.com/ManageIQ/activerecord-virtual_attributes"
   spec.license       = "Apache 2.0"
-  spec.metadata["homepage_uri"] = spec.homepage
-  spec.metadata["source_code_uri"] = "https://github.com/ManageIQ/activerecord-virtual_attributes"
-  spec.metadata["changelog_uri"] = "https://github.com/ManageIQ/activerecord-virtual_attributes/blob/master/CHANGELOG.md"
+  spec.metadata      = {
+    "homepage_uri"          => spec.homepage,
+    "source_code_uri"       => "https://github.com/ManageIQ/activerecord-virtual_attributes",
+    "changelog_uri"         => "https://github.com/ManageIQ/activerecord-virtual_attributes/blob/master/CHANGELOG.md",
+    "rubygems_mfa_required" => "true"
+  }
 
   # Specify which files should be added to the gem when it is released.
   # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
-  spec.files         = Dir.chdir(File.expand_path('..', __FILE__)) do
+  spec.files = Dir.chdir(File.expand_path('..', __FILE__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
   end
 
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activerecord", "~> 6.1.0"
+  spec.add_runtime_dependency "activerecord", "~> 7.0"
 
   spec.add_development_dependency "byebug"
+  spec.add_development_dependency "database_cleaner-active_record", "~> 2.1"
   spec.add_development_dependency "db-query-matchers"
   spec.add_development_dependency "manageiq-style"
+  spec.add_development_dependency "mysql2"
+  spec.add_development_dependency "pg"
   spec.add_development_dependency "rake", "~> 13.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov", ">= 0.21.2"
+  spec.add_development_dependency "sqlite3"
 end

data/bin/console

@@ -3,9 +3,12 @@
 require "bundler/setup"
 require "active_record-virtual_attributes"
 
+# any helper that is not rspec specific
+Dir['./spec/support/**/*.rb'].sort.select { |f| !File.read(f).include?("RSpec") }.each { |f| require f }
+
 # models for local testing
-require "rspec"
-Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
+Database.new.setup.migrate
+require_relative "../seed"
 
 require "irb"
 IRB.start(__FILE__)

data/bin/setup

@@ -1,8 +1,13 @@
 #!/usr/bin/env bash
 set -euo pipefail
 IFS=$'\n\t'
-set -vx
+set -e
 
 bundle install
+echo
 
-# Do any other automated setup that you need to do here
+echo "Setting up the postgres database for specs..."
+echo "SELECT 'CREATE DATABASE virtual_attributes' WHERE NOT EXISTS (SELECT FROM pg_database WHERE datname = 'virtual_attributes')\gexec" | psql -U postgres
+
+echo "Setting up the mysql database for specs..."
+mysql -u root -e 'CREATE SCHEMA IF NOT EXISTS 'virtual_attributes';'

data/lib/active_record/virtual_attributes/rspec/have_virtual_attribute.rb

@@ -1,4 +1,4 @@
-RSpec::Matchers.define :have_virtual_attribute do |name, type|
+RSpec::Matchers.define(:have_virtual_attribute) do |name, type|
   match do |klass|
     expect(klass.has_attribute?(name)).to be_truthy
     expect(klass.virtual_attribute?(name)).to be_truthy

data/lib/active_record/virtual_attributes/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module VirtualAttributes
-    VERSION = "6.1.1".freeze
+    VERSION = "7.0.0".freeze
   end
 end

data/lib/active_record/virtual_attributes/virtual_arel.rb

@@ -10,8 +10,13 @@ module ActiveRecord
     # Model.select(Model.arel_table.grouping(Model.arel_table[:field2]).as(:field))
     # Model.attribute_supported_by_sql?(:field) # => true
 
-    # in essence, this is our Arel::Nodes::VirtualAttribute
-    class Arel::Nodes::Grouping
+    class VirtualAttribute < Arel::Nodes::Grouping
+      def initialize(arel, name = nil, relation = nil)
+        super(arel)
+        @name = name
+        @relation = relation
+      end
+
       attr_accessor :name, :relation
 
       # methods from Arel::Nodes::Attribute
@@ -36,10 +41,8 @@ module ActiveRecord
     end
 
     module VirtualArel
-      # This arel table proxy is our shim to get our functionality into rails
+      # This arel table proxy. This allows WHERE clauses to use virtual attributes
       class ArelTableProxy < Arel::Table
-        attr_accessor :klass
-
         # overrides Arel::Table#[]
         # adds aliases and virtual attribute arel (aka sql)
         #
@@ -70,16 +73,9 @@ module ActiveRecord
       end
 
       module ClassMethods
-        if ActiveRecord.version.to_s < "6.1"
-          # ActiveRecord::Core 6.0 (every version of active record seems to do this differently)
-          def arel_table
-            @arel_table ||= ArelTableProxy.new(table_name, :type_caster => type_caster).tap { |t| t.klass = self }
-          end
-        else
-          # ActiveRecord::Core 6.1
-          def arel_table
-            @arel_table ||= ArelTableProxy.new(table_name, :klass => self)
-          end
+        # ActiveRecord::Core 6.1
+        def arel_table
+          @arel_table ||= ArelTableProxy.new(table_name, :klass => self)
         end
 
         # supported by sql if any are true:
@@ -104,10 +100,12 @@ module ActiveRecord
           return unless arel_lambda
 
           arel = arel_lambda.call(table)
-          arel = Arel::Nodes::Grouping.new(arel) unless arel.kind_of?(Arel::Nodes::Grouping)
-          arel.name = column_name
-          arel.relation = table
-          arel
+          # By convention, all attributes are defined with a grouping.
+          # Since we're adding a VirtualAttribute node, which is essentially a
+          # grouping, there is no need to keep both and end up with double parens
+          arel = arel.expr if arel.kind_of?(Arel::Nodes::Grouping)
+
+          VirtualAttribute.new(arel, column_name, table)
         end
 
         private
@@ -120,6 +118,8 @@ module ActiveRecord
   end
 end
 
+# fixed in https://github.com/rails/rails/pull/45642
+if ActiveRecord.version < Gem::Version.new(7.1)
 module Arel # :nodoc: all
   # rubocop:disable Naming/MethodName
   # rubocop:disable Naming/MethodParameterName
@@ -159,3 +159,4 @@ module Arel # :nodoc: all
   # rubocop:enable Naming/MethodParameterName
   # rubocop:enable Style/ConditionalAssignment
 end
+end

data/lib/active_record/virtual_attributes/virtual_delegates.rb

@@ -43,7 +43,7 @@ module ActiveRecord
             method_prefix = virtual_delegate_name_prefix(options[:prefix], to)
             method_name = "#{method_prefix}#{method}"
             if to.include?(".") # to => "target.method"
-              to, method = to.split(".")
+              to, method = to.split(".").map(&:to_sym)
               options[:to] = to
             end
 
@@ -74,12 +74,13 @@ module ActiveRecord
           type = options[:type] || to_ref.klass.type_for_attribute(col)
           type = ActiveRecord::Type.lookup(type) if type.kind_of?(Symbol)
           raise "unknown attribute #{to}##{col} referenced in #{name}" unless type
+
           arel = virtual_delegate_arel(col, to_ref)
           define_virtual_attribute(method_name, type, :uses => (options[:uses] || to), :arel => arel)
         end
 
         # see activesupport module/delegation.rb
-        def define_delegate(method_name, method, to: nil, allow_nil: nil, default: nil)
+        def define_delegate(method_name, method, to: nil, allow_nil: nil, default: nil) # rubocop:disable Naming/MethodParameterName
           location = caller_locations(2, 1).first
           file, line = location.path, location.lineno
 
@@ -125,7 +126,7 @@ module ActiveRecord
           module_eval(method_def, file, line)
         end
 
-        def virtual_delegate_name_prefix(prefix, to)
+        def virtual_delegate_name_prefix(prefix, to) # rubocop:disable Naming/MethodParameterName
           "#{prefix == true ? to : prefix}_" if prefix
         end
 
@@ -260,8 +261,7 @@ module ActiveRecord
 
         yield arel if block_given?
 
-        # convert arel to sql to populate with bind variables
-        ::Arel::Nodes::Grouping.new(Arel.sql(arel.to_sql))
+        arel
       end
 
       # determine table reference to use for a sub query

data/lib/active_record/virtual_attributes/virtual_fields.rb

@@ -5,6 +5,7 @@ module ActiveRecord
       include ActiveRecord::VirtualAttributes
       include ActiveRecord::VirtualAttributes::VirtualReflections
 
+      # rubocop:disable Style/SingleLineMethods
       module NonARModels
         def dangerous_attribute_method?(_); false; end
 
@@ -14,6 +15,7 @@ module ActiveRecord
 
         def belongs_to_required_by_default; false; end
       end
+      # rubocop:enable Style/SingleLineMethods
 
       included do
         unless respond_to?(:dangerous_attribute_method?)
@@ -31,18 +33,20 @@ module ActiveRecord
         end
 
         def replace_virtual_fields(associations)
-          return associations if associations.blank?
-
-          case associations
-          when String, Symbol
-            virtual_field?(associations) ? replace_virtual_fields(virtual_includes(associations)) : associations
-          when Array
-            associations.collect { |association| replace_virtual_fields(association) }.compact
-          when Hash
-            replace_virtual_field_hash(associations)
-          else
-            associations
-          end
+          return nil if associations.blank?
+
+          ret =
+            case associations
+            when String, Symbol
+              virtual_field?(associations) ? replace_virtual_fields(virtual_includes(associations)) : associations.to_sym
+            when Array
+              associations.filter_map { |association| replace_virtual_fields(association) }
+            when Hash
+              replace_virtual_field_hash(associations)
+            else
+              associations
+            end
+          simplify_includes(ret)
         end
 
         def replace_virtual_field_hash(associations)
@@ -67,9 +71,11 @@ module ActiveRecord
         def include_to_hash(value)
           case value
           when String, Symbol
-            {value => {}}
+            {value.to_sym => {}}
           when Array
-            value.flatten.each_with_object({}) { |k, h| h[k] = {} }
+            value.flatten.each_with_object({}) do |k, h|
+              merge_includes(h, k)
+            end
           when nil
             {}
           else
@@ -77,15 +83,33 @@ module ActiveRecord
           end
         end
 
-        # @param [Hash] hash1
-        # @param [Hash] hash2
+        # @param [Hash] hash1 (incoming hash is modified and returned)
+        # @param [Hash|Symbol|nil] hash2 (this hash will not be modified)
         def merge_includes(hash1, hash2)
           return hash1 if hash2.blank?
 
-          hash1 = include_to_hash(hash1)
-          hash2 = include_to_hash(hash2)
-          hash1.deep_merge!(hash2) do |_k, v1, v2|
-            merge_includes(v1, v2)
+          # very common case.
+          # optimization to skip deep_merge and hash creation
+          if hash2.kind_of?(Symbol)
+            hash1[hash2] ||= {}
+            return hash1
+          end
+
+          hash1.deep_merge!(include_to_hash(hash2)) do |_k, v1, v2|
+            # this block is conflict resolution when a key has 2 values
+            merge_includes(include_to_hash(v1), v2)
+          end
+        end
+
+        # @param [Hash|Array|Symbol|nil]
+        def simplify_includes(ret)
+          case ret
+          when Hash
+            ret.size <= 1 && ret.values.first.blank? ? ret.keys.first : ret
+          when Array
+            ret.size <= 1 ? ret.first : ret
+          else
+            ret
           end
         end
       end
@@ -93,6 +117,25 @@ module ActiveRecord
   end
 end
 
+def assert_klass_has_instance_method(klass, instance_method)
+  klass.instance_method(instance_method)
+rescue NameError => err
+  msg = "#{klass} is missing the method our prepended code is expecting to patch. Was the undefined method removed or renamed upstream?\nSee: #{__FILE__}.\nThe NameError was: #{err}. "
+  raise NameError, msg
+end
+
+# Expect these methods to exist. (Otherwise we are patching the wrong methods)
+%w[
+  grouped_records
+  preloaders_for_reflection
+].each { |method| assert_klass_has_instance_method(ActiveRecord::Associations::Preloader::Branch, method) }
+
+%w[
+  build_select
+  arel_column
+  construct_join_dependency
+].each { |method| assert_klass_has_instance_method(ActiveRecord::Relation, method) }
+
 module ActiveRecord
   class Base
     include ActiveRecord::VirtualAttributes::VirtualFields
@@ -101,105 +144,81 @@ module ActiveRecord
   module Associations
     class Preloader
       prepend(Module.new {
-        # preloader.rb active record 6.0
-        # changed:
-        # since grouped_records can return a hash/array, we need to handle those 2 new cases
-        def preloaders_for_reflection(reflection, records, scope, polymorphic_parent)
-          case reflection
-          when Array
-            reflection.flat_map { |ref| preloaders_on(ref, records, scope, polymorphic_parent) }
-          when Hash
-            preloaders_on(reflection, records, scope, polymorphic_parent)
-          else
-            super(reflection, records, scope)
+        # preloader is called with virtual attributes - need to resolve
+        def call
+          # Possibly overkill since all records probably have the same class and associations
+          # use a cache so we only convert includes once per base class
+          assoc_cache = Hash.new { |h, klass| h[klass] = klass.replace_virtual_fields(associations) }
+
+          # convert the includes with virtual attributes to includes with proper associations
+          records_by_assoc = records.group_by { |rec| assoc_cache[rec.class] }
+          # if these are the same includes, then do the preloader work
+          return super if records_by_assoc.size == 1 && records_by_assoc.keys.first == associations
+
+          # for each of the associations, run a preloader
+          records_by_assoc.each do |klass_associations, klass_records|
+            next if klass_associations.blank?
+
+            Array[klass_associations].each do |klass_association| # rubocop:disable Style/RedundantArrayConstructor
+              # this calls back into itself, but it will take the short circuit
+              Preloader.new(:records => klass_records, :associations => klass_association, :scope => scope).call
+            end
           end
         end
+      })
 
-        # rubocop:disable Style/BlockDelimiters, Lint/AmbiguousBlockAssociation, Style/MethodCallWithArgsParentheses
-        # preloader.rb active record 6.0
-        # changed:
-        # passing polymorphic around (and makes 5.2 more similar to 6.0)
-        def preloaders_for_hash(association, records, scope, polymorphic_parent)
-          association.flat_map { |parent, child|
-            grouped_records(parent, records, polymorphic_parent).flat_map do |reflection, reflection_records|
-              loaders = preloaders_for_reflection(reflection, reflection_records, scope, polymorphic_parent)
-              recs = loaders.flat_map(&:preloaded_records).uniq
-              child_polymorphic_parent = reflection && reflection.respond_to?(:options) && reflection.options[:polymorphic]
-              loaders.concat Array.wrap(child).flat_map { |assoc|
-                preloaders_on assoc, recs, scope, child_polymorphic_parent
-              }
-              loaders
-            end
-          }
-        end
+      class Branch
+        prepend(Module.new {
+          # from branched.rb 7.0
+          def grouped_records
+            h = {}
+            polymorphic_parent = !root? && parent.polymorphic?
+            source_records.each do |record|
+              # begin virtual_attributes changes
+              association = record.class.replace_virtual_fields(self.association)
+              # end virtual_attributes changes
 
-        # preloader.rb active record 6.0
-        # changed:
-        # passing polymorphic_parent to preloaders_for_reflection
-        def preloaders_for_one(association, records, scope, polymorphic_parent)
-          grouped_records(association, records, polymorphic_parent)
-            .flat_map do |reflection, reflection_records|
-              preloaders_for_reflection(reflection, reflection_records, scope, polymorphic_parent)
+              reflection = record.class._reflect_on_association(association)
+              next if polymorphic_parent && !reflection || !record.association(association).klass
+              (h[reflection] ||= []) << record
             end
-        end
+            h
+          end
 
-        # preloader.rb active record 6.0, 6.1
-        def grouped_records(orig_association, records, polymorphic_parent)
-          h = {}
-          records.each do |record|
-            # The virtual_field lookup can return Symbol/Nil/Other (typically a Hash)
-            #   so the case statement and the cases for Nil/Other are new
+          # branched.rb 7.0
+          def preloaders_for_reflection(reflection, reflection_records)
+            reflection_records.group_by do |record|
+              # begin virtual_attributes changes
+              needed_association = record.class.replace_virtual_fields(association)
+              # end virtual_attributes changes
 
-            # each class can resolve virtual_{attributes,includes} differently
-            association = record.class.replace_virtual_fields(orig_association)
-            # 1 line optimization for single element array:
-            association = association.first if association.kind_of?(Array) && association.size == 1
+              klass = record.association(needed_association).klass
 
-            case association
-            when Symbol, String
-              reflection = record.class._reflect_on_association(association)
-              next if polymorphic_parent && !reflection || !record.association(association).klass
-            when nil
-              next
-            else # need parent (preloaders_for_{hash,one}) to handle this Array/Hash
-              reflection = association
+              if reflection.scope && reflection.scope.arity != 0
+                # For instance dependent scopes, the scope is potentially
+                # different for each record. To allow this we'll group each
+                # object separately into its own preloader
+                reflection_scope = reflection.join_scopes(klass.arel_table, klass.predicate_builder, klass, record).inject(&:merge!)
+              end
+
+              [klass, reflection_scope]
+            end.map do |(rhs_klass, reflection_scope), rs|
+              preloader_for(reflection).new(rhs_klass, rs, reflection, scope, reflection_scope, associate_by_default)
             end
-            (h[reflection] ||= []) << record
           end
-          h
-        end
-        # rubocop:enable Style/BlockDelimiters, Lint/AmbiguousBlockAssociation, Style/MethodCallWithArgsParentheses
-      })
+        })
+      end
     end
   end
 
   class Relation
-    def without_virtual_includes
-      filtered_includes = includes_values && klass.replace_virtual_fields(includes_values)
-      if filtered_includes != includes_values
-        spawn.tap { |other| other.includes_values = filtered_includes }
-      else
-        self
-      end
-    end
-
     include(Module.new {
-      # From ActiveRecord::FinderMethods
-      def apply_join_dependency(*args, **kargs, &block)
-        real = without_virtual_includes
-        if real.equal?(self)
-          super
-        else
-          real.apply_join_dependency(*args, **kargs, &block)
-        end
-      end
-
       # From ActiveRecord::QueryMethods (rails 5.2 - 6.1)
       def build_select(arel)
         if select_values.any?
-          cols = arel_columns(select_values.uniq).map do |col|
+          cols = arel_columns(select_values).map do |col|
             # if it is a virtual attribute, then add aliases to those columns
-            if col.kind_of?(Arel::Nodes::Grouping) && col.name
+            if col.kind_of?(VirtualAttributes::VirtualAttribute)
               col.as(connection.quote_column_name(col.name))
             else
               col
@@ -211,9 +230,8 @@ module ActiveRecord
         end
       end
 
-      # from ActiveRecord::QueryMethods (rails 5.2 - 6.0)
-      # TODO: remove from rails 7.0
-      def arel_column(field, &block)
+      # from ActiveRecord::QueryMethods (rails 5.2 - 7.0)
+      def arel_column(field)
         if virtual_attribute?(field) && (arel = table[field])
           arel
         else
@@ -222,19 +240,9 @@ module ActiveRecord
       end
 
       def construct_join_dependency(associations, join_type) # :nodoc:
-        associations = klass.replace_virtual_fields(associations)
+        associations = klass.replace_virtual_fields(associations) || {}
         super
       end
-
-      # From ActiveRecord::Calculations
-      # introduces virtual includes support for calculate (we mostly use COUNT(*))
-      def calculate(operation, attribute_name)
-        # allow calculate to work with includes and a virtual attribute
-        real = without_virtual_includes
-        return super if real.equal?(self)
-
-        real.calculate(operation, attribute_name)
-      end
     })
   end
 end

data/lib/active_record/virtual_attributes/virtual_reflections.rb

@@ -17,7 +17,7 @@ module ActiveRecord
         end
 
         def virtual_has_many(name, options = {})
-          define_method("#{name.to_s.singularize}_ids") do
+          define_method(:"#{name.to_s.singularize}_ids") do
             records = send(name)
             records.respond_to?(:ids) ? records.ids : records.collect(&:id)
           end
@@ -57,11 +57,11 @@ module ActiveRecord
         end
 
         def follow_associations(association_names)
-          association_names.inject(self) { |klass, name| klass.try!(:reflect_on_association, name).try!(:klass) }
+          association_names.inject(self) { |klass, name| klass&.reflect_on_association(name)&.klass }
         end
 
         def follow_associations_with_virtual(association_names)
-          association_names.inject(self) { |klass, name| klass.try!(:reflection_with_virtual, name).try!(:klass) }
+          association_names.inject(self) { |klass, name| klass&.reflection_with_virtual(name)&.klass }
         end
 
         # invalid associations return a nil
@@ -97,6 +97,7 @@ module ActiveRecord
 
         def add_virtual_reflection(reflection, name, uses, _options)
           raise ArgumentError, "macro must be specified" unless reflection
+
           reset_virtual_reflection_information
           _virtual_reflections[name.to_sym] = reflection
           define_virtual_include(name.to_s, uses)

data/lib/active_record/virtual_attributes/virtual_total.rb

@@ -49,35 +49,6 @@ module VirtualAttributes
         define_virtual_aggregate_method(name, relation, column, :average) { |values| values.count == 0 ? 0 : values.sum / values.count }
       end
 
-      #  @param method_name
-      #    :count :average :minimum :maximum :sum
-      #
-      #  example:
-      #
-      #    class Hardware
-      #      has_many :disks
-      #      virtual_sum :allocated_disk_storage, :disks, :size
-      #    end
-      #
-      #    generates:
-      #
-      #    def allocated_disk_storage
-      #      if disks.loaded?
-      #        disks.map(&:size).compact.sum
-      #      else
-      #        disks.sum(:size) || 0
-      #      end
-      #    end
-      #
-      #    virtual_attribute :allocated_disk_storage, :integer, :uses => :disks, :arel => ...
-      #
-      #    # arel => (SELECT sum("disks"."size") where "hardware"."id" = "disks"."hardware_id")
-
-      def virtual_aggregate(name, relation, method_name = :sum, column = nil, options = {})
-        return virtual_total(name, relation, options) if method_name == :size
-        return virtual_sum(name, relation, column, options) if method_name == :sum
-      end
-
       def define_virtual_aggregate_attribute(name, relation, method_name, column, options)
         reflection = reflect_on_association(relation)
 
@@ -101,7 +72,7 @@ module VirtualAttributes
           if has_attribute?(name)
             self[name] || 0
           elsif (rel = send(relation)).loaded?
-            values = rel.map { |t| t.send(column) }.compact
+            values = rel.filter_map { |t| t.send(column) }
             if block_given?
               yield values
             else
@@ -114,7 +85,7 @@ module VirtualAttributes
       end
 
       def virtual_aggregate_arel(reflection, method_name, column)
-        return unless reflection && reflection.macro == :has_many
+        return unless reflection && [:has_many, :has_and_belongs_to_many].include?(reflection.macro)
 
         # need db access for the reflection join_keys, so delaying all this key lookup until call time
         lambda do |t|
@@ -137,14 +108,8 @@ module VirtualAttributes
           # query: SELECT COUNT(*) FROM foreign_table JOIN ... [WHERE main_table.id = foreign_table.id]
           query.where(join.right.expr)
 
-          # convert bind variables from ? to actual values. otherwise, sql is incomplete
-          conn = connection
-          sql = conn.unprepared_statement { conn.to_sql(query) }
-
-          # add () around query
-          query = t.grouping(Arel::Nodes::SqlLiteral.new(sql))
           # add coalesce to ensure correct value comes out
-          t.grouping(Arel::Nodes::NamedFunction.new('COALESCE', [query, Arel::Nodes::SqlLiteral.new("0")]))
+          Arel::Nodes::NamedFunction.new('COALESCE', [t.grouping(query), Arel.sql("0")])
         end
       end
     end

data/lib/active_record/virtual_attributes.rb

@@ -83,14 +83,6 @@ module ActiveRecord
         end
       end
 
-      def attributes_builder # :nodoc:
-        unless defined?(@attributes_builder) && @attributes_builder
-          defaults = _default_attributes.except(*(column_names - [primary_key]))
-          @attributes_builder = ActiveModel::AttributeSet::Builder.new(attribute_types, defaults)
-        end
-        @attributes_builder
-      end
-
       private
 
       def load_schema!

data/renovate.json

@@ -0,0 +1,6 @@
+{
+  "$schema": "https://docs.renovatebot.com/renovate-schema.json",
+  "extends": [
+    "config:recommended"
+  ]
+}

data/seed.rb

@@ -0,0 +1,3 @@
+Author.create_with_books(3)
+Author.create_with_books(4)
+Author.create_with_books(2)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-virtual_attributes
 version: !ruby/object:Gem::Version
-  version: 6.1.1
+  version: 7.0.0
 platform: ruby
 authors:
 - Keenan Brock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-09 00:00:00.000000000 Z
+date: 2024-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: '7.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: '7.0'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: database_cleaner-active_record
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: db-query-matchers
   requirement: !ruby/object:Gem::Requirement
@@ -66,6 +80,34 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pg
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -108,6 +150,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 0.21.2
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Define attributes in arel
 email:
 - keenan@thebrocks.net
@@ -145,6 +201,8 @@ files:
 - lib/active_record/virtual_attributes/virtual_reflections.rb
 - lib/active_record/virtual_attributes/virtual_total.rb
 - lib/activerecord-virtual_attributes.rb
+- renovate.json
+- seed.rb
 homepage: https://github.com/ManageIQ/activerecord-virtual_attributes
 licenses:
 - Apache 2.0
@@ -152,6 +210,7 @@ metadata:
   homepage_uri: https://github.com/ManageIQ/activerecord-virtual_attributes
   source_code_uri: https://github.com/ManageIQ/activerecord-virtual_attributes
   changelog_uri: https://github.com/ManageIQ/activerecord-virtual_attributes/blob/master/CHANGELOG.md
+  rubygems_mfa_required: 'true'
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -167,7 +226,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.5.9
 signing_key:
 specification_version: 4
 summary: Access non-sql attributes from sql