calculated_attributes 0.1.2 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a15804206f8ef6a215d616b036b8019c4bea1754
-  data.tar.gz: 36be65afdbe2ca7018547f9d77250b2d516c98d9
+  metadata.gz: 114648311fe5389527380b81d89677279f8e9019
+  data.tar.gz: 42e5dc334c01643eaf56d97e4eb42aca0cb0113d
 SHA512:
-  metadata.gz: 2e86e989c7ff52c20586dfea1135dafd77eb62b2c2aefbd62d46b7d1d5cd99c1bf88957289ffdb33a5e5b8704faef6e3ee7d415352d04d633c052abab8e79f5d
-  data.tar.gz: 02463a40ef5fc7ecc63fc351a1cbb81702a2566060ff69dc68b9eb54ea51db2e1af4fc87de4811a43bb360e32041092c07e2ecab733c324abf7bbc95e3033247
+  metadata.gz: 6635d62772fca4d1da02752555ed19fd55c8b04d9047e95086c233f89ee83822c7e277257ba21607e9bf7bf484b518e2547477333f5da84a1ccd0bcea223cc7d
+  data.tar.gz: f5881cb7665e8132f22ee7dbfd932b7695d420cd5fec33fb7e2248a40cdd2975ca093a37fca39ff0375e493e1039fef630c06213935eefa771a13392ebe16772

data/gemfiles/rails3.gemfile.lock

@@ -27,6 +27,7 @@ GEM
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
     builder (3.0.4)
+    byebug (6.0.2)
     diff-lcs (1.2.5)
     i18n (0.7.0)
     multi_json (1.11.1)
@@ -66,6 +67,7 @@ DEPENDENCIES
   activerecord (= 3.2.21)
   appraisal (~> 1.0.3)
   bundler (~> 1.7)
+  byebug
   calculated_attributes!
   rake (~> 10.0)
   rspec (~> 3.1)

data/gemfiles/rails4_1.gemfile.lock

@@ -29,6 +29,7 @@ GEM
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
     builder (3.2.2)
+    byebug (6.0.2)
     diff-lcs (1.2.5)
     i18n (0.7.0)
     json (1.8.3)
@@ -71,6 +72,7 @@ DEPENDENCIES
   activerecord (= 4.1.11)
   appraisal (~> 1.0.3)
   bundler (~> 1.7)
+  byebug
   calculated_attributes!
   rake (~> 10.0)
   rspec (~> 3.1)

data/gemfiles/rails4_2.gemfile.lock

@@ -29,6 +29,7 @@ GEM
     astrolabe (1.3.0)
       parser (>= 2.2.0.pre.3, < 3.0)
     builder (3.2.2)
+    byebug (6.0.2)
     diff-lcs (1.2.5)
     i18n (0.7.0)
     json (1.8.3)
@@ -71,6 +72,7 @@ DEPENDENCIES
   activerecord (= 4.2.2)
   appraisal (~> 1.0.3)
   bundler (~> 1.7)
+  byebug
   calculated_attributes!
   rake (~> 10.0)
   rspec (~> 3.1)

data/lib/calculated_attributes/arel_patches.rb

@@ -1,5 +1,5 @@
-Arel::SelectManager.send(:include, Module.new do
+class Arel::SelectManager
   def projections
     @ctx.projections
   end
-end)
+end

data/lib/calculated_attributes/model_methods.rb

@@ -17,7 +17,7 @@ module CalculatedAttributes
 end
 ActiveRecord::Base.extend CalculatedAttributes
 
-ActiveRecord::Base.send(:include, Module.new do
+class ActiveRecord::Base
   def calculated(*args)
     if self.class.respond_to? :scoped
       self.class.scoped.calculated(*args).find(id)
@@ -62,9 +62,9 @@ ActiveRecord::Base.send(:include, Module.new do
       end
     super || (no_sym_in_attr && (self.class.calculated.calculated[method] || self.class.base_class.calculated.calculated[method]))
   end
-end)
+end
 
-ActiveRecord::Relation.send(:include, Module.new do
+class ActiveRecord::Relation
   def calculated(*args)
     projections = arel.projections
     args.each do |arg|
@@ -83,4 +83,4 @@ ActiveRecord::Relation.send(:include, Module.new do
     end
     select(projections)
   end
-end)
+end

data/lib/calculated_attributes/rails_4_patches.rb

@@ -44,19 +44,30 @@ module ActiveRecord
         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
+        if ActiveRecord::VERSION::MINOR == 1
+          type_caster = result_set.column_type primary_key
+          
           result_set.each do |row_hash|
-            parent = parents[row_hash[primary_key]] ||= join_root.instantiate(row_hash, column_aliases)
+            primary_id = type_caster.type_cast row_hash[primary_key]
+            parent = parents[primary_id] ||= 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
+        else
+          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 do |row_hash|
+              parent = parents[row_hash[primary_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
+          end
         end
 
         parents.values

data/lib/calculated_attributes/version.rb

@@ -1,3 +1,3 @@
 module CalculatedAttributes
-  VERSION = '0.1.2'
+  VERSION = '0.1.3'
 end

data/spec/lib/calculated_attributes_spec.rb

@@ -104,7 +104,10 @@ describe 'calculated_attributes' do
 
   context 'when eager loading models' do
     it 'includes calculated attributes' do
-      scope = model_scoped(Post).includes(:comments).references(:comments)
+      scope = case ActiveRecord::VERSION::MAJOR
+      when 4 then model_scoped(Post).includes(:comments).references(:comments)
+      when 3 then model_scoped(Post).eager_load(:comments)
+      end
       expect(scope.first.comments_count).to eq(1)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: calculated_attributes
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.3
 platform: ruby
 authors:
 - Zach Schneider