activerecord-virtual_attributes 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6f8bd112296732146d0d98ed5f2f490b6d72361bc965d16d092f0712d6061767
-  data.tar.gz: 5dbbc67687d1143f69f18292f2cbdefe5166b69c8e034d5050cd2d203730ac5d
+  metadata.gz: 9a6c500c61ceb22d7703070013800f894b62a5efd8bf14e3e5aec0e24afdb5e1
+  data.tar.gz: 1e8c99b6823e09e10e39958c3f50651e5f1b558a76ef15377f23cd13571fd2cc
 SHA512:
-  metadata.gz: fd7ab60cefbb59e9c77f197f755822e530d95e52fc67fb0f9eea261473abfae8a34713957e756fa328c2128982a3af344eae629d5d3b9b8bdaec14f671985a07
-  data.tar.gz: a08eecd9ed665f9276fe098a95108df2d7e566751b6a8e0ed5ca39d34738a3dd5638df1e33517f41b6016ae446c4cb470dac1ed49c2a48613c7f515c8c72ec7b
+  metadata.gz: 0d1b3dc8b531417c714f180c74946f7f42fe6470b7a4912567be43f79529cdaad399c4316af05e0ca63b51e37d022f2887e316752d69371afed7c7ca92f0c6d0
+  data.tar.gz: fb251d9ca04da11c0042f0ec93c908e1ded759faf3c0935a94a7809219cd3ba73d7d4ef7451d6d7293efded29da176af921bcc92607170b5d2219c546559d317

data/.codeclimate.yml

@@ -27,4 +27,6 @@ checks:
 plugins:
   rubocop:
     enabled: true
-    config: ".rubocop_cc.yml"
+    channel: "rubocop-0-67"
+    config:
+      file: ".rubocop_cc.yml"

data/.yamllint

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

data/CHANGELOG.md

@@ -5,24 +5,32 @@ a nice looking [Changelog](http://keepachangelog.com).
 
 ## Version [Unreleased]
 
+## Version [1.2.0] <small>2019-04-23</small>
+
+* Virtual_delegate :type now specified to avoid rare race conditions with attribute discovery
+* Delays interpreting delegate until column is used
+* Postgres now supports order by virtual_aggregate
+* More flexible includes. e.g.: Arrays of symbols now work
+* Raises errors for invalid `includes()` and `:uses`
+
 ## Version [1.1.0] <small>2019-04-23</small>
 
-* add legacy types for VirtualAttribute::Types
-* fix rails 5.1 bug with includes
-* remove reference to MiqPreloader
-* climate code fixes
+* Add legacy types for `VirtualAttribute::Types`
+* Fix rails 5.1 bug with `includes()`
+* Remove reference to `MiqPreloader`
 
 ## Version [1.0.0] <small>2019-03-05</small>
 
-* renamed to activerecord-virtual_attributes
-* moved to ManageIQ
-* added support for Rails 5.1
+* Renamed to activerecord-virtual_attributes
+* Moved from ManageIQ to own repo
+* Added support for Rails 5.1
 
 ## Version 0.1.0 <small>2019-01-17</small>
 
 * Initial Release
 * Extracted from ManageIQ/manageiq
 
-[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.1.0...HEAD
+[Unreleased]: https://github.com/ManageIQ/activerecord-virtual_attributes/compare/v1.2.0...HEAD
+[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/Gemfile

@@ -2,7 +2,7 @@
 
 source "https://rubygems.org"
 
-gem "activerecord", "~> 5.0.0"
+gem "activerecord", "~> 5.0.7"
 gem "sqlite3", "~> 1.3.6"
 gem "pg"
 gem "mysql2", '~> 0.4.0'

data/lib/active_record/virtual_attributes.rb

@@ -15,15 +15,21 @@ module ActiveRecord
     module Type
       # TODO: do we actually need symbol types?
       class Symbol < ActiveRecord::Type::String
-        def type; :symbol; end
+        def type
+          :symbol
+        end
       end
 
       class StringSet < ActiveRecord::Type::Value
-        def type; :string_set; end
+        def type
+          :string_set
+        end
       end
 
       class NumericSet < ActiveRecord::Type::Value
-        def type; :numeric_set; end
+        def type
+          :numeric_set
+        end
       end
     end
 
@@ -37,7 +43,6 @@ module ActiveRecord
     end
 
     module ClassMethods
-
       #
       # Definition
       #
@@ -127,17 +132,17 @@ require "active_record/virtual_attributes/virtual_fields"
 
 # this patch is no longer necessary for 5.2
 if ActiveRecord.version.to_s < "5.2"
-require "active_record/attribute"
-module ActiveRecord
-  # This is a bug in rails 5.0 and 5.1, but it is made much worse by virtual attributes
-  class Attribute
-    def with_value_from_database(value)
-      # self.class.from_database(name, value, type)
-      initialized? ? self.class.from_database(name, value, type) : self
+  require "active_record/attribute"
+  module ActiveRecord
+    # This is a bug in rails 5.0 and 5.1, but it is made much worse by virtual attributes
+    class Attribute
+      def with_value_from_database(value)
+        # self.class.from_database(name, value, type)
+        initialized? ? self.class.from_database(name, value, type) : self
+      end
     end
   end
 end
-end
 
 require "active_record/virtual_attributes/virtual_total"
 require "active_record/virtual_attributes/arel_groups"

data/lib/active_record/virtual_attributes/rspec/have_virtual_attribute.rb

@@ -1,27 +1,3 @@
-# TODO: expose this to classes that include this gem
-
-# legacy matcher
-RSpec::Matchers.define :have_virtual_column do |name, type|
-  match do |klass|
-    expect(klass.has_attribute?(name)).to be_truthy
-    expect(klass.virtual_attribute?(name)).to be_truthy
-    expect(klass.type_for_attribute(name).type).to eq(type)
-    klass.instance_methods.include?(name.to_sym)
-  end
-
-  failure_message do |klass|
-    "expected #{klass.name} to have virtual column #{name.inspect} with type #{type.inspect}"
-  end
-
-  failure_message_when_negated do |klass|
-    "expected #{klass.name} to not have virtual column #{name.inspect} with type #{type.inspect}"
-  end
-
-  description do
-    "expect the object to have the virtual column"
-  end
-end
-
 RSpec::Matchers.define :have_virtual_attribute do |name, type|
   match do |klass|
     expect(klass.has_attribute?(name)).to be_truthy
@@ -42,3 +18,5 @@ RSpec::Matchers.define :have_virtual_attribute do |name, type|
     "expect the object to have the virtual column"
   end
 end
+
+RSpec::Matchers.alias_matcher(:have_virtual_column, :have_virtual_attribute)

data/lib/active_record/virtual_attributes/version.rb

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

data/lib/active_record/virtual_attributes/virtual_arel.rb

@@ -37,6 +37,7 @@ module ActiveRecord
           try(:attribute_alias?, name) ||
             (has_attribute?(name) && (!virtual_attribute?(name) || !!_virtual_arel[name.to_s]))
         end
+
         private
 
         def define_virtual_arel(name, arel)

data/lib/active_record/virtual_attributes/virtual_delegates.rb

@@ -15,7 +15,6 @@ module ActiveRecord
       end
 
       module ClassMethods
-
         #
         # Definition
         #
@@ -72,7 +71,8 @@ module ActiveRecord
           end
 
           col = col.to_s
-          type = to_ref.klass.type_for_attribute(col)
+          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)
@@ -142,20 +142,23 @@ module ActiveRecord
         #   See select_from_alias for examples
 
         def virtual_delegate_arel(col, to_ref)
-          # ensure the column has sql and the association is reachable via sql
+          # Ensure the association is reachable via sql
+          #
+          # But NOT ensuring the target column has sql
+          #   to_ref.klass.arel_attribute(col) loads the target classes' schema.
+          #   This cascades and causing a race condition
+          #
           # There is currently no way to propagate sql over a virtual association
-          if to_ref.klass.arel_attribute(col) && reflect_on_association(to_ref.name)
-            if to_ref.macro == :has_one || to_ref.macro == :belongs_to
+          if reflect_on_association(to_ref.name) && (to_ref.macro == :has_one || to_ref.macro == :belongs_to)
+            lambda do |t|
+              join_keys = if ActiveRecord.version.to_s >= "5.1"
+                            to_ref.join_keys
+                          else
+                            to_ref.join_keys(to_ref.klass)
+                          end
+              src_model_id = arel_attribute(join_keys.foreign_key, t)
               blk = ->(arel) { arel.limit = 1 } if to_ref.macro == :has_one
-              lambda do |t|
-                if ActiveRecord.version.to_s >= "5.1"
-                  join_keys = to_ref.join_keys
-                else
-                  join_keys = to_ref.join_keys(to_ref.klass)
-                end
-                src_model_id = arel_attribute(join_keys.foreign_key, t)
-                VirtualDelegates.select_from_alias(to_ref, col, join_keys.key, src_model_id, &blk)
-              end
+              VirtualDelegates.select_from_alias(to_ref, col, join_keys.key, src_model_id, &blk)
             end
           end
         end

data/lib/active_record/virtual_attributes/virtual_fields.rb

@@ -40,7 +40,7 @@ module ActiveRecord
             associations.each_with_object({}) do |(parent, child), h|
               next if virtual_field?(parent)
               reflection = reflect_on_association(parent.to_sym)
-              h[parent] = reflection.options[:polymorphic] ? nil : reflection.klass.remove_virtual_fields(child) if reflection
+              h[parent] = reflection.nil? || reflection.options[:polymorphic] ? {} : reflection.klass.remove_virtual_fields(child) || {}
             end
           else
             associations

data/lib/active_record/virtual_attributes/virtual_total.rb

@@ -100,14 +100,6 @@ module VirtualAttributes
                     reflection.klass.all
                   end
 
-          # ordering will probably screw up aggregations, so clear this out from
-          # any calls
-          #
-          # only clear this out if this isn't a `:size` call as well, since doing
-          # a COUNT(*) will allow any ORDER BY to still work properly.  This is
-          # to avoid any possible edge cases by clearing out the order clause.
-          query.order_values = [] if method_name != :size
-
           foreign_table = reflection.klass.arel_table
           # need db access for the keys, so delaying all this lookup until call time
           if ActiveRecord.version.to_s >= "5.1"
@@ -115,7 +107,7 @@ module VirtualAttributes
           else
             join_keys = reflection.join_keys(reflection.klass)
           end
-          query       = query.where(t[join_keys.foreign_key].eq(foreign_table[join_keys.key]))
+          query       = query.except(:order).where(t[join_keys.foreign_key].eq(foreign_table[join_keys.key]))
 
           arel_column = if method_name == :size
                           Arel.star.count

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-virtual_attributes
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Keenan Brock
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-23 00:00:00.000000000 Z
+date: 2019-05-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -94,6 +94,7 @@ files:
 - ".rubocop_cc.yml"
 - ".rubocop_local.yml"
 - ".travis.yml"
+- ".yamllint"
 - Appraisals
 - CHANGELOG.md
 - Gemfile
@@ -143,7 +144,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.6.2
 signing_key: 
 specification_version: 4
 summary: Access non-sql attributes from sql