calculated_attributes 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 31b050a3311b7b6c70f23b201f4761b103b6137f
-  data.tar.gz: 875255b28e9c8e597b4bf0d912f3f02283544d18
+  metadata.gz: a0940be8c91d38d2aec6592df3ab0ecb9d45cff3
+  data.tar.gz: 9d497e3a163e7447892aa73e81b0b647fa16d8ec
 SHA512:
-  metadata.gz: 9dd904985c4d11aa47ecbc53e90b9500f5a427437ec934e8666ffdb29db88c129151843899f93dad9dc6f9aa884903933ad529b0f5bf03c8e15ad5a23e718f18
-  data.tar.gz: 493f1937397278a71be5743c39160f12582ebe30a93530de9e9138454423e475259fc72e0d1c26d800314a4a5b39f7d956443855827bd014c9a05bc2658c54c2
+  metadata.gz: 195341ee43dcb6b87fd1ca1a45c9c5eb41f26ad3bd9479c8aabc3cd96e131d1b5671276a20767f99d43e0c3c136d2b5188d988e481afa5045b21641956d7c50c
+  data.tar.gz: f9634c6a9762bfc550001d92b98f112dbcc51397e5f81f0e0fcbd4ca36508f45a28cd0d12ece28ab40919add24740c26b04f78bfe8f2cec193485db93c824483

data/.ruby-version

@@ -1 +1 @@
-2.0.0
+2.3.1

data/Appraisals

@@ -9,3 +9,7 @@ end
 appraise 'rails4_2' do
   gem 'activerecord', '4.2.2'
 end
+
+appraise 'rails5_0' do
+  gem 'activerecord', '5.0.0'
+end

data/gemfiles/rails3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    calculated_attributes (0.1.4)
+    calculated_attributes (0.1.5)
       activerecord (>= 3.2.20)
 
 GEM
@@ -72,4 +72,4 @@ DEPENDENCIES
   sqlite3 (~> 1.3.10)
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/gemfiles/rails4_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    calculated_attributes (0.1.4)
+    calculated_attributes (0.1.5)
       activerecord (>= 3.2.20)
 
 GEM
@@ -77,4 +77,4 @@ DEPENDENCIES
   sqlite3 (~> 1.3.10)
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/gemfiles/rails4_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    calculated_attributes (0.1.4)
+    calculated_attributes (0.1.5)
       activerecord (>= 3.2.20)
 
 GEM
@@ -77,4 +77,4 @@ DEPENDENCIES
   sqlite3 (~> 1.3.10)
 
 BUNDLED WITH
-   1.11.2
+   1.12.5

data/gemfiles/rails5_0.gemfile

@@ -0,0 +1,7 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "activerecord", "5.0.0"
+
+gemspec :path => "../"

data/gemfiles/rails5_0.gemfile.lock

@@ -0,0 +1,77 @@
+PATH
+  remote: ../
+  specs:
+    calculated_attributes (0.1.5)
+      activerecord (>= 3.2.20)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activemodel (5.0.0)
+      activesupport (= 5.0.0)
+    activerecord (5.0.0)
+      activemodel (= 5.0.0)
+      activesupport (= 5.0.0)
+      arel (~> 7.0)
+    activesupport (5.0.0)
+      concurrent-ruby (~> 1.0, >= 1.0.2)
+      i18n (~> 0.7)
+      minitest (~> 5.1)
+      tzinfo (~> 1.1)
+    appraisal (1.0.3)
+      bundler
+      rake
+      thor (>= 0.14.0)
+    arel (7.1.1)
+    ast (2.3.0)
+    astrolabe (1.3.1)
+      parser (~> 2.2)
+    concurrent-ruby (1.0.2)
+    diff-lcs (1.2.5)
+    i18n (0.7.0)
+    minitest (5.9.0)
+    parser (2.3.1.2)
+      ast (~> 2.2)
+    powerpack (0.1.1)
+    rainbow (2.1.0)
+    rake (10.5.0)
+    rspec (3.5.0)
+      rspec-core (~> 3.5.0)
+      rspec-expectations (~> 3.5.0)
+      rspec-mocks (~> 3.5.0)
+    rspec-core (3.5.3)
+      rspec-support (~> 3.5.0)
+    rspec-expectations (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-mocks (3.5.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.5.0)
+    rspec-support (3.5.0)
+    rubocop (0.32.1)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.2.5, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.4)
+    ruby-progressbar (1.8.1)
+    sqlite3 (1.3.11)
+    thor (0.19.1)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  activerecord (= 5.0.0)
+  appraisal (~> 1.0.3)
+  calculated_attributes!
+  rake (~> 10.0)
+  rspec (~> 3.1)
+  rubocop (~> 0.32.0)
+  sqlite3 (~> 1.3.10)
+
+BUNDLED WITH
+   1.12.5

data/lib/calculated_attributes/rails_5_patches.rb

@@ -0,0 +1,65 @@
+module ActiveRecord
+  module AttributeMethods
+    module ClassMethods
+      # Generates all the attribute related methods for columns in the database
+      # accessors, mutators and query methods.
+      def define_attribute_methods # :nodoc:
+        return false if @attribute_methods_generated
+        # Use a mutex; we don't want two threads simultaneously trying to define
+        # attribute methods.
+        generated_attribute_methods.synchronize do
+          return false if @attribute_methods_generated
+          superclass.define_attribute_methods unless self == base_class
+          columns_to_define =
+            if defined?(calculated) && calculated.instance_variable_get('@calculations')
+              calculated_keys = calculated.instance_variable_get('@calculations').keys
+              column_names.reject { |c| calculated_keys.include? c.intern }
+            else
+              column_names
+            end
+          super(columns_to_define)
+          @attribute_methods_generated = true
+        end
+        true
+      end
+    end
+  end
+
+  module Associations
+    class JoinDependency
+      attr_writer :calculated_columns
+
+      def instantiate(result_set, aliases)
+        primary_key = aliases.column_alias(join_root, join_root.primary_key)
+
+        seen = Hash.new { |i, object_id|
+          i[object_id] = Hash.new { |j, child_class|
+            j[child_class] = {}
+          }
+        }
+
+        model_cache = Hash.new { |h,klass| h[klass] = {} }
+        parents = model_cache[join_root]
+        column_aliases = aliases.column_aliases join_root
+
+        message_bus = ActiveSupport::Notifications.instrumenter
+
+        payload = {
+          record_count: result_set.length,
+          class_name: join_root.base_klass.name
+        }
+
+        message_bus.instrument("instantiation.active_record", payload) do
+          result_set.each { |row_hash|
+            parent_key = primary_key ? row_hash[primary_key] : row_hash
+            parent = parents[parent_key] ||= join_root.instantiate(row_hash, column_aliases)
+            @calculated_columns.each { |column| parent[column.right] = model[column.right] } if @calculated_columns
+            construct(parent, join_root, row_hash, result_set, seen, model_cache, aliases)
+          }
+        end
+
+        parents.values
+      end
+    end
+  end
+end

data/lib/calculated_attributes/rails_patches.rb

@@ -15,7 +15,7 @@ module ActiveRecord
       # Updates the attribute identified by <tt>attr_name</tt> with the specified +value+. Empty strings
       # for fixnum and float columns are turned into +nil+.
       def write_attribute(attr_name, value)
-        if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 2
+        if ActiveRecord::VERSION::MAJOR == 4 && ActiveRecord::VERSION::MINOR == 2 || ActiveRecord::VERSION::MAJOR == 5
           write_attribute_with_type_cast(attr_name, value, true)
         else
           attr_name = attr_name.to_s

data/lib/calculated_attributes/version.rb

@@ -1,3 +1,3 @@
 module CalculatedAttributes
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

data/lib/calculated_attributes.rb

@@ -4,7 +4,7 @@ require 'active_record'
 # Include patches.
 require 'calculated_attributes/rails_patches'
 require 'calculated_attributes/arel_patches'
-fail "Unsupported ActiveRecord version: #{ActiveRecord::VERSION::MAJOR}" unless [3, 4].include? ActiveRecord::VERSION::MAJOR
+fail "Unsupported ActiveRecord version: #{ActiveRecord::VERSION::MAJOR}" unless [3, 4, 5].include? ActiveRecord::VERSION::MAJOR
 require "calculated_attributes/rails_#{ActiveRecord::VERSION::MAJOR}_patches"
 
 # Include model code.

data/spec/lib/calculated_attributes_spec.rb

@@ -120,6 +120,7 @@ describe 'calculated_attributes' do
   context 'when eager loading models' do
     it 'includes calculated attributes' do
       scope = case ActiveRecord::VERSION::MAJOR
+      when 5 then model_scoped(Post).includes(:comments).references(:comments)
       when 4 then model_scoped(Post).includes(:comments).references(:comments)
       when 3 then model_scoped(Post).eager_load(:comments)
       end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calculated_attributes
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Zach Schneider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-02 00:00:00.000000000 Z
+date: 2016-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal
@@ -118,11 +118,14 @@ files:
 - gemfiles/rails4_1.gemfile.lock
 - gemfiles/rails4_2.gemfile
 - gemfiles/rails4_2.gemfile.lock
+- gemfiles/rails5_0.gemfile
+- gemfiles/rails5_0.gemfile.lock
 - lib/calculated_attributes.rb
 - lib/calculated_attributes/arel_patches.rb
 - lib/calculated_attributes/model_methods.rb
 - lib/calculated_attributes/rails_3_patches.rb
 - lib/calculated_attributes/rails_4_patches.rb
+- lib/calculated_attributes/rails_5_patches.rb
 - lib/calculated_attributes/rails_patches.rb
 - lib/calculated_attributes/version.rb
 - spec/lib/calculated_attributes_spec.rb