activerecord-virtual_attributes 1.2.0 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9a6c500c61ceb22d7703070013800f894b62a5efd8bf14e3e5aec0e24afdb5e1
-  data.tar.gz: 1e8c99b6823e09e10e39958c3f50651e5f1b558a76ef15377f23cd13571fd2cc
+  metadata.gz: 5fe283d7922a8073591f5c00728e976c3c7ed2ec9dbe51972224b35f55095498
+  data.tar.gz: ec6c34d345f4ecf01a48d53f266f13b0b91b2a8e87d72c5b5cffffcda6101c36
 SHA512:
-  metadata.gz: 0d1b3dc8b531417c714f180c74946f7f42fe6470b7a4912567be43f79529cdaad399c4316af05e0ca63b51e37d022f2887e316752d69371afed7c7ca92f0c6d0
-  data.tar.gz: fb251d9ca04da11c0042f0ec93c908e1ded759faf3c0935a94a7809219cd3ba73d7d4ef7451d6d7293efded29da176af921bcc92607170b5d2219c546559d317
+  metadata.gz: 96bfd6336c293999b0aa436b9d63067a7fb50effb8ac8c4bf17a151b80233765dbff782507546053e62e10e5dd49fa64a70d92cb6a47e0acd0cef2c0ff7c5991
+  data.tar.gz: c0bbca8dc201efcb927e35e2dc45b39c626a3e81842366b89500b5ca7007a49caa5dee922efd394b987da2f04cd638af03d9573a2fd3df792e8d27f462239770

data/CHANGELOG.md

@@ -5,6 +5,10 @@ a nice looking [Changelog](http://keepachangelog.com).
 
 ## Version [Unreleased]
 
+## Version [1.3.0] <small>2019-05-24</small>
+
+* Rails 5.2 support
+
 ## Version [1.2.0] <small>2019-04-23</small>
 
 * Virtual_delegate :type now specified to avoid rare race conditions with attribute discovery
@@ -30,7 +34,8 @@ a nice looking [Changelog](http://keepachangelog.com).
 * Initial Release
 * Extracted from ManageIQ/manageiq
 
-[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.2.0...HEAD
+[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.3.0...HEAD
+[1.3.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.2.0...v1.3.0
 [1.2.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.1.0...v1.2.0
 [1.1.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.0.0...v1.1.0
 [1.0.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v0.1.0...v1.0.0

data/lib/active_record/virtual_attributes/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module VirtualAttributes
-    VERSION = "1.2.0"
+    VERSION = "1.3.0"
   end
 end

data/lib/active_record/virtual_attributes/virtual_fields.rb

@@ -30,17 +30,29 @@ module ActiveRecord
           virtual_attribute?(name) || virtual_reflection?(name)
         end
 
-        def remove_virtual_fields(associations)
+        def replace_virtual_fields(associations)
+          return associations if associations.blank?
+
           case associations
           when String, Symbol
-            virtual_field?(associations) ? nil : associations
+            virtual_field?(associations) ? replace_virtual_fields(virtual_includes(associations)) : associations
           when Array
-            associations.collect { |association| remove_virtual_fields(association) }.compact
+            associations.collect { |association| replace_virtual_fields(association) }.compact
           when Hash
             associations.each_with_object({}) do |(parent, child), h|
-              next if virtual_field?(parent)
-              reflection = reflect_on_association(parent.to_sym)
-              h[parent] = reflection.nil? || reflection.options[:polymorphic] ? {} : reflection.klass.remove_virtual_fields(child) || {}
+              if virtual_field?(parent) # form virtual_attribute => {}
+                case (new_includes = replace_virtual_fields(virtual_includes(parent)))
+                when String, Symbol
+                  h[new_includes] = {}
+                when Array
+                  new_includes.each { |association| h[association] = {} }
+                when Hash
+                  h.deep_merge!(new_includes)
+                end
+              else
+                reflection = reflect_on_association(parent.to_sym)
+                h[parent] = reflection.nil? || reflection.options[:polymorphic] ? {} : reflection.klass.replace_virtual_fields(child) || {}
+              end
             end
           else
             associations
@@ -168,7 +180,7 @@ module ActiveRecord
 
   class Relation
     def without_virtual_includes
-      filtered_includes = includes_values && klass.remove_virtual_fields(includes_values)
+      filtered_includes = includes_values && klass.replace_virtual_fields(includes_values)
       if filtered_includes != includes_values
         spawn.tap { |other| other.includes_values = filtered_includes }
       else
@@ -178,25 +190,12 @@ module ActiveRecord
 
     include(Module.new {
       # From ActiveRecord::FinderMethods
-      def find_with_associations
+      def find_with_associations(&block)
         real = without_virtual_includes
-        return super if real.equal?(self)
-
-        if ActiveRecord.version.to_s >= "5.1"
-          recs, join_dep = real.find_with_associations { |relation, join_dependency| [relation, join_dependency] }
-        else
-          recs = real.find_with_associations
-        end
-
-        if includes_values
-          ActiveRecord::Associations::Preloader.new.preload(recs, preload_values + includes_values)
-        end
-
-        # when 5.0 support is dropped, assume a block given
-        if block_given?
-          yield recs, join_dep
+        if real.equal?(self)
+          super
         else
-          recs
+          real.find_with_associations(&block)
         end
       end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-virtual_attributes
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Keenan Brock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-05-22 00:00:00.000000000 Z
+date: 2019-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord