hasoffers 0.1.2 → 0.1.4

data/.gitignore

@@ -1,3 +1,4 @@
 pkg
 doc
-Manifest
+Manifest
+hasoffers-0.1.4.gem

data/CHANGELOG

@@ -1,4 +1,10 @@
-= HasOffers CHANGELOG
+== Version 0.1.4
+  * Create a class method to get and set the @@base_uri, with tests
+
+== Version 0.1.3
+* Bug fix - it's possible for AffiliateBilling to return an array of nil, instead
+  of an array of invoices.
+* Updated various unit tests to fix failing tests while HAS_OFFERS_LIVE is enabled.
 
 == Version 0.1.2
 * Minor bug fix for running without the has_offers.yml config file

data/Gemfile.lock

@@ -0,0 +1,20 @@
+PATH
+  remote: .
+  specs:
+    hasoffers (0.1.4)
+      crack
+      yajl-ruby
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    crack (0.3.1)
+    rake (0.9.2)
+    yajl-ruby (1.1.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  hasoffers!
+  rake

data/Rakefile

@@ -1,2 +1,8 @@
 require 'bundler'
 Bundler::GemHelper.install_tasks
+
+require 'rake/testtask'
+
+Rake::TestTask.new do |t|
+  t.test_files = `git ls-files -- {test,spec,features}/*`.split("\n")
+end

data/hasoffers.gemspec

@@ -8,7 +8,7 @@ Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.authors     = ["Luke Ludwig"]
   s.email       = ["luke.ludwig@tstmedia.com"]
-  s.homepage    = "https://github.com/ngin/hasoffers"
+  s.homepage    = "https://github.com/tstmedia/hasoffers"
   s.summary     = %q{Implementation of the HasOffers API for affiliate advertising.}
   s.description = %q{Implementation of the HasOffers API for affiliate advertising.}
 
@@ -18,4 +18,7 @@ Gem::Specification.new do |s|
   s.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
+  s.add_dependency 'crack'
+  s.add_dependency 'yajl-ruby'
+  s.add_development_dependency 'rake'
 end

data/lib/hasoffers/affiliate_billing.rb

@@ -11,14 +11,22 @@ module HasOffers
         get_request(Target, 'findInvoiceStats', params)
       end
 
+      def simplify_response_data data
+        # Data is returned as a hash like this:
+        # {
+        #   "1" => {"AffiliateInvoice" => {<what we really want>}, ... },
+        #   "2" => {"AffiliateInvoice" => {<what we really want>}, ... }
+        # }
+        #
+        # This function will extract it out.
+        data.map { |id, invoice_data| invoice_data["AffiliateInvoice"] }
+      end
+
       def find_all_invoices(params)
         response = get_request(Target, 'findAllInvoices', params)
         if response.success?
           # strip out the clutter
-          data = response.data.map do |invoice|
-            invoice[1].values.first
-          end
-          response.set_data data
+          response.set_data simplify_response_data(response.data)
         end
         response
       end
@@ -28,10 +36,7 @@ module HasOffers
         response = get_request(Target, 'findAllInvoicesByIds', params)
         if response.success?
           # strip out the clutter
-          data = response.data.map do |invoice|
-            invoice[1].values.first
-          end
-          response.set_data data
+          response.set_data simplify_response_data(response.data)
         end
         response
       end

data/lib/hasoffers/base.rb

@@ -3,12 +3,20 @@ module HasOffers
 
   class Base
 
-    BaseUri = 'https://api.hasoffers.com/Api'
+    @@base_uri = 'https://api.hasoffers.com/Api'
     @@api_mode = ((defined?(Rails) and Rails.env.production?) or ENV['HAS_OFFERS_LIVE'] == '1') ? :live : :test
     @@default_params = nil
 
     class << self
 
+      def base_uri=(uri)
+        @@base_uri = uri
+      end
+
+      def base_uri
+        @@base_uri
+      end
+
       def initialize_credentials
         config_file = ENV['HAS_OFFERS_CONFIG_FILE'] || "config/has_offers.yml"
         if File.exists?(config_file)
@@ -77,12 +85,12 @@ module HasOffers
         data = build_request_params(target, method, params)
         if live?
           if http_method == :post
-            uri = URI.parse BaseUri
+            uri = URI.parse base_uri
             http = new_http uri
             raw_request = Net::HTTP::Post.new(uri.request_uri)
             raw_request.body = query_string data
           else # assume get
-            uri = URI.parse("#{BaseUri}?#{query_string(data)}")
+            uri = URI.parse("#{base_uri}?#{query_string(data)}")
             http = new_http uri
             raw_request = Net::HTTP::Get.new(uri.request_uri)
           end
@@ -108,4 +116,4 @@ module HasOffers
 
   end
 
-end
+end

data/lib/hasoffers/response.rb

@@ -80,7 +80,7 @@ module HasOffers
     protected
 
     def paginated_response?
-      @body['response']['data'] and @body['response']['data'].is_a?(Hash) and @body['response']['data']['pageCount']
+      @body['response']['data'] and @body['response']['data'].is_a?(Hash) and @body['response']['data'].has_key?('pageCount')
     end
 
   end

data/lib/hasoffers/version.rb

@@ -1,3 +1,3 @@
 module Hasoffers
-  VERSION = "0.1.2"
+  VERSION = "0.1.4"
 end

data/test/affiliate_billing_test.rb

@@ -10,23 +10,22 @@ class AffiliateBillingTest < Test::Unit::TestCase
   def test_find_all_invoices
     response = HasOffers::AffiliateBilling.find_all_invoices({})
     assert_success response
-    assert response.data.length > 0, "No invoices were returned."
+    assert response.data.compact.length > 0, "No invoices were returned."
   end
 
   def test_find_all_invoices_filtered_by_affiliate
     response = HasOffers::AffiliateBilling.find_all_invoices(
-      'filters' => ['AffiliateInvoice.affiliate_id' => '7'],
+      'filters' => ['AffiliateInvoice.affiliate_id' => '1'],
       'fields' => ['is_paid', 'impressions', 'clicks', 'conversions', 'amount']
     )
     assert_success response
-    assert response.data.length > 0, "No invoices were returned."
+    assert response.data.compact.length > 0, "No invoices were returned."
   end
 
   def test_find_all_invoices_by_ids
-    response = HasOffers::AffiliateBilling.find_all_invoices_by_ids([7,11]
-    )
+    response = HasOffers::AffiliateBilling.find_all_invoices_by_ids([7,11])
     assert_success response
-    assert response.data.length > 0, "No invoices were returned."
+    assert response.data.compact.length > 0, "No invoices were returned."
   end
 
   def good_params

data/test/base_test.rb

@@ -0,0 +1,10 @@
+require File.dirname(__FILE__) + '/test_helper'
+
+class AdvertiserTest < Test::Unit::TestCase
+  def test_set_base_uri
+    new_uri = "http://example.com"
+    HasOffers::Base.base_uri = new_uri
+    assert_equal new_uri, HasOffers::Base.base_uri
+  end
+end
+

data/test/conversion_test.rb

@@ -12,7 +12,9 @@ class ConversionTest < Test::Unit::TestCase
   end
 
   def test_update
-    response = HasOffers::Conversion.update(1, {'affiliate_id' => '1', 'offer_id' => '1', 'payout' => '11.50', 'revenue' => '6.75'})
+    response = HasOffers::Conversion.create(good_params)
+    assert_success response
+    response = HasOffers::Conversion.update(response.data, {'payout' => '11.50', 'revenue' => '6.75'})
     assert_success response
   end
 

metadata

@@ -1,37 +1,60 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: hasoffers
-version: !ruby/object:Gem::Version 
-  hash: 31
+version: !ruby/object:Gem::Version
+  version: 0.1.4
   prerelease: 
-  segments: 
-  - 0
-  - 1
-  - 2
-  version: 0.1.2
 platform: ruby
-authors: 
+authors:
 - Luke Ludwig
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-03-17 00:00:00 -05:00
-default_executable: 
-dependencies: []
-
+date: 2012-02-13 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: crack
+  requirement: &70315768875080 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70315768875080
+- !ruby/object:Gem::Dependency
+  name: yajl-ruby
+  requirement: &70315768874660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: *70315768874660
+- !ruby/object:Gem::Dependency
+  name: rake
+  requirement: &70315768874240 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *70315768874240
 description: Implementation of the HasOffers API for affiliate advertising.
-email: 
+email:
 - luke.ludwig@tstmedia.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - .gitignore
 - CHANGELOG
 - Gemfile
+- Gemfile.lock
 - README.rdoc
 - Rakefile
 - config/has_offers.yml
@@ -51,48 +74,46 @@ files:
 - test/advertiser_test.rb
 - test/affiliate_billing_test.rb
 - test/affiliate_test.rb
+- test/base_test.rb
 - test/conversion_test.rb
 - test/offer_test.rb
 - test/report_test.rb
 - test/test_helper.rb
-has_rdoc: true
-homepage: https://github.com/ngin/hasoffers
+homepage: https://github.com/tstmedia/hasoffers
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+      hash: -3016471400862680151
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      version: "0"
+      hash: -3016471400862680151
 requirements: []
-
 rubyforge_project: hasoffers
-rubygems_version: 1.4.2
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: Implementation of the HasOffers API for affiliate advertising.
-test_files: 
+test_files:
 - test/advertiser_test.rb
 - test/affiliate_billing_test.rb
 - test/affiliate_test.rb
+- test/base_test.rb
 - test/conversion_test.rb
 - test/offer_test.rb
 - test/report_test.rb