adknowledge 0.0.4 → 0.0.6

data/Gemfile

@@ -5,6 +5,7 @@ gemspec
 
 group :development, :test do
   platforms :jruby do
+    gem 'jruby-openssl'
     gem 'gson'
     gem 'libxml-jruby'
   end

data/README.md

@@ -100,7 +100,6 @@ For more details see the specs, and [ADK documentation](https://publisher.adknow
 TODO
 ----
 There are several things currently unfinished:
-* Error handling when requests are unsuccessful
 * Options/convenience methods for parsing pivot query results
 * Add an end-point for "lookup" API
 

data/lib/adknowledge.rb

@@ -1,6 +1,7 @@
 require "adknowledge/version"
 
 module Adknowledge
+  class Exception < ::Exception; end
 end
 
 require 'faraday_middleware/adknowledge'

data/lib/adknowledge/integrated.rb

@@ -76,7 +76,7 @@ module Adknowledge
     # @return [Array] mapped recipients
     def mapped_recipients
       return [] unless mapped?
-      recipients.select{|r| r['success']}
+      recipients.select{ |r| r['success'] == true }
     end
 
     # Return all errored recipients
@@ -84,7 +84,7 @@ module Adknowledge
     # @return [Array] errored recipients
     def errored_recipients
       return [] unless mapped?
-      recipients.select{|r| ! r['success']}
+      recipients.select{ |r| r['success'] == false }
     end
 
     # Set both click-domain and image-domain

data/lib/adknowledge/performance.rb

@@ -188,7 +188,7 @@ module Adknowledge
       unless Adknowledge.token
         raise ArgumentError, 'Adknowledge token required to perform queries'
       end
-      results.body['data'] if results.body.has_key?('data')
+      results
     end
 
 
@@ -199,9 +199,14 @@ module Adknowledge
     end
 
     def results
-      @results ||= conn.get do |req|
+      raw_result = conn.get do |req|
         req.url '/performance.json', query_params
+      end.body
+
+      if raw_result['code'] > 200
+        raise Adknowledge::Exception, get_error_str(raw_result)
       end
+      @results ||= raw_result['data']
     end
 
     def conn
@@ -226,6 +231,12 @@ module Adknowledge
       value ? '1' : '0'
     end
 
+    def get_error_str raw_result
+      raw_result['messages'].map do |msg|
+        msg['message']
+      end.join(' ')
+    end
+
     def valid_pivot_values
       dimensions.keys + ['*']
     end

data/lib/adknowledge/version.rb

@@ -1,3 +1,3 @@
 module Adknowledge
-  VERSION = "0.0.4"
+  VERSION = "0.0.6"
 end

data/spec/adknowledge/integrated_spec.rb

@@ -238,7 +238,7 @@ describe Adknowledge::Integrated do
     context "single results" do
 
       before do
-        VCR.use_cassette :map_single_success, record: :once do
+        VCR.use_cassette :map_single_success do
           integrated.map!
         end
       end
@@ -319,7 +319,7 @@ describe Adknowledge::Integrated do
       end
 
       before do
-        VCR.use_cassette :map_multi_success, record: :once do
+        VCR.use_cassette :map_multi_success do
           integrated.map!
         end
       end

data/spec/adknowledge/performance_spec.rb

@@ -288,33 +288,53 @@ describe Adknowledge::Performance do
         limit(20)
     end
 
-    before do
-      VCR.use_cassette :performance, record: :once do
-        performance.records
+    context "succesful" do
+
+      let :records do
+        VCR.use_cassette :performance do
+          performance.records
+        end
       end
-    end
 
-    subject do
-      performance.records
-    end
+      subject do
+        records
+      end
 
-    it 'has results' do
-      expect(subject).to be_an Array
-    end
+      it 'has results' do
+        expect(subject).to be_an Array
+      end
 
-    it 'has the correct dimensions' do
-      expect(subject.first).to have_key 'subid'
-      expect(subject.first).to have_key 'report_date'
-    end
+      it 'has the correct dimensions' do
+        expect(subject.first).to have_key 'subid'
+        expect(subject.first).to have_key 'report_date'
+      end
 
-    it 'has the correct measures' do
-      expect(subject.first).to have_key 'paid_clicks'
-      expect(subject.first).to have_key 'revenue'
-    end
+      it 'has the correct measures' do
+        expect(subject.first).to have_key 'paid_clicks'
+        expect(subject.first).to have_key 'revenue'
+      end
+
+      it 'has the correct count' do
+        expect(subject.size).to eql 20
+      end
+
+    end # successful
+
+    context "unsuccessful" do
 
-    it 'has the correct count' do
-      expect(subject.size).to eql 20
+      let :error_str do
+        "The email/password or token provided does not match a " +
+          "valid account. Please try again."
+      end
+
+      it 'raises an exception' do
+        VCR.use_cassette :performance_errored do
+          expect{ performance.records }.
+            to raise_error(Adknowledge::Exception, error_str)
+        end
+      end
     end
 
-  end
+  end # #records
+
 end

data/spec/cassettes/performance_errored.yml

@@ -0,0 +1,43 @@
+---
+http_interactions:
+- request:
+    method: get
+    uri: http://api.publisher.adknowledge.com/performance.json?dimensions=subid,report_date&limit=20&measures=revenue,paid_clicks&product_guid=*&product_id=2&start_date=1&token=b6d8610998e883b3a460fd2fcf71ead4
+    body:
+      encoding: US-ASCII
+      string: ''
+    headers:
+      User-Agent:
+      - Faraday v0.8.6
+      Accept-Encoding:
+      - gzip;q=1.0,deflate;q=0.6,identity;q=0.3
+      Accept:
+      - ! '*/*'
+  response:
+    status:
+      code: 401
+      message: Authorization Required
+    headers:
+      Date:
+      - Sun, 10 Mar 2013 19:04:43 GMT
+      Server:
+      - Apache/2.2.12 (Linux/SUSE)
+      X-Powered-By:
+      - PHP/5.3.8-ZS5.5.0 ZendServer/5.0
+      Set-Cookie:
+      - ZDEDebuggerPresent=php,phtml,php3; path=/
+      Cache-Control:
+      - no-cache, must-revalidate
+      Expires:
+      - Mon, 26 Jul 1997 05:00:00 GMT
+      Content-Length:
+      - '178'
+      Content-Type:
+      - application/json
+    body:
+      encoding: US-ASCII
+      string: ! '{"status":0,"data":[],"messages":[{"type":0,"message":"The email\/password
+        or token provided does not match a valid account. Please try again."}],"errors":[],"code":401,"time":0}'
+    http_version: 
+  recorded_at: Sun, 10 Mar 2013 19:04:43 GMT
+recorded_with: VCR 2.4.0

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adknowledge
 version: !ruby/object:Gem::Version
-  version: 0.0.4
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-10 00:00:00.000000000 Z
+date: 2013-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: pry
@@ -244,6 +244,7 @@ files:
 - spec/cassettes/map_multi_success.yml
 - spec/cassettes/map_single_success.yml
 - spec/cassettes/performance.yml
+- spec/cassettes/performance_errored.yml
 - spec/spec_helper.rb
 homepage: ''
 licenses: []
@@ -257,12 +258,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4552902463842622263
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4552902463842622263
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -276,5 +283,5 @@ test_files:
 - spec/cassettes/map_multi_success.yml
 - spec/cassettes/map_single_success.yml
 - spec/cassettes/performance.yml
+- spec/cassettes/performance_errored.yml
 - spec/spec_helper.rb
-has_rdoc: