soapy_cake 2.2.3 → 2.2.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: db53a85a24c32bedc5424cb71fa94299d1b2b656
-  data.tar.gz: 6ff419a8734b6c665d239c9f277abfce3a6e7d3a
+  metadata.gz: 70c84bead32dad291a2969cf47b93f30e7ca08ea
+  data.tar.gz: 71bf3ac75e66d776971df47f70e6d955f3034407
 SHA512:
-  metadata.gz: e7ef921b6577c7e37f9fc448199f1b832ff556cd9ad63dfc2db1377a66160185eda2669f1067c48a7266155d2190f6f45699fa8c0f42b266981faaf8ff949d91
-  data.tar.gz: 7be351d763c9cafebd1f500e6a3cf6b3c879e26e821d96e7e701f09ec103a6e798037dca7d87aa5e8157a2a217ff345f7fc8e86693945551a3e157e73c14052a
+  metadata.gz: a4ef76954d20b9576ceb510fbcbb015fa750f772ca3719b39bfb41df118b360c0929a8ba1cdf220d89ad6c9685350e23ef0189c35c40f2cfc4513df0d150749b
+  data.tar.gz: 79dc72b5b081674155311aaa690e56e567dda81024eb86dadcc3dd786ebed07d43f8955404018e3feae36140fa095eef710448ceb5024c69f3ebf750b1377a56

data/.ruby-version

@@ -1 +1 @@
-2.4.1
+2.4.3

data/lib/soapy_cake/admin.rb

@@ -164,4 +164,5 @@ module SoapyCake
       Request.new(:admin, :reports, :event_conversions, opts.merge(event_type: event_type))
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/soapy_cake/admin_addedit.rb

@@ -282,4 +282,5 @@ module SoapyCake
       run Request.new(:admin, :addedit, :offer_contract, opts)
     end
   end
+  # rubocop:enable Metrics/ClassLength
 end

data/lib/soapy_cake/client.rb

@@ -29,8 +29,17 @@ module SoapyCake
       request.time_converter = time_converter
 
       with_retries do
-        response = Response.new(response_body(request), request.short_response?, time_converter)
-        xml_response? ? response.to_xml : response.to_enum
+        begin
+          response = Response.new(response_body(request), request.short_response?, time_converter)
+          xml_response? ? response.to_xml : response.to_enum
+        rescue RequestFailed => e
+          raise RequestFailed.new(
+            e.message,
+            request_path: request.path,
+            request_body: request.xml,
+            response_body: e.response_body || response.body
+          )
+        end
       end
     end
 
@@ -84,8 +93,6 @@ module SoapyCake
       unless response.is_a?(Net::HTTPSuccess)
         raise RequestFailed.new(
           "Request failed with HTTP #{response.code}",
-          request_path: request.path,
-          request_body: http_request.body,
           response_body: response.body
         )
       end
@@ -94,8 +101,12 @@ module SoapyCake
     end
 
     def perform_http_request(http_request)
-      Net::HTTP.start(domain,
-        use_ssl: true, open_timeout: NET_TIMEOUT, read_timeout: NET_TIMEOUT) do |http|
+      Net::HTTP.start(
+        domain,
+        use_ssl: true,
+        open_timeout: NET_TIMEOUT,
+        read_timeout: NET_TIMEOUT
+      ) do |http|
         http.request(http_request)
       end
     end

data/lib/soapy_cake/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SoapyCake
-  VERSION = '2.2.3'
+  VERSION = '2.2.4'
 end

data/spec/integration/soapy_cake/admin_addedit_spec.rb

@@ -89,10 +89,8 @@ RSpec.describe SoapyCake::AdminAddedit do
         thankyou_link: 'http://www.example.com/',
         from_lines: 'from',
         subject_lines: 'subject',
-
         conversion_cap_behavior: :ignore,
         conversion_behavior_on_redirect: :ignore,
-
         advertiser_id: advertiser_id,
         vertical_id: vertical_id,
         postback_url_ms_delay: 60,
@@ -101,7 +99,6 @@ RSpec.describe SoapyCake::AdminAddedit do
         received: 2.0,
         received_percentage: false,
         payout: 1.5,
-
         tags: %w[some tags],
         offer_name: 'Test Offer',
         offer_description: 'TEST1',

data/spec/lib/soapy_cake/admin_addedit_spec.rb

@@ -6,6 +6,7 @@ RSpec.describe SoapyCake::AdminAddedit do
   before do
     # rubocop:disable RSpec/SubjectStub
     allow(admin_addedit).to receive(:run).and_return({})
+    # rubocop:enable RSpec/SubjectStub
   end
 
   describe '#edit_offer' do
@@ -148,28 +149,43 @@ RSpec.describe SoapyCake::AdminAddedit do
 
     context 'when creative id was passed' do
       it 'raises an error' do
-        expect { admin_addedit.create_creative(offer_id: 10, creative_id: 11) }.to raise_error(
-          'cannot pass creative_id when creating creative'
-        )
+        expect do
+          admin_addedit.create_creative(offer_id: 10, creative_id: 11)
+        end.to raise_error('cannot pass creative_id when creating creative')
       end
     end
 
     context 'when given the right parameters' do
       it 'creates a creative and adds a file to it' do
-        expect(admin_addedit).to receive(:addedit_creative).with(
-          offer_id: 10, creative_name: 'creative_name'
-        ).and_return(
-          success: true, message: 'Creative 12163 Created', creative_id: 12163
-        )
-        expect(admin_addedit).to receive(:addedit_creative_files).with(
-          creative_id: 12163, creative_file_import_url: 'http://www.example.org/image.png'
-        ).and_return(
-          success: true, message: 'Creative Files 8013 Created.', creative_files: {
-            creative_file: {
-              creative_file_id: 8013, creative_file_name: 'image.jpg', updated: false
-            }
-          }
-        )
+        expect(SoapyCake::Request)
+          .to receive(:new)
+          .with(
+            :admin,
+            :addedit,
+            :creative,
+            creative_name: 'creative_name',
+            creative_status_id: 1,
+            creative_type_id: 3,
+            height: 0,
+            notes: '',
+            offer_link: '',
+            third_party_name: '',
+            width: 0,
+            offer_id: 10
+          )
+          .and_call_original
+
+        expect(SoapyCake::Request)
+          .to receive(:new)
+          .with(
+            :admin,
+            :addedit,
+            :creative_files,
+            creative_file_import_url: 'http://www.example.org/image.png',
+            creative_id: nil
+          )
+          .and_call_original
+
         admin_addedit.create_creative(
           offer_id: 10,
           creative_name: 'creative_name',

data/spec/lib/soapy_cake/affiliate_spec.rb

@@ -14,6 +14,7 @@ RSpec.describe SoapyCake::Affiliate do
         .with(:affiliate, service, method, cake_opts).and_return(request)
       # rubocop:disable RSpec/SubjectStub
       expect(affiliate).to receive(:run).with(request)
+      # rubocop:enable RSpec/SubjectStub
 
       affiliate.public_send(method, opts)
     end

data/spec/lib/soapy_cake/client_spec.rb

@@ -0,0 +1,49 @@
+# frozen_string_literal: true
+
+RSpec.describe SoapyCake::Client do
+  subject(:client) { described_class.new }
+
+  let(:http) do
+    instance_double(Net::HTTP)
+  end
+
+  let(:request) do
+    SoapyCake::Request.new(:admin, :addedit, :advertiser, {})
+  end
+
+  describe '#run' do
+    context 'receives non-200 HTTP status code' do
+      before do
+        stub_request(:post, "https://#{ENV.fetch('CAKE_DOMAIN')}/api/1/addedit.asmx")
+          .to_return(status: 500, body: '🔥')
+      end
+
+      it 'raises an exception with request information' do
+        expect do
+          client.run(request)
+        end.to raise_error(SoapyCake::RequestFailed, 'Request failed with HTTP 500') do |e|
+          expect(e.request_path).to eq('/api/1/addedit.asmx')
+          expect(e.request_body).to include('<cake:api_key>[redacted]</cake:api_key>')
+          expect(e.response_body).to eq('🔥')
+        end
+      end
+    end
+
+    context 'receives 200 HTTP status code with errors' do
+      before do
+        stub_request(:post, "https://#{ENV.fetch('CAKE_DOMAIN')}/api/1/addedit.asmx")
+          .to_return(status: 200, body: '🔥')
+      end
+
+      it 'raises an exception with request information' do
+        expect do
+          client.run(request)
+        end.to raise_error(SoapyCake::RequestFailed, 'Unknown error') do |e|
+          expect(e.request_path).to eq('/api/1/addedit.asmx')
+          expect(e.request_body).to include('<cake:api_key>[redacted]</cake:api_key>')
+          expect(e.response_body).to eq('🔥')
+        end
+      end
+    end
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soapy_cake
 version: !ruby/object:Gem::Version
-  version: 2.2.3
+  version: 2.2.4
 platform: ruby
 authors:
 - ad2games GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-15 00:00:00.000000000 Z
+date: 2018-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -260,6 +260,7 @@ files:
 - spec/lib/soapy_cake/admin_track_spec.rb
 - spec/lib/soapy_cake/affiliate_spec.rb
 - spec/lib/soapy_cake/campaigns_spec.rb
+- spec/lib/soapy_cake/client_spec.rb
 - spec/lib/soapy_cake/modification_type_spec.rb
 - spec/lib/soapy_cake/request_failed_spec.rb
 - spec/lib/soapy_cake/request_spec.rb
@@ -288,7 +289,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Simple client for the CAKE API
@@ -339,6 +340,7 @@ test_files:
 - spec/lib/soapy_cake/admin_track_spec.rb
 - spec/lib/soapy_cake/affiliate_spec.rb
 - spec/lib/soapy_cake/campaigns_spec.rb
+- spec/lib/soapy_cake/client_spec.rb
 - spec/lib/soapy_cake/modification_type_spec.rb
 - spec/lib/soapy_cake/request_failed_spec.rb
 - spec/lib/soapy_cake/request_spec.rb