commission_junction 1.7.1 → 1.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bafc377290960323c66d4b5f9896d87e42ab50fc
-  data.tar.gz: cf4ddcb839f9b1874c7f78fd1125ff9f08a129df
+  metadata.gz: e00330e15a7b42cf61330c9aa59685979dbdfd50
+  data.tar.gz: c56a45455189f9c159b871f70f9fdf22bdfcafb4
 SHA512:
-  metadata.gz: 79688b4fc4c47888685c67652ef547c256f83d5758a2f9a6d7cb8c4316d0e95a398e203dce167dd8a962b4a2bb509c198dee62136355420ded3eb9e7711ef4ce
-  data.tar.gz: b318559c47762d3092bdfdf0ecf7d6e79832e258e45be7ff43272e8670e55fecec7ad2d387012d87e2dc24af38d20732c1482c18be323422f2c1259a191f9b05
+  metadata.gz: 41046a5ab67a67afe7efd89461180923740a47de1cf87ac2df6bc05b683be395da0f5a4382de0a4bf46f03c4d1ca39f6742ade2f964b901fa88d71dd46777c2a
+  data.tar.gz: f5e6df6e63b1007d415288a19def29301729d26e2fb4f922417deb5eceac987e292455df8affda7d09747f752d71b790f133a51aaf70cc9521894b86ddb303ef

data/README.md

@@ -104,6 +104,7 @@ end
 * [Michael Nutt](https://github.com/mnutt)
 * [Jean-Sebastien Boulanger](https://github.com/jsboulanger)
 * [luckyjazzbo](https://github.com/luckyjazzbo)
+* [samsaradog](https://github.com/samsaradog)
 
 ## Copyright
 

data/lib/commission_junction.rb

@@ -45,13 +45,7 @@ class CommissionJunction
     params = {'locale' => 'en'}.merge(params)
 
     response = self.class.get(WEB_SERVICE_URIS[:categories], :query => params, :timeout => @timeout)
-
-    cj_api = response['cj_api']
-    error_message = cj_api['error_message']
-
-    raise ArgumentError, error_message if error_message
-
-    @categories = cj_api['categories']['category']
+    @categories = extract_contents(response, 'categories', 'category')
   end
 
   def advertiser_lookup(params = {})
@@ -63,12 +57,7 @@ class CommissionJunction
 
     begin
       response = self.class.get(WEB_SERVICE_URIS[:advertiser_lookup], :query => params)
-      cj_api = response['cj_api']
-      error_message = cj_api['error_message']
-
-      raise ArgumentError, error_message if error_message
-
-      advertisers = cj_api['advertisers']
+      advertisers = extract_contents(response, 'advertisers')
 
       @total_matched = advertisers['total_matched'].to_i
       @records_returned = advertisers['records_returned'].to_i
@@ -97,13 +86,7 @@ class CommissionJunction
 
     begin
       response = self.class.get(WEB_SERVICE_URIS[:product_search], :query => params, :timeout => @timeout)
-
-      cj_api = response['cj_api']
-      error_message = cj_api['error_message']
-
-      raise ArgumentError, error_message if error_message
-
-      products = cj_api['products']
+      products = extract_contents(response, 'products')
 
       @total_matched = products['total_matched'].to_i
       @records_returned = products['records_returned'].to_i
@@ -132,13 +115,7 @@ class CommissionJunction
 
     begin
       response = self.class.get(WEB_SERVICE_URIS[:link_search], :query => params, :timeout => @timeout)
-
-      cj_api = response['cj_api']
-      error_message = cj_api['error_message']
-
-      raise ArgumentError, error_message if error_message
-
-      links = cj_api['links']
+      links = extract_contents(response, 'links')
 
       @total_matched = links['total_matched'].to_i
       @records_returned = links['records_returned'].to_i
@@ -163,12 +140,7 @@ class CommissionJunction
 
     begin
       response = self.class.get(WEB_SERVICE_URIS[:commissions], :query => params)
-      cj_api = response['cj_api']
-      error_message = cj_api['error_message']
-
-      raise ArgumentError, error_message if error_message
-
-      commissions = cj_api['commissions']
+      commissions = extract_contents(response, 'commissions')
 
       @total_matched = commissions['total_matched'].to_i
       @records_returned = commissions['records_returned'].to_i
@@ -184,6 +156,19 @@ class CommissionJunction
     @cj_objects
   end
 
+  def extract_contents(response, first_level, second_level=nil)
+    cj_api = response['cj_api']
+
+    raise ArgumentError, "cj api missing from response" if cj_api.nil?
+
+    error_message = cj_api['error_message']
+
+    raise ArgumentError, error_message if error_message
+
+    return cj_api[first_level] if second_level.nil?
+    cj_api[first_level][second_level]
+  end
+
   class CjObject
     def initialize(params)
       raise ArgumentError, "params must be a Hash; got #{params.class} instead" unless params.is_a?(Hash)

data/lib/commission_junction/version.rb

@@ -1,3 +1,3 @@
 class CommissionJunction
-  VERSION = '1.7.1'
+  VERSION = '1.7.2'
 end

data/test/commission_junction_test.rb

@@ -388,4 +388,43 @@ class CommissionJunctionTest < Minitest::Test
       assert_respond_to(link, :three_month_epc)
     end
   end
+
+  def test_contents_extractor_with_first_level
+    contents = "abc"
+    response = {'cj_api' => {'first' => contents}}
+
+    cj = CommissionJunction.new('developer_key', 123456)
+
+    assert_equal(contents, cj.extract_contents(response, "first"))
+  end
+
+  def test_contents_extractor_with_second_level
+    contents = "abc"
+    response = {'cj_api' => {'first' => {'second' => contents}}}
+
+    cj = CommissionJunction.new('developer_key', 123456)
+
+    assert_equal(contents, cj.extract_contents(response, "first", "second"))
+  end
+
+  def test_contents_extractor_with_error_message
+    contents = "abc"
+    response = {'cj_api' => {'error_message' => contents}}
+
+    cj = CommissionJunction.new('developer_key', 123456)
+
+    assert_raises ArgumentError do
+      cj.extract_contents(response, "first")
+    end
+  end
+
+  def test_contents_extractor_with_no_cj_api
+    response = {}
+
+    cj = CommissionJunction.new('developer_key', 123456)
+
+    assert_raises ArgumentError do
+      cj.extract_contents(response, "first")
+    end
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: commission_junction
 version: !ruby/object:Gem::Version
-  version: 1.7.1
+  version: 1.7.2
 platform: ruby
 authors:
 - Albert Vernon
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-15 00:00:00.000000000 Z
+date: 2015-01-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty