activerecord-virtual_attributes 7.1.1 → 7.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 26048751ad2fe218660a4b62fa6c89d6467e7d33404c463154a041cf638ff43c
-  data.tar.gz: 8c2302076104393e4e4eac994e854a951ee6c0588b3fbfefc6c95f3d8d905861
+  metadata.gz: 0f9b4d5589eb768e0f866cd4d4cdf54e937284a98aea2ff1644e8dddb56413f9
+  data.tar.gz: 981261df2b4e1092f1206eb633b064d7605ada874ac1c56946524b89461f7779
 SHA512:
-  metadata.gz: 34b460bb1293c44743f26c0b91d62d857f53158022f2777ffb29f97a2279b6a9bbd3d19e4cd83dafaee035061093da669da4ac2bb749f1524258ae5db8d5577c
-  data.tar.gz: 2b7876b8d6f5c0eeafaf2f2f7740943ead1cc25b0c211ee84e44365609d86c659c328103c432d0c01184d1c09f13f2af5226c9d05614ac7c875392e503ae981a
+  metadata.gz: 5bf6835a1bc40e8fd619b1f5b00a84d2f39f86ce51de170941d71e9880a1ae9c6c061b523c43f801664c8ec5789363f55d016207acde9e66655207c22fa923bf
+  data.tar.gz: 52a5dff2126f009791c7f9dad66647b0d589d9f0c659a184c79307fb087505b37bb23e8ad3c95c82c4939531d86ed8f11cc874f0b141c34cd5836cc122897dc6

data/CHANGELOG.md

@@ -4,6 +4,10 @@ The versioning of this gem follows ActiveRecord versioning, and does not follow
 
 ## [Unreleased]
 
+## [7.1.2] - 2025-06-20
+
+* Introduce virtual_has_many :through [#191](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/191)
+
 ## [7.1.1] - 2025-06-18
 
 * Deprecate virtual_delegate without a type [#188](https://github.com/ManageIQ/activerecord-virtual_attributes/pull/188)
@@ -115,7 +119,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.1...HEAD
+[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v7.1.2...HEAD
+[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
 [7.0.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v6.1.2...v7.0.0

data/lib/active_record/virtual_attributes/version.rb

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

data/lib/active_record/virtual_attributes/virtual_arel.rb

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

data/lib/active_record/virtual_attributes/virtual_delegates.rb

@@ -18,42 +18,28 @@ module ActiveRecord
         # Definition
         #
 
-        def virtual_delegate(*methods)
-          options = methods.extract_options!
-          unless (to = options[:to])
-            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]
+        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
 
           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'
+          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'
           end
 
           if to.count(".") > 1
-            raise ArgumentError, 'Delegation needs a single association. Supply an option hash with a :to key with only 1 period (e.g. delegate :hello, to: "greeter.greeting")'
+            raise ArgumentError, 'Delegation needs a single association. Supply keyword :to with only 1 period (e.g. delegate :hello, to: "greeter.greeting")'
           end
 
-          allow_nil = options[:allow_nil]
-          default = options[:default]
-
           # put method entry per method name.
           # This better supports reloading of the class and changing the definitions
           methods.each do |method|
-            method_prefix = virtual_delegate_name_prefix(options[:prefix], to)
-            method_name = "#{method_prefix}#{method}"
-            if to.include?(".") # to => "target.method"
-              to, method = to.split(".").map(&:to_sym)
-              options[:to] = to
-            end
-
+            method_name, to, method = determine_method_names(method, to, prefix)
             define_delegate(method_name, method, :to => to, :allow_nil => allow_nil, :default => default)
 
             self.virtual_delegates_to_define =
-              virtual_delegates_to_define.merge(method_name => [method, options])
+              virtual_delegates_to_define.merge(method_name.to_s => [method, options.merge(:to => to, :type => type)])
           end
         end
 
@@ -83,6 +69,7 @@ module ActiveRecord
         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
           location = caller_locations(2, 1).first
           file, line = location.path, location.lineno
@@ -128,9 +115,27 @@ module ActiveRecord
           method_def = method_def.split("\n").map(&:strip).join(';')
           module_eval(method_def, file, line)
         end
+        # rubocop:enable Style/TernaryParentheses
+
+        # Sometimes the `to` contains the column name target.column, split it up to the source method_name and target column
+        # If `to` does specify the column name, `to` becomes the target (i.e.: association)
+        #
+        # @param column [Symbol|String] the name of the column
+        # @param to [Symbol|String]
+        # @param prefix [Boolean|Nil|Symbol]
+        # @return [Symbol, Symbol, Symbol] method_name, relation, relation's column name
+        def determine_method_names(column, to, prefix) # rubocop:disable Naming/MethodParameterName
+          method_name = column = column.to_sym
+
+          tos = to.to_s
+          if tos.include?(".") # to => "target.method"
+            to, column = tos.split(".").map(&:to_sym)
+          end
+
+          method_prefix = "#{prefix == true ? to : prefix}_" if prefix
+          method_name = "#{method_prefix}#{method_name}".to_sym
 
-        def virtual_delegate_name_prefix(prefix, to) # rubocop:disable Naming/MethodParameterName
-          "#{prefix == true ? to : prefix}_" if prefix
+          [method_name, to.to_sym, column]
         end
 
         # @param col [String] attribute name

data/lib/active_record/virtual_attributes/virtual_fields.rb

@@ -143,7 +143,7 @@ module ActiveRecord
 
   module Associations
     class Preloader
-      prepend(Module.new {
+      prepend(Module.new do
         # preloader is called with virtual attributes - need to resolve
         def call
           # Possibly overkill since all records probably have the same class and associations
@@ -165,13 +165,14 @@ module ActiveRecord
             end
           end
         end
-      })
+      end)
 
       class Branch
-        prepend(Module.new {
+        prepend(Module.new do
           # from branched.rb 7.0
           # not going to modify rails code for rubocops
           # rubocop:disable Lint/AmbiguousOperatorPrecedence
+          # rubocop:disable Layout/EmptyLineAfterGuardClause
           def grouped_records
             h = {}
             polymorphic_parent = !root? && parent.polymorphic?
@@ -186,6 +187,7 @@ module ActiveRecord
             end
             h
           end
+          # rubocop:enable Layout/EmptyLineAfterGuardClause
           # rubocop:enable Lint/AmbiguousOperatorPrecedence
 
           # branched.rb 7.0
@@ -209,13 +211,13 @@ module ActiveRecord
               preloader_for(reflection).new(rhs_klass, rs, reflection, scope, reflection_scope, associate_by_default)
             end
           end
-        })
+        end)
       end
     end
   end
 
   class Relation
-    include(Module.new {
+    include(Module.new do
       # From ActiveRecord::QueryMethods (rails 5.2 - 6.1)
       def build_select(arel)
         if select_values.any?
@@ -246,6 +248,6 @@ module ActiveRecord
         associations = klass.replace_virtual_fields(associations) || {}
         super
       end
-    })
+    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 => uses)
+          self._virtual_includes = _virtual_includes.merge(name.to_s => uses)
         end
       end
     end

data/lib/active_record/virtual_attributes/virtual_reflections.rb

@@ -5,31 +5,28 @@ module ActiveRecord
       include ActiveRecord::VirtualAttributes::VirtualIncludes
 
       module ClassMethods
-
         #
         # Definition
         #
 
-        def virtual_has_one(name, options = {})
-          uses = options.delete(:uses)
+        def virtual_has_one(name, uses: nil, **options)
           reflection = ActiveRecord::Associations::Builder::HasOne.build(self, name, nil, options)
-          add_virtual_reflection(reflection, name, uses, options)
+          add_virtual_reflection(reflection, name, uses)
         end
 
-        def virtual_has_many(name, options = {})
+        def virtual_has_many(name, uses: nil, source: nil, through: nil, **options)
           define_method(:"#{name.to_s.singularize}_ids") do
             records = send(name)
             records.respond_to?(:ids) ? records.ids : records.collect(&:id)
           end
-          uses = options.delete(:uses)
+          define_delegate(name, source || name, :to => through, :allow_nil => true, :default => []) if through
           reflection = ActiveRecord::Associations::Builder::HasMany.build(self, name, nil, options)
-          add_virtual_reflection(reflection, name, uses, options)
+          add_virtual_reflection(reflection, name, uses)
         end
 
-        def virtual_belongs_to(name, options = {})
-          uses = options.delete(:uses)
+        def virtual_belongs_to(name, uses: nil, **options)
           reflection = ActiveRecord::Associations::Builder::BelongsTo.build(self, name, nil, options)
-          add_virtual_reflection(reflection, name, uses, options)
+          add_virtual_reflection(reflection, name, uses)
         end
 
         def virtual_reflection?(name)
@@ -95,7 +92,7 @@ module ActiveRecord
 
         private
 
-        def add_virtual_reflection(reflection, name, uses, _options)
+        def add_virtual_reflection(reflection, name, uses)
           raise ArgumentError, "macro must be specified" unless reflection
 
           reset_virtual_reflection_information

data/lib/active_record/virtual_attributes.rb

@@ -52,10 +52,7 @@ module ActiveRecord
       #
 
       # Compatibility method: `virtual_attribute` is a more accurate name
-      def virtual_column(name, **options)
-        type = options.delete(:type)
-        raise ArgumentError, "missing :type attribute" unless type
-
+      def virtual_column(name, type:, **options)
         virtual_attribute(name, type, **options)
       end
 
@@ -105,7 +102,7 @@ module ActiveRecord
       end
 
       def define_virtual_attribute(name, cast_type, uses: nil, arel: nil)
-        attribute_types[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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-virtual_attributes
 version: !ruby/object:Gem::Version
-  version: 7.1.1
+  version: 7.1.2
 platform: ruby
 authors:
 - Keenan Brock
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-17 00:00:00.000000000 Z
+date: 2025-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord