activerecord-futures 0.2.0 → 0.3.0

data/spec/in_action/future_count_execution_spec.rb

@@ -3,8 +3,9 @@ require 'spec_helper'
 describe "future_count method" do
   context "single value count" do
     let(:relation) { Post.where("published_at < ?", Time.new(2013, 1, 1)) }
-    let(:count) { relation.future_count }
-    let(:count_sql) do
+    let(:future) { relation.future_count }
+    let(:relation_result) { relation.count }
+    let(:future_sql) do
       arel = relation.arel
       arel.projections = []
       arel.project("COUNT(*)")
@@ -17,37 +18,14 @@ describe "future_count method" do
       Post.create(published_at: Time.new(2013, 4, 5))
     end
 
-    describe "#value" do
-      let(:calling_value) { -> { count.value } }
-
-      specify do
-        calling_value.should exec(1).query
-      end
-
-      specify do
-        calling_value.should exec_query(count_sql)
-      end
-
-      specify { count.value.should eq 2 }
-
-      context "executing it twice" do
-        before do
-          count.value
-        end
-
-        specify do
-          calling_value.should exec(0).queries
-        end
-
-        specify { count.value.should eq 2 }
-      end
-    end
+    it_behaves_like "a futurized method", :value
   end
 
   context "grouped value count" do
     let(:relation) { Comment.scoped }
-    let(:count) { relation.future_count(group: :post_id) }
-    let(:count_sql) do
+    let(:future) { relation.future_count(group: :post_id) }
+    let(:relation_result) { relation.count(group: :post_id) }
+    let(:future_sql) do
       arel = relation.arel
       arel.projections = []
       arel.project("COUNT(*) AS count_all")
@@ -67,32 +45,6 @@ describe "future_count method" do
       Comment.create(post: post_2)
     end
 
-    describe "#value" do
-      let(:calling_value) { -> { count.value } }
-
-      specify do
-        calling_value.should exec(1).query
-      end
-
-      specify do
-        calling_value.should exec_query(count_sql)
-      end
-
-      specify { count.value[post_1.id].should eq 2 }
-      specify { count.value[post_2.id].should eq 3 }
-
-      context "executing it twice" do
-        before do
-          count.value
-        end
-
-        specify do
-          calling_value.should exec(0).queries
-        end
-
-        specify { count.value[post_1.id].should eq 2 }
-        specify { count.value[post_2.id].should eq 3 }
-      end
-    end
+    it_behaves_like "a futurized method", :value
   end
 end

data/spec/in_action/future_exists_execution_spec.rb

@@ -0,0 +1,22 @@
+require 'spec_helper'
+
+describe "future_exists? method" do
+  let(:relation) { Post.where("published_at < ?", Time.new(2013, 1, 1)) }
+  let(:future) { relation.future_exists? }
+  let(:relation_result) { relation.exists? }
+  let(:future_sql) do
+    arel = relation.arel
+    arel.projections = []
+    arel.project("1 AS one")
+    arel.limit = 1
+    arel.to_sql
+  end
+
+  before do
+    Post.create(published_at: Time.new(2012, 12, 10))
+    Post.create(published_at: Time.new(2012, 6, 23))
+    Post.create(published_at: Time.new(2013, 4, 5))
+  end
+
+  it_behaves_like "a futurized method", :value
+end

data/spec/in_action/future_find_execution_spec.rb

@@ -0,0 +1,68 @@
+require 'spec_helper'
+
+describe "future_find method" do
+  context "finding by a single id" do
+    let(:relation) { Post.where("published_at < ?", Time.new(2013, 1, 1)) }
+    let(:future) { relation.future_find(@post_id) }
+    let(:relation_result) { relation.find(@post_id) }
+    let(:future_sql) do
+      arel = relation.where(id: @post_id).arel
+      arel.limit = 1
+      arel.to_sql
+    end
+
+    let(:future_sql_postgresql) do
+      arel = relation.arel
+      arel.constraints.unshift(Arel.sql('"posts"."id" = $1'))
+      arel.limit = 1
+      arel.to_sql
+    end
+
+    before do
+      Post.create(published_at: Time.new(2012, 12, 10))
+      Post.create(published_at: Time.new(2012, 6, 23))
+      Post.create(published_at: Time.new(2013, 4, 5))
+      @post_id = relation.first.id
+    end
+
+    it_behaves_like "a futurized method", :value
+  end
+
+  context "finding by multiple ids" do
+    let(:relation) { Post.where("published_at < ?", Time.new(2013, 1, 1)) }
+    let(:future) { relation.future_find(*@post_ids) }
+    let(:relation_result) { relation.find(*@post_ids) }
+    let(:future_sql) do
+      arel = relation.where(id: @post_ids).arel
+      arel.to_sql
+    end
+
+    before do
+      Post.create(published_at: Time.new(2012, 12, 10))
+      Post.create(published_at: Time.new(2012, 6, 23))
+      Post.create(published_at: Time.new(2013, 4, 5))
+      @post_ids = [relation.first.id, relation.last.id]
+    end
+
+    it_behaves_like "a futurized method", :to_a
+  end
+
+  context "finding by multiple ids, with single array parameter" do
+    let(:relation) { Post.where("published_at < ?", Time.new(2013, 1, 1)) }
+    let(:future) { relation.future_find(@post_ids) }
+    let(:relation_result) { relation.find(@post_ids) }
+    let(:future_sql) do
+      arel = relation.where(id: @post_ids).arel
+      arel.to_sql
+    end
+
+    before do
+      Post.create(published_at: Time.new(2012, 12, 10))
+      Post.create(published_at: Time.new(2012, 6, 23))
+      Post.create(published_at: Time.new(2013, 4, 5))
+      @post_ids = [relation.first.id, relation.last.id]
+    end
+
+    it_behaves_like "a futurized method", :to_a
+  end
+end

data/spec/in_action/future_first_execution_spec.rb

@@ -0,0 +1,20 @@
+require 'spec_helper'
+
+describe "future_first method" do
+  let(:relation) { Post.where("published_at < ?", Time.new(2013, 1, 1)) }
+  let(:future) { relation.future_first }
+  let(:relation_result) { relation.first }
+  let(:future_sql) do
+    arel = relation.arel
+    arel.limit = 1
+    arel.to_sql
+  end
+
+  before do
+    Post.create(published_at: Time.new(2012, 12, 10))
+    Post.create(published_at: Time.new(2012, 6, 23))
+    Post.create(published_at: Time.new(2013, 4, 5))
+  end
+
+  it_behaves_like "a futurized method", :value
+end

data/spec/in_action/future_fulfillment_spec.rb

@@ -2,19 +2,20 @@ require "spec_helper"
 
 module ActiveRecord::Futures
   describe "Future fulfillment" do
-    subject { Future }
+    subject { FutureRegistry }
 
     context "when futurizing a relation" do
-      let!(:future) { Post.where(title: "Some post").future }
+      let!(:future_result) { Post.where(title: "Some post").future }
+      let!(:future) { future_result.send(:future_execution) }
 
       its(:all) { should have(1).future }
 
-      context "the relation future" do
+      context "the future" do
         specify { future.should_not be_fulfilled }
       end
 
       context "and executing it" do
-        before { future.to_a }
+        before { future_result.to_a }
 
         its(:all) { should have(0).futures }
 
@@ -28,8 +29,10 @@ module ActiveRecord::Futures
     end
 
     context "when futurizing two relations" do
-      let!(:future) { Post.where(title: "Some post").future }
-      let!(:another_future) { User.where(name: "Lenny").future }
+      let!(:future_result) { Post.where(title: "Some post").future }
+      let!(:future) { future_result.send(:future_execution) }
+      let!(:another_future_result) { User.where(name: "Lenny").future }
+      let!(:another_future) { another_future_result.send(:future_execution) }
 
       its(:all) { should have(2).futures }
 
@@ -42,7 +45,7 @@ module ActiveRecord::Futures
       end
 
       context "and executing one of them" do
-        before { future.to_a }
+        before { future_result.to_a }
 
         its(:all) { should have(0).futures }
 

data/spec/in_action/future_last_execution_spec.rb

@@ -0,0 +1,21 @@
+require 'spec_helper'
+
+describe "future_last method" do
+  let(:relation) { Post.where("published_at < ?", Time.new(2013, 1, 1)) }
+  let(:future) { relation.future_last }
+  let(:relation_result) { relation.last }
+  let(:future_sql) do
+    arel = relation.arel
+    arel.order("#{relation.quoted_table_name}.#{relation.quoted_primary_key} DESC")
+    arel.limit = 1
+    arel.to_sql
+  end
+
+  before do
+    Post.create(published_at: Time.new(2012, 12, 10))
+    Post.create(published_at: Time.new(2012, 6, 23))
+    Post.create(published_at: Time.new(2013, 4, 5))
+  end
+
+  it_behaves_like "a futurized method", :value
+end

data/spec/in_action/future_pluck_execution_spec.rb

@@ -2,8 +2,9 @@ require 'spec_helper'
 
 describe "future_pluck method" do
   let(:relation) { Post.where("published_at < ?", Time.new(2013, 1, 1)) }
-  let(:pluck) { relation.future_pluck('title') }
-  let(:pluck_sql) do
+  let(:future) { relation.future_pluck('title') }
+  let(:relation_result) { relation.pluck('title') }
+  let(:future_sql) do
     arel = relation.arel
     arel.projections = []
     arel.project('title')
@@ -16,29 +17,5 @@ describe "future_pluck method" do
     Post.create(title: "Post 3", published_at: Time.new(2013, 4, 5))
   end
 
-  describe "#to_a" do
-    let(:calling_to_a) { -> { pluck.to_a } }
-
-    specify do
-      calling_to_a.should exec(1).query
-    end
-
-    specify do
-      calling_to_a.should exec_query(pluck_sql)
-    end
-
-    specify { pluck.to_a.should eq ["Post 1", "Post 2"] }
-
-    context "executing it twice" do
-      before do
-        pluck.to_a
-      end
-
-      specify do
-        calling_to_a.should exec(0).queries
-      end
-
-      specify { pluck.to_a.should eq ["Post 1", "Post 2"] }
-    end
-  end
+  it_behaves_like "a futurized method", :to_a
 end

data/spec/in_action/future_relation_execution_spec.rb

@@ -8,45 +8,23 @@ describe "future method" do
     Post.create(published_at: Time.new(2013, 4, 5))
   end
 
-  def self.spec_relation(description, relation_lambda, &block)
+  def self.test_case(description, &relation_lambda)
     context "with a sample relation that #{description}" do
       let(:relation) { relation_lambda.call }
+      let(:relation_result) { relation.to_a }
       let(:future) { relation.future }
+      let(:future_sql) { relation.to_sql }
 
-      describe "#to_a" do
-        let(:calling_to_a) { lambda { future.to_a } }
-
-        specify do
-          calling_to_a.should exec(1).query
-        end
-
-        specify do
-          calling_to_a.should exec_query(relation.to_sql)
-        end
-
-        instance_eval(&block)
-
-        context "executing it twice" do
-          before do
-            future.to_a
-          end
-
-          specify do
-            calling_to_a.should exec(0).queries
-          end
-
-          instance_eval(&block)
-        end
-      end
+      it_behaves_like "a futurized method", :to_a
     end
   end
 
-  spec_relation "filters by published_at", -> { Post.where("published_at < ?", Time.new(2013, 1, 1)) } do
-    specify { future.to_a.should have(2).posts }
+  test_case "filters by published_at" do
+    Post.where("published_at < ?", Time.new(2013, 1, 1))
   end
 
-  spec_relation "limits by 10", -> { Post.limit(10) } do
-    specify { future.to_a.should have(3).posts }
+  test_case "limits by 10" do
+    Post.limit(10)
   end
 
 end

data/spec/spec_helper.rb

@@ -50,6 +50,7 @@ RSpec.configure do |config|
   config.run_all_when_everything_filtered = true
   config.filter_run :focus
   config.filter_run_excluding(supports_futures ? :not_supporting_adapter : :supporting_adapter)
+  config.filter_run_excluding(postgresql: config_key.to_s.include?("postgresql") ? false : true)
   # Run specs in random order to surface order dependencies. If you find an
   # order dependency and want to debug it, you can fix the order by providing
   # the seed, which is printed after each run.
@@ -64,6 +65,6 @@ RSpec.configure do |config|
   end
 
   config.after do
-    ActiveRecord::Futures::Future.clear
+    ActiveRecord::Futures::FutureRegistry.clear
   end
 end

data/spec/support/futurized_method_examples.rb

@@ -0,0 +1,43 @@
+shared_examples "a futurized method" do |exec_trigger|
+  describe "##{exec_trigger}" do
+    let(:future_execution) { future.send(:future_execution) }
+    let(:calling_future) { -> { future.send(exec_trigger) } }
+
+    specify(nil, :supporting_adapter) { future_execution.should_not be_fulfilled }
+
+    specify do
+      calling_future.should exec(1).query
+    end
+
+    specify(nil, postgresql: false) do
+      calling_future.should exec_query(future_sql)
+    end
+
+    specify(nil, postgresql: true) do
+      sql = respond_to?(:future_sql_postgresql) ? future_sql_postgresql : future_sql
+      calling_future.should exec_query(sql)
+    end
+
+    specify { future.send(exec_trigger).should eq relation_result }
+
+    context "after executing the future" do
+      before do
+        future.send(exec_trigger)
+      end
+
+      specify(nil, :supporting_adapter) { future_execution.should be_fulfilled }
+    end
+
+    context "executing it twice" do
+      before do
+        future.send(exec_trigger)
+      end
+
+      specify do
+        calling_future.should exec(0).queries
+      end
+
+      specify { future.send(exec_trigger).should eq relation_result }
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-futures
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-03 00:00:00.000000000 Z
+date: 2013-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -110,31 +110,38 @@ files:
 - lib/active_record/connection_adapters/future_enabled_mysql2_adapter.rb
 - lib/active_record/connection_adapters/future_enabled_postgresql_adapter.rb
 - lib/active_record/futures.rb
+- lib/active_record/futures/calculation_methods.rb
 - lib/active_record/futures/delegation.rb
+- lib/active_record/futures/finder_methods.rb
 - lib/active_record/futures/future.rb
-- lib/active_record/futures/future_calculation.rb
-- lib/active_record/futures/future_calculation_array.rb
-- lib/active_record/futures/future_calculation_value.rb
-- lib/active_record/futures/future_relation.rb
+- lib/active_record/futures/future_array.rb
+- lib/active_record/futures/future_registry.rb
+- lib/active_record/futures/future_value.rb
 - lib/active_record/futures/proxy.rb
 - lib/active_record/futures/query_recording.rb
 - lib/activerecord-futures.rb
 - lib/activerecord-futures/version.rb
-- spec/active_record/futures/future_calculation_array_spec.rb
-- spec/active_record/futures/future_calculation_value_spec.rb
-- spec/active_record/futures/future_relation_spec.rb
+- spec/active_record/futures/future_array_spec.rb
+- spec/active_record/futures/future_registry_spec.rb
 - spec/active_record/futures/future_spec.rb
+- spec/active_record/futures/future_value_spec.rb
 - spec/active_record/futures/proxy_spec.rb
 - spec/db/schema.rb
 - spec/in_action/combination_of_futures_spec.rb
+- spec/in_action/future_all_execution_spec.rb
 - spec/in_action/future_count_execution_spec.rb
+- spec/in_action/future_exists_execution_spec.rb
+- spec/in_action/future_find_execution_spec.rb
+- spec/in_action/future_first_execution_spec.rb
 - spec/in_action/future_fulfillment_spec.rb
+- spec/in_action/future_last_execution_spec.rb
 - spec/in_action/future_pluck_execution_spec.rb
 - spec/in_action/future_relation_execution_spec.rb
 - spec/models/comment.rb
 - spec/models/post.rb
 - spec/models/user.rb
 - spec/spec_helper.rb
+- spec/support/futurized_method_examples.rb
 - spec/support/matchers/exec.rb
 - spec/support/matchers/exec_query.rb
 homepage: https://github.com/leoasis/activerecord-futures
@@ -162,21 +169,27 @@ signing_key:
 specification_version: 3
 summary: Fetch all queries at once from the database and save round trips.
 test_files:
-- spec/active_record/futures/future_calculation_array_spec.rb
-- spec/active_record/futures/future_calculation_value_spec.rb
-- spec/active_record/futures/future_relation_spec.rb
+- spec/active_record/futures/future_array_spec.rb
+- spec/active_record/futures/future_registry_spec.rb
 - spec/active_record/futures/future_spec.rb
+- spec/active_record/futures/future_value_spec.rb
 - spec/active_record/futures/proxy_spec.rb
 - spec/db/schema.rb
 - spec/in_action/combination_of_futures_spec.rb
+- spec/in_action/future_all_execution_spec.rb
 - spec/in_action/future_count_execution_spec.rb
+- spec/in_action/future_exists_execution_spec.rb
+- spec/in_action/future_find_execution_spec.rb
+- spec/in_action/future_first_execution_spec.rb
 - spec/in_action/future_fulfillment_spec.rb
+- spec/in_action/future_last_execution_spec.rb
 - spec/in_action/future_pluck_execution_spec.rb
 - spec/in_action/future_relation_execution_spec.rb
 - spec/models/comment.rb
 - spec/models/post.rb
 - spec/models/user.rb
 - spec/spec_helper.rb
+- spec/support/futurized_method_examples.rb
 - spec/support/matchers/exec.rb
 - spec/support/matchers/exec_query.rb
 has_rdoc: