activerecord-virtual_attributes 1.3.1 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d35dc5f3ef872b957e24553488667ea6e1f948e56d741d6f5dbf5a7612dc1208
-  data.tar.gz: 8980c2297bb237b520aafd79177e727c29628b3e807349df8ec153e259f3ccb6
+  metadata.gz: 12889257087183346e6a2d382f1105adcd42dcf0d56e8cfb3174ad9bc03e93a4
+  data.tar.gz: 422aa8fc3a9115014feca968087c32f52641daaaab04db3308fe7382377b6b7d
 SHA512:
-  metadata.gz: a42caa72fee1075051551c5c12c14b71696be135ed27eaf755936bde51b63a4953a51458ad22dd7fd40808c2aae9c661b93b0aee5e6a3d684acd85a21461f788
-  data.tar.gz: 7ca0eb7fde02046e0921a81d84735be127cd068ee554550fd4dc903da2b105f025064ab3e8a728fb9e26d2586dbd892a569eb8a6cac6557d19770a9fc28945c0
+  metadata.gz: 92c23a0d47b390b39c1576e28ae444891dc7c4fda8b4ee493541d760aa7784442b6be95ea5f4dbd7d742feec949defd5640a5b923c755aa8162076a3fdd0700b
+  data.tar.gz: f2ee6541b6b0aaa5dcd6d25e2019bbd97ead4276495f688e71ff614463a1c818f12106a38bfb13c801e91880c8910fecd71878d9aee23f7e4c6d178010e06d91

data/CHANGELOG.md

@@ -5,6 +5,13 @@ a nice looking [Changelog](http://keepachangelog.com).
 
 ## Version [Unreleased]
 
+## Version [1.4.0] <small>2019-07-13</small>
+
+* fix includes to include all associations
+* fix bin/console to now actually run
+* select no longer munges field attribute
+* support virtual attributes in left_outer_joins
+
 ## Version [1.3.1] <small>2019-06-06</small>
 
 * quote column aliases
@@ -38,7 +45,8 @@ a nice looking [Changelog](http://keepachangelog.com).
 * Initial Release
 * Extracted from ManageIQ/manageiq
 
-[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.3.1...HEAD
+[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.4.0...HEAD
+[1.4.0]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.3.1...v1.4.0
 [1.3.1]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.3.0...v1.3.1
 [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

data/activerecord-virtual_attributes.gemspec

@@ -28,6 +28,7 @@ Gem::Specification.new do |spec|
   spec.add_runtime_dependency "activerecord", ">= 5.0"
 
   spec.add_development_dependency "appraisal"
+  spec.add_development_dependency "byebug"
   spec.add_development_dependency "rake", "~> 10.0"
   spec.add_development_dependency "rspec", "~> 3.0"
   spec.add_development_dependency "simplecov"

data/bin/console

@@ -1,14 +1,11 @@
 #!/usr/bin/env ruby
 
 require "bundler/setup"
-require "virtual_attributes"
+require "active_record-virtual_attributes"
 
-# You can add fixtures and/or initialization code here to make experimenting
-# with your gem easier. You can also use a different console, if you like.
-
-# (If you use this, don't forget to add pry to your Gemfile!)
-# require "pry"
-# Pry.start
+# models for local testing
+require "rspec"
+Dir['./spec/support/**/*.rb'].sort.each { |f| require f }
 
 require "irb"
 IRB.start(__FILE__)

data/init.rb

@@ -1 +1 @@
-require 'virtual_attributes'
+require 'active_record-virtual_attributes'

data/lib/active_record/virtual_attributes/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module VirtualAttributes
-    VERSION = "1.3.1"
+    VERSION = "1.4.0".freeze
   end
 end

data/lib/active_record/virtual_attributes/virtual_fields.rb

@@ -50,18 +50,46 @@ module ActiveRecord
             if virtual_field?(parent) # form virtual_attribute => {}
               case (new_includes = replace_virtual_fields(virtual_includes(parent)))
               when String, Symbol
-                h[new_includes] = {}
+                merge_includes(h, new_includes)
               when Array
-                new_includes.each { |association| h[association] = {} }
+                merge_includes(h, new_includes)
               when Hash
-                h.deep_merge!(new_includes)
+                merge_includes(h, new_includes)
               end
             else
               reflection = reflect_on_association(parent.to_sym)
-              h[parent] = reflection.nil? || reflection.options[:polymorphic] ? {} : reflection.klass.replace_virtual_fields(child) || {}
+              new_child = reflection.nil? || reflection.options[:polymorphic] ? {} : reflection.klass.replace_virtual_fields(child) || {}
+              merge_includes(h, parent => new_child)
             end
           end
         end
+
+        # @param [Hash, Array, String, Symbol] value
+        # @return [Hash]
+        def include_to_hash(value)
+          case value
+          when String, Symbol
+            {value => {}}
+          when Array
+            value.flatten.each_with_object({}) { |k, h| h[k] = {} }
+          when nil
+            {}
+          else
+            value
+          end
+        end
+
+        # @param [Hash] hash1
+        # @param [Hash] hash2
+        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)
+          end
+        end
       end
     end
   end
@@ -209,8 +237,7 @@ module ActiveRecord
         # support virtual attributes by adding an alias to the sql phrase for the column
         # it does not add an as() if the column already has an as
         # this code is based upon _select()
-        fields.flatten!
-        fields.map! do |field|
+        fields = fields.flatten.map! do |field|
           if virtual_attribute?(field) && (arel = klass.arel_attribute(field)) && arel.respond_to?(:as)
             arel.as(connection.quote_column_name(field.to_s))
           else
@@ -221,6 +248,12 @@ module ActiveRecord
         super
       end
 
+      # From ActiveRecord::QueryMethods
+      def build_left_outer_joins(manager, outer_joins, *rest)
+        outer_joins = klass.replace_virtual_fields(outer_joins)
+        super if outer_joins.present?
+      end
+
       # From ActiveRecord::Calculations
       def calculate(operation, attribute_name)
         # work around 1 until https://github.com/rails/rails/pull/25304 gets merged

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-virtual_attributes
 version: !ruby/object:Gem::Version
-  version: 1.3.1
+  version: 1.4.0
 platform: ruby
 authors:
 - Keenan Brock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-06 00:00:00.000000000 Z
+date: 2019-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -38,6 +38,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: byebug
+  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