soapy_cake 1.11.5 → 1.11.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 90aab26ebb422cf0e5e2acbd44948a2314b0a90d
-  data.tar.gz: 3875d9128e5cabcbfd05e3087ca54f074d6cc05d
+  metadata.gz: 7a5f8f5255750b90410b9dcbc2e66248a6545a30
+  data.tar.gz: ad7db8d775664b4d4ed965e94f6fed2e44f6f1ac
 SHA512:
-  metadata.gz: 4a0ec1a818f34a0e3687b03e9ee2b38c94ede2de97dff7e3354da284a49bd1246ed95e9e4c36ffe9a8730cc58e17a5f3741a45c28dc384db88122774f43a2981
-  data.tar.gz: 202628dd1eb5bd7035c972970e9f6d522290aa19d01de5267bcae54d7e53cdbb4c7289822aa159fe32e06c6855d88db4bb04c34e9a5a5f059ba329ce821e6249
+  metadata.gz: 723f7e27bf32c48db72bedf24e68d3ad601ae07e1ffe50d8301fe2c86ddd2b6851241a0db3979028ee41e601d984822179f8aa033df7b16cb11648d52141c115
+  data.tar.gz: e2c6a1717b5b4f6633cdc09eb052deee6506f78c6eabfd41bad45f59ed366935eebead9929cbc3491d3ef246bb8d51f202216668747ffa5c5f0261513d64fe50

data/circle.yml

@@ -1,3 +1,6 @@
+dependencies:
+  post:
+    - bundle update
 test:
   pre:
     - bundle exec rake rubocop

data/lib/soapy_cake.rb

@@ -5,6 +5,7 @@ require 'active_support/core_ext/hash/reverse_merge'
 require 'active_support/core_ext/date'
 require 'active_support/core_ext/numeric/time'
 require 'active_support/core_ext/time/zones'
+require 'active_support/core_ext/hash/transform_values'
 
 require 'soapy_cake/version'
 require 'soapy_cake/const'

data/lib/soapy_cake/admin.rb

@@ -35,7 +35,7 @@ module SoapyCake
     end
 
     def creatives(opts = {})
-      translate_values!(opts, %i(creative_type_id creative_status_id))
+      opts = translate_values(opts, %i(creative_type_id creative_status_id))
 
       run Request.new(:admin, :export, :creatives, opts)
     end
@@ -78,7 +78,7 @@ module SoapyCake
 
     def caps(opts)
       require_params(opts, %i(start_date end_date))
-      translate_values!(opts, %i(cap_type_id))
+      opts = translate_values(opts, %i(cap_type_id))
 
       run Request.new(:admin, :reports, :caps, opts)
     end

data/lib/soapy_cake/admin_addedit.rb

@@ -91,24 +91,27 @@ module SoapyCake
       require_params(opts, %i(offer_contract_id allow_countries))
 
       if opts[:allow_countries]
-        geo_targets_allow_options!(opts)
+        opts = geo_targets_allow_options(opts)
       else
-        geo_targets_redirect_options!(opts)
+        opts = geo_targets_redirect_options(opts)
       end
 
-      opts.merge!(add_edit_option: 'add', set_targeting_to_geo: true)
+      opts = opts.merge(add_edit_option: 'add', set_targeting_to_geo: true)
 
       run Request.new(:admin, :addedit, :geo_targets, opts)
     end
 
-    def geo_targets_allow_options!(opts)
+    def geo_targets_allow_options(opts)
       require_params(opts, %i(countries))
+      opts = opts.dup
       countries = Array(opts[:countries])
       opts[:countries] = countries.join(',')
       opts[:redirect_offer_contract_ids] = ([-1] * countries.count).join(',')
+      opts
     end
 
-    def geo_targets_redirect_options!(opts)
+    def geo_targets_redirect_options(opts)
+      opts = opts.dup
       redirects = opts.delete(:redirects)
       unless redirects.is_a?(Hash) && redirects.keys.count > 0
         fail Error, "Parameter 'redirects' must be a COUNTRY=>REDIRECT_OFFER_CONTRACT_ID hash!"
@@ -116,6 +119,7 @@ module SoapyCake
 
       opts[:countries] = redirects.keys.join(',')
       opts[:redirect_offer_contract_ids] = redirects.values.join(',')
+      opts
     end
 
     def add_offer_contract(opts = {})
@@ -131,7 +135,7 @@ module SoapyCake
     def update_caps(opts)
       require_params(opts, %i(cap_type_id cap_interval_id cap_amount send_alert_only))
 
-      translate_values!(opts, %i(cap_type_id cap_interval_id))
+      opts = translate_values(opts, %i(cap_type_id cap_interval_id))
 
       run Request.new(:admin, :addedit, :caps, opts)
     end
@@ -139,19 +143,18 @@ module SoapyCake
     def remove_caps(opts)
       require_params(opts, %i(cap_type_id))
 
-      translate_values!(opts, %i(cap_type_id))
+      opts = translate_values(opts, %i(cap_type_id))
 
-      opts.merge!(cap_interval_id: 0, cap_amount: -1, send_alert_only: false)
+      opts = opts.merge(cap_interval_id: 0, cap_amount: -1, send_alert_only: false)
       run Request.new(:admin, :addedit, :caps, opts)
     end
 
     def add_offer_tier(opts)
-      require_params(opts, %i(offer_id tier_id price_format_id offer_contract_id status_id))
-
-      opts.merge!(redirect_offer_contract_id: -1, add_edit_option: 'add')
-      translate_values!(opts, %i(status_id price_format_id))
+      addedit_offer_tier('add', opts)
+    end
 
-      run Request.new(:admin, :addedit, :offer_tiers, opts)
+    def edit_offer_tier(opts)
+      addedit_offer_tier('replace', opts)
     end
 
     def edit_affiliate(opts)
@@ -173,15 +176,24 @@ module SoapyCake
 
     private
 
-    def apply_tag_opts!(opts)
-      return unless opts[:tags]
+    def addedit_offer_tier(add_edit_option, opts)
+      require_params(opts, %i(offer_id tier_id price_format_id offer_contract_id status_id))
 
-      apply_tag_modification_type!(opts)
+      opts = opts.merge(redirect_offer_contract_id: -1, add_edit_option: add_edit_option)
+      opts = translate_values(opts, %i(status_id price_format_id))
 
+      run Request.new(:admin, :addedit, :offer_tiers, opts)
+    end
+
+    def apply_tag_opts(opts)
+      return opts unless opts[:tags]
+      opts = apply_tag_modification_type(opts)
       opts[:tags] = Array(opts[:tags]).join(',')
+      opts
     end
 
-    def apply_tag_modification_type!(opts)
+    def apply_tag_modification_type(opts)
+      opts = opts.dup
       opts[:tags_modification_type] =
         if opts[:tags].to_s == ''
           'remove_all'
@@ -190,6 +202,7 @@ module SoapyCake
         else
           'add'
         end
+      opts
     end
 
     def default_offer_options
@@ -203,10 +216,9 @@ module SoapyCake
     def addedit_offer(opts)
       require_params(opts, REQUIRED_OFFER_PARAMS)
 
-      translate_booleans!(opts)
-      apply_tag_opts!(opts)
-
-      translate_values!(opts, %i(
+      opts = translate_booleans(opts)
+      opts = apply_tag_opts(opts)
+      opts = translate_values(opts, %i(
         currency_id offer_status_id offer_type_id price_format_id
         conversion_cap_behavior conversion_behavior_on_redirect
       ))
@@ -216,7 +228,7 @@ module SoapyCake
 
     def addedit_offer_contract(opts)
       require_params(opts, REQUIRED_OFFER_CONTRACT_PARAMS)
-      translate_values!(opts, %i(price_format_id))
+      opts = translate_values(opts, %i(price_format_id))
 
       run Request.new(:admin, :addedit, :offer_contract, opts)
     end
@@ -224,9 +236,9 @@ module SoapyCake
     def addedit_campaign(opts)
       require_params(opts, %i(affiliate_id offer_id media_type_id account_status_id payout))
 
-      translate_values!(opts, %i(account_status_id))
+      opts = translate_values(opts, %i(account_status_id))
 
-      opts.reverse_merge!(
+      opts = opts.reverse_merge(
         display_link_type_id: 1,
         expiration_date: future_expiration_date
       )

data/lib/soapy_cake/admin_batched.rb

@@ -28,7 +28,7 @@ module SoapyCake
       def to_enum
         Enumerator.new do |y|
           loop do
-            result = admin.public_send(method, opts.merge(row_limit: limit, start_at_row: offset))
+            result = next_batch
             @offset += limit
             limit.times { y << result.next }
           end
@@ -40,6 +40,10 @@ module SoapyCake
 
       private
 
+      def next_batch
+        admin.public_send(method, opts.merge(row_limit: limit, start_at_row: offset))
+      end
+
       attr_reader :admin, :method, :opts, :offset, :limit
     end
 

data/lib/soapy_cake/const.rb

@@ -53,7 +53,8 @@ module SoapyCake
         indefinite: 0,
         daily: 1,
         weekly: 2,
-        monthly: 3
+        monthly: 3,
+        custom: 4
       },
       creative_type_id: {
         link: 1,

data/lib/soapy_cake/helper.rb

@@ -23,17 +23,23 @@ module SoapyCake
       end
     end
 
-    def translate_booleans!(opts)
-      opts.each do |k, v|
-        opts[k] = 'on' if v == true
-        opts[k] = 'off' if v == false
+    def translate_booleans(opts)
+      opts.transform_values do |v|
+        case v
+        when true then 'on'
+        when false then 'off'
+        else v
+        end
       end
     end
 
-    def translate_values!(opts, params)
-      params.each do |type|
-        opts[type] = const_lookup(type, opts[type]) if opts.key?(type)
-      end
+    def translate_values(opts, params)
+      opts.map do |k, v|
+        [
+          k,
+          params.include?(k) ? const_lookup(k, v) : v
+        ]
+      end.to_h
     end
 
     def const_lookup(type, key)

data/lib/soapy_cake/request.rb

@@ -19,7 +19,7 @@ module SoapyCake
         xml['env'].Envelope(xml_namespaces) do
           xml.Header
           xml.Body do
-            xml['cake'].send(method.camelize.to_sym) do
+            xml['cake'].public_send(method.camelize.to_sym) do
               xml_params(xml)
             end
           end
@@ -40,7 +40,7 @@ module SoapyCake
     def xml_params(xml)
       xml.api_key api_key
       opts.each do |k, v|
-        xml.send(k.to_sym, format_param(v))
+        xml.public_send(k.to_sym, format_param(v))
       end
     end
 

data/lib/soapy_cake/version.rb

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

data/soapy_cake.gemspec

@@ -1,5 +1,4 @@
 # coding: utf-8
-# rubocop:disable ExtraSpacing
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'soapy_cake/version'

data/spec/fixtures/vcr_cassettes/SoapyCake_AdminAddedit/campaigns/adds_a_campaign.yml

@@ -12,14 +12,14 @@ http_interactions:
           <env:Body>
             <cake:Campaign>
               <cake:api_key>cake-api-key</cake:api_key>
+              <cake:display_link_type_id>1</cake:display_link_type_id>
+              <cake:expiration_date>2045-02-09T01:00:00</cake:expiration_date>
               <cake:affiliate_id>1</cake:affiliate_id>
               <cake:offer_id>8910</cake:offer_id>
               <cake:media_type_id>1</cake:media_type_id>
               <cake:account_status_id>1</cake:account_status_id>
               <cake:payout>1.23</cake:payout>
               <cake:campaign_id>0</cake:campaign_id>
-              <cake:display_link_type_id>1</cake:display_link_type_id>
-              <cake:expiration_date>2045-02-09T01:00:00</cake:expiration_date>
             </cake:Campaign>
           </env:Body>
         </env:Envelope>

data/spec/fixtures/vcr_cassettes/SoapyCake_AdminAddedit/campaigns/edits_a_campaign.yml

@@ -12,14 +12,14 @@ http_interactions:
           <env:Body>
             <cake:Campaign>
               <cake:api_key>cake-api-key</cake:api_key>
+              <cake:display_link_type_id>1</cake:display_link_type_id>
+              <cake:expiration_date>2045-02-09T01:00:00</cake:expiration_date>
               <cake:campaign_id>123</cake:campaign_id>
               <cake:affiliate_id>1</cake:affiliate_id>
               <cake:offer_id>8910</cake:offer_id>
               <cake:media_type_id>1</cake:media_type_id>
               <cake:account_status_id>1</cake:account_status_id>
               <cake:payout>1.23</cake:payout>
-              <cake:display_link_type_id>1</cake:display_link_type_id>
-              <cake:expiration_date>2045-02-09T01:00:00</cake:expiration_date>
             </cake:Campaign>
           </env:Body>
         </env:Envelope>

data/spec/fixtures/vcr_cassettes/SoapyCake_AdminAddedit/offer_tiers/edits_an_offer_tier.yml

@@ -0,0 +1,55 @@
+---
+http_interactions:
+- request:
+    method: post
+    uri: https://cake-partner-domain.com/api/1/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:Header/>
+          <env:Body>
+            <cake:OfferTiers>
+              <cake:api_key>cake-api-key</cake:api_key>
+              <cake:offer_id>8910</cake:offer_id>
+              <cake:offer_contract_id>1456</cake:offer_contract_id>
+              <cake:tier_id>4</cake:tier_id>
+              <cake:price_format_id>1</cake:price_format_id>
+              <cake:status_id>1</cake:status_id>
+              <cake:redirect_offer_contract_id>-1</cake:redirect_offer_contract_id>
+              <cake:add_edit_option>replace</cake:add_edit_option>
+            </cake:OfferTiers>
+          </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.5
+      X-Aspnet-Version:
+      - 4.0.30319
+      X-Powered-By:
+      - ASP.NET
+      Date:
+      - Wed, 19 Aug 2015 13:40:14 GMT
+      Content-Length:
+      - '447'
+    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><OfferTiersResponse
+        xmlns="http://cakemarketing.com/api/1/"><OfferTiersResult><success>true</success><message>Offer
+        Tier Replaced</message><row_count>0</row_count></OfferTiersResult></OfferTiersResponse></soap:Body></soap:Envelope>
+    http_version: 
+  recorded_at: Tue, 17 Feb 2015 12:00:00 GMT
+recorded_with: VCR 2.9.0

data/spec/integration/soapy_cake/admin_addedit_spec.rb

@@ -241,6 +241,18 @@ RSpec.describe SoapyCake::AdminAddedit do
 
       expect(result[:message]).to eq('Offer Tier Added')
     end
+
+    it 'edits an offer tier', :vcr do
+      result = subject.edit_offer_tier(
+        offer_id: offer_id,
+        offer_contract_id: offer_contract_id,
+        tier_id: tier_id,
+        price_format_id: :cpa,
+        status_id: :public
+      )
+
+      expect(result[:message]).to eq('Offer Tier Replaced')
+    end
   end
 
   describe 'campaigns' do

data/spec/spec_helper.rb

@@ -1,5 +1,7 @@
-require 'codeclimate-test-reporter'
-CodeClimate::TestReporter.start
+if ENV['CODECLIMATE_REPO_TOKEN']
+  require 'codeclimate-test-reporter'
+  CodeClimate::TestReporter.start
+end
 require 'bundler/setup'
 Bundler.require(:default, :development)
 require 'soapy_cake'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soapy_cake
 version: !ruby/object:Gem::Version
-  version: 1.11.5
+  version: 1.11.6
 platform: ruby
 authors:
 - ad2games GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-08-16 00:00:00.000000000 Z
+date: 2015-08-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -211,6 +211,7 @@ files:
 - spec/fixtures/vcr_cassettes/SoapyCake_AdminAddedit/offer_contracts/creates_an_offer_contract.yml
 - spec/fixtures/vcr_cassettes/SoapyCake_AdminAddedit/offer_contracts/updates_an_offer_contract.yml
 - spec/fixtures/vcr_cassettes/SoapyCake_AdminAddedit/offer_tiers/adds_an_offer_tier.yml
+- spec/fixtures/vcr_cassettes/SoapyCake_AdminAddedit/offer_tiers/edits_an_offer_tier.yml
 - spec/fixtures/vcr_cassettes/SoapyCake_AdminAddedit/offers/creates_an_offer.yml
 - spec/fixtures/vcr_cassettes/SoapyCake_AdminAddedit/offers/updates_an_offer.yml
 - spec/fixtures/vcr_cassettes/SoapyCake_AdminTrack/_mass_conversion_insert/insers_conversions.yml
@@ -247,7 +248,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.5
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: Simple client for the CAKE API
@@ -268,6 +269,7 @@ test_files:
 - spec/fixtures/vcr_cassettes/SoapyCake_AdminAddedit/offer_contracts/creates_an_offer_contract.yml
 - spec/fixtures/vcr_cassettes/SoapyCake_AdminAddedit/offer_contracts/updates_an_offer_contract.yml
 - spec/fixtures/vcr_cassettes/SoapyCake_AdminAddedit/offer_tiers/adds_an_offer_tier.yml
+- spec/fixtures/vcr_cassettes/SoapyCake_AdminAddedit/offer_tiers/edits_an_offer_tier.yml
 - spec/fixtures/vcr_cassettes/SoapyCake_AdminAddedit/offers/creates_an_offer.yml
 - spec/fixtures/vcr_cassettes/SoapyCake_AdminAddedit/offers/updates_an_offer.yml
 - spec/fixtures/vcr_cassettes/SoapyCake_AdminTrack/_mass_conversion_insert/insers_conversions.yml