soapy_cake 1.20.0 → 1.21.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b83f34c1746ec07e1eb0eb47ddbb50c9fea4796c
-  data.tar.gz: f0dd1db1eaa1ba6550669564ea3a0c6984021a8c
+  metadata.gz: 9a66e1c42c1689312ec741c7ca995566d85e5aba
+  data.tar.gz: a2bf186bbde7a7373798b2805c987a93181ed584
 SHA512:
-  metadata.gz: ce98500805287cef4ed338947ca7f556e707c6143941ba02a9a9b2ce71d1ddd340347d742a69cccb277d4ce2bcf03c6e1c80d7572fe36b82185376710cc6e555
-  data.tar.gz: 082ec9d5cd54283ca0857bad5cf246bd43faf03bf27ac4314e8ebf3267b79ae593333668d1b06a9b2cccb2bc6bc6e60c4ed1f729dd512ef2c92585a7a4847365
+  metadata.gz: 9b10715b6a53bd27bc8f7eec15bd821f310e86d9ed5e65391997c6d18660d61ab8f0199f07d1f1787f1d7877d0b5d92028aaff32f4ec447b0eda92b8f36ce4e5
+  data.tar.gz: 56f798c3dac1384e86d44608ec97c995157c47b86f11357a4f4f537bf5e70b360d8414ea1bc342d509cad98c3b5d1ce4df526523640466255d6377a23f3c0fc3

data/.ruby-version

@@ -1 +1 @@
-2.2.3
+2.3.0

data/lib/soapy_cake/admin_addedit.rb

@@ -90,11 +90,11 @@ module SoapyCake
     def add_geo_targets(opts)
       require_params(opts, %i(offer_contract_id allow_countries))
 
-      if opts[:allow_countries]
-        opts = geo_targets_allow_options(opts)
-      else
-        opts = geo_targets_redirect_options(opts)
-      end
+      opts = if opts[:allow_countries]
+               geo_targets_allow_options(opts)
+             else
+               geo_targets_redirect_options(opts)
+             end
 
       opts = opts.merge(add_edit_option: 'add', set_targeting_to_geo: true)
 
@@ -219,9 +219,9 @@ module SoapyCake
       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
-      ))
+                                currency_id offer_status_id offer_type_id price_format_id
+                                conversion_cap_behavior conversion_behavior_on_redirect
+                              ))
 
       run(Request.new(:admin, :addedit, :offer, default_offer_options.merge(opts)))[:success_info]
     end

data/lib/soapy_cake/admin_track.rb

@@ -15,9 +15,9 @@ module SoapyCake
 
     def mass_conversion_insert(opts)
       require_params(opts, %i(
-        conversion_date affiliate_id sub_affiliate
-        campaign_id creative_id total_to_insert
-      ))
+                       conversion_date affiliate_id sub_affiliate
+                       campaign_id creative_id total_to_insert
+                     ))
 
       run Request.new(:admin, :track, :mass_conversion_insert, opts)
     end

data/lib/soapy_cake/client.rb

@@ -5,10 +5,12 @@ module SoapyCake
     def initialize(opts = {})
       @domain = opts.fetch(:domain, ENV['CAKE_DOMAIN']) || fail(Error, 'Cake domain missing')
       @api_key = opts.fetch(:api_key, ENV['CAKE_API_KEY']) || fail(Error, 'Cake API key missing')
+      @retry_count = opts.fetch(:retry_count, ENV['CAKE_RETRY_COUNT']) || 4
 
-      time_offset = opts.fetch(:time_offset, ENV['CAKE_TIME_OFFSET'])
-      time_zone = opts.fetch(:time_zone, ENV['CAKE_TIME_ZONE'])
-      @time_converter = TimeConverter.new(time_zone, time_offset)
+      @time_converter = TimeConverter.new(
+        opts.fetch(:time_zone, ENV['CAKE_TIME_ZONE']),
+        opts.fetch(:time_offset, ENV['CAKE_TIME_OFFSET'])
+      )
 
       @opts = opts
     end
@@ -19,13 +21,17 @@ module SoapyCake
 
     protected
 
-    attr_reader :domain, :api_key, :time_converter, :opts, :logger
+    attr_reader :domain, :api_key, :time_converter, :opts, :logger, :retry_count
 
     def run(request)
       request.api_key = api_key
       request.time_converter = time_converter
 
-      Retryable.retryable(tries: 5, on: RateLimitError, sleep: -> (n) { 3**n }) do
+      Retryable.retryable(
+        tries: retry_count + 1,
+        on: [RateLimitError, SocketError],
+        sleep: -> (n) { 3**n }
+      ) do
         response = Response.new(response_body(request), request.short_response?, time_converter)
         xml_response? ? response.to_xml : response.to_enum
       end

data/lib/soapy_cake/helper.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SoapyCake
   module Helper
     def walk_tree(obj, key = nil, &block)

data/lib/soapy_cake/request.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SoapyCake
   class Request
     DATE_CLASSES = [Date, Time, DateTime, ActiveSupport::TimeWithZone].freeze

data/lib/soapy_cake/response.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SoapyCake
   class Response
     include Helper

data/lib/soapy_cake/response_value.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SoapyCake
   class ResponseValue
     attr_reader :key, :value

data/lib/soapy_cake/time_converter.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SoapyCake
   class TimeConverter
     def initialize(time_zone, time_offset = nil)
@@ -21,15 +22,15 @@ module SoapyCake
       zone.parse(value).utc
     end
 
-    private
-
-    attr_reader :zone
-
     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
   end
 end

data/lib/soapy_cake/version.rb

@@ -1,3 +1,4 @@
+# frozen_string_literal: true
 module SoapyCake
-  VERSION = '1.20.0'.freeze
+  VERSION = '1.21.0'.freeze
 end

data/spec/lib/soapy_cake/response_spec.rb

@@ -31,8 +31,8 @@ RSpec.describe SoapyCake::Response do
 
   it 'parses the CAKE XML structure properly' do
     expect(subject.to_enum.to_a).to eq([
-      { id: '123' },
-      { id: '312' }
-    ])
+                                         { id: '123' },
+                                         { id: '312' }
+                                       ])
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: soapy_cake
 version: !ruby/object:Gem::Version
-  version: 1.20.0
+  version: 1.21.0
 platform: ruby
 authors:
 - ad2games GmbH
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-11-03 00:00:00.000000000 Z
+date: 2016-01-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -270,7 +270,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.5.1
 signing_key: 
 specification_version: 4
 summary: Simple client for the CAKE API