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

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
checksums.yaml CHANGED
@@ -1,7 +1,7 @@
1
1
  ---
2
2
  SHA1:
3
- metadata.gz: 40bb4e39b19017fcef0127c393ccb0280c8ea6bb
4
- data.tar.gz: 9ed902fdd76d02a30e91ccb7385d761df6e4936b
3
+ metadata.gz: 9bbb50f81c0b640ebea73e406a3bbeb7b5136b4d
4
+ data.tar.gz: 692eab44def99331fb152f9a71aed257c80ae1a9
5
5
  SHA512:
6
- metadata.gz: 987f316efd2e36ca612f45fc212bcd6c967dd2e3cd6840923b159a1acb1fa35448843411b14d695125b8a277a966dbbd3d0068b7cf47c40ccea5a96a63a8ad53
7
- data.tar.gz: 34edc2ed19b618c8297a9e8a925ae26262e627b14b272c57758f33b201d5c9f56191d78d5b958bdbc6e640db05046fb3f990bbf8e1a9367c7c7c5d02002033db
6
+ metadata.gz: eb4ceb81237d249ed4d7ca3fb81d7e957a82a535e35998f8636da779c60153f381213f77d648ed248859f4bb333743f0b6e3cfd422a286b27b337221d6714c0e
7
+ data.tar.gz: 4a278a5c82d8e893a487c58f8b641cb2bb40808f0812b187ede5575f06e4c8c6df53a4681a6d45957233dbf4c5027bb3eeeb7a26c263c5087bed35d43fb80955
@@ -31,8 +31,8 @@ module Cassie::Queries::Statement
31
31
  def fetch_each(opts={})
32
32
  return to_enum(:fetch_each, opts) unless block_given?
33
33
 
34
- fetch_in_batches(opts) do |rows|
35
- rows.each { |row| yield row }
34
+ fetch_in_batches(opts) do |records|
35
+ records.each { |record| yield record }
36
36
  end
37
37
  end
38
38
 
@@ -71,15 +71,14 @@ module Cassie::Queries::Statement
71
71
  # note: stateless page size is independent from limit
72
72
  paged_query.stateless_page_size = opts[:batch_size]
73
73
  paged_query.paging_state = nil
74
- done = false
75
74
 
76
75
  loop do
76
+ # done if the previous result was the last page
77
+ break if paged_query.result && paged_query.result.last_page?
77
78
  raise page_size_changed_error(opts[:batch_size]) if opts[:batch_size] != paged_query.stateless_page_size
78
- batch = paged_query.fetch
79
79
 
80
+ batch = paged_query.fetch
80
81
  paged_query.paging_state = paged_query.result.paging_state
81
- break if done
82
- done = true if paged_query.result.last_page?
83
82
 
84
83
  yield batch
85
84
  end
@@ -3,16 +3,25 @@ require_relative 'prepared_statement'
3
3
 
4
4
  module Cassie::Testing::Fake
5
5
  class Session
6
- attr_reader :last_statement
6
+ attr_reader :last_statement, :query_count
7
7
  attr_accessor :rows
8
8
 
9
+ def initialize
10
+ reset_query_count!
11
+ end
12
+
9
13
  def execute(statement, args={})
10
14
  @last_statement = statement
15
+ @query_count += 1
11
16
  Result.new(statement, args.merge(rows: rows))
12
17
  end
13
18
 
14
19
  def prepare(statement)
15
20
  PreparedStatement.new(statement)
16
21
  end
22
+
23
+ def reset_query_count!
24
+ @query_count = 0
25
+ end
17
26
  end
18
27
  end
metadata CHANGED
@@ -1,14 +1,14 @@
1
1
  --- !ruby/object:Gem::Specification
2
2
  name: cassie
3
3
  version: !ruby/object:Gem::Version
4
- version: 1.0.0.beta.6
4
+ version: 1.0.0.beta.7
5
5
  platform: ruby
6
6
  authors:
7
7
  - Evan Prothro
8
8
  autorequire:
9
9
  bindir: bin
10
10
  cert_chain: []
11
- date: 2016-08-23 00:00:00.000000000 Z
11
+ date: 2016-08-24 00:00:00.000000000 Z
12
12
  dependencies:
13
13
  - !ruby/object:Gem::Dependency
14
14
  name: cassandra-driver