adzerk 0.15 → 0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b08fcf724937ddb370874ccdf50506ca1f6e16be79cde06dc8777d1e1d99bfd6
-  data.tar.gz: 28776f7247b58b93c4590fa1689737288a738240403e0d0af18bebd381f9b97d
+  metadata.gz: de13745f2fdeb568524fc13132ce9357b360b18b8f52441796ccba849936d325
+  data.tar.gz: 2012611e5f91cbb4660d9c52bfba65e1530bdacda6e2b28ab94eaad2d5d07943
 SHA512:
-  metadata.gz: 4763be769dac520c65beb9e7e6049089633635a75fc20f9480428d1b286cbeaa2bd543d5a16e4ae4d4a40c5674ae3e6963e2f2d5f5141ab574686829d8511630
-  data.tar.gz: 5e6e08ec68228782bf1acdecc0c035ac66567f0886adcbde45ba77e03a073321d375287b1e4e316aee2a6d65ba7cb20c4812d1a4597567ae0eeb8a6dbc783090
+  metadata.gz: 1ba9d92c3d94e1e991a6100c5c17aa5a4eb1bf466ce30d87ef52d3b37e2c3681ce913f25223c59448497989fb3352c9252f3a3669b2e1f526a9fd6b642a94d4f
+  data.tar.gz: 22c4cbb832d2f13023c29202691c437661f028c44bddf0e07805d4e92a7b936039313311a585b5c0d8c2263c002572d0f9c77fecfb1769e861b45d35b428f63f

data/lib/adzerk/client.rb

@@ -12,6 +12,9 @@ module Adzerk
     VERSION = Gem.loaded_specs['adzerk'].version.to_s
     SDK_HEADER_NAME = 'X-Adzerk-Sdk-Version'
     SDK_HEADER_VALUE = "adzerk-management-sdk-ruby:#{VERSION}"
+    BASE_SLEEP = 0.25
+    MAX_SLEEP = 5
+    MAX_ATTEMPTS = 10
 
     DEFAULTS = {
       :host => ENV["ADZERK_API_HOST"] || 'https://api.adzerk.net/',
@@ -90,35 +93,62 @@ module Adzerk
     end
 
     def create_creative(data={}, image_path='', version: 'v1')
-      response = RestClient.post(@config[:host] + version + '/creative',
-                                 {:creative => camelize_data(data).to_json},
-                                  :X_Adzerk_ApiKey => @api_key,
-                                  :X_Adzerk_Sdk_Version => SDK_HEADER_VALUE,
-                                  :accept => :json)
+      response = nil
+      attempt = 0
+
+      loop do
+        response = RestClient.post(@config[:host] + version + '/creative',
+                                  {:creative => camelize_data(data).to_json},
+                                    :X_Adzerk_ApiKey => @api_key,
+                                    :X_Adzerk_Sdk_Version => SDK_HEADER_VALUE,
+                                    :accept => :json)
+        break if response.code != 429 or attempt >= (@config[:max_attempts] || MAX_ATTEMPTS)
+        sleep(rand(0.0..[MAX_SLEEP, BASE_SLEEP * 2 ** attempt].min()))
+        attempt += 1
+      end
       response = upload_creative(JSON.parse(response)["Id"], image_path) unless image_path.empty?
       response
     end
 
     def upload_creative(id, image_path, size_override: false, version: 'v1')
+      response = nil
+      attempt = 0
       image = File.new(image_path, 'rb')
       url = @config[:host] + version + '/creative/' + id.to_s + '/upload'
       url += '?sizeOverride=true' if size_override
-      RestClient.post(url,
-      {:image => image},
-      "X-Adzerk-ApiKey" => @api_key,
-      SDK_HEADER_NAME => SDK_HEADER_VALUE,
-      :accept => :mime)
+      loop do
+        response = RestClient.post(url,
+        {:image => image},
+        "X-Adzerk-ApiKey" => @api_key,
+        SDK_HEADER_NAME => SDK_HEADER_VALUE,
+        :accept => :mime)
+
+        break if response.code != 429 or attempt >= (@config[:max_attempts] || MAX_ATTEMPTS)
+        sleep(rand(0.0..[MAX_SLEEP, BASE_SLEEP * 2 ** attempt].min()))
+        attempt += 1
+      end
+      response
     end
 
     def send_request(request, uri)
+      response = nil
+      attempt = 0
       http = Net::HTTP.new(uri.host, uri.port)
       http.use_ssl = uri.scheme == 'https'
-      response = http.request(request)
+
+      loop do
+        response = http.request(request)
+        break if response.code != "429" or attempt >= (@config[:max_attempts] || MAX_ATTEMPTS)
+        sleep(rand(0.0..[MAX_SLEEP, BASE_SLEEP * 2 ** attempt].min()))
+        attempt += 1
+      end
+
       if response.kind_of? Net::HTTPClientError or response.kind_of? Net::HTTPServerError
         error_response = JSON.parse(response.body)
         msg = error_response["message"] || error_response["Error"] || response.body
         raise Adzerk::ApiError.new(msg)
       end
+
       response
     end
 

data/lib/adzerk/version.rb

@@ -1,3 +1,3 @@
 module Adzerk
-  VERSION = "0.15"
+  VERSION = "0.16"
 end

data/test/campaign_api_spec.rb

@@ -172,7 +172,7 @@ describe "Campaign API" do
   end
 
   it "should not retrieve a campaign with a advertiserId that doesn't belong to it" do
-    expect { @campaigns.get('123') }.to raise_error("This campaign is not part of your network")
+    expect { @campaigns.get('123') }.to raise_error("Campaign not found.")
   end
 
     it "should delete a new campaign" do

data/test/channel_api_spec.rb

@@ -74,7 +74,7 @@ describe "Channel API" do
     expect(last_channel[:engine]).to eq($u_channel_engine)
     expect(last_channel[:keywords]).to eq($u_channel_keywords)
     expect(last_channel[:cpm]).to eq($u_channel_CPM.to_f)
-    expect(last_channel[:ad_types]).to eq($u_channel_AdTypes)
+    expect(last_channel[:ad_types]).to match_array($u_channel_AdTypes)
   end
 
   it "should delete a new channel" do

data/test/creative_template_spec.rb

@@ -17,12 +17,14 @@ describe "Creative Template API" do
         type: 'String',
         variable: 'ctTitle',
         required: true,
+        ad_query: false
       }, {
         name: 'Thumbnail',
         description: 'The URL of a Thumbnail Image',
         type: 'String',
         variable: 'ctThumbnailUrl',
         required: false,
+        ad_query: true
       }],
       contents: [{
         type: 'Raw',
@@ -60,12 +62,14 @@ describe "Creative Template API" do
         type: 'String',
         variable: 'ctTitle',
         required: true,
+        ad_query: false,
       }, {
         name: 'Thumbnail',
         description: 'The URL of a Thumbnail Image',
         type: 'String',
         variable: 'ctThumbnailUrl',
         required: false,
+        ad_query: true,
       }],
       contents: [{
         type: 'Raw',

data/test/login_api_spec.rb

@@ -38,7 +38,6 @@ describe "Login_API" do
                            :name => "New Name",
                            :email => new_email)
     expect(login[:name]).to eq("New Name")
-    expect(login[:email]).to eq(new_email)
   end
 
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adzerk
 version: !ruby/object:Gem::Version
-  version: '0.15'
+  version: '0.16'
 platform: ruby
 authors:
 - Kacy Fortner
@@ -17,7 +17,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-01-22 00:00:00.000000000 Z
+date: 2021-04-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec