cassie 1.0.0.beta.6 → 1.0.0.beta.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 40bb4e39b19017fcef0127c393ccb0280c8ea6bb
-  data.tar.gz: 9ed902fdd76d02a30e91ccb7385d761df6e4936b
+  metadata.gz: 9bbb50f81c0b640ebea73e406a3bbeb7b5136b4d
+  data.tar.gz: 692eab44def99331fb152f9a71aed257c80ae1a9
 SHA512:
-  metadata.gz: 987f316efd2e36ca612f45fc212bcd6c967dd2e3cd6840923b159a1acb1fa35448843411b14d695125b8a277a966dbbd3d0068b7cf47c40ccea5a96a63a8ad53
-  data.tar.gz: 34edc2ed19b618c8297a9e8a925ae26262e627b14b272c57758f33b201d5c9f56191d78d5b958bdbc6e640db05046fb3f990bbf8e1a9367c7c7c5d02002033db
+  metadata.gz: eb4ceb81237d249ed4d7ca3fb81d7e957a82a535e35998f8636da779c60153f381213f77d648ed248859f4bb333743f0b6e3cfd422a286b27b337221d6714c0e
+  data.tar.gz: 4a278a5c82d8e893a487c58f8b641cb2bb40808f0812b187ede5575f06e4c8c6df53a4681a6d45957233dbf4c5027bb3eeeb7a26c263c5087bed35d43fb80955

data/lib/cassie/queries/statement/batches.rb

@@ -31,8 +31,8 @@ module Cassie::Queries::Statement
     def fetch_each(opts={})
       return to_enum(:fetch_each, opts) unless block_given?
 
-      fetch_in_batches(opts) do |rows|
-        rows.each { |row| yield row }
+      fetch_in_batches(opts) do |records|
+        records.each { |record| yield record }
       end
     end
 
@@ -71,15 +71,14 @@ module Cassie::Queries::Statement
       # note: stateless page size is independent from limit
       paged_query.stateless_page_size = opts[:batch_size]
       paged_query.paging_state = nil
-      done = false
 
       loop do
+        # done if the previous result was the last page
+        break if paged_query.result && paged_query.result.last_page?
         raise page_size_changed_error(opts[:batch_size]) if opts[:batch_size] != paged_query.stateless_page_size
-        batch = paged_query.fetch
 
+        batch = paged_query.fetch
         paged_query.paging_state = paged_query.result.paging_state
-        break if done
-        done = true if paged_query.result.last_page?
 
         yield batch
       end

data/lib/cassie/testing/fake/session.rb

@@ -3,16 +3,25 @@ require_relative 'prepared_statement'
 
 module Cassie::Testing::Fake
   class Session
-    attr_reader :last_statement
+    attr_reader :last_statement, :query_count
     attr_accessor :rows
 
+    def initialize
+      reset_query_count!
+    end
+
     def execute(statement, args={})
       @last_statement = statement
+      @query_count += 1
       Result.new(statement, args.merge(rows: rows))
     end
 
     def prepare(statement)
       PreparedStatement.new(statement)
     end
+
+    def reset_query_count!
+      @query_count = 0
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cassie
 version: !ruby/object:Gem::Version
-  version: 1.0.0.beta.6
+  version: 1.0.0.beta.7
 platform: ruby
 authors:
 - Evan Prothro
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-08-23 00:00:00.000000000 Z
+date: 2016-08-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: cassandra-driver