soapy_cake 1.11.4 → 1.11.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0c358f062efa7fc3ac3b7c59bc98929e832f080a
-  data.tar.gz: 67e5fbfe4b111b42839c517012481be87349e9df
+  metadata.gz: 90aab26ebb422cf0e5e2acbd44948a2314b0a90d
+  data.tar.gz: 3875d9128e5cabcbfd05e3087ca54f074d6cc05d
 SHA512:
-  metadata.gz: 4bf611fe1c634dcc60dc302cf1525120377f253a40fbcf6f592c5a1f95d3e803237640f94c1af484b8015458ed16d28d88f86df90acbfc3883137fa5a4ebe997
-  data.tar.gz: d5cdb2090387c8a044007bf33d83f360a0610fd7f507f3445060de1918d629b90094e75017cb826974dbc6e5d187f7674bd58683ed5d3587c11a65825842679a
+  metadata.gz: 4a0ec1a818f34a0e3687b03e9ee2b38c94ede2de97dff7e3354da284a49bd1246ed95e9e4c36ffe9a8730cc58e17a5f3741a45c28dc384db88122774f43a2981
+  data.tar.gz: 202628dd1eb5bd7035c972970e9f6d522290aa19d01de5267bcae54d7e53cdbb4c7289822aa159fe32e06c6855d88db4bb04c34e9a5a5f059ba329ce821e6249

data/lib/soapy_cake/admin_batched.rb

@@ -23,25 +23,24 @@ module SoapyCake
         @opts = opts
         @offset = INITIAL_OFFSET
         @limit = limit || LIMIT
-        @finished = false
       end
 
       def to_enum
         Enumerator.new do |y|
-          next_batch.each { |row| y << row } until finished
+          loop do
+            result = admin.public_send(method, opts.merge(row_limit: limit, start_at_row: offset))
+            @offset += limit
+            limit.times { y << result.next }
+          end
         end
+        # we know we received less than limit objects when we see a stop iteration exception from
+        # the underlying result enumerator and therefore know that we're done.
+      rescue StopIteration # rubocop:disable Lint/HandleExceptions
       end
 
       private
 
-      attr_reader :admin, :method, :opts, :finished, :offset, :limit
-
-      def next_batch
-        result = admin.public_send(method, opts.merge(row_limit: limit, start_at_row: offset))
-        @finished = true if result.count < limit
-        @offset += limit
-        result
-      end
+      attr_reader :admin, :method, :opts, :offset, :limit
     end
 
     def method_missing(name, opts = {}, limit = nil)

data/lib/soapy_cake/version.rb

@@ -1,3 +1,3 @@
 module SoapyCake
-  VERSION = '1.11.4'
+  VERSION = '1.11.5'
 end

data/spec/lib/soapy_cake/admin_batched_spec.rb

@@ -9,9 +9,9 @@ RSpec.describe SoapyCake::AdminBatched do
 
   it 'returns an enumerator and uses batched CAKE calls' do
     expect(admin).to receive(:offers)
-      .with(advertiser: 1, start_at_row: 1, row_limit: 2).and_return(%i(a b))
+      .with(advertiser: 1, start_at_row: 1, row_limit: 2).and_return(%i(a b).to_enum)
     expect(admin).to receive(:offers)
-      .with(advertiser: 1, start_at_row: 3, row_limit: 2).and_return(%i(c))
+      .with(advertiser: 1, start_at_row: 3, row_limit: 2).and_return(%i(c).to_enum)
 
     result = subject.offers(advertiser: 1)
 
@@ -21,7 +21,7 @@ RSpec.describe SoapyCake::AdminBatched do
 
   it 'can use a custom limit' do
     expect(admin).to receive(:offers)
-      .with(advertiser: 1, start_at_row: 1, row_limit: 100).and_return(%i(a b))
+      .with(advertiser: 1, start_at_row: 1, row_limit: 100).and_return(%i(a b).to_enum)
 
     expect(subject.offers({ advertiser: 1 }, 100).to_a).to eq(%i(a b))
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soapy_cake
 version: !ruby/object:Gem::Version
-  version: 1.11.4
+  version: 1.11.5
 platform: ruby
 authors:
 - ad2games GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-10 00:00:00.000000000 Z
+date: 2015-08-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -247,7 +247,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple client for the CAKE API