soapy_cake 1.3.6 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 830ff2900a4ace7abce4a1d8e4248838bdda3624
-  data.tar.gz: 57bc6180452370286040dcdbfbe01df3a018bf94
+  metadata.gz: cd9650087f25d594328017d9adf7455f3d6b3763
+  data.tar.gz: 91a2b6a9eef7ee1b47d2389a7468e43de79b191f
 SHA512:
-  metadata.gz: c1d08a4890790afb01f34c693b4c8c88af8a3b888610fb4043b37a10f3f209c44c59f6d30e947cc868dd09cd9a2f7fae25fae14fe83c0ecce59c663b1dc6c9a2
-  data.tar.gz: 93b81c448ff6f2bfdeaf28632f0dacb555a3e9d9568563b71e267655a032503588e6fb04c12f1814b147b570b37faf4751b2ecd8ba88aca2ac16d09d181075f5
+  metadata.gz: d6eb4e5f4cba2ce09552f8f37671ee22fa4cb64522dadcae33156894a81fa3eea5a1b9aaf03cc241b09811b59ba03cc14ae4eb5d4b02df80c3626ed1364a3e97
+  data.tar.gz: 7e2c571cf58d813ca780dfd56272f41aca615e04b97f7e1d8e1a20bdc820b82a78003c13efb0379b0d04f3217f44d71961b1df074171df5afd838e28ad44d5c7

data/api_versions.yml

@@ -20,7 +20,7 @@ admin:
     creative: 1
     creative_files: 1
     exchange_rates: 1
-    geo_targets: 1
+    geo_targets: 2
     offer: 4
     offer_contract: 1
     offer_tiers: 1

data/lib/soapy_cake/admin_addedit.rb

@@ -21,11 +21,29 @@ module SoapyCake
     end
 
     def add_geo_targets(opts = {})
-      require_params(opts, %i(offer_contract_id countries set_targeting_to_geo))
+      require_params(opts, %i(offer_contract_id allow_countries))
+
+      if opts[:allow_countries]
+        require_params(opts, %i(countries))
+        countries = Array(opts[:countries])
+        opts[:countries] = countries.join(',')
+        opts[:redirect_offer_contract_ids] = ([0] * countries.count).join(',')
+      else
+        unless opts[:redirects].is_a?(Hash) && opts[:redirects].keys.count > 0
+          fail Error, "Parameter 'redirects' must be a COUNTRY=>REDIRECT_OFFER_CONTRACT_ID hash!"
+        end
+
+        opts[:countries] = opts[:redirects].keys.join(',')
+        opts[:redirect_offer_contract_ids] = opts[:redirects].values.join(',')
+        opts.delete(:redirects)
+      end
 
-      opts[:countries] = Array(opts[:countries]).join(',')
+      opts.merge!(
+        add_edit_option: 'add',
+        set_targeting_to_geo: true
+      )
 
-      run Request.new(:admin, :addedit, :geo_targets, opts.merge(add_edit_option: 'add'))
+      run Request.new(:admin, :addedit, :geo_targets, opts)
     end
 
     def add_offer_contract(opts = {})

data/lib/soapy_cake/version.rb

@@ -1,3 +1,3 @@
 module SoapyCake
-  VERSION = '1.3.6'
+  VERSION = '1.4.0'
 end

data/spec/fixtures/vcr_cassettes/ADDEDIT_integration_test/geo_targeting/creates_geo_targetings.yml

@@ -2,20 +2,73 @@
 http_interactions:
 - request:
     method: post
-    uri: https://cake-partner-domain.com/api/1/addedit.asmx
+    uri: https://cake-partner-domain.com/api/2/addedit.asmx
     body:
       encoding: UTF-8
       string: |
         <?xml version="1.0"?>
-        <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:cake="http://cakemarketing.com/api/1/">
+        <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:cake="http://cakemarketing.com/api/2/">
           <env:Header/>
           <env:Body>
             <cake:GeoTargets>
               <cake:api_key>cake-api-key</cake:api_key>
               <cake:offer_contract_id>1456</cake:offer_contract_id>
               <cake:countries>DE,FR</cake:countries>
+              <cake:allow_countries>true</cake:allow_countries>
+              <cake:redirect_offer_contract_ids>0,0</cake:redirect_offer_contract_ids>
+              <cake:add_edit_option>add</cake:add_edit_option>
               <cake:set_targeting_to_geo>true</cake:set_targeting_to_geo>
+            </cake:GeoTargets>
+          </env:Body>
+        </env:Envelope>
+    headers:
+      Content-Type:
+      - application/soap+xml;charset=UTF-8
+  response:
+    status:
+      code: 200
+      message: OK
+    headers:
+      Cache-Control:
+      - private, max-age=0
+      Content-Type:
+      - application/soap+xml; charset=utf-8
+      Server:
+      - Microsoft-IIS/8.0
+      X-Aspnet-Version:
+      - 4.0.30319
+      X-Powered-By:
+      - ASP.NET
+      Date:
+      - Tue, 17 Mar 2015 10:22:54 GMT
+      Content-Length:
+      - '446'
+    body:
+      encoding: UTF-8
+      string: <?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope"
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body><GeoTargetsResponse
+        xmlns="http://cakemarketing.com/api/2/"><GeoTargetsResult><success>true</success><message>Geotarget(s)
+        Added</message><row_count>2</row_count></GeoTargetsResult></GeoTargetsResponse></soap:Body></soap:Envelope>
+    http_version: 
+  recorded_at: Tue, 17 Feb 2015 12:00:00 GMT
+- request:
+    method: post
+    uri: https://cake-partner-domain.com/api/2/addedit.asmx
+    body:
+      encoding: UTF-8
+      string: |
+        <?xml version="1.0"?>
+        <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:cake="http://cakemarketing.com/api/2/">
+          <env:Header/>
+          <env:Body>
+            <cake:GeoTargets>
+              <cake:api_key>cake-api-key</cake:api_key>
+              <cake:offer_contract_id>1456</cake:offer_contract_id>
+              <cake:countries>AT,CH</cake:countries>
+              <cake:allow_countries>false</cake:allow_countries>
+              <cake:redirect_offer_contract_ids>1392,1392</cake:redirect_offer_contract_ids>
               <cake:add_edit_option>add</cake:add_edit_option>
+              <cake:set_targeting_to_geo>true</cake:set_targeting_to_geo>
             </cake:GeoTargets>
           </env:Body>
         </env:Envelope>
@@ -38,15 +91,15 @@ http_interactions:
       X-Powered-By:
       - ASP.NET
       Date:
-      - Wed, 04 Mar 2015 07:44:47 GMT
+      - Tue, 17 Mar 2015 10:22:55 GMT
       Content-Length:
-      - '443'
+      - '446'
     body:
       encoding: UTF-8
       string: <?xml version="1.0" encoding="utf-8"?><soap:Envelope xmlns:soap="http://www.w3.org/2003/05/soap-envelope"
         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body><GeoTargetsResponse
-        xmlns="http://cakemarketing.com/api/1/"><GeoTargetsResult><success>true</success><message>Countries
-        Added</message><row_count>0</row_count></GeoTargetsResult></GeoTargetsResponse></soap:Body></soap:Envelope>
+        xmlns="http://cakemarketing.com/api/2/"><GeoTargetsResult><success>true</success><message>Geotarget(s)
+        Added</message><row_count>2</row_count></GeoTargetsResult></GeoTargetsResponse></soap:Body></soap:Envelope>
     http_version: 
   recorded_at: Tue, 17 Feb 2015 12:00:00 GMT
 recorded_with: VCR 2.9.3

data/spec/lib/soapy_cake/addedit_integration_spec.rb

@@ -7,6 +7,7 @@ RSpec.describe 'ADDEDIT integration test' do
   let(:vertical_id) { 41 }
   let(:offer_id) { 8910 }
   let(:offer_contract_id) { 1456 }
+  let(:redirect_offer_contract_id) { 1392 }
   let(:tier_id) { 4 }
 
   describe 'offers' do
@@ -95,10 +96,33 @@ RSpec.describe 'ADDEDIT integration test' do
       result = subject.add_geo_targets(
         offer_contract_id: offer_contract_id,
         countries: %w(DE FR),
-        set_targeting_to_geo: true,
+        allow_countries: true
       )
+      expect(result).to include(success: true, row_count: '2')
 
-      expect(result).to include(success: true)
+      result = subject.add_geo_targets(
+        offer_contract_id: offer_contract_id,
+        countries: %w(AT CH),
+        redirects: {
+          'AT' => redirect_offer_contract_id,
+          'CH' => redirect_offer_contract_id,
+        },
+        allow_countries: false
+      )
+      expect(result).to include(success: true, row_count: '2')
+    end
+
+    it 'fails if it does not get a correct redirect hash' do
+      expect do
+        subject.add_geo_targets(
+          offer_contract_id: offer_contract_id,
+          redirects: {},
+          allow_countries: false
+        )
+      end.to raise_error(
+        SoapyCake::Error,
+        "Parameter 'redirects' must be a COUNTRY=>REDIRECT_OFFER_CONTRACT_ID hash!"
+      )
     end
   end
 

data/spec/spec_helper.rb

@@ -35,8 +35,8 @@ RSpec.configure do |config|
   config.expose_dsl_globally = false
 end
 
-ENV['CAKE_API_KEY'] = 'piljvSwWlHlmGoqSEiSx7UuHxWWD2J' if ENV['CAKE_API_KEY'].blank?
-ENV['CAKE_DOMAIN'] = 'network-staging.ad2games.com' if ENV['CAKE_DOMAIN'].blank?
+ENV['CAKE_API_KEY'] = 'cake-api-key' if ENV['CAKE_API_KEY'].blank?
+ENV['CAKE_DOMAIN'] = 'cake-partner-domain.com' if ENV['CAKE_DOMAIN'].blank?
 ENV['CAKE_TIME_OFFSET'] = '1' if ENV['CAKE_TIME_OFFSET'].blank?
 
 VCR.configure do |c|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soapy_cake
 version: !ruby/object:Gem::Version
-  version: 1.3.6
+  version: 1.4.0
 platform: ruby
 authors:
 - ad2games GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-03-06 00:00:00.000000000 Z
+date: 2015-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -228,7 +228,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.6
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Simple client for the CAKE API