activerecord-virtual_attributes 7.1.2 → 7.2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f9b4d5589eb768e0f866cd4d4cdf54e937284a98aea2ff1644e8dddb56413f9
-  data.tar.gz: 981261df2b4e1092f1206eb633b064d7605ada874ac1c56946524b89461f7779
+  metadata.gz: ef69f0683d1cf4b95da626b2407fe42fcd2e6564053bcb424ea8c867365e6c94
+  data.tar.gz: 28d0d1506872044eae2cb1d9e84cd0044e9dae43f849facabd44024c9f1ed676
 SHA512:
-  metadata.gz: 5bf6835a1bc40e8fd619b1f5b00a84d2f39f86ce51de170941d71e9880a1ae9c6c061b523c43f801664c8ec5789363f55d016207acde9e66655207c22fa923bf
-  data.tar.gz: 52a5dff2126f009791c7f9dad66647b0d589d9f0c659a184c79307fb087505b37bb23e8ad3c95c82c4939531d86ed8f11cc874f0b141c34cd5836cc122897dc6
+  metadata.gz: 2c26a6ea644c42aa0317bcf3848f31ae79d49a86f80fa2c0832642652c9195171f52fe23b52789544fd7045efbb51a398d911e39fc2f4645e2e88a2945fa1555
+  data.tar.gz: 3d59e61f9b22e9037237c1e1f8e8be91ee36dc165c54a101bf742f4a5b88cc9da6b0a13fef44dbe18dda4f0af299028179e5e37c001e7f3419f6cd988679e044

data/CHANGELOG.md

@@ -4,9 +4,15 @@ The versioning of this gem follows ActiveRecord versioning, and does not follow
 
 ## [Unreleased]
 
+## [7.2.0.0] - 2025-06-25
+
+* virtual_delegate requires type [#185](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/185)
+* Rails 7.2 support [#187](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/187)
+
 ## [7.1.2] - 2025-06-20
 
 * Introduce virtual_has_many :through [#191](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/191)
+* Use kwargs for virtual_delegate and virtual_column [#190](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/190)
 
 ## [7.1.1] - 2025-06-18
 
@@ -119,7 +125,8 @@ 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.1.2...HEAD
+[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v7.2.0.0...HEAD
+[7.2.0.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v7.1.2...v7.2.0.0
 [7.1.2]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v7.1.1...v7.1.2
 [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

data/Gemfile

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

data/activerecord-virtual_attributes.gemspec

@@ -28,7 +28,7 @@ Gem::Specification.new do |spec|
 
   spec.require_paths = ["lib"]
 
-  spec.add_runtime_dependency "activerecord", "~> 7.1", ">=7.1.5.1"
+  spec.add_runtime_dependency "activerecord", "~> 7.2.2", ">=7.2.2.1"
 
   spec.add_development_dependency "byebug"
   spec.add_development_dependency "database_cleaner-active_record", "~> 2.1"
@@ -40,5 +40,5 @@ Gem::Specification.new do |spec|
   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"
+  spec.add_development_dependency "sqlite3", "< 2"
 end

data/lib/active_record/virtual_attributes/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module VirtualAttributes
-    VERSION = "7.1.2".freeze
+    VERSION = "7.2.0.0".freeze
   end
 end

data/lib/active_record/virtual_attributes/virtual_arel.rb

@@ -111,7 +111,7 @@ module ActiveRecord
         private
 
         def define_virtual_arel(name, arel) # :nodoc:
-          self._virtual_arel = _virtual_arel.merge(name.to_s => arel)
+          self._virtual_arel = _virtual_arel.merge(name.to_s => arel) unless arel.nil?
         end
       end
     end

data/lib/active_record/virtual_attributes/virtual_delegates.rb

@@ -9,20 +9,12 @@ module ActiveRecord
     module VirtualDelegates
       extend ActiveSupport::Concern
 
-      included do
-        class_attribute :virtual_delegates_to_define, :instance_accessor => false, :default => {}
-      end
-
       module ClassMethods
         #
         # Definition
         #
 
-        def virtual_delegate(*methods, to:, type: nil, prefix: nil, allow_nil: nil, default: nil, **options) # rubocop:disable Naming/MethodParameterName
-          unless type
-            ActiveRecord::VirtualAttributes.deprecator.warn("Calling virtual_delegate without :type is now deprecated", caller)
-          end
-
+        def virtual_delegate(*methods, to:, type:, prefix: nil, allow_nil: nil, default: nil, uses: nil, **options) # rubocop:disable Naming/MethodParameterName
           to = to.to_s
           if to.include?(".") && (methods.size > 1 || prefix)
             raise ArgumentError, 'Delegation only supports specifying a target method name when defining a single virtual method with no prefix'
@@ -36,38 +28,17 @@ module ActiveRecord
           # This better supports reloading of the class and changing the definitions
           methods.each do |method|
             method_name, to, method = determine_method_names(method, to, prefix)
-            define_delegate(method_name, method, :to => to, :allow_nil => allow_nil, :default => default)
+            unless (to_ref = reflection_with_virtual(to))
+              raise ArgumentError, "Delegation needs an association. Association #{to} does not exist"
+            end
 
-            self.virtual_delegates_to_define =
-              virtual_delegates_to_define.merge(method_name.to_s => [method, options.merge(:to => to, :type => type)])
+            define_delegate(method_name, method, :to => to, :allow_nil => allow_nil, :default => default)
+            virtual_attribute(method_name, type, :uses => (uses || to), :arel => virtual_delegate_arel(method, to_ref), **options)
           end
         end
 
         private
 
-        # define virtual_attribute for delegates
-        #
-        # this is called at schema load time (and not at class definition time)
-        #
-        # @param  method_name [Symbol] name of the attribute on the source class to be defined
-        # @param  col [Symbol] name of the attribute on the associated class to be referenced
-        # @option options :to [Symbol] name of the association from the source class to be referenced
-        # @option options :arel [Proc] (optional and not common)
-        # @option options :uses [Array|Symbol|Hash] sql includes hash. (default: to)
-        def define_virtual_delegate(method_name, col, options)
-          unless (to = options[:to]) && (to_ref = reflection_with_virtual(to.to_s))
-            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
-
-          col = col.to_s
-          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
         # rubocop:disable Style/TernaryParentheses
         def define_delegate(method_name, method, to: nil, allow_nil: nil, default: nil) # rubocop:disable Naming/MethodParameterName
@@ -85,6 +56,7 @@ module ActiveRecord
           # On the other hand it could be that the target has side-effects,
           # whereas conceptually, from the user point of view, the delegator should
           # be doing one call.
+          # NOTE: This is based upon ActiveSupport 6.0 delegate.rb, but we added has_attribute? and default
           if allow_nil
             method_def = <<-METHOD
               def #{method_name}(#{definition})

data/lib/active_record/virtual_attributes/virtual_fields.rb

@@ -152,8 +152,12 @@ module ActiveRecord
 
           # 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
+          # If the association were already translated, then short circuit / do the standard preloader work.
+          # When replace_virtual_fields removes the outer array, match that too.
+          if records_by_assoc.size == 1 &&
+            (associations == records_by_assoc.keys.first || associations == [records_by_assoc.keys.first])
+            return super
+          end
 
           # for each of the associations, run a preloader
           records_by_assoc.each do |klass_associations, klass_records|
@@ -191,6 +195,7 @@ module ActiveRecord
           # rubocop:enable Lint/AmbiguousOperatorPrecedence
 
           # branched.rb 7.0
+          # rubocop:disable Style/MultilineBlockChain
           def preloaders_for_reflection(reflection, reflection_records)
             reflection_records.group_by do |record|
               # begin virtual_attributes changes
@@ -212,6 +217,7 @@ module ActiveRecord
             end
           end
         end)
+        # rubocop:enable Style/MultilineBlockChain
       end
     end
   end

data/lib/active_record/virtual_attributes/virtual_includes.rb

@@ -25,7 +25,7 @@ module ActiveRecord
         private
 
         def define_virtual_include(name, uses)
-          self._virtual_includes = _virtual_includes.merge(name.to_s => uses)
+          self._virtual_includes = _virtual_includes.merge(name.to_s => uses) unless uses.nil?
         end
       end
     end

data/lib/active_record/virtual_attributes/virtual_reflections.rb

@@ -14,12 +14,12 @@ module ActiveRecord
           add_virtual_reflection(reflection, name, uses)
         end
 
-        def virtual_has_many(name, uses: nil, source: nil, through: nil, **options)
+        def virtual_has_many(name, uses: nil, source: name, through: nil, **options)
           define_method(:"#{name.to_s.singularize}_ids") do
             records = send(name)
             records.respond_to?(:ids) ? records.ids : records.collect(&:id)
           end
-          define_delegate(name, source || name, :to => through, :allow_nil => true, :default => []) if through
+          define_delegate(name, source, :to => through, :allow_nil => true, :default => []) if through
           reflection = ActiveRecord::Associations::Builder::HasMany.build(self, name, nil, options)
           add_virtual_reflection(reflection, name, uses)
         end

data/lib/active_record/virtual_attributes.rb

@@ -56,12 +56,15 @@ module ActiveRecord
         virtual_attribute(name, type, **options)
       end
 
-      def virtual_attribute(name, type, **options)
+      def virtual_attribute(name, type, uses: nil, arel: nil, **options)
         name = name.to_s
         reload_schema_from_cache
 
         self.virtual_attributes_to_define =
           virtual_attributes_to_define.merge(name => [type, options])
+
+        define_virtual_include(name, uses)
+        define_virtual_arel(name, arel)
       end
 
       #
@@ -84,27 +87,18 @@ module ActiveRecord
         end
       end
 
-      private
-
-      def load_schema!
-        super
-
-        virtual_attributes_to_define.each do |name, (type, options)|
-          type = type.call if type.respond_to?(:call)
-          type = ActiveRecord::Type.lookup(type, **options.except(:uses, :arel)) if type.kind_of?(Symbol)
-
-          define_virtual_attribute(name, type, **options.slice(:uses, :arel))
-        end
-
-        virtual_delegates_to_define.each do |method_name, (method, options)|
-          define_virtual_delegate(method_name, method, options)
+      def attribute_types
+        @attribute_types || super.tap do |hash|
+          virtual_attributes_to_define.each do |name, (type, options)|
+            type = type.call if type.respond_to?(:call)
+            type = ActiveRecord::Type.lookup(type, **options) if type.kind_of?(Symbol)
+            hash[name] = type
+          end
         end
       end
 
-      def define_virtual_attribute(name, cast_type, uses: nil, arel: nil)
+      def define_virtual_attribute(name, cast_type)
         attribute_types[name.to_s] = cast_type
-        define_virtual_include(name, uses) if uses
-        define_virtual_arel(name, arel) if arel
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-virtual_attributes
 version: !ruby/object:Gem::Version
-  version: 7.1.2
+  version: 7.2.0.0
 platform: ruby
 authors:
 - Keenan Brock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-20 00:00:00.000000000 Z
+date: 2025-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,20 +16,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: 7.2.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.5.1
+        version: 7.2.2.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: 7.2.2
     - - ">="
       - !ruby/object:Gem::Version
-        version: 7.1.5.1
+        version: 7.2.2.1
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement
@@ -160,16 +160,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2'
 description: Define attributes in arel
 email:
 - keenan@thebrocks.net