soapy_cake 2.2.7 → 2.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd16c8da8348a5df3c47886020f1193f106f316cfe258d46bfa3b2eaf9a3517c
-  data.tar.gz: adda4a48b4e65b76f6ffa4c33b310838e06b784cf3b7bbf967ce6f11bc9e61c2
+  metadata.gz: e1a10b55da67455d7850300f6b1da3a3b4321a008df2986bf2de8dc53d05b5e2
+  data.tar.gz: f74e861ce703df28b9ac771fa6fcaac96b8d6f2c1be2a725c0425f2fe9d240c9
 SHA512:
-  metadata.gz: d147c287a7cc8a4a0476d2c0414229f5e3ffde35b8c6e2aed3bab018323a2d18c4f983cb265cbe800a823d29d77f0c23bdbc5b6c2cf344082299bcd229566113
-  data.tar.gz: b496919bea856baa8b6ce2749a4c36b94542fabfcc77fc895f6b05f1d0bfd70b83c266ac56aa636965e338f09fe2994ab39ef86da2b3f7faed4796f706b16b15
+  metadata.gz: 9fc9818fcecb399918332e5624b753cd7bf74030d4f460b1939f7e8c7859ed2fdd55c2d4d0e18448153f4b284e0c770f22a94feb73def6ab0c8afd487f319afb
+  data.tar.gz: b6e3e18834d04dfd7548aa86837a2e322d519237635998077aa12f699454d0a0db5e5bf1deb2fbff6fe50246d57eb0c47b53c018e65a9275574b1e510cb79ee3

data/.circleci/config.yml

@@ -46,8 +46,6 @@ jobs:
                             --out /tmp/test-results/rspec.xml \
                             --format progress
 
-      - run: bundle exec codeclimate-test-reporter
-
       - store_test_results:
           path: /tmp/test-results
 

data/Gemfile

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

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/client.rb

@@ -12,7 +12,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?
@@ -53,6 +53,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
 
@@ -80,13 +81,14 @@ module SoapyCake
     end
 
     def http_response(request)
-      logger&.info("soapy_cake:request #{request}")
-
       log_curl_command(request) if fetch_opt(:log_curl)
 
       http_request = Net::HTTP::Post.new(request.path, HEADERS)
       http_request.body = request.xml
+      t0 = Time.now
       response = perform_http_request(http_request)
+      response_time = Time.now - t0
+      logger&.info("soapy_cake:request #{request} took: #{response_time.round(2)} s")
 
       unless response.is_a?(Net::HTTPSuccess)
         raise RequestFailed.new(

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.7'
+  VERSION = '2.3.0'
 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/integration/soapy_cake/admin_spec.rb

@@ -3,17 +3,19 @@
 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) { instance_spy(Logger) }
 
   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}')
-
     result = admin.affiliates(affiliate_id: 16027)
+
+    expect(logger).to have_received(:info).with(
+      a_string_matching(
+        /soapy_cake:request admin:export:affiliates:5 {"affiliate_id":16027} took: \d+.\d+ s/
+      )
+    )
+
     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/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.7
+  version: 2.3.0
 platform: ruby
 authors:
 - ad2games GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-01-20 00:00:00.000000000 Z
+date: 2020-05-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport