activerecord-futures 0.1.1 → 0.2.0

data/lib/active_record/futures.rb

@@ -3,7 +3,7 @@ module ActiveRecord
     include QueryRecording
 
     def self.original_calculation_methods
-      [:count, :average, :minimum, :maximum, :sum, :calculate, :pluck]
+      [:count, :average, :minimum, :maximum, :sum, :calculate]
     end
 
     def self.future_calculation_methods
@@ -14,6 +14,12 @@ module ActiveRecord
       FutureRelation.new(self)
     end
 
+    def future_pluck(*args, &block)
+      exec = lambda { pluck(*args, &block) }
+      query = record_query(&exec)
+      FutureCalculationArray.new(self, query, exec)
+    end
+
     method_table = Hash[future_calculation_methods.zip(original_calculation_methods)]
 
     # define a "future_" method for each calculation method
@@ -21,14 +27,8 @@ module ActiveRecord
     method_table.each do |future_method, method|
       define_method(future_method) do |*args, &block|
         exec = lambda { send(method, *args, &block) }
-        query, type = record_query(&exec)
-
-        case type
-        when :value
-          FutureCalculationValue.new(self, query, exec)
-        when :all
-          FutureCalculationArray.new(self, query, exec)
-        end
+        query = record_query(&exec)
+        FutureCalculationValue.new(self, query, exec)
       end
     end
   end

data/lib/active_record/futures/query_recording.rb

@@ -8,7 +8,7 @@ module ActiveRecord
         connection = ConnectionProxy.new(@klass.connection)
         @klass = KlassProxy.new(@klass, connection)
         yield
-        [connection.recorded_query, connection.query_type]
+        connection.recorded_query
       ensure
         @klass = orig_klass
       end
@@ -31,7 +31,7 @@ module ActiveRecord
 
       class ConnectionProxy < Proxy
         attr_reader :connection
-        attr_accessor :recorded_query, :query_type
+        attr_accessor :recorded_query
 
         def initialize(connection)
           super(connection)
@@ -39,13 +39,11 @@ module ActiveRecord
         end
 
         def select_value(arel, name = nil)
-          self.query_type = :value
           self.recorded_query = arel.to_sql
           nil
         end
 
         def select_all(arel, name = nil, binds = [])
-          self.query_type = :all
           self.recorded_query = arel.to_sql
           []
         end

data/lib/activerecord-futures/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module Futures
-    VERSION = "0.1.1"
+    VERSION = "0.2.0"
   end
 end

data/spec/in_action/future_count_execution_spec.rb

@@ -67,31 +67,31 @@ describe "future_count method" do
       Comment.create(post: post_2)
     end
 
-    describe "#to_a" do
-      let(:calling_to_a) { -> { count.to_a } }
+    describe "#value" do
+      let(:calling_value) { -> { count.value } }
 
       specify do
-        calling_to_a.should exec(1).query
+        calling_value.should exec(1).query
       end
 
       specify do
-        calling_to_a.should exec_query(count_sql)
+        calling_value.should exec_query(count_sql)
       end
 
-      specify { count.to_a[post_1.id].should eq 2 }
-      specify { count.to_a[post_2.id].should eq 3 }
+      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.to_a
+          count.value
         end
 
         specify do
-          calling_to_a.should exec(0).queries
+          calling_value.should exec(0).queries
         end
 
-        specify { count.to_a[post_1.id].should eq 2 }
-        specify { count.to_a[post_2.id].should eq 3 }
+        specify { count.value[post_1.id].should eq 2 }
+        specify { count.value[post_2.id].should eq 3 }
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-futures
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.2.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-04-30 00:00:00.000000000 Z
+date: 2013-05-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord