commission_junction 1.8.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bae9d34f121c997545515282c9ff05fb25a24a4a
-  data.tar.gz: 3ee56677421920706ceb322f6b038da241cb38d4
+  metadata.gz: 750c227b15e7e3f9bd1e9a6db340f498851bfeaf
+  data.tar.gz: 49a96c42d479e7e7027d0d6039c9b531984ebf7c
 SHA512:
-  metadata.gz: dbb7d127f62de372d6aa32bbd6f0616ae0bb333e9e51c191da5c737f62532c33b8022897ea27a48f5f6089caa72a6aa51287acd4d2447860013ea8dbc32bd814
-  data.tar.gz: 8ac81f01181cc6050141d66203134657bf8e47affede11bd4b617d5ed070238e6e45092d36767e1d74f5abb5cbef467f4f0646e1c76a55cdd14061a4bfc97d9a
+  metadata.gz: 0bcf73dda51f0bf74dd057493e581aaf3889b02f4c0a22abe9db769a51aff35070ab890a072183ad58d180951c8d3c56f536eb74eecafe10e89e543d605c7896
+  data.tar.gz: 03b7cfae4c2f13cf2e0ca180f72257521d25954e4feeaee42561df5aa3e16d49f0e09de3f14fa149e68a699759b4b204ce77b56df66adb5e72f0b1bcad73625e

data/.rubocop.yml

@@ -1,3 +1,5 @@
+AllCops:
+  TargetRubyVersion: 2.1
 Metrics/LineLength:
   Enabled: false
 Metrics/MethodLength:
@@ -6,3 +8,5 @@ Metrics/AbcSize:
   Enabled: false
 Metrics/ClassLength:
   Enabled: false
+Style/EvalWithLocation:
+    Enabled: false

data/README.md

@@ -4,7 +4,7 @@ Ruby wrapper for the Commission Junction web services APIs (REST)
 
 See https://cjcommunity.force.com/s/article/4777058.
 
-[![Gem Version](https://badge.fury.io/rb/commission_junction.png)](http://badge.fury.io/rb/commission_junction)
+[![Gem Version](https://badge.fury.io/rb/commission_junction.svg)](https://badge.fury.io/rb/commission_junction)
 
 ## Installation
 
@@ -129,6 +129,7 @@ end
 * [Jean-Sebastien Boulanger](https://github.com/jsboulanger)
 * [luckyjazzbo](https://github.com/luckyjazzbo)
 * [samsaradog](https://github.com/samsaradog)
+* [Sergii Konev](https://github.com/K-S-A)
 
 ## Copyright
 

data/commission_junction.gemspec

@@ -1,4 +1,3 @@
-# -*- encoding: utf-8 -*-
 lib = File.expand_path('../lib', __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 require 'commission_junction/version'
@@ -16,8 +15,10 @@ Gem::Specification.new do |gem|
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})
   gem.require_paths = ['lib']
-  gem.add_dependency 'httparty', '~> 0.13'
-  gem.add_development_dependency 'minitest', '~> 0'
-  gem.add_dependency 'ox', '~> 2.1'
+  gem.add_dependency 'httparty', '~> 0.15'
+  gem.add_dependency 'ox', '~> 2.8'
+  gem.add_development_dependency 'json', '~> 2.1'
+  gem.add_development_dependency 'minitest', '> 0'
   gem.license = 'BSD-3-Clause'
+  gem.required_ruby_version = '~> 2.1'
 end

data/lib/commission_junction.rb

@@ -33,7 +33,7 @@ class CommissionJunction
     raise ArgumentError, "You must supply your website ID.\nSee cj.com > Account > Web site Settings > PID" if website_id.empty?
     @website_id = website_id
 
-    raise ArgumentError, "timeout must be a Fixnum; got #{timeout.class} instead" unless timeout.is_a?(Fixnum)
+    raise ArgumentError, "timeout must be a Integer; got #{timeout.class} instead" unless timeout.is_a?(Integer)
     raise ArgumentError, "timeout must be > 0; got #{timeout} instead" unless timeout > 0
     @timeout = timeout
 
@@ -57,20 +57,16 @@ class CommissionJunction
 
     @cj_objects = []
 
-    begin
-      response = self.class.get(WEB_SERVICE_URIS[:advertiser_lookup], query: params)
-      advertisers = extract_contents(response, 'advertisers')
+    response = self.class.get(WEB_SERVICE_URIS[:advertiser_lookup], query: params)
+    advertisers = extract_contents(response, 'advertisers')
 
-      @total_matched = advertisers['total_matched'].to_i
-      @records_returned = advertisers['records_returned'].to_i
-      @page_number = advertisers['page_number'].to_i
+    @total_matched = advertisers['total_matched'].to_i
+    @records_returned = advertisers['records_returned'].to_i
+    @page_number = advertisers['page_number'].to_i
 
-      advertiser = advertisers['advertiser']
-      advertiser = [advertiser] if advertiser.is_a?(Hash) # If we got exactly one result, put it in an array.
-      advertiser.each { |item| @cj_objects << Advertiser.new(item) } if advertiser
-    rescue Timeout::Error
-      @total_matched = @records_returned = @page_number = 0
-    end
+    advertiser = advertisers['advertiser']
+    advertiser = [advertiser] if advertiser.is_a?(Hash) # If we got exactly one result, put it in an array.
+    advertiser.each { |item| @cj_objects << Advertiser.new(item) } if advertiser
 
     @cj_objects
   end
@@ -86,20 +82,16 @@ class CommissionJunction
 
     @cj_objects = []
 
-    begin
-      response = self.class.get(WEB_SERVICE_URIS[:product_search], query: params, timeout: @timeout)
-      products = extract_contents(response, 'products')
+    response = self.class.get(WEB_SERVICE_URIS[:product_search], query: params, timeout: @timeout)
+    products = extract_contents(response, 'products')
 
-      @total_matched = products['total_matched'].to_i
-      @records_returned = products['records_returned'].to_i
-      @page_number = products['page_number'].to_i
+    @total_matched = products['total_matched'].to_i
+    @records_returned = products['records_returned'].to_i
+    @page_number = products['page_number'].to_i
 
-      product = products['product']
-      product = [product] if product.is_a?(Hash) # If we got exactly one result, put it in an array.
-      product.each { |item| @cj_objects << Product.new(item) } if product
-    rescue Timeout::Error
-      @total_matched = @records_returned = @page_number = 0
-    end
+    product = products['product']
+    product = [product] if product.is_a?(Hash) # If we got exactly one result, put it in an array.
+    product.each { |item| @cj_objects << Product.new(item) } if product
 
     @cj_objects
   end
@@ -115,20 +107,16 @@ class CommissionJunction
 
     @cj_objects = []
 
-    begin
-      response = self.class.get(WEB_SERVICE_URIS[:link_search], query: params, timeout: @timeout)
-      links = extract_contents(response, 'links')
+    response = self.class.get(WEB_SERVICE_URIS[:link_search], query: params, timeout: @timeout)
+    links = extract_contents(response, 'links')
 
-      @total_matched = links['total_matched'].to_i
-      @records_returned = links['records_returned'].to_i
-      @page_number = links['page_number'].to_i
+    @total_matched = links['total_matched'].to_i
+    @records_returned = links['records_returned'].to_i
+    @page_number = links['page_number'].to_i
 
-      link = links['link']
-      link = [link] if link.is_a?(Hash) # If we got exactly one result, put it in an array.
-      link.each { |item| @cj_objects << Link.new(item) } if link
-    rescue Timeout::Error
-      @total_matched = @records_returned = @page_number = 0
-    end
+    link = links['link']
+    link = [link] if link.is_a?(Hash) # If we got exactly one result, put it in an array.
+    link.each { |item| @cj_objects << Link.new(item) } if link
 
     @cj_objects
   end
@@ -140,20 +128,16 @@ class CommissionJunction
 
     @cj_objects = []
 
-    begin
-      response = self.class.get(WEB_SERVICE_URIS[:commissions], query: params)
-      commissions = extract_contents(response, 'commissions')
+    response = self.class.get(WEB_SERVICE_URIS[:commissions], query: params)
+    commissions = extract_contents(response, 'commissions')
 
-      @total_matched = commissions['total_matched'].to_i
-      @records_returned = commissions['records_returned'].to_i
-      @page_number = commissions['page_number'].to_i
+    @total_matched = commissions['total_matched'].to_i
+    @records_returned = commissions['records_returned'].to_i
+    @page_number = commissions['page_number'].to_i
 
-      commission = commissions['commission']
-      commission = [commission] if commission.is_a?(Hash) # If we got exactly one result, put it in an array.
-      commission.each { |item| @cj_objects << Commission.new(item) } if commission
-    rescue Timeout::Error
-      @total_matched = @records_returned = @page_number = 0
-    end
+    commission = commissions['commission']
+    commission = [commission] if commission.is_a?(Hash) # If we got exactly one result, put it in an array.
+    commission.each { |item| @cj_objects << Commission.new(item) } if commission
 
     @cj_objects
   end
@@ -167,14 +151,10 @@ class CommissionJunction
 
     @cj_objects = []
 
-    begin
-      ids = original_action_ids.join(',')
-      response = self.class.get(WEB_SERVICE_URIS[:item_detail] + ids, query: "original-action-id=#{ids}")
-      @cj_objects = extract_contents(response, 'item_details')
-      @cj_objects = [@cj_objects] if @cj_objects.is_a?(Hash) # If we got exactly one result, put it in an array.
-    rescue Timeout::Error
-      @total_matched = @records_returned = @page_number = 0
-    end
+    ids = original_action_ids.join(',')
+    response = self.class.get(WEB_SERVICE_URIS[:item_detail] + ids, query: "original-action-id=#{ids}")
+    @cj_objects = extract_contents(response, 'item_details')
+    @cj_objects = [@cj_objects] if @cj_objects.is_a?(Hash) # If we got exactly one result, put it in an array.
 
     @cj_objects
   end

data/lib/commission_junction/version.rb

@@ -1,3 +1,3 @@
 class CommissionJunction
-  VERSION = '1.8.0'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/test/commission_junction_test.rb

@@ -189,9 +189,9 @@ class CommissionJunctionTest < Minitest::Test
   end
 
   def check_search_results(results)
-    assert_instance_of(Fixnum, results.total_matched)
-    assert_instance_of(Fixnum, results.records_returned)
-    assert_instance_of(Fixnum, results.page_number)
+    assert_instance_of(Integer, results.total_matched)
+    assert_instance_of(Integer, results.records_returned)
+    assert_instance_of(Integer, results.page_number)
     assert_instance_of(Array, results.cj_objects)
 
     results.cj_objects.each do |product|
@@ -256,9 +256,9 @@ class CommissionJunctionTest < Minitest::Test
   end
 
   def check_advertiser_lookup_results(results)
-    assert_instance_of(Fixnum, results.total_matched)
-    assert_instance_of(Fixnum, results.records_returned)
-    assert_instance_of(Fixnum, results.page_number)
+    assert_instance_of(Integer, results.total_matched)
+    assert_instance_of(Integer, results.records_returned)
+    assert_instance_of(Integer, results.page_number)
     assert_instance_of(Array, results.cj_objects)
 
     results.cj_objects.each do |advertiser|
@@ -308,9 +308,9 @@ class CommissionJunctionTest < Minitest::Test
   end
 
   def check_commission_lookup_results(results)
-    assert_instance_of(Fixnum, results.total_matched)
-    assert_instance_of(Fixnum, results.records_returned)
-    assert_instance_of(Fixnum, results.page_number)
+    assert_instance_of(Integer, results.total_matched)
+    assert_instance_of(Integer, results.records_returned)
+    assert_instance_of(Integer, results.page_number)
     assert_instance_of(Array, results.cj_objects)
 
     results.cj_objects.each do |commission|
@@ -427,9 +427,9 @@ class CommissionJunctionTest < Minitest::Test
   end
 
   def check_link_search_results(results)
-    assert_instance_of(Fixnum, results.total_matched)
-    assert_instance_of(Fixnum, results.records_returned)
-    assert_instance_of(Fixnum, results.page_number)
+    assert_instance_of(Integer, results.total_matched)
+    assert_instance_of(Integer, results.records_returned)
+    assert_instance_of(Integer, results.page_number)
     assert_instance_of(Array, results.cj_objects)
 
     results.cj_objects.each do |link|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commission_junction
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Albert Vernon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-21 00:00:00.000000000 Z
+date: 2018-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -16,42 +16,56 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.15'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.13'
+        version: '0.15'
 - !ruby/object:Gem::Dependency
-  name: minitest
+  name: ox
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '2.8'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.8'
 - !ruby/object:Gem::Dependency
-  name: ox
+  name: json
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
-  type: :runtime
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '2.1'
+- !ruby/object:Gem::Dependency
+  name: minitest
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">"
+      - !ruby/object:Gem::Version
+        version: '0'
 description: Ruby wrapper for the Commission Junction web services APIs (REST)
 email: aev@vernon.nu
 executables: []
@@ -79,9 +93,9 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - "~>"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.1'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -89,7 +103,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.14
 signing_key: 
 specification_version: 4
 summary: Commission Junction web services APIs (REST)