hasoffersv3 0.2.6 → 0.4.0

data/lib/hasoffersv3/offer.rb

@@ -1,59 +1,57 @@
 class HasOffersV3
   class Offer < Base
-    class << self
-      def find_all(params = {})
-        post_request 'findAll', params
-      end
-
-      def find_all_by_ids(params = {})
-        requires! params, [:ids]
-        post_request 'findAllByIds', params
-      end
-
-      def find_all_ids_by_advertiser_id(params = {})
-        requires! params, [:advertiser_id]
-        post_request 'findAllIdsByAdvertiserId', params
-      end
-
-      def find_all_ids_by_affiliate_id(params = {})
-        requires! params, [:affiliate_id]
-        post_request 'findAllIdsByAffiliateId', params
-      end
-
-      def find_by_id(params = {})
-        requires! params, [:id]
-        post_request 'findById', params
-      end
-
-      def get_groups(params = {})
-        requires! params, [:id]
-        post_request 'getGroups', params
-      end
-
-      def get_approved_affiliate_ids(params = {})
-        requires! params, [:id]
-        post_request 'getApprovedAffiliateIds', params
-      end
-
-      def set_payout(params = {})
-        requires! params, [:id, :affiliate_id]
-        post_request 'setPayout', params
-      end
-
-      def remove_payout(params = {})
-        requires! params, [:id, :affiliate_id]
-        post_request 'removePayout', params
-      end
-
-      def generate_tracking_link(params = {})
-        requires! params, [:offer_id, :affiliate_id]
-        post_request 'generateTrackingLink', params
-      end
-
-      def get_tier_payouts(params = {})
-        requires! params, [:id]
-        post_request 'getTierPayouts', params
-      end
+    def find_all(params = {})
+      post_request 'findAll', params
+    end
+
+    def find_all_by_ids(params = {})
+      requires! params, [:ids]
+      post_request 'findAllByIds', params
+    end
+
+    def find_all_ids_by_advertiser_id(params = {})
+      requires! params, [:advertiser_id]
+      post_request 'findAllIdsByAdvertiserId', params
+    end
+
+    def find_all_ids_by_affiliate_id(params = {})
+      requires! params, [:affiliate_id]
+      post_request 'findAllIdsByAffiliateId', params
+    end
+
+    def find_by_id(params = {})
+      requires! params, [:id]
+      post_request 'findById', params
+    end
+
+    def get_groups(params = {})
+      requires! params, [:id]
+      post_request 'getGroups', params
+    end
+
+    def get_approved_affiliate_ids(params = {})
+      requires! params, [:id]
+      post_request 'getApprovedAffiliateIds', params
+    end
+
+    def set_payout(params = {})
+      requires! params, [:id, :affiliate_id]
+      post_request 'setPayout', params
+    end
+
+    def remove_payout(params = {})
+      requires! params, [:id, :affiliate_id]
+      post_request 'removePayout', params
+    end
+
+    def generate_tracking_link(params = {})
+      requires! params, [:offer_id, :affiliate_id]
+      post_request 'generateTrackingLink', params
+    end
+
+    def get_tier_payouts(params = {})
+      requires! params, [:id]
+      post_request 'getTierPayouts', params
     end
   end
 end

data/lib/hasoffersv3/offer_pixel.rb

@@ -0,0 +1,22 @@
+class HasOffersV3
+  class OfferPixel < Base
+    def find_all(params = {})
+      post_request 'findAll', params
+    end
+
+    def find_all_by_ids(params = {})
+      requires! params, [:ids]
+      post_request 'findAllByIds', params
+    end
+
+    def find_by_id(params = {})
+      requires! params, [:id]
+      post_request 'findById', params
+    end
+
+    def get_allowed_types(params = {})
+      requires! params, [:offer_id]
+      post_request 'getAllowedTypes', params
+    end
+  end
+end

data/lib/hasoffersv3/raw_log.rb

@@ -1,24 +1,22 @@
 class HasOffersV3
   class RawLog < Base
-    class << self
-      def get_download_link(params = {})
-        requires! params, [:log_type, :log_filename]
-        get_request 'getDownloadLink', params
-      end
+    def get_download_link(params = {})
+      requires! params, [:log_type, :log_filename]
+      get_request 'getDownloadLink', params
+    end
 
-      def get_log_expirations
-        get_request 'getLogExpirations'
-      end
+    def get_log_expirations
+      get_request 'getLogExpirations'
+    end
 
-      def list_date_dirs(params = {})
-        requires! params, [:log_type]
-        get_request 'listDateDirs', params
-      end
+    def list_date_dirs(params = {})
+      requires! params, [:log_type]
+      get_request 'listDateDirs', params
+    end
 
-      def list_logs(params = {})
-        requires! params, [:log_type, :date_dir]
-        get_request 'listLogs', params
-      end
+    def list_logs(params = {})
+      requires! params, [:log_type, :date_dir]
+      get_request 'listLogs', params
     end
   end
 end

data/lib/hasoffersv3/report.rb

@@ -1,27 +1,13 @@
 class HasOffersV3
   class Report < Base
-    Target = 'Report'
-
-    class << self
-      def getConversions(params = {}, &block)
-        deprecation 'getConversions', 'get_conversions'
-        get_conversions params, &block
-      end
-
-      def get_conversions(params = {}, &block)
-        # TODO: This *should* be a GET request, however, if we use that here we get: "The requested URL's length exceeds the capacity limit for this server."
-        #       because the number of affiliate_ids we pass in is too high.
-        post_request 'getConversions', params, &block
-      end
-
-      def getModSummaryLogs(params = {}, &block)
-        deprecation 'getModSummaryLogs', 'get_mod_summary_logs'
-        get_mod_summary_logs params, &block
-      end
+    def get_conversions(params = {}, &block)
+      # TODO: This *should* be a GET request, however, if we use that here we get: "The requested URL's length exceeds the capacity limit for this server."
+      #       because the number of affiliate_ids we pass in is too high.
+      post_request 'getConversions', params, &block
+    end
 
-      def get_mod_summary_logs(params = {}, &block)
-        get_request 'getModSummaryLogs', params, &block
-      end
+    def get_mod_summary_logs(params = {}, &block)
+      get_request 'getModSummaryLogs', params, &block
     end
   end
 end

data/lib/hasoffersv3/version.rb

@@ -1,3 +1,3 @@
 class HasOffersV3
-  VERSION = '0.2.6'
+  VERSION = '0.4.0'
 end

data/lib/hasoffersv3.rb

@@ -3,14 +3,13 @@ require 'json'
 
 require 'hasoffersv3/client'
 
-%w!base affiliate response conversion raw_log report configuration advertiser advertiser_user offer application!.each do |file|
+%w!base affiliate response conversion raw_log report configuration advertiser advertiser_user offer offer_pixel employee application!.each do |file|
   require "hasoffersv3/#{file}"
 end
 
 require 'hasoffersv3/advertiser_billing'
 require 'hasoffersv3/affiliate_offer'
 require 'hasoffersv3/affiliate_billing'
-require 'hasoffersv3/adapter'
 
 class HasOffersV3
 
@@ -22,7 +21,9 @@ class HasOffersV3
     affiliate_offers: HasOffersV3::AffiliateOffer,
     affiliate_billing: HasOffersV3::AffiliateBilling,
     conversions: HasOffersV3::Conversion,
+    employee: HasOffersV3::Employee,
     offers: HasOffersV3::Offer,
+    offer_pixels: HasOffersV3::OfferPixel,
     raw_logs: HasOffersV3::RawLog,
     reports: HasOffersV3::Report,
     application: HasOffersV3::Application
@@ -60,9 +61,13 @@ class HasOffersV3
     @configuration = ::HasOffersV3::Configuration.new options
   end
 
+  def client
+    ::HasOffersV3::Client.new(@configuration)
+  end
+
   API_TARGETS.each do |name, target|
     define_method name do
-      HasOffersV3::Adapter.new(configuration, target)
+      target.new(client)
     end
   end
 

data/spec/lib/advertiser_billing_spec.rb

@@ -9,7 +9,7 @@ describe HasOffersV3::AdvertiserBilling do
     it 'makes a proper request call' do
       stub_call
       response = subject.find_all_invoices
-      a_request(:post, url).with(body: hash_including({'Method' => 'findAllInvoices'})).should have_been_made
+      expect(a_request(:post, url).with(body: hash_including({'Method' => 'findAllInvoices'}))).to have_been_made
       validate_call response
     end
   end
@@ -19,10 +19,11 @@ describe HasOffersV3::AdvertiserBilling do
       it 'makes a proper request call' do
         stub_call
         response = subject.create_invoice(data: {advertiser_id: 1, start_date: '2014-10-01', end_date: '2014-10-30'})
-        a_request(:post, url).with(body: hash_including({
+        req = a_request(:post, url).with(body: hash_including({
           'Method' => 'createInvoice',
           'data'   => {'advertiser_id' => '1', 'start_date' => '2014-10-01', 'end_date' => '2014-10-30'}
-        })).should have_been_made
+        }))
+        expect(req).to have_been_made
         validate_call response
       end
     end
@@ -39,7 +40,7 @@ describe HasOffersV3::AdvertiserBilling do
       it 'makes a proper request call' do
         stub_call
         response = subject.find_invoice_by_id(id: '1')
-        a_request(:post, url).with(body: hash_including({'Method' => 'findInvoiceById', 'id' => '1'})).should have_been_made
+        expect(a_request(:post, url).with(body: hash_including({'Method' => 'findInvoiceById', 'id' => '1'}))).to have_been_made
         validate_call response
       end
     end

data/spec/lib/advertiser_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe HasOffersV3::Advertiser do
-  subject { HasOffersV3::Advertiser }
+  subject { HasOffersV3::Advertiser.new }
 
   let(:url)  { api_url 'Advertiser' }
 

data/spec/lib/advertiser_user_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe HasOffersV3::AdvertiserUser do
-  subject { HasOffersV3::AdvertiserUser }
+  subject { HasOffersV3::AdvertiserUser.new }
 
   let(:url)  { api_url 'AdvertiserUser' }
 

data/spec/lib/affiliate_billing_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe HasOffersV3::AffiliateBilling do
-  subject { HasOffersV3::AffiliateBilling }
+  subject { HasOffersV3::AffiliateBilling.new }
 
   let(:url) { api_url 'AffiliateBilling' }
 

data/spec/lib/affiliate_offer_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe HasOffersV3::AffiliateOffer do
-  subject { HasOffersV3::AffiliateOffer }
+  subject { HasOffersV3::AffiliateOffer.new }
 
   let(:url)  { api_url 'Affiliate_Offer' }
 

data/spec/lib/affiliate_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe HasOffersV3::Affiliate do
-  subject { HasOffersV3::Affiliate }
+  subject { HasOffersV3::Affiliate.new }
 
   let(:url)  { api_url 'Affiliate' }
 

data/spec/lib/conversion_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe HasOffersV3::Conversion do
-  subject { HasOffersV3::Conversion }
+  subject { HasOffersV3::Conversion.new }
 
   let(:url)  { Regexp.new api_url('Conversion') }
 
@@ -35,19 +35,14 @@ describe HasOffersV3::Conversion do
 
   describe '.findAll' do
     it 'should make a proper request call' do
-      response = subject.findAll
+      response = subject.find_all
       expect(a_request(:get, url).with(query: hash_including({'Method' => 'findAll'}))).to have_been_made
       validate_call response
     end
 
-    it 'should show a deprecation warning' do
-      expect(subject).to receive(:deprecation).with('findAll', 'find_all')
-      subject.findAll
-    end
-
     it 'should call find_all method' do
       expect(subject).to receive(:find_all).with({test: 1})
-      subject.findAll test: 1
+      subject.find_all test: 1
     end
   end
 end

data/spec/lib/employee_spec.rb

@@ -0,0 +1,47 @@
+require 'spec_helper'
+
+describe HasOffersV3::Employee do
+  subject { HasOffersV3::Employee.new }
+
+  let(:url)  { api_url 'Employee' }
+
+  before(:each) do |example|
+    stub_call unless example.metadata[:no_stub]
+  end
+
+  describe '.find_all' do
+    it 'should make a proper request call' do
+      response = subject.find_all
+      expect(a_request(:post, url).with(body: hash_including({'Method' => 'findAll'}))).to have_been_made
+      validate_call response
+    end
+  end
+
+  describe '.find_all_by_ids' do
+    it 'should make a proper request call' do
+      response = subject.find_all_by_ids ids: [1]
+      expect(a_request(:post, url).with(body: hash_including({'Method' => 'findAllByIds'}))).to have_been_made
+      validate_call response
+    end
+
+    context 'when there is no id' do
+      it 'should raise exception' do
+        expect { subject.find_all_by_ids }.to raise_error ArgumentError
+      end
+    end
+  end
+
+  describe '.find_by_id' do
+    it 'should make a proper request call' do
+      response = subject.find_by_id id: 1
+      expect(a_request(:post, url).with(body: hash_including({'Method' => 'findById', 'id' => '1'}))).to have_been_made
+      validate_call response
+    end
+
+    context 'when there is no id' do
+      it 'should raise exception' do
+        expect { subject.find_by_id }.to raise_error ArgumentError
+      end
+    end
+  end
+end

data/spec/lib/hasoffersv3_spec.rb

@@ -14,6 +14,12 @@ describe HasOffersV3 do
       subject = HasOffersV3.new
       expect(subject.configuration).to_not eq(HasOffersV3.configuration)
     end
+
+    it 'should use params instead of default' do
+      subject = HasOffersV3.new(host: 'example.com')
+      expect(subject.configuration.host).to eq('example.com')
+      expect(subject.configuration.host).to_not eq(HasOffersV3::Configuration::DEFAULTS[:host])
+    end
   end
 
   context 'api' do
@@ -21,7 +27,9 @@ describe HasOffersV3 do
 
     describe '#offers' do
       it 'should get offers for current connection' do
-        expect(HasOffersV3::Offer).to receive(:find_all)
+        offer = double('HasOffersV3::Offer')
+        expect(HasOffersV3::Offer).to receive(:new).and_return(offer)
+        expect(offer).to receive(:find_all)
         subject.offers.find_all
       end
     end

data/spec/lib/offer_pixel_spec.rb

@@ -0,0 +1,76 @@
+require 'spec_helper'
+
+describe HasOffersV3::OfferPixel do
+  subject { HasOffersV3::OfferPixel.new }
+
+  let(:url) { api_url 'OfferPixel' }
+
+  describe '.find_all' do
+    it 'should make a proper request call' do
+      stub_call
+      response = subject.find_all
+      expect(a_request(:post, url).with(body: hash_including({'Method' => 'findAll'}))).to have_been_made
+      validate_call response
+    end
+
+    it 'should contain filters by type and modified' do
+      stub_call
+      response = subject.find_all(filters: {type: 'url', modified: {'GREATER_THAN' => '2015-01-01+00:00'}})
+      expect(a_request(:post, url).with(body: hash_including({'Method' => 'findAll', filters: { type: 'url', modified: {'GREATER_THAN' => '2015-01-01+00:00'} }}))).to have_been_made
+      validate_call response
+    end
+
+    it 'should sort by modified' do
+      stub_call
+      response = subject.find_all(sort: {modified: 'asc'})
+      expect(a_request(:post, url).with(body: hash_including({'Method' => 'findAll', sort: {modified: 'asc'}}))).to have_been_made
+      validate_call response
+    end
+  end
+
+  describe '.find_all_by_ids' do
+    it 'should make a proper request call' do
+      stub_call
+      response = subject.find_all_by_ids ids: [1]
+      expect(a_request(:post, url).with(body: hash_including({'Method' => 'findAllByIds'}))).to have_been_made
+      validate_call response
+    end
+
+    context 'when there is no id' do
+      it 'should raise exception' do
+        expect { subject.find_all_by_ids }.to raise_error ArgumentError
+      end
+    end
+  end
+
+  describe '.find_by_id' do
+    it 'should make a proper request call' do
+      stub_call
+      response = subject.find_by_id id: [1]
+      expect(a_request(:post, url).with(body: hash_including({'Method' => 'findById'}))).to have_been_made
+      validate_call response
+    end
+
+    context 'when there is no id' do
+      it 'should raise exception' do
+        expect { subject.find_by_id }.to raise_error ArgumentError
+      end
+    end
+  end
+
+  describe '.get_allowed_types' do
+    it 'should make a proper request call' do
+      stub_call
+      response = subject.get_allowed_types offer_id: [1]
+      expect(a_request(:post, url).with(body: hash_including({'Method' => 'getAllowedTypes'}))).to have_been_made
+      validate_call response
+    end
+
+    context 'when there is no offer_id' do
+      it 'should raise exception' do
+        expect { subject.get_allowed_types }.to raise_error ArgumentError
+      end
+    end
+  end
+
+end

data/spec/lib/offer_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe HasOffersV3::Offer do
-  subject { HasOffersV3::Offer }
+  subject { HasOffersV3::Offer.new }
 
   let(:url)  { api_url 'Offer' }
 

data/spec/lib/raw_log_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe HasOffersV3::RawLog do
-  subject { HasOffersV3::RawLog }
+  subject { HasOffersV3::RawLog.new }
 
   let(:url)  { Regexp.new api_url('RawLog') }
 

data/spec/lib/report_spec.rb

@@ -1,7 +1,7 @@
 require 'spec_helper'
 
 describe HasOffersV3::Report do
-  subject { HasOffersV3::Report }
+  subject { HasOffersV3::Report.new }
   let(:url)  { api_url 'Report' }
 
   describe '.get_conversions' do
@@ -18,19 +18,14 @@ describe HasOffersV3::Report do
     before(:each) { stub_call }
 
     it 'should make a proper request call' do
-      response = subject.getConversions
+      response = subject.get_conversions
       expect(a_request(:post, url).with(body: hash_including({'Method' => 'getConversions'}))).to have_been_made
       validate_call response
     end
 
-    it 'should show a deprecation warning' do
-      expect(subject).to receive(:deprecation).with('getConversions', 'get_conversions')
-      subject.getConversions
-    end
-
     it 'should call find_all method' do
       expect(subject).to receive(:get_conversions).with({test: 1})
-      subject.getConversions test: 1
+      subject.get_conversions test: 1
     end
   end
 
@@ -52,19 +47,14 @@ describe HasOffersV3::Report do
     before(:each) { stub_call :get }
 
     it 'should make a proper request call' do
-      response = subject.getModSummaryLogs
+      response = subject.get_mod_summary_logs
       expect(a_request(:get, url).with(query: hash_including({'Method' => 'getModSummaryLogs'}))).to have_been_made
       validate_call response
     end
 
-    it 'should show a deprecation warning' do
-      expect(subject).to receive(:deprecation).with('getModSummaryLogs', 'get_mod_summary_logs')
-      subject.getModSummaryLogs
-    end
-
     it 'should call find_all method' do
       expect(subject).to receive(:get_mod_summary_logs).with({test: 1})
-      subject.getModSummaryLogs test: 1
+      subject.get_mod_summary_logs test: 1
     end
 
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: hasoffersv3
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.4.0
 platform: ruby
 authors:
 - Maximilian Seifert
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-31 00:00:00.000000000 Z
+date: 2016-01-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -91,7 +91,6 @@ extra_rdoc_files: []
 files:
 - ".gitignore"
 - ".rspec"
-- ".ruby-gemset"
 - ".ruby-version"
 - ".travis.yml"
 - CHANGELOG.md
@@ -101,7 +100,6 @@ files:
 - Rakefile
 - hasoffersv3.gemspec
 - lib/hasoffersv3.rb
-- lib/hasoffersv3/adapter.rb
 - lib/hasoffersv3/advertiser.rb
 - lib/hasoffersv3/advertiser_billing.rb
 - lib/hasoffersv3/advertiser_user.rb
@@ -113,13 +111,14 @@ files:
 - lib/hasoffersv3/client.rb
 - lib/hasoffersv3/configuration.rb
 - lib/hasoffersv3/conversion.rb
+- lib/hasoffersv3/employee.rb
 - lib/hasoffersv3/offer.rb
+- lib/hasoffersv3/offer_pixel.rb
 - lib/hasoffersv3/raw_log.rb
 - lib/hasoffersv3/report.rb
 - lib/hasoffersv3/response.rb
 - lib/hasoffersv3/testing.rb
 - lib/hasoffersv3/version.rb
-- spec/lib/adapter_spec.rb
 - spec/lib/advertiser_billing_spec.rb
 - spec/lib/advertiser_spec.rb
 - spec/lib/advertiser_user_spec.rb
@@ -130,7 +129,9 @@ files:
 - spec/lib/base_spec.rb
 - spec/lib/client_spec.rb
 - spec/lib/conversion_spec.rb
+- spec/lib/employee_spec.rb
 - spec/lib/hasoffersv3_spec.rb
+- spec/lib/offer_pixel_spec.rb
 - spec/lib/offer_spec.rb
 - spec/lib/raw_log_spec.rb
 - spec/lib/report_spec.rb
@@ -160,7 +161,6 @@ signing_key:
 specification_version: 4
 summary: REST Client for the HasOffers API, version 3.
 test_files:
-- spec/lib/adapter_spec.rb
 - spec/lib/advertiser_billing_spec.rb
 - spec/lib/advertiser_spec.rb
 - spec/lib/advertiser_user_spec.rb
@@ -171,9 +171,10 @@ test_files:
 - spec/lib/base_spec.rb
 - spec/lib/client_spec.rb
 - spec/lib/conversion_spec.rb
+- spec/lib/employee_spec.rb
 - spec/lib/hasoffersv3_spec.rb
+- spec/lib/offer_pixel_spec.rb
 - spec/lib/offer_spec.rb
 - spec/lib/raw_log_spec.rb
 - spec/lib/report_spec.rb
 - spec/spec_helper.rb
-has_rdoc: