soapy_cake 2.2.4 → 2.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 70c84bead32dad291a2969cf47b93f30e7ca08ea
-  data.tar.gz: 71bf3ac75e66d776971df47f70e6d955f3034407
+SHA256:
+  metadata.gz: 067f6e7655ca70f82bdb56092d19dcfbb0f41879077ede785b6490ee40ba0192
+  data.tar.gz: 945cce14ca15a79590bef7b1bef2a636288da4cfb0ba93b6d9f50482ecdc533b
 SHA512:
-  metadata.gz: a4ef76954d20b9576ceb510fbcbb015fa750f772ca3719b39bfb41df118b360c0929a8ba1cdf220d89ad6c9685350e23ef0189c35c40f2cfc4513df0d150749b
-  data.tar.gz: 79dc72b5b081674155311aaa690e56e567dda81024eb86dadcc3dd786ebed07d43f8955404018e3feae36140fa095eef710448ceb5024c69f3ebf750b1377a56
+  metadata.gz: bc1c8bbba8cf6b41ca72aeebe6c516b7a915a8a3fb1bead22794e87c600aba8b4e6d8b7c590e0e6c700e3a327f8eb0264b3f0142d837c6b3e13be7dbbffce967
+  data.tar.gz: 9ecf1e1d0d996917d3b079b8e74f0bd3db0f5ea67d27d276c78cb8387572045893b01555877aaab17c09e20ce5e7ba0df6a0b8ebfea7152416597160f917b791

data/.circleci/config.yml

@@ -0,0 +1,62 @@
+version: 2
+jobs:
+  setup:
+    docker: &docker
+      - image: circleci/ruby:2.5.1-node
+        environment:
+          BUNDLE_PATH: vendor/bundle
+
+    steps:
+      - checkout
+
+      - run:
+          name: Check if Ruby versions match
+          command: test "$(ruby -v | grep -oP '\d\.\d\.\d')" = "$(cat .ruby-version)"
+
+      - run:
+          name: Install dependencies
+          command: bundle install --jobs=4 --retry=3
+
+      - persist_to_workspace:
+          root: .
+          paths:
+            - .
+
+  lint:
+    docker: *docker
+    steps:
+      - attach_workspace:
+          at: .
+
+      - run: bundle exec rake rubocop
+
+  test:
+    docker: *docker
+    steps:
+      - attach_workspace:
+          at: .
+
+      - run:
+          name: run tests
+          command: |
+            mkdir /tmp/test-results
+
+            bundle exec rspec --format progress \
+                            --format RspecJunitFormatter \
+                            --out /tmp/test-results/rspec.xml \
+                            --format progress
+
+      - store_test_results:
+          path: /tmp/test-results
+
+workflows:
+  version: 2
+  lint-and-test:
+    jobs:
+      - setup
+      - lint:
+          requires:
+            - setup
+      - test:
+          requires:
+            - setup

data/.ruby-version

@@ -1 +1 @@
-2.4.3
+2.5.1

data/Gemfile

@@ -5,7 +5,7 @@ source 'https://rubygems.org'
 gemspec
 
 group :development, :test do
-  gem 'codeclimate-test-reporter', require: false
-  gem 'rubocop-ci', git: 'https://github.com/ad2games/rubocop-ci'
+  gem 'rspec_junit_formatter'
+  gem 'rubocop-ci', git: 'https://github.com/ComboStrikeHQ/rubocop-ci'
   gem 'simplecov'
 end

data/README.md

@@ -1,8 +1,7 @@
 # SoapyCake
-[![Code Climate](https://codeclimate.com/github/ad2games/soapy_cake.png)](https://codeclimate.com/github/ad2games/soapy_cake)
-[![Test Coverage](https://codeclimate.com/github/ad2games/soapy_cake/coverage.png)](https://codeclimate.com/github/ad2games/soapy_cake)
+[![Maintainability](https://api.codeclimate.com/v1/badges/506ccd1a270e86f6b2bb/maintainability)](https://codeclimate.com/github/ad2games/soapy_cake/maintainability)
+[![Test Coverage](https://api.codeclimate.com/v1/badges/506ccd1a270e86f6b2bb/test_coverage)](https://codeclimate.com/github/ad2games/soapy_cake/test_coverage)
 [![Gem Version](http://img.shields.io/gem/v/soapy_cake.svg)](http://rubygems.org/gems/soapy_cake)
-[![Dependency Status](http://img.shields.io/gemnasium/ad2games/soapy_cake.svg)](https://gemnasium.com/ad2games/soapy_cake)
 [![Circle CI](https://circleci.com/gh/ad2games/soapy_cake.png?style=shield&circle-token=aac691804f58acd8e96db632f8133e3c6155f123)](https://circleci.com/gh/ad2games/soapy_cake)
 
 Simple client library for [cake](http://getcake.com).

data/api.yml

@@ -102,6 +102,7 @@ versions:
       rejected_dispositions: 1
       update_conversion: 4
       update_conversion_disposition: 2
+      update_conversion_events: 6
       update_conversion_price: 2
       update_conversion_revenue: 1
       update_lead_price: 2

data/lib/soapy_cake.rb

@@ -28,6 +28,6 @@ require 'soapy_cake/modification_type'
 require 'soapy_cake/campaigns'
 
 module SoapyCake
-  API_CONFIG = YAML.safe_load(File.read(File.expand_path('../../api.yml', __FILE__)))
+  API_CONFIG = YAML.safe_load(File.read(File.expand_path('../api.yml', __dir__)))
   NET_TIMEOUT = 600
 end

data/lib/soapy_cake/admin_addedit.rb

@@ -239,6 +239,7 @@ module SoapyCake
 
     def apply_tag_opts(opts)
       return opts unless opts[:tags]
+
       opts = apply_tag_modification_type(opts)
       opts[:tags] = Array(opts[:tags]).join(',')
       opts

data/lib/soapy_cake/admin_track.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require 'soapy_cake/request_mass_conversion_insert'
-
 module SoapyCake
   class AdminTrack < Client
     include Helper
@@ -23,13 +21,13 @@ module SoapyCake
                        campaign_id creative_id total_to_insert
                      ])
 
-      run RequestMassConversionInsert.new(:admin, :track, :mass_conversion_insert, opts)
+      run Request.new(:admin, :track, :mass_conversion_insert, opts)
     end
 
     def update_conversion(opts)
       require_params(opts, %i[offer_id payout])
 
-      run Request.new(:admin, :track, :update_conversion, CONVERSION_DEFAULTS.merge(opts))
+      run Request.new(:admin, :track, :update_conversion_events, CONVERSION_DEFAULTS.merge(opts))
     end
 
     def decrypt_affiliate_link(opts = {})

data/lib/soapy_cake/campaigns.rb

@@ -8,12 +8,12 @@ module SoapyCake
     # be in the list.
     ALL_PARAMS = %i[
       account_status_id affiliate_id auto_disposition_delay_hours campaign_id
-      clear_session_on_conversion currency_id display_link_type_id
-      expiration_date expiration_date_modification_type media_type_id
-      offer_contract_id offer_id paid paid_redirects paid_upsells payout
-      payout_update_option pixel_html postback_delay_ms postback_url
-      redirect_404 redirect_domain redirect_offer_contract_id review test_link
-      third_party_name unique_key_hash use_offer_contract_payout
+      clear_session_on_conversion currency_id expiration_date
+      expiration_date_modification_type media_type_id offer_contract_id
+      offer_id paid paid_redirects paid_upsells payout payout_update_option
+      pixel_html postback_delay_ms postback_url redirect_404 redirect_domain
+      redirect_offer_contract_id review test_link third_party_name
+      unique_key_hash use_offer_contract_payout
     ].freeze
 
     NO_CHANGE_VALUES = {
@@ -54,13 +54,14 @@ module SoapyCake
       nil
     end
 
+    # The default for `display_link_type_id` is "Fallback" in Cake, which
+    # doesn't have an ID and, hence, cannot be set via the API. In order to not
+    # change it, it has to be absent from the request.
     def patch(campaign_id, opts = {})
       campaign = get(campaign_id: campaign_id).first
       opts = NO_CHANGE_VALUES
         .merge(
           affiliate_id: campaign.fetch(:affiliate).fetch(:affiliate_id),
-          # Only present in production:
-          display_link_type_id: campaign.dig(:display_link_type, :link_display_type_id) || 1,
           media_type_id: campaign.fetch(:media_type).fetch(:media_type_id),
           offer_contract_id: campaign.fetch(:offer_contract).fetch(:offer_contract_id),
           offer_id: campaign.fetch(:offer).fetch(:offer_id),

data/lib/soapy_cake/client.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 require 'net/http'
+require 'active_support/tagged_logging'
 
+# rubocop:disable Metrics/ClassLength
 module SoapyCake
   class Client
     HEADERS = { 'Content-Type' => 'application/soap+xml;charset=UTF-8' }.freeze
@@ -12,7 +14,7 @@ module SoapyCake
       @api_key = fetch_opt(:api_key) || raise(Error, 'Cake API key missing')
       @retry_count = fetch_opt(:retry_count, 4)
       @write_enabled = ['yes', true].include?(fetch_opt(:write_enabled))
-      @time_converter = TimeConverter.new(fetch_opt(:time_zone), fetch_opt(:time_offset))
+      @time_converter = TimeConverter.new(fetch_opt(:time_zone))
     end
 
     def xml_response?
@@ -29,17 +31,15 @@ module SoapyCake
       request.time_converter = time_converter
 
       with_retries do
-        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
+        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
 
@@ -55,6 +55,7 @@ module SoapyCake
 
     def check_write_enabled!(request)
       return if request.read_only? || write_enabled
+
       raise Error, 'Writes not enabled (pass write_enabled: true or set CAKE_WRITE_ENABLED=yes)'
     end
 
@@ -63,45 +64,58 @@ module SoapyCake
       Retryable.retryable(opts, &block)
     end
 
-    def logger
-      @logger ||= opts[:logger] || (defined?(::Rails) && ::Rails.logger)
-    end
-
-    def log_curl_command(request)
-      curl_headers = HEADERS.map { |k, v| "-H \"#{k}: #{v}\"" }.join(' ')
-      curl_body = request.xml
-        .tr("\n", '')
-        .gsub(/>\s*</, '><')
-        .sub(request.api_key, '{{{ INSERT API KEY }}}')
-
-      logger&.info("curl --data '#{curl_body}' #{curl_headers} https://#{domain}/#{request.path}")
-    end
-
     def response_body(request)
       request.opts[:response].presence || http_response(request)
     end
 
     def http_response(request)
-      logger&.info("soapy_cake:request #{request}")
+      response = nil
+      logger.tagged('soapy_cake', unique_id) do
+        log_request(request)
+        response = perform_http_request(http_request(request))
+        log_response(response)
+      end
 
-      log_curl_command(request) if fetch_opt(:log_curl)
+      raise_if_unsuccessful(response)
+      response.body
+    end
 
-      http_request = Net::HTTP::Post.new(request.path, HEADERS)
-      http_request.body = request.xml
-      response = perform_http_request(http_request)
+    def http_request(request)
+      http_req = Net::HTTP::Post.new(request.path, HEADERS)
+      http_req.body = request.xml
+      http_req
+    end
 
-      unless response.is_a?(Net::HTTPSuccess)
-        raise RequestFailed.new(
-          "Request failed with HTTP #{response.code}",
-          response_body: response.body
+    def unique_id
+      SecureRandom.hex(4)
+    end
+
+    def log_request(request)
+      logger.tagged('request') do
+        logger.info(
+          request
+            .xml
+            .gsub(/>[\n\s]+</, '><')
+            .sub(request.api_key, '[REDACTED]')
         )
       end
+    end
 
-      response.body
+    def log_response(response)
+      logger.tagged('response', response.code) do
+        logger.info(response.body)
+      end
+    end
+
+    def logger
+      @logger ||= ActiveSupport::TaggedLogging.new(
+        opts[:logger] || (defined?(::Rails) && ::Rails.logger) || Logger.new('/dev/null')
+      )
     end
 
     def perform_http_request(http_request)
-      Net::HTTP.start(
+      t0 = Time.now
+      response = Net::HTTP.start(
         domain,
         use_ssl: true,
         open_timeout: NET_TIMEOUT,
@@ -109,6 +123,18 @@ module SoapyCake
       ) do |http|
         http.request(http_request)
       end
+      logger.info("took: #{(Time.now - t0).round(2)} s")
+      response
+    end
+
+    def raise_if_unsuccessful(response)
+      return if response.is_a?(Net::HTTPSuccess)
+
+      raise RequestFailed.new(
+        "Request failed with HTTP #{response.code}",
+        response_body: response.body
+      )
     end
   end
 end
+# rubocop:enable Metrics/ClassLength

data/lib/soapy_cake/modification_type.rb

@@ -37,8 +37,11 @@ module SoapyCake
 
     def validate_input(input_opts)
       return unless input_opts[key].nil? && input_opts[modification_type_key] == CHANGE
-      raise InvalidInput,
+
+      raise(
+        InvalidInput,
         "`#{modification_type_key}` was '#{CHANGE}', but no `#{key}` was provided to change it to"
+      )
     end
 
     InvalidInput = Class.new(StandardError)

data/lib/soapy_cake/response.rb

@@ -59,6 +59,7 @@ module SoapyCake
 
       error_check_fault!
       return if error_check_special_case?
+
       error_check_success!
     end
 
@@ -70,6 +71,7 @@ module SoapyCake
     def error_check_success!
       return if sax.for_tag(:success).first == 'true'
       raise RateLimitError if error_message == 'Restricted'
+
       raise RequestFailed, error_message
     end
 

data/lib/soapy_cake/response_value.rb

@@ -55,6 +55,7 @@ module SoapyCake
       unless value.nil? || numeric?
         raise Error, "'#{key}' contains non-digit chars but was to be parsed as an integer id"
       end
+
       value.to_i
     end
   end

data/lib/soapy_cake/time_converter.rb

@@ -2,15 +2,7 @@
 
 module SoapyCake
   class TimeConverter
-    def initialize(time_zone, time_offset = nil)
-      if time_offset
-        self.class.print_deprecation_warning
-
-        # Etc/GMT time zones have their sign reversed
-        time_zone = format('Etc/GMT%+d', -time_offset.to_i)
-      end
-
-      raise Error, 'Cake time zone missing' if time_zone.blank?
+    def initialize(time_zone)
       @zone = ActiveSupport::TimeZone[time_zone]
     end
 
@@ -23,13 +15,6 @@ module SoapyCake
       zone.parse(value).utc
     end
 
-    def self.print_deprecation_warning
-      return if @deprecation_warning_printed
-      @deprecation_warning_printed = true
-
-      STDERR.puts 'SoapyCake - DEPRECATED: Please use time_zone instead of time_offset.'
-    end
-
     private
 
     attr_reader :zone

data/lib/soapy_cake/version.rb

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

data/soapy_cake.gemspec

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path('lib', __dir__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'soapy_cake/version'
 

data/spec/fixtures/vcr_cassettes/SoapyCake_AdminTrack/_mass_conversion_insert/inserts_conversions.yml

@@ -4,10 +4,10 @@ http_interactions:
     method: post
     uri: https://cake-partner-domain.com/api/2/track.asmx
     body:
-      encoding: ASCII-8BIT
+      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:MassConversionInsert>
@@ -39,6 +39,14 @@ http_interactions:
       code: 200
       message: OK
     headers:
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Allow-Headers:
+      - Origin, X-Requested-With, Content-Type, Accept
+      Access-Control-Allow-Methods:
+      - POST,GET,OPTIONS,PUT,DELETE
+      Access-Control-Max-Age:
+      - '1728000'
       Cache-Control:
       - private, max-age=0
       Content-Length:
@@ -46,7 +54,7 @@ http_interactions:
       Content-Type:
       - application/soap+xml; charset=utf-8
       Date:
-      - Mon, 24 Jul 2017 19:42:39 GMT
+      - Thu, 30 Aug 2018 15:39:26 GMT
       X-Aspnet-Version:
       - 4.0.30319
       X-Powered-By:
@@ -57,8 +65,8 @@ http_interactions:
       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><MassConversionInsertResponse
-        xmlns="http://cakemarketing.com/api/1/"><MassConversionInsertResult><success>true</success><message>Conversions
+        xmlns="http://cakemarketing.com/api/2/"><MassConversionInsertResult><success>true</success><message>Conversions
         Inserted</message></MassConversionInsertResult></MassConversionInsertResponse></soap:Body></soap:Envelope>
     http_version: 
-  recorded_at: Mon, 24 Jul 2017 19:42:40 GMT
-recorded_with: VCR 3.0.3
+  recorded_at: Thu, 30 Aug 2018 15:39:27 GMT
+recorded_with: VCR 4.0.0

data/spec/fixtures/vcr_cassettes/SoapyCake_AdminTrack/_update_conversion/updates_a_conversion.yml

@@ -2,15 +2,15 @@
 http_interactions:
 - request:
     method: post
-    uri: https://cake-partner-domain.com/api/4/track.asmx
+    uri: https://cake-partner-domain.com/api/6/track.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/4/">
+        <env:Envelope xmlns:env="http://www.w3.org/2003/05/soap-envelope" xmlns:cake="http://cakemarketing.com/api/6/">
           <env:Header/>
           <env:Body>
-            <cake:UpdateConversion>
+            <cake:UpdateConversionEvents>
               <cake:api_key>cake-api-key</cake:api_key>
               <cake:add_to_existing_payout>false</cake:add_to_existing_payout>
               <cake:received_option>total_revenue</cake:received_option>
@@ -23,37 +23,51 @@ http_interactions:
               <cake:conversion_id>145211</cake:conversion_id>
               <cake:offer_id>5032</cake:offer_id>
               <cake:payout>0.75</cake:payout>
-            </cake:UpdateConversion>
+            </cake:UpdateConversionEvents>
           </env:Body>
         </env:Envelope>
     headers:
       Content-Type:
       - application/soap+xml;charset=UTF-8
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - "*/*"
+      User-Agent:
+      - Ruby
   response:
     status:
       code: 200
       message: OK
     headers:
+      Access-Control-Allow-Credentials:
+      - 'true'
+      Access-Control-Allow-Headers:
+      - Origin, X-Requested-With, Content-Type, Accept
+      Access-Control-Allow-Methods:
+      - POST,GET,OPTIONS,PUT,DELETE
+      Access-Control-Max-Age:
+      - '1728000'
       Cache-Control:
       - private, max-age=0
+      Content-Length:
+      - '470'
       Content-Type:
       - application/soap+xml; charset=utf-8
-      Server:
-      - Microsoft-IIS/8.5
+      Date:
+      - Mon, 20 Jan 2020 14:34:11 GMT
       X-Aspnet-Version:
       - 4.0.30319
       X-Powered-By:
       - ASP.NET
-      Date:
-      - Mon, 12 Oct 2015 09:58:20 GMT
-      Content-Length:
-      - '446'
+      Connection:
+      - close
     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><UpdateConversionResponse
-        xmlns="http://cakemarketing.com/api/4/"><UpdateConversionResult><success>true</success><message>Conversion
-        Updated</message></UpdateConversionResult></UpdateConversionResponse></soap:Body></soap:Envelope>
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema"><soap:Body><UpdateConversionEventsResponse
+        xmlns="http://cakemarketing.com/api/6/"><UpdateConversionEventsResult><success>true</success><message>Conversion
+        Updated</message></UpdateConversionEventsResult></UpdateConversionEventsResponse></soap:Body></soap:Envelope>
     http_version: 
-  recorded_at: Mon, 12 Oct 2015 09:58:29 GMT
-recorded_with: VCR 2.9.3
+  recorded_at: Mon, 20 Jan 2020 14:34:12 GMT
+recorded_with: VCR 4.0.0

data/spec/fixtures/vcr_cassettes/SoapyCake_Campaigns/_patch/different_pre-existing_values/does_not_change_anything_unintentionally_attribute_set_0_.yml

@@ -252,7 +252,6 @@ http_interactions:
               <cake:clear_session_on_conversion>no_change</cake:clear_session_on_conversion>
               <cake:postback_delay_ms>-1</cake:postback_delay_ms>
               <cake:affiliate_id>9643</cake:affiliate_id>
-              <cake:display_link_type_id>1</cake:display_link_type_id>
               <cake:media_type_id>1</cake:media_type_id>
               <cake:offer_contract_id>10338</cake:offer_contract_id>
               <cake:offer_id>11390</cake:offer_id>

data/spec/fixtures/vcr_cassettes/SoapyCake_Campaigns/_patch/different_pre-existing_values/does_not_change_anything_unintentionally_attribute_set_1_.yml

@@ -254,7 +254,6 @@ http_interactions:
               <cake:clear_session_on_conversion>no_change</cake:clear_session_on_conversion>
               <cake:postback_delay_ms>-1</cake:postback_delay_ms>
               <cake:affiliate_id>9643</cake:affiliate_id>
-              <cake:display_link_type_id>1</cake:display_link_type_id>
               <cake:media_type_id>2</cake:media_type_id>
               <cake:offer_contract_id>10342</cake:offer_contract_id>
               <cake:offer_id>11390</cake:offer_id>

data/spec/fixtures/vcr_cassettes/SoapyCake_Campaigns/_patch/updates_a_campaign.yml

@@ -101,7 +101,6 @@ http_interactions:
               <cake:clear_session_on_conversion>no_change</cake:clear_session_on_conversion>
               <cake:postback_delay_ms>-1</cake:postback_delay_ms>
               <cake:affiliate_id>9643</cake:affiliate_id>
-              <cake:display_link_type_id>1</cake:display_link_type_id>
               <cake:media_type_id>1</cake:media_type_id>
               <cake:offer_contract_id>10338</cake:offer_contract_id>
               <cake:offer_id>11390</cake:offer_id>
@@ -326,7 +325,6 @@ http_interactions:
               <cake:clear_session_on_conversion>no_change</cake:clear_session_on_conversion>
               <cake:postback_delay_ms>-1</cake:postback_delay_ms>
               <cake:affiliate_id>9643</cake:affiliate_id>
-              <cake:display_link_type_id>1</cake:display_link_type_id>
               <cake:media_type_id>1</cake:media_type_id>
               <cake:offer_contract_id>10338</cake:offer_contract_id>
               <cake:offer_id>11390</cake:offer_id>

data/spec/integration/soapy_cake/admin_spec.rb

@@ -3,17 +3,22 @@
 RSpec.describe SoapyCake::Admin do
   around { |example| Timecop.freeze(Time.utc(2015, 6, 15, 12), &example) }
 
-  let(:logger) { instance_double(Logger) }
-
-  before { allow(logger).to receive(:info) }
+  let(:logger) { Logger.new('/dev/null') }
 
   subject(:admin) { described_class.new(logger: logger) }
 
   it 'returns an affiliate with correct data types', :vcr do
-    expect(logger).to receive(:info)
-      .with('soapy_cake:request admin:export:affiliates:5 {"affiliate_id":16027}')
+    # rubocop:disable RSpec/AnyInstance
+    expect_any_instance_of(Logger).to receive(:info).twice.with(
+      a_string_matching(/^<\?xml/)
+    )
+    expect_any_instance_of(Logger).to receive(:info).with(
+      a_string_matching(/took: \d+.\d+ s/)
+    )
+    # rubocop:enable RSpec/AnyInstance
 
     result = admin.affiliates(affiliate_id: 16027)
+
     expect(result.count).to eq(1)
     expect(result.first).to include(
       affiliate_id: 16027,

data/spec/lib/soapy_cake/admin_addedit_spec.rb

@@ -26,17 +26,23 @@ RSpec.describe SoapyCake::AdminAddedit do
     end
 
     it 'keeps existing tags' do
-      expect(SoapyCake::Request).to receive(:new)
-        .with(:admin, :addedit, :offer,
-          hash_including(tags: 'new-tag', tags_modification_type: 'add'))
+      expect(SoapyCake::Request).to receive(:new).with(
+        :admin,
+        :addedit,
+        :offer,
+        hash_including(tags: 'new-tag', tags_modification_type: 'add')
+      )
 
       admin_addedit.edit_offer(offer_params)
     end
 
     it 'allows replacing tags' do
-      expect(SoapyCake::Request).to receive(:new)
-        .with(:admin, :addedit, :offer,
-          hash_including(tags: 'new-tag', tags_modification_type: 'replace'))
+      expect(SoapyCake::Request).to receive(:new).with(
+        :admin,
+        :addedit,
+        :offer,
+        hash_including(tags: 'new-tag', tags_modification_type: 'replace')
+      )
 
       admin_addedit.edit_offer(offer_params.merge(tags_replace: true))
     end
@@ -78,9 +84,12 @@ RSpec.describe SoapyCake::AdminAddedit do
     end
 
     it 'always adds on creation' do
-      expect(SoapyCake::Request).to receive(:new)
-        .with(:admin, :addedit, :offer,
-          hash_including(tags: 'tag', tags_modification_type: 'add'))
+      expect(SoapyCake::Request).to receive(:new).with(
+        :admin,
+        :addedit,
+        :offer,
+        hash_including(tags: 'tag', tags_modification_type: 'add')
+      )
 
       admin_addedit.add_offer(offer_params.merge(tags: 'tag', tags_replace: true))
     end
@@ -96,17 +105,23 @@ RSpec.describe SoapyCake::AdminAddedit do
     end
 
     it 'replaces the existing config by default' do
-      expect(SoapyCake::Request).to receive(:new)
-        .with(:admin, :addedit, :geo_targets,
-          hash_including(add_edit_option: 'replace'))
+      expect(SoapyCake::Request).to receive(:new).with(
+        :admin,
+        :addedit,
+        :geo_targets,
+        hash_including(add_edit_option: 'replace')
+      )
 
       admin_addedit.edit_geo_targets(base_opts)
     end
 
     it 'allows to override the add_edit_option' do
-      expect(SoapyCake::Request).to receive(:new)
-        .with(:admin, :addedit, :geo_targets,
-          hash_including(add_edit_option: 'add'))
+      expect(SoapyCake::Request).to receive(:new).with(
+        :admin,
+        :addedit,
+        :geo_targets,
+        hash_including(add_edit_option: 'add')
+      )
 
       admin_addedit.edit_geo_targets(base_opts.merge(add_edit_option: 'add'))
     end
@@ -130,9 +145,12 @@ RSpec.describe SoapyCake::AdminAddedit do
     end
 
     it 'adds geo targets' do
-      expect(SoapyCake::Request).to receive(:new)
-        .with(:admin, :addedit, :geo_targets,
-          hash_including(add_edit_option: 'add'))
+      expect(SoapyCake::Request).to receive(:new).with(
+        :admin,
+        :addedit,
+        :geo_targets,
+        hash_including(add_edit_option: 'add')
+      )
 
       admin_addedit.add_geo_targets(base_opts)
     end
@@ -157,34 +175,28 @@ RSpec.describe SoapyCake::AdminAddedit do
 
     context 'when given the right parameters' do
       it 'creates a creative and adds a file to it' do
-        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
+        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,

data/spec/lib/soapy_cake/admin_track_spec.rb

@@ -15,7 +15,7 @@ RSpec.describe SoapyCake::AdminTrack do
 
   describe '#update_conversion' do
     let(:service) { :track }
-    let(:cake_method) { :update_conversion }
+    let(:cake_method) { :update_conversion_events }
     let(:method) { :update_conversion }
     let(:cake_opts) { described_class::CONVERSION_DEFAULTS.merge(opts) }
     let(:opts) { { offer_id: 42, payout: 0 } }

data/spec/lib/soapy_cake/time_converter_spec.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# rubocop:disable Style/DateTime
 RSpec.describe SoapyCake::TimeConverter do
   subject(:time_converter) { described_class.new('Europe/Berlin') }
 
@@ -26,16 +25,4 @@ RSpec.describe SoapyCake::TimeConverter do
         .to eq(Time.utc(2015, 6, 11, 12, 53, 40))
     end
   end
-
-  context 'legacy mode / CAKE_TIME_OFFSET' do
-    subject(:time_converter) { described_class.new('Europe/Berlin', 5) }
-
-    it 'works as before (broken, without DST)' do
-      expect(STDERR).to receive(:puts).with(/Please use time_zone/)
-
-      expect(time_converter.to_cake(DateTime.new(2015, 1, 2, 12, 30))).to eq('2015-01-02T17:30:00')
-      expect(time_converter.to_cake(DateTime.new(2015, 6, 2, 12, 30))).to eq('2015-06-02T17:30:00')
-    end
-  end
 end
-# rubocop:enable Style/DateTime

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soapy_cake
 version: !ruby/object:Gem::Version
-  version: 2.2.4
+  version: 2.3.1
 platform: ruby
 authors:
 - ad2games GmbH
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2018-01-25 00:00:00.000000000 Z
+date: 2020-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -185,6 +185,7 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".circleci/config.yml"
 - ".gitignore"
 - ".rspec"
 - ".rubocop_todo.yml"
@@ -194,7 +195,6 @@ files:
 - README.md
 - Rakefile
 - api.yml
-- circle.yml
 - lib/soapy_cake.rb
 - lib/soapy_cake/admin.rb
 - lib/soapy_cake/admin_addedit.rb
@@ -208,7 +208,6 @@ files:
 - lib/soapy_cake/helper.rb
 - lib/soapy_cake/modification_type.rb
 - lib/soapy_cake/request.rb
-- lib/soapy_cake/request_mass_conversion_insert.rb
 - lib/soapy_cake/response.rb
 - lib/soapy_cake/response_value.rb
 - lib/soapy_cake/time_converter.rb
@@ -273,7 +272,7 @@ homepage: http://ad2games.com
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -288,9 +287,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.14
-signing_key: 
+rubyforge_project:
+rubygems_version: 2.7.6
+signing_key:
 specification_version: 4
 summary: Simple client for the CAKE API
 test_files:

data/circle.yml

@@ -1,8 +0,0 @@
-dependencies:
-  post:
-    - bundle update
-test:
-  pre:
-    - bundle exec rake rubocop
-  post:
-    - bundle exec codeclimate-test-reporter

data/lib/soapy_cake/request_mass_conversion_insert.rb

@@ -1,16 +0,0 @@
-# frozen_string_literal: true
-
-module SoapyCake
-  class RequestMassConversionInsert < Request
-    private
-
-    # There is a bug in MassConversionInsert version 2 API in cake,
-    # in which xmlns is still using version 1.
-    def xml_namespaces
-      {
-        'xmlns:env' => 'http://www.w3.org/2003/05/soap-envelope',
-        'xmlns:cake' => 'http://cakemarketing.com/api/1/'
-      }
-    end
-  end
-end