calculated_attributes 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6e9af41ada6b87c3d05e4d8a3e47ccebb28b2a3b
-  data.tar.gz: 4bf3d866adaf0a9fd07bdfc7bdb8b6a2e2e42857
+  metadata.gz: a15804206f8ef6a215d616b036b8019c4bea1754
+  data.tar.gz: 36be65afdbe2ca7018547f9d77250b2d516c98d9
 SHA512:
-  metadata.gz: d43f7a046648b0a1dd8a26313cfeffc1d814653c31216c324521e8aab85ce981b58969c7a005f54b5c4fb88062ac63a592f7968c77aee93110da23878f43d617
-  data.tar.gz: 10ebe98f3b66530b26fcc85f8f279a58801d2454f3126a4de98d79c6bae2b646f7a8ad69356e0dd81cb917e5a69724ff13d70d040f2569d0514aef41ee90df8d
+  metadata.gz: 2e86e989c7ff52c20586dfea1135dafd77eb62b2c2aefbd62d46b7d1d5cd99c1bf88957289ffdb33a5e5b8704faef6e3ee7d415352d04d633c052abab8e79f5d
+  data.tar.gz: 02463a40ef5fc7ecc63fc351a1cbb81702a2566060ff69dc68b9eb54ea51db2e1af4fc87de4811a43bb360e32041092c07e2ecab733c324abf7bbc95e3033247

data/gemfiles/rails3.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    calculated_attributes (0.1.1)
+    calculated_attributes (0.1.2)
       activerecord (>= 3.2.20)
 
 GEM

data/gemfiles/rails4_1.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    calculated_attributes (0.1.1)
+    calculated_attributes (0.1.2)
       activerecord (>= 3.2.20)
 
 GEM

data/gemfiles/rails4_2.gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: ../
   specs:
-    calculated_attributes (0.1.1)
+    calculated_attributes (0.1.2)
       activerecord (>= 3.2.20)
 
 GEM

data/lib/calculated_attributes/model_methods.rb

@@ -70,7 +70,14 @@ ActiveRecord::Relation.send(:include, Module.new do
     args.each do |arg|
       lam = klass.calculated.calculated[arg] || klass.base_class.calculated.calculated[arg]
       sql = lam.call
-      new_projection = sql.is_a?(String) ? Arel.sql("(#{sql})").as(arg.to_s) : sql.as(arg.to_s)
+      new_projection = 
+        if sql.is_a?(String)
+          Arel.sql("(#{sql})").as(arg.to_s)
+        elsif sql.respond_to? :to_sql
+          Arel.sql("(#{sql.to_sql})").as(arg.to_s)
+        else
+          sql.as(arg.to_s)
+        end
       new_projection.calculated_attr!
       projections.push new_projection
     end

data/lib/calculated_attributes/rails_4_patches.rb

@@ -32,9 +32,11 @@ module ActiveRecord
       def instantiate(result_set, aliases)
         primary_key = aliases.column_alias(join_root, join_root.primary_key)
 
-        seen = Hash.new do |i, object_id|
-          i[object_id] = Hash.new do |j, child_class|
-            j[child_class] = {}
+        seen = Hash.new do |k, primary_key|
+          Hash.new do |i, object_id|
+            i[object_id] = Hash.new do |j, child_class|
+              j[child_class] = {}
+            end
           end
         end
 

data/lib/calculated_attributes/version.rb

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

data/spec/lib/calculated_attributes_spec.rb

@@ -10,39 +10,39 @@ end
 
 describe 'calculated_attributes' do
   it 'includes calculated attributes' do
-    expect(model_scoped(Post).calculated(:comments).first.comments).to eq(1)
+    expect(model_scoped(Post).calculated(:comments_count).first.comments_count).to eq(1)
   end
 
   it 'includes multiple calculated attributes' do
-    post = model_scoped(Post).calculated(:comments, :comments_two).first
-    expect(post.comments).to eq(1)
+    post = model_scoped(Post).calculated(:comments_count, :comments_two).first
+    expect(post.comments_count).to eq(1)
     expect(post.comments_two).to eq(1)
   end
 
   it 'includes chained calculated attributes' do
-    post = model_scoped(Post).calculated(:comments).calculated(:comments_two).first
-    expect(post.comments).to eq(1)
+    post = model_scoped(Post).calculated(:comments_count).calculated(:comments_two).first
+    expect(post.comments_count).to eq(1)
     expect(post.comments_two).to eq(1)
   end
 
   it 'nests with where query' do
-    expect(Post.where(id: 1).calculated(:comments).first.comments).to eq(1)
+    expect(Post.where(id: 1).calculated(:comments_count).first.comments_count).to eq(1)
   end
 
   it 'nests with order query' do
-    expect(Post.order('id DESC').calculated(:comments).first.id).to eq(Post.count)
+    expect(Post.order('id DESC').calculated(:comments_count).first.id).to eq(Post.count)
   end
 
   it 'allows access via model instance method' do
-    expect(Post.first.calculated(:comments).comments).to eq(1)
+    expect(Post.first.calculated(:comments_count).comments_count).to eq(1)
   end
 
   it 'allows anonymous access via model instance method' do
-    expect(Post.first.comments).to eq(1)
+    expect(Post.first.comments_count).to eq(1)
   end
 
   it 'allows anonymous access via model instance method with STI and lambda on base class' do
-    expect(Tutorial.first.comments).to eq(1)
+    expect(Tutorial.first.comments_count).to eq(1)
   end
 
   it 'allows anonymous access via model instance method with STI and lambda on subclass' do
@@ -58,8 +58,8 @@ describe 'calculated_attributes' do
   end
 
   it 'allows access to multiple calculated attributes via model instance method' do
-    post = Post.first.calculated(:comments, :comments_two)
-    expect(post.comments).to eq(1)
+    post = Post.first.calculated(:comments_count, :comments_two)
+    expect(post.comments_count).to eq(1)
     expect(post.comments_two).to eq(1)
   end
 
@@ -67,21 +67,45 @@ describe 'calculated_attributes' do
     expect(model_scoped(Post).calculated(:comments_arel).first.comments_arel).to eq(1)
   end
 
+  it 'allows attributes to be defined using class that responds to to_sql' do
+    expect(model_scoped(Post).calculated(:comments_to_sql).first.comments_to_sql).to eq(1)
+  end
+
   it 'maintains previous scope' do
-    expect(Post.where(text: 'First post!').calculated(:comments).first.comments).to eq(1)
-    expect(Post.where("posts.text = 'First post!'").calculated(:comments).first.comments).to eq(1)
+    expect(Post.where(text: 'First post!').calculated(:comments_count).first.comments_count).to eq(1)
+    expect(Post.where("posts.text = 'First post!'").calculated(:comments_count).first.comments_count).to eq(1)
   end
 
   it 'maintains subsequent scope' do
-    expect(model_scoped(Post).calculated(:comments).where(text: 'First post!').first.comments).to eq(1)
-    expect(model_scoped(Post).calculated(:comments).where("posts.text = 'First post!'").first.comments).to eq(1)
+    expect(model_scoped(Post).calculated(:comments_count).where(text: 'First post!').first.comments_count).to eq(1)
+    expect(model_scoped(Post).calculated(:comments_count).where("posts.text = 'First post!'").first.comments_count).to eq(1)
   end
 
   it 'includes calculated attributes with STI and lambda on base class' do
-    expect(model_scoped(Tutorial).calculated(:comments).first.comments).to eq(1)
+    expect(model_scoped(Tutorial).calculated(:comments_count).first.comments_count).to eq(1)
   end
 
   it 'includes calculated attributes with STI and lambda on subclass' do
     expect(model_scoped(Article).calculated(:sub_comments).first.sub_comments).to eq(1)
   end
+
+  context 'when joining models' do
+    it 'includes calculated attributes' do
+      expect(model_scoped(Post).joins(:comments).calculated(:comments_count).first.comments_count).to eq(1)
+    end
+
+    context 'when conditions are specified on the joined table' do
+      it 'includes calculated models' do
+        scope = model_scoped(Post).joins(:comments)
+        expect(scope.first.comments_count).to eq(1)
+      end
+    end
+  end
+
+  context 'when eager loading models' do
+    it 'includes calculated attributes' do
+      scope = model_scoped(Post).includes(:comments).references(:comments)
+      expect(scope.first.comments_count).to eq(1)
+    end
+  end
 end

data/spec/support/models.rb

@@ -1,7 +1,11 @@
 class Post < ActiveRecord::Base
-  calculated :comments, -> { 'select count(*) from comments where comments.post_id = posts.id' }
+  has_many :comments
+  belongs_to :user
+
+  calculated :comments_count, -> { 'select count(*) from comments where comments.post_id = posts.id' }
   calculated :comments_two, -> { 'select count(*) from comments where comments.post_id = posts.id' }
   calculated :comments_arel, -> { Comment.where(Comment.arel_table[:post_id].eq(Post.arel_table[:id])).select(Arel.sql('count(*)')) }
+  calculated :comments_to_sql, -> { Comment.where('comments.post_id = posts.id').select('count(*)') }
 end
 
 class Tutorial < Post
@@ -12,4 +16,11 @@ class Article < Post
 end
 
 class Comment < ActiveRecord::Base
+  belongs_to :post
+  belongs_to :user
+end
+
+class User < ActiveRecord::Base
+  has_many :comments
+  has_many :posts
 end

data/spec/support/schema.rb

@@ -3,12 +3,18 @@ ActiveRecord::Schema.define do
 
   create_table :posts, force: true do |t|
     t.string :text
+    t.references :user
     t.timestamps null: false
   end
 
   create_table :comments, force: true do |t|
     t.integer :post_id
     t.string :text
+    t.references :user
     t.timestamps null: false
   end
+
+  create_table :users, force: true do |t|
+    t.string :username
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: calculated_attributes
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Zach Schneider
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-10-27 00:00:00.000000000 Z
+date: 2015-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: appraisal