soapy_cake 1.14.2 → 1.14.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e818f8c8f8f07c68afce7217b6ec5289d889dba4
-  data.tar.gz: b2ca4293be84d7e7bc3dbeb25763e951375a8b30
+  metadata.gz: 274c6c48d643201ef471755c417f79cb6d706327
+  data.tar.gz: 570e80542b976f9e557a1e0146c3b7848ed52f49
 SHA512:
-  metadata.gz: b41b4e7c2b45f00c9ed526970f6765cd66ee0e58f14a8e10b45f4f7421fbf72c84d168f54a8c4f41302cfda13b42e746f85971c433b6041f1fc670895210b9d9
-  data.tar.gz: 5375bb41a9b31ae198368eddf1ba7164ffe75f8f97ea606a72afa901a6c74abe66df66601d5676dad7a7bf31f47a2d44aeaf3080ff07e138f9ee00b195f096c5
+  metadata.gz: c2e0fe1d2b066fb8faf733788118d7ec2c302b306ac91313168a4d8c542406571f10964ff6b42dc5909420f092937d4117863b3cc1ba45d1d49d791e53dea01e
+  data.tar.gz: 6f5b4a158f277ce3fb6c6c444c152719cf69385550c376a3d829514cc4ad6cd7ad5128c861ca02f137fec979654d272ebb9ce6040c229c9385922f0a35995dec

data/lib/soapy_cake/admin_batched.rb

@@ -32,10 +32,7 @@ module SoapyCake
       def to_enum
         Enumerator.new do |y|
           loop do
-            result = next_batch
-            # raises StopIteration when less than `limit` elements are present
-            # which is then rescued by `loop`
-            limit.times { y << result.next }
+            fetch_elements(y)
             @offset += limit
           end
         end
@@ -43,7 +40,18 @@ module SoapyCake
 
       private
 
-      def next_batch
+      def fetch_elements(enumerator)
+        result = fetch_batch
+        # raises StopIteration when less than `limit` elements are present
+        # which is then rescued by `loop`
+        if admin.xml_response?
+          enumerator << result.next
+        else
+          limit.times { enumerator << result.next }
+        end
+      end
+
+      def fetch_batch
         admin.public_send(method, opts.merge(row_limit: limit, start_at_row: offset))
       end
 

data/lib/soapy_cake/client.rb

@@ -10,6 +10,10 @@ module SoapyCake
       @opts = opts
     end
 
+    def xml_response?
+      opts[:xml_response] == true
+    end
+
     protected
 
     attr_reader :opts
@@ -25,10 +29,6 @@ module SoapyCake
 
     private
 
-    def xml_response?
-      opts[:xml_response] == true
-    end
-
     def response_body(request)
       if request.opts[:response].present?
         request.opts[:response]

data/lib/soapy_cake/version.rb

@@ -1,3 +1,3 @@
 module SoapyCake
-  VERSION = '1.14.2'.freeze
+  VERSION = '1.14.3'.freeze
 end

data/spec/lib/soapy_cake/admin_batched_spec.rb

@@ -1,5 +1,5 @@
 RSpec.describe SoapyCake::AdminBatched do
-  let(:admin) { double('admin') }
+  let(:admin) { double('admin', xml_response?: false) }
 
   before :each do
     allow(SoapyCake::Admin).to receive(:new).and_return(admin)
@@ -26,6 +26,28 @@ RSpec.describe SoapyCake::AdminBatched do
     expect(subject.offers({ advertiser: 1 }, 100).to_a).to eq(%i(a b))
   end
 
+  context 'SoapyCake Batched with XMLResponse set' do
+    subject { described_class.new(xml_response: true) }
+
+    before do
+      allow(admin).to receive(:xml_response?).and_return(true)
+    end
+
+    it 'returns all affiliates in batched mode' do
+      expect(admin).to receive(:affiliates)
+        .with(start_at_row: 1, row_limit: 10).and_return(%i(a).to_enum)
+      expect(admin).to receive(:affiliates)
+        .with(start_at_row: 11, row_limit: 10).and_return(%i(b).to_enum)
+      expect(admin).to receive(:affiliates)
+        .with(start_at_row: 21, row_limit: 10).and_return([].to_enum)
+
+      result = subject.affiliates({}, 10)
+
+      expect(result).to be_a(Enumerator)
+      expect(result.to_a).to eq(%i(a b))
+    end
+  end
+
   context 'errors' do
     it 'fails with an invalid method' do
       expect { subject.something }.to raise_error(/Invalid method something/)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soapy_cake
 version: !ruby/object:Gem::Version
-  version: 1.14.2
+  version: 1.14.3
 platform: ruby
 authors:
 - ad2games GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-09-18 00:00:00.000000000 Z
+date: 2015-09-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -250,7 +250,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: Simple client for the CAKE API