soapy_bing 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 050d78288c2a6684ef1755104627587ba44f6263
-  data.tar.gz: 84eca8e11161bd4645d2d8ba35a7e42defdf281d
+  metadata.gz: 6769b40c74197462ce64b3858e1d9685a96a2afc
+  data.tar.gz: e7cd2d208675f7318e838318e9ba3f7598a95d2c
 SHA512:
-  metadata.gz: b39872dacbc8cc83a41293ba31cbdbb98ddc22902093f361064b6218224e105c63a4f5e8baf7b86d3867dc10d6bd2dd9a4d5bce5e8a4c62428ab98a97287777a
-  data.tar.gz: b45e9ef2c03f630a262ef99f67e6267deb3354fd082a601bddbabd111973a69788a81dd03a391342d953b8dc431e4997ccea03110f5adad8f3d3c5a31a4e52a0
+  metadata.gz: 9d9c735dccb584cc54a9de1a4827a481393f24a4ab7e086c0e3ac9770d9c0d272fbedda8d8da233e2fcb8a78132663be31a3c58be26c36e1ee5525dfb1e21990
+  data.tar.gz: 9c19239300bc2ee50a79a3c87cdb995d24a7e37b7e029c976cc735ce7683088faed872e76f383ba9397d76b46df3175a9fa36ef40ed696cd1d6347a82a9b6aec

data/lib/soapy_bing/ads/bulk/campaigns.rb

@@ -4,15 +4,19 @@ module SoapyBing
     module Bulk
       class Campaigns
         DEFAULT_ENTITIES = %w(CampaignTargets Ads).freeze
-        POLLING_TRIES = 30
+        DEFAULT_POLLING_SETTINGS = {
+          tries: 20,
+          sleep: ->(n) { n < 7 ? 2**n : 120 }
+        }.freeze
         NotCompleted = Class.new(StandardError)
 
-        attr_reader :oauth_credentials, :account, :entities, :status
+        attr_reader :oauth_credentials, :account, :entities, :polling_settings, :status
 
         def initialize(options)
           @oauth_credentials = options.fetch(:oauth_credentials)
           @account = options.fetch(:account)
           @entities = options.fetch(:entities) || DEFAULT_ENTITIES
+          @polling_settings = DEFAULT_POLLING_SETTINGS.merge(options.fetch(:polling_settings) || {})
         end
 
         def rows
@@ -36,7 +40,7 @@ module SoapyBing
         private
 
         def wait_status_complete
-          Retryable.retryable(tries: POLLING_TRIES, on: NotCompleted) do
+          Retryable.retryable(polling_settings.merge(on: NotCompleted)) do
             fetch_status
             raise NotCompleted if status['RequestStatus'] != 'Completed'
           end

data/lib/soapy_bing/ads.rb

@@ -21,11 +21,12 @@ module SoapyBing
       )
     end
 
-    def bulk_campaigns(entities = nil)
+    def bulk_campaigns(entities = nil, polling_settings = {})
       Bulk::Campaigns.new(
         oauth_credentials: oauth_credentials,
         account: account,
-        entities: entities
+        entities: entities,
+        polling_settings: polling_settings
       )
     end
 

data/lib/soapy_bing/soap/response/get_bulk_download_status_response.rb

@@ -3,7 +3,12 @@ module SoapyBing
   module Soap
     module Response
       class GetBulkDownloadStatusResponse < Base
+        StatusFailed = Class.new(StandardError)
+
         def extract_payload
+          if response['RequestStatus'] == 'Failed'
+            raise StatusFailed, response['Errors'].to_s
+          end
           response.slice('PercentComplete', 'RequestStatus', 'ResultFileUrl')
         end
       end

data/lib/soapy_bing/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module SoapyBing
-  VERSION = '0.3.0'
+  VERSION = '0.3.1'
 end

data/spec/soapy_bing/soap/response/get_bulk_download_status_response_spec.rb

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+RSpec.describe SoapyBing::Soap::Response::GetBulkDownloadStatusResponse do
+  subject(:response) { described_class.new(response_hash) }
+
+  describe '#payload' do
+    context 'in progress status response' do
+      let(:response_hash) do
+        {
+          'Envelope' => {
+            'Body' => {
+              'GetBulkDownloadStatusResponse' => {
+                'Errors' => nil,
+                'PercentComplete' => '42',
+                'RequestStatus' => 'InProgress',
+                'ResultFileUrl' => nil
+              }
+            }
+          }
+        }
+      end
+
+      it 'returns status and percent complete' do
+        expect(response.payload).to include(
+          'PercentComplete' => '42',
+          'RequestStatus' => 'InProgress',
+          'ResultFileUrl' => nil
+        )
+      end
+    end
+
+    context 'failed status response' do
+      let(:response_hash) do
+        {
+          'Envelope' => {
+            'Body' => {
+              'GetBulkDownloadStatusResponse' => {
+                'Errors' => [
+                  'OperationError' => {
+                    'Code' => '0',
+                    'ErrorCode' => 'InternalError',
+                    'Message' => 'An internal error has occurred'
+                  }
+                ],
+                'PercentComplete' => '0',
+                'RequestStatus' => 'Failed',
+                'ResultFileUrl' => nil
+              }
+            }
+          }
+        }
+      end
+
+      it 'raises a StatusFailed exception with error message' do
+        expect { response.payload }.to raise_error(
+          described_class::StatusFailed, /An internal error has occurred/
+        )
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soapy_bing
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - ad2games GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-09-15 00:00:00.000000000 Z
+date: 2016-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: erubis
@@ -284,6 +284,7 @@ files:
 - spec/soapy_bing/soap/request/base_spec.rb
 - spec/soapy_bing/soap/request/poll_generate_report_request_spec.rb
 - spec/soapy_bing/soap/response/base_spec.rb
+- spec/soapy_bing/soap/response/get_bulk_download_status_response_spec.rb
 - spec/soapy_bing/soap/response/payload_spec.rb
 - spec/soapy_bing/soap/response/poll_generate_report_response_spec.rb
 - spec/soapy_bing/soap/response/report_status_spec.rb
@@ -352,6 +353,7 @@ test_files:
 - spec/soapy_bing/soap/request/base_spec.rb
 - spec/soapy_bing/soap/request/poll_generate_report_request_spec.rb
 - spec/soapy_bing/soap/response/base_spec.rb
+- spec/soapy_bing/soap/response/get_bulk_download_status_response_spec.rb
 - spec/soapy_bing/soap/response/payload_spec.rb
 - spec/soapy_bing/soap/response/poll_generate_report_response_spec.rb
 - spec/soapy_bing/soap/response/report_status_spec.rb