activerecord-virtual_attributes 7.0.0 → 7.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cf8f363320713146ad286d76999f5640a9fc44f3e139f6e5377ac8220e476217
-  data.tar.gz: cbabad277bfef0e01da4d14b8942671770eb283c9692ef9eb7a07cbac5f25b68
+  metadata.gz: 26048751ad2fe218660a4b62fa6c89d6467e7d33404c463154a041cf638ff43c
+  data.tar.gz: 8c2302076104393e4e4eac994e854a951ee6c0588b3fbfefc6c95f3d8d905861
 SHA512:
-  metadata.gz: 10295799b997217903b155c7ed84e9ee82bad2cf6c208b6aa140dc94e66df9b4ed8fbcf13418a2feadf075e7f93b2c550d7a94b698aae0c08b6d29a4d5ebe159
-  data.tar.gz: 1663fd7ab8af93e3419b6a1ae608c94d55df957b45d904e38b31a3b5f93667159e6ee10e667f560174b12cc2b66e936e20bcadc4ac98a45953ed3923f21cac94
+  metadata.gz: 34b460bb1293c44743f26c0b91d62d857f53158022f2777ffb29f97a2279b6a9bbd3d19e4cd83dafaee035061093da669da4ac2bb749f1524258ae5db8d5577c
+  data.tar.gz: 2b7876b8d6f5c0eeafaf2f2f7740943ead1cc25b0c211ee84e44365609d86c659c328103c432d0c01184d1c09f13f2af5226c9d05614ac7c875392e503ae981a

data/CHANGELOG.md

@@ -4,6 +4,15 @@ The versioning of this gem follows ActiveRecord versioning, and does not follow
 
 ## [Unreleased]
 
+## [7.1.1] - 2025-06-18
+
+* Deprecate virtual_delegate without a type [#188](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/188)
+
+## [7.1.0] - 2025-02-19
+
+* Use TableAlias for table aliasing [#168](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/168)
+* Rails 7.1 support
+
 ## [7.0.0] - 2024-08-01
 
 * Use Arel.literal [#154](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/154)
@@ -106,7 +115,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/v7.0.0...HEAD
+[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v7.1.1...HEAD
+[7.1.1]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v7.1.0...v7.1.1
+[7.1.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v7.0.0...v7.1.0
 [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

data/Gemfile

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

data/activerecord-virtual_attributes.gemspec

@@ -23,17 +23,18 @@ Gem::Specification.new do |spec|
   # 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
-    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features)/}) }
+    `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(test|spec|features|bin)/}) || f.match(/^(\.)|renovate.json/) }
   end
 
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activerecord", "~> 7.0"
+  spec.add_runtime_dependency "activerecord", "~> 7.1", ">=7.1.5.1"
 
   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 "manageiq-style", ">= 1.5.4"
+
   spec.add_development_dependency "mysql2"
   spec.add_development_dependency "pg"
   spec.add_development_dependency "rake", "~> 13.0"

data/lib/active_record/virtual_attributes/version.rb

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

data/lib/active_record/virtual_attributes/virtual_arel.rb

@@ -118,45 +118,3 @@ 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
-  # rubocop:disable Style/ConditionalAssignment
-  module Visitors
-    # rails 6.1...
-    class ToSql
-      private
-
-      def visit_Arel_Nodes_HomogeneousIn(o, collector)
-        collector.preparable = false
-
-        # change:
-        # See https://github.com/rails/rails/pull/45642
-        visit(o.left, collector)
-        # /change
-
-        if o.type == :in
-          collector << " IN ("
-        else
-          collector << " NOT IN ("
-        end
-
-        values = o.casted_values
-
-        if values.empty?
-          collector << @connection.quote(nil)
-        else
-          collector.add_binds(values, o.proc_for_binds, &bind_block)
-        end
-
-        collector << ")"
-      end
-    end
-  end
-  # rubocop:enable Naming/MethodName
-  # rubocop:enable Naming/MethodParameterName
-  # rubocop:enable Style/ConditionalAssignment
-end
-end

data/lib/active_record/virtual_attributes/virtual_delegates.rb

@@ -10,8 +10,7 @@ module ActiveRecord
       extend ActiveSupport::Concern
 
       included do
-        class_attribute :virtual_delegates_to_define, :instance_accessor => false
-        self.virtual_delegates_to_define = {}
+        class_attribute :virtual_delegates_to_define, :instance_accessor => false, :default => {}
       end
 
       module ClassMethods
@@ -25,6 +24,10 @@ module ActiveRecord
             raise ArgumentError, 'Delegation needs an association. Supply an options hash with a :to key as the last argument (e.g. delegate :hello, to: :greeter).'
           end
 
+          unless options[:type]
+            ActiveRecord::VirtualAttributes.deprecator.warn("Calling virtual_delegate without :type is now deprecated", caller)
+          end
+
           to = to.to_s
           if to.include?(".") && methods.size > 1
             raise ArgumentError, 'Delegation only supports specifying a method name when defining a single virtual method'
@@ -271,11 +274,9 @@ module ActiveRecord
       def self.select_from_alias_table(to_klass, src_relation)
         to_table = to_klass.arel_table
         # if a self join, alias the second table to a different name
-        if to_table.table_name == src_relation.table_name
-          # use a dup to not modify the primary table in the model
-          to_table = to_table.dup
+        if to_table.name == src_relation.name
           # use a table alias to not conflict with table name in the primary query
-          to_table.table_alias = "#{to_table.table_name}_sub"
+          to_table = to_table.alias("#{to_table.name}_sub")
         end
         to_table
       end

data/lib/active_record/virtual_attributes/virtual_fields.rb

@@ -159,9 +159,9 @@ module ActiveRecord
           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
+            Array.wrap(klass_associations).each do |klass_association|
               # this calls back into itself, but it will take the short circuit
-              Preloader.new(:records => klass_records, :associations => klass_association, :scope => scope).call
+              Preloader.new(:records => klass_records, :associations => klass_association, :scope => scope, :available_records => @available_records, :associate_by_default => @associate_by_default).call
             end
           end
         end
@@ -170,6 +170,8 @@ module ActiveRecord
       class Branch
         prepend(Module.new {
           # from branched.rb 7.0
+          # not going to modify rails code for rubocops
+          # rubocop:disable Lint/AmbiguousOperatorPrecedence
           def grouped_records
             h = {}
             polymorphic_parent = !root? && parent.polymorphic?
@@ -184,6 +186,7 @@ module ActiveRecord
             end
             h
           end
+          # rubocop:enable Lint/AmbiguousOperatorPrecedence
 
           # branched.rb 7.0
           def preloaders_for_reflection(reflection, reflection_records)

data/lib/active_record/virtual_attributes.rb

@@ -1,6 +1,7 @@
 require "active_support/concern"
 require "active_record"
 
+require "active_record/virtual_attributes/version"
 require "active_record/virtual_attributes/virtual_includes"
 require "active_record/virtual_attributes/virtual_arel"
 require "active_record/virtual_attributes/virtual_delegates"
@@ -37,9 +38,12 @@ module ActiveRecord
     ActiveRecord::Type.register(:string_set, Type::StringSet)
     ActiveRecord::Type.register(:symbol, Type::Symbol)
 
+    def self.deprecator
+      @deprecator ||= ActiveSupport::Deprecation.new(ActiveRecord::VirtualAttributes::VERSION, "virtual_attributes")
+    end
+
     included do
-      class_attribute :virtual_attributes_to_define, :instance_accessor => false
-      self.virtual_attributes_to_define = {}
+      class_attribute :virtual_attributes_to_define, :instance_accessor => false, :default => {}
     end
 
     module ClassMethods

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-virtual_attributes
 version: !ruby/object:Gem::Version
-  version: 7.0.0
+  version: 7.1.1
 platform: ruby
 authors:
 - Keenan Brock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2024-07-31 00:00:00.000000000 Z
+date: 2025-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.5.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.0'
+        version: '7.1'
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 7.1.5.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -72,14 +78,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.5.4
 - !ruby/object:Gem::Dependency
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
@@ -171,23 +177,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".codeclimate.yml"
-- ".github/workflows/ci.yaml"
-- ".gitignore"
-- ".rspec"
-- ".rubocop.yml"
-- ".rubocop_cc.yml"
-- ".rubocop_local.yml"
-- ".whitesource"
-- ".yamllint"
 - CHANGELOG.md
 - Gemfile
 - LICENSE.txt
 - README.md
 - Rakefile
 - activerecord-virtual_attributes.gemspec
-- bin/console
-- bin/setup
 - init.rb
 - lib/active_record-virtual_attributes.rb
 - lib/active_record/virtual_attributes.rb
@@ -201,8 +196,6 @@ 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
@@ -226,7 +219,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.9
+rubygems_version: 3.5.22
 signing_key:
 specification_version: 4
 summary: Access non-sql attributes from sql

data/.codeclimate.yml

@@ -1,34 +0,0 @@
-version: '2'
-prepare:
-  fetch:
-  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_base.yml
-    path: ".rubocop_base.yml"
-  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/.rubocop_cc_base.yml
-    path: ".rubocop_cc_base.yml"
-  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/styles/base.yml
-    path: styles/base.yml
-  - url: https://raw.githubusercontent.com/ManageIQ/manageiq-style/master/styles/cc_base.yml
-    path: styles/cc_base.yml
-checks:
-  argument-count:
-    enabled: false
-  complex-logic:
-    enabled: false
-  file-lines:
-    enabled: false
-  method-complexity:
-    config:
-      threshold: 11
-  method-count:
-    enabled: false
-  method-lines:
-    enabled: false
-  nested-control-flow:
-    enabled: false
-  return-statements:
-    enabled: false
-plugins:
-  rubocop:
-    enabled: true
-    config: ".rubocop_cc.yml"
-    channel: rubocop-1-56-3

data/.github/workflows/ci.yaml

@@ -1,71 +0,0 @@
-name: CI
-
-on:
-  push:
-  pull_request:
-  schedule:
-  - cron: '0 0 * * 0'
-
-jobs:
-  ci:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        ruby-version:
-        - '2.7'
-        - '3.0'
-        - '3.1'
-    services:
-      postgres:
-        image: postgres:13
-        env:
-          POSTGRES_PASSWORD: password
-          POSTGRES_DB: virtual_attributes
-        options: --health-cmd pg_isready --health-interval 2s --health-timeout 5s --health-retries 5
-        ports:
-        - 5432:5432
-      mysql:
-        image: mysql:8.4
-        env:
-          MYSQL_ROOT_PASSWORD: password
-          MYSQL_DATABASE: virtual_attributes
-        options: --health-cmd="mysqladmin ping -h 127.0.0.1 -P 3306 --silent" --health-interval 10s --health-timeout 5s --health-retries 3
-        ports:
-        - 3306:3306
-    env:
-      CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}
-      # for the pg cli (psql, pg_isready) and rails
-      PGHOST: localhost
-      PGPORT: 5432
-      PGUSER: postgres
-      PGPASSWORD: password
-      # for the mysql cli (mysql, mysqladmin)
-      MYSQL_HOST: 127.0.0.1
-      MYSQL_PWD: password
-    steps:
-      - uses: actions/checkout@v4
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby-version }}
-          bundler-cache: true
-        timeout-minutes: 30
-      - name: Run SQLite tests
-        env:
-          DB: sqlite3
-        run: bundle exec rake
-      - name: Run PostgreSQL tests
-        env:
-          DB: postgresql
-          COLLATE_SYMBOLS: false
-        run: bundle exec rake
-      - name: Run MySQL tests
-        env:
-          DB: mysql2
-        run: bundle exec rake
-      - name: Report code coverage
-        if: ${{ github.ref == 'refs/heads/master' && matrix.ruby-version == '3.1' }}
-        continue-on-error: true
-        uses: paambaati/codeclimate-action@v8
-        env:
-          CC_TEST_REPORTER_ID: ${{ secrets.CC_TEST_REPORTER_ID }}

data/.gitignore

@@ -1,17 +0,0 @@
-/.bundle/
-/.yardoc
-/_yardoc/
-/coverage/
-/doc/
-/pkg/
-/spec/reports/
-/tmp/
-
-test/database.yml
-**/*.log
-**/*.db
-Gemfile.lock
-gemfiles/*.lock
-
-# rspec failure tracking
-.rspec_status

data/.rspec

@@ -1,3 +0,0 @@
---format documentation
---color
---require spec_helper

data/.rubocop.yml

@@ -1,4 +0,0 @@
-inherit_from:
-- ".rubocop_local.yml"
-inherit_gem:
-  manageiq-style: ".rubocop_base.yml"

data/.rubocop_cc.yml

@@ -1,4 +0,0 @@
-inherit_from:
-- ".rubocop_base.yml"
-- ".rubocop_cc_base.yml"
-- ".rubocop_local.yml"

data/.whitesource

@@ -1,3 +0,0 @@
-{
-  "settingsInheritedFrom": "ManageIQ/whitesource-config@master"
-}

data/.yamllint

@@ -1,8 +0,0 @@
----
-extends: relaxed
-
-rules:
-  indentation:
-    indent-sequences: false
-  line-length:
-    max: 1000

data/bin/console

@@ -1,14 +0,0 @@
-#!/usr/bin/env ruby
-
-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
-Database.new.setup.migrate
-require_relative "../seed"
-
-require "irb"
-IRB.start(__FILE__)

data/bin/setup

@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-set -euo pipefail
-IFS=$'\n\t'
-set -e
-
-bundle install
-echo
-
-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/renovate.json

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

data/seed.rb

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