ad_leads 0.1.6.1 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ce9d2997804b510871ae6df0ce9352acfa0e9248
-  data.tar.gz: 6e89fd30d81d604c877599b7d0125776e2e3fcb7
+  metadata.gz: 3d7000e942209e9c92354564fa68b260925f8c71
+  data.tar.gz: de28f9996e6ca7383f136852e9a8a5e36f706321
 SHA512:
-  metadata.gz: 2311c0f3356752b816a3a62e18bd2289d82b54732a2849f088cf3abd842b4cc758819162fd382449204929dd1931fb38276b0cdb6a52aa35f80ffdc1d680cd5c
-  data.tar.gz: 0950717a79e8af61fb04d980d03cd548f7a121cd5e492c4e7db9c1673cde4f55c8799f93a059476353b9fb6a1cc6737ca0ae497e100e98546d790fad2f47100a
+  metadata.gz: 77692bf8a3ded98d7d13ee154359d6dfaf7157738e988cc669de2f8912e99fa64eaa132c6f435219280c8afb235b8931f45f14cdf7523cdd18590095f1d4a7f8
+  data.tar.gz: 84af060967a19a460f53bfb5d2df70cfeb078cb28ee9132c1dc97a21073fa8e51a01a6bdaa36abe2fd51f4875e45d781207137ff782dfcd9d6ff5907ab7919d7

data/lib/ad_leads/ad.rb

@@ -1,19 +1,9 @@
-class AdLeads::Ad < AdLeads::Base
-  # params = {
-  #         'type' => 'Mobile',
-  #         'name' =>  'test mobile ad',
-  #         'headerText' => 'get your ad on this phone today',
-  #         'bodyText' => 'this is mobile ad body copy'
-  #       }
-
-  attr_accessor :creative_group_id
-
-  def initialize(creative_group_id)
-    @creative_group_id = creative_group_id
+module AdLeads
+  class Client
+    module Ad
+      def create_ad(creative_group_id, options)
+        post "/creativegroups/#{creative_group_id}/creatives", options
+      end
+    end
   end
-
-  def root_path
-    "/creativegroups/#{creative_group_id}/creatives"
-  end
-
 end

data/lib/ad_leads/campaign.rb

@@ -1,43 +1,58 @@
-class AdLeads::Campaign < AdLeads::Base
-  include AdLeads::Etag
-
-  # params = {
-  #   'name' => 'test',
-  #   'verticals' =>  82,
-  #   'offerIncentiveCategory' => 5,
-  #   'collectedFields' => 'firstname,lastname,email,companyname',
-  #   'budget' => 50,
-  #   'creativeGroups' => creative_group.id
-  # }
-
-  def update!(params)
-    client.post(campaign_path, params)
-  end
-
-  def verify!
-    client.get(verify_campaign_path)
-  end
-
-  def launch!
-    with_etag do
-      client.post(launch_campaign_path, etag: etag)
+module AdLeads
+  class Client
+    module Campaign
+      def create_campaign(creative_id, options)
+        post '/campaigns', options.merge(creativeGroups: creative_id)
+      end
+
+      def create_complete_campaign(options)
+        create_creative_group(options[:creative_group])
+        creative_id = self.last_response_id
+
+        create_ad(creative_id, options[:ad])
+        ad_id = self.last_response_id
+
+        create_image(creative_id, ad_id, options[:image])
+        image_id = self.last_response_id
+        upload_image(creative_id, ad_id, image_id, options[:file])
+
+        create_campaign(creative_id, options[:campaign])
+      end
+
+      def update_campaign(id, options)
+        post campaign_path(id), options
+      end
+
+      def verify_campaign(id)
+        get verify_campaign_path(id)
+      end
+
+      def launch_campaign(id)
+        remaining_tries ||= 3
+        post launch_campaign_path(id), etag: campaign_etag(id).headers['Etag']
+      rescue AdLeads::EtagMismatchError
+        remaining_tries -= 1
+        retry unless remaining_tries.zero?
+      end
+
+      private
+
+      def campaign_path(id)
+        "/campaigns/#{id}"
+      end
+      alias :campaign_etag_path :campaign_path
+
+      def launch_campaign_path(id)
+        campaign_path(id) + '/launch'
+      end
+
+      def verify_campaign_path(id)
+        campaign_path(id) + '/plan'
+      end
+
+      def campaign_etag(id)
+        get campaign_etag_path(id)
+      end
     end
   end
-
-  def campaign_path
-    root_path + "/#{id}"
-  end
-  alias :etag_path :campaign_path
-
-  def launch_campaign_path
-    campaign_path + '/launch'
-  end
-
-  def root_path
-    '/campaigns'
-  end
-
-  def verify_campaign_path
-    campaign_path + '/plan'
-  end
 end

data/lib/ad_leads/client.rb

@@ -1,10 +1,12 @@
-require 'faraday'
-require 'json'
-require 'logger'
-
-module  AdLeads
+module AdLeads
   class Client
+    include AdLeads::Client::CreativeGroup
+    include AdLeads::Client::Ad
+    include AdLeads::Client::Image
+    include AdLeads::Client::Campaign
+
     attr_accessor *Configuration::VALID_CONFIG_KEYS
+    attr_reader :last_response
 
     def initialize(options={})
       merged_options = AdLeads.options.merge(options)
@@ -40,6 +42,10 @@ module  AdLeads
       request(:post, path, params)
     end
 
+    def last_response_id
+      JSON.parse(last_response.body)['data'].first
+    end
+
     private
 
     def etag_opts(etag)
@@ -87,14 +93,14 @@ module  AdLeads
       case response.status
       when 400 then raise ArgError.new response.body
       when 401 then raise AuthError.new "token: #{token}" + response.body.to_s
+      when 412 then raise EtagMismatchError.new response.body
       when 500 then raise ApiServerError.new response.body
       else
-        response
+        @last_response = response
       end
       # rescue Faraday::Error::TimeoutError, Timeout::Error => error
       # rescue Faraday::Error::ClientError, JSON::ParserError => error
     end
-
   end
 
   class ApiError < StandardError
@@ -106,4 +112,5 @@ module  AdLeads
   class AuthError < ApiError; end
   class ApiServerError < ApiError; end
   class ArgError < ApiError; end
+  class EtagMismatchError < ApiError; end
 end

data/lib/ad_leads/creative_group.rb

@@ -1,13 +1,9 @@
-class AdLeads::CreativeGroup < AdLeads::Base
-
-  # params = {
-  #   'name' => 'test creative group',
-  #   'productName' =>  'test product',
-  #   'privacyPolicyUrl' => 'http://privacy_url'
-  # }
-
-  def root_path
-    '/creativegroups'
+module AdLeads
+  class Client
+    module CreativeGroup
+      def create_creative_group(options)
+        post '/creativegroups', options
+      end
+    end
   end
-
 end

data/lib/ad_leads/image.rb

@@ -1,48 +1,38 @@
-class AdLeads::Image < AdLeads::Base
-  include AdLeads::Etag
-  attr_accessor :creative_group_id, :ad_id
+module AdLeads
+  class Client
+    module Image
+      def create_image(creative_group_id, ad_id, options)
+        post image_root_path(creative_group_id, ad_id), options
+      end
 
-  def initialize(opts)
-    @creative_group_id = opts[:creative_group_id]
-    @ad_id = opts[:ad_id]
-  end
+      def upload_image(creative_group_id, ad_id, image_id, file)
+        remaining_tries ||= 3
+        post image_upload_path(creative_group_id, ad_id, image_id), image_upload_opts(creative_group_id, ad_id, image_id, file)
+      rescue AdLeads::EtagMismatchError
+        remaining_tries -= 1
+        retry unless remaining_tries.zero?
+      end
 
-  def ids
-    { group: creative_group_id, creative: ad_id }
-  end
+      private
 
-  def upload!(file)
-    with_etag do
-      client.post(image_upload_path, image_upload_params(file))
-    end
-  end
+      def image_root_path(creative_group_id, ad_id)
+        "/creativegroups/#{creative_group_id}/creatives/#{ad_id}/images"
+      end
 
-  def image_upload_params(file)
-    {
-      file: Faraday::UploadIO.new(file, 'image/jpeg'),
-      etag: etag
-    }
-  end
+      def image_upload_path(creative_group_id, ad_id, image_id)
+        "/creativegroups/#{creative_group_id}/creatives/#{ad_id}/images/#{image_id}/file"
+      end
 
-  def image_upload_path
-    [
-      root_path,
-      id,
-      'file'
-    ].join('/')
-  end
-
-  def etag_path
-    root_path + "/#{id}"
-  end
+      def image_upload_opts(creative_group_id, ad_id, image_id, file)
+        {
+          file: Faraday::UploadIO.new(file, 'image/jpeg'),
+          etag: image_etag(creative_group_id, ad_id, image_id).headers['Etag']
+        }
+      end
 
-  def root_path
-    [
-      '/creativegroups',
-      creative_group_id,
-      'creatives',
-      ad_id,
-      'images'
-    ].join('/')
+      def image_etag(creative_group_id, ad_id, image_id)
+        get "/creativegroups/#{creative_group_id}/creatives/#{ad_id}/images/#{image_id}"
+      end
+    end
   end
 end

data/lib/ad_leads/promotion.rb

@@ -1,4 +1,4 @@
-module  AdLeads
+module AdLeads
   class Promotion
     def self.promotion_params(deal)
       {

data/lib/ad_leads/token.rb

@@ -1,5 +1,4 @@
-module  AdLeads
-
+module AdLeads
   class Token
     attr_accessor *Configuration::VALID_CONFIG_KEYS
 

data/lib/ad_leads/version.rb

@@ -1,3 +1,3 @@
 module AdLeads
-  VERSION = "0.1.6.1"
+  VERSION = "0.1.7"
 end

data/lib/ad_leads.rb

@@ -1,14 +1,16 @@
 require 'jwt'
+require 'faraday'
+require 'json'
+require 'logger'
+
 require 'ad_leads/version'
 require 'ad_leads/configuration'
-require 'ad_leads/client'
 require 'ad_leads/token'
-require 'ad_leads/base'
-require 'ad_leads/etag'
+require 'ad_leads/creative_group'
+require 'ad_leads/ad'
 require 'ad_leads/image'
 require 'ad_leads/campaign'
-require 'ad_leads/ad'
-require 'ad_leads/creative_group'
+require 'ad_leads/client'
 
 module AdLeads
   extend Configuration

data/spec/ad_leads/ad_spec.rb

@@ -1,24 +1,13 @@
 require 'spec_helper'
 
-describe AdLeads::Ad do
-  let(:ad) { AdLeads::Ad.new(1) }
-  let(:client) { ad.client }
-  let(:params) { {} }
-
-  it 'inherits from AdLeads::Base' do
-    expect(ad.class.ancestors).to include AdLeads::Base
-  end
-
-  describe '#create!' do
-    it 'posts to Ad Leads ad endpoint for creatives' do
-      expect(client).to receive(:post).with('/creativegroups/1/creatives', params)
-      ad.create!(params)
-    end
-
-    it 'assigns #response' do
-      client.stub(:post) { 'Foobar' }
-      ad.create!(params)
-      expect(ad.response).to eq 'Foobar'
+describe AdLeads::Client::Ad do
+  let(:client) { AdLeads::Client.new }
+  let(:options) { {} }
+
+  describe '#create_ad' do
+    it 'creates an ad' do
+      expect(client).to receive(:post).with('/creativegroups/1/creatives', options)
+      client.create_ad(1, options)
     end
   end
 

data/spec/ad_leads/campaign_spec.rb

@@ -1,69 +1,78 @@
 require 'spec_helper'
 
-describe AdLeads::Campaign do
-  let(:campaign) { AdLeads::Campaign.new() }
-  let(:client) { campaign.client }
-  let(:params) { {} }
+describe AdLeads::Client::Campaign do
+  let(:client) { AdLeads::Client.new }
+  let(:options) { {} }
   let(:http_success) { double(:http_success, status: 200) }
 
-  it 'inherits from AdLeads::Base' do
-    expect(campaign.class.ancestors).to include AdLeads::Base
-  end
+  describe '#create_complete_campaign' do
+    let(:creative_opts) { {} }
+    let(:ad_opts) { {} }
+    let(:image_opts) { {} }
+    let(:file) { './spec/fixtures/test.jpg' }
+    let(:campaign_opts) { {} }
+    let(:complete_campaign_opts) {{
+      creative_group: creative_opts,
+      ad: ad_opts,
+      image: image_opts,
+      file: file,
+      campaign: campaign_opts
+    }}
 
-  describe '#create!' do
-    it 'posts to AdLeads::Campaign#root_path' do
-      expect(client).to receive(:post).with('/campaigns', params)
-      campaign.create!(params)
-    end
+    it 'creates a creative group, ad, image, and campaign' do
+      client.stub(:last_response_id) { 1 }
 
-    it 'assigns #response' do
-      client.stub(:post) { 'Foobar' }
-      campaign.create!(params)
-      expect(campaign.response).to eq 'Foobar'
+      expect(client).to receive(:create_creative_group).with(creative_opts)
+      expect(client).to receive(:create_ad).with(1, ad_opts)
+      expect(client).to receive(:create_image).with(1, 1, image_opts)
+      expect(client).to receive(:upload_image).with(1, 1, 1, file)
+      expect(client).to receive(:create_campaign).with(1, campaign_opts)
+      client.create_complete_campaign(complete_campaign_opts)
     end
   end
 
-  describe '#update!' do
-    before { campaign.instance_variable_set(:@id, 1) }
-
-    it 'posts to AdLeads::Campaign#campaign_path' do
-      expect(client).to receive(:post).with('/campaigns/1', params)
-      campaign.update!(params)
+  describe '#create_campaign' do
+    it 'creates a campaign' do
+      expect(client).to receive(:post).with('/campaigns', {creativeGroups: 1})
+      client.create_campaign(1, options)
     end
   end
 
-  describe '#verify!' do
-    before { campaign.instance_variable_set(:@id, 1) }
-
-    it 'sends a GET request to AdLeads::Campaign#verify_campaign_path' do
-      expect(client).to receive(:get).with('/campaigns/1/plan')
-      campaign.verify!
+  describe '#update_campaign' do
+    it 'updates the respective campaign' do
+      expect(client).to receive(:post).with('/campaigns/1', options)
+      client.update_campaign(1, options)
     end
   end
 
-  describe '#launch!' do
-    before do
-      campaign.stub(:id) { 1 }
-      campaign.stub(:etag) { 'Fake etag' }
+  describe '#verify_campaign' do
+    it 'verifies the respective campaign' do
+      expect(client).to receive(:get).with('/campaigns/1/plan')
+      client.verify_campaign(1)
     end
+  end
 
-    it 'posts to AdLeads::Campaign#launch_campaign_path' do
-      expect(client).to receive(:post).with('/campaigns/1/launch', { etag: 'Fake etag'}).and_return(http_success)
-      campaign.launch!
+  describe '#launch_campaign' do
+    it 'launches a campaign' do
+      etag_response = double :response, headers: { 'Etag' => 1 }
+      client.stub(:campaign_etag) { etag_response }
+      expect(client).to receive(:post).with('/campaigns/1/launch', {etag: 1} )
+      client.launch_campaign(1)
     end
 
-    it 'uses #with_etag block' do
-      client.stub(:post)
-      expect(campaign).to receive(:with_etag)
-      campaign.launch!
+    it 'gets etag' do
+      expect(client).to receive(:get).with('/campaigns/1')
+      client.send(:campaign_etag, 1)
     end
-  end
-
-  describe '#etag_path' do
-    before { campaign.instance_variable_set(:@id, 1) }
 
-    it 'is an alias for #campaign_path' do
-      expect(campaign.etag_path).to eq campaign.campaign_path
+    context 'with EtagMismatchError' do
+      it 'retries launch a maximum of three times' do
+        etag_response = double :response, headers: { 'Etag' => 1 }
+        client.stub(:campaign_etag) { etag_response }
+        client.stub(:post) { raise AdLeads::EtagMismatchError.new 'Error' }
+        expect(client).to receive(:post).exactly(3).times
+        client.launch_campaign(1)
+      end
     end
   end
 end

data/spec/ad_leads/client_spec.rb

@@ -10,6 +10,8 @@ describe AdLeads::Client do
 
   before { client.stub(:token) { token } }
 
+  it { should respond_to(:last_response) }
+
   describe '#connection' do
     let(:config_keys) { AdLeads::Configuration::VALID_CONFIG_KEYS }
 
@@ -29,6 +31,23 @@ describe AdLeads::Client do
       connection.stub(:post) { response }
     end
 
+    context 'status: 200' do
+      let(:status) { 200 }
+      it 'sets @last_response' do
+        client.post('foo')
+        expect(client.instance_variable_get(:@last_response)).to eq response
+      end
+    end
+
+    context 'status: 412' do
+      let(:status) { 412 }
+      it 'raises AdLeads::EtagMismatchError' do
+        expect {
+          client.post('foo')
+        }.to raise_error AdLeads::EtagMismatchError
+      end
+    end
+
     context 'status: 500' do
       let(:status) { 500 }
       it 'raises AdLeads::ApiError' do
@@ -46,4 +65,13 @@ describe AdLeads::Client do
       end
     end
   end
+
+  describe '#last_response_id' do
+    let(:last_response) { double :response, body: {'data' => [88]}.to_json }
+
+    it 'retrieves id from @last_response' do
+      client.stub(:last_response) { last_response }
+      expect(client.last_response_id).to eq 88
+    end
+  end
 end

data/spec/ad_leads/creative_group_spec.rb

@@ -1,24 +1,13 @@
 require 'spec_helper'
 
-describe AdLeads::CreativeGroup do
-  let(:creative_group) { AdLeads::CreativeGroup.new }
-  let(:client) { creative_group.client }
-  let(:params) {{}}
-
-  it 'inherits from AdLeads::Base' do
-    expect(creative_group.class.ancestors).to include AdLeads::Base
-  end
-
-  describe '#create!' do
-    it 'posts to /creativegroups path' do
-      expect(client).to receive(:post).with('/creativegroups', params)
-      creative_group.create!(params)
-    end
-
-    it 'assigns #response' do
-      client.stub(:post) { 'Foobar' }
-      creative_group.create!(params)
-      expect(creative_group.response).to eq 'Foobar'
+describe AdLeads::Client::CreativeGroup do
+  let(:client) { AdLeads::Client.new }
+  let(:options) {{}}
+
+  describe '#create_creative_group' do
+    it 'creates a creative group' do
+      expect(client).to receive(:post).with('/creativegroups', options)
+      client.create_creative_group(options)
     end
   end
 

data/spec/ad_leads/image_spec.rb

@@ -1,70 +1,39 @@
 require 'spec_helper'
 
-# TODO: Extract Etag specs!
+describe AdLeads::Client::Image do
+  let(:client) { AdLeads::Client.new }
+  let(:options) { {} }
+  let(:file) { './spec/fixtures/test.jpg' }
 
-describe AdLeads::Image do
-  let(:image) { AdLeads::Image.new( {creative_group_id: 1, ad_id: 1} ) }
-  let(:client) { image.client }
-  let(:params) { {} }
-  let(:success) { double(:http_response, status: 200) }
-  let(:etag_mismatch) { double(:http_response, status: 412) }
-  let(:new_etag) { double(:http_response, status: 200, headers: { 'Etag' => '123'} ) }
-
-  it 'inherits from AdLeads::Base' do
-    expect(image.class.ancestors).to include AdLeads::Base
-  end
-
-  describe '#create!' do
-    it 'posts to AdLeads::Image endpoint' do
-      expect(client).to receive(:post).with('/creativegroups/1/creatives/1/images', params)
-      image.create!(params)
-    end
-
-    it 'assigns #response' do
-      client.stub(:post) { 'Foobar' }
-      image.create!(params)
-      expect(image.response).to eq 'Foobar'
-    end
-  end
-
-  describe '#refresh_etag' do
-    before { image.stub(:etag_path) { '/foo' } }
-    it 'sets @etag from response headers' do
-      expect(client).to receive(:get).with('/foo').and_return(new_etag)
-      image.refresh_etag!
-      expect(image.etag).to eq '123'
+  describe '#create_image' do
+    it 'creates an image' do
+      expect(client).to receive(:post).
+        with('/creativegroups/1/creatives/1/images', options)
+      client.create_image(1, 1, options)
     end
   end
 
-  describe '#upload!' do
-    let(:file) { './spec/fixtures/test.jpg' }
-    before do
-      image.stub(:etag) { 'Fake etag' }
-      image.stub(:id) { 1 }
-    end
-
-    it 'posts to AdLeads::Image#image_upload_path' do
-      image.stub(:image_upload_params) {{}}
+  describe '#upload_image' do
+    it 'uploads an image' do
+      client.stub(:image_upload_opts) { {} }
       expect(client).to receive(:post).
-        with('/creativegroups/1/creatives/1/images/1/file', params).
-        and_return(success)
-      image.upload!(file)
+        with('/creativegroups/1/creatives/1/images/1/file', options)
+      client.upload_image(1, 1, 1, file)
     end
 
-    context 'with Etag mismatch' do
-      it 'retries post' do
-        expect(client).to receive(:post).once.and_return(etag_mismatch)
-        expect(image).to receive(:refresh_etag!).and_return(1)
-        expect(client).to receive(:post).once.and_return(success)
-        image.upload!(file)
-      end
+    it 'gets etag' do
+      etag_response = double :response, headers: { 'Etag' => 1 }
+      expect(client).to receive(:get).with('/creativegroups/1/creatives/1/images/1').
+        and_return(etag_response)
+      client.send(:image_upload_opts, 1, 1, 1, file)
+    end
 
-      it 'raises EtagMismatchError' do
-        client.stub(:post) { etag_mismatch }
-        client.stub(:get) { new_etag }
-        expect {
-          image.upload!(file)
-        }.to raise_error AdLeads::Etag::MismatchError
+    context 'with EtagMismatchError' do
+      it 'retries upload a maximum of three times' do
+        client.stub(:image_upload_opts) { {} }
+        client.stub(:post) { raise AdLeads::EtagMismatchError.new 'Error' }
+        expect(client).to receive(:post).exactly(3).times
+        client.upload_image(1, 1, 1, file)
       end
     end
   end

data/spec/ad_leads/network_requests_redux_spec.rb

@@ -1,10 +1,10 @@
 require 'spec_helper'
+require 'pry'
 
 describe AdLeads::Client do
   let!(:client) { AdLeads::Client.new }
   let(:connection) { client.connection }
-  let(:creative_group_id) { 12858 }
-  let(:token) { '99d3492c-f82e-40c1-ac12-95a3c3326edc' }
+  let(:token) { '55bd8390-9cd9-4b69-9966-1a10a9bc5591' }
   let(:file) { './spec/fixtures/test.jpg' }
 
   before do
@@ -16,47 +16,80 @@ describe AdLeads::Client do
     describe 'Ad Campaign' do
       xit 'uploads logo image, creates campaign using logo image, verifies and launches ad campaign' do
 
-        params = {
+        options = {
           'name' => 'Creative Group Name',
           'productName' =>  'amazing product',
           'privacyPolicyUrl' => 'http://privacy_url'
         }
 
-        creative_group = AdLeads::CreativeGroup.new
-        creative_group.create!(params)
+        client.create_creative_group(options)
+        creative_id = client.last_response_id
 
-        params = {
+        options = {
           'type' => 'Mobile',
           'name' =>  'Ad name',
           'headerText' => 'get your ad on this phone today',
           'bodyText' => 'this is mobile ad body copy'
         }
 
-        ad = AdLeads::Ad.new(creative_group.id)
-        ad.create!(params)
+        client.create_ad(creative_id, options)
+        ad_id = client.last_response_id
 
-        params = { 'type' => 'LogoImage' }
+        options = { 'type' => 'LogoImage' }
 
-        image = AdLeads::Image.new( { creative_group_id: creative_group.id, ad_id: ad.id } )
-        image.create!(params)
-        image.upload!(file)
+        client.create_image(creative_id, ad_id, options)
+        image_id = client.last_response_id
+        client.upload_image(creative_id, ad_id, image_id, file)
 
-        params = {
+        options = {
           'name' => 'Campaign name',
           'verticals' =>  82,
           'offerIncentiveCategory' => 5,
           'collectedFields' => 'firstname,lastname,email,companyname',
           'budget' => 50,
-          'creativeGroups' => creative_group.id
+          'creativeGroups' => creative_id
         }
 
-        campaign = AdLeads::Campaign.new
-        campaign.create!(params)
-        campaign.verify!
-        campaign.launch!
+        client.create_campaign(options)
+        campaign_id = client.last_response_id
 
-        expect(campaign.response.status).to eq(200)
-        expect(JSON.parse(campaign.response.body)['result']).to eq true
+        client.verify_campaign(campaign_id)
+        response = client.launch_campaign(campaign_id)
+
+        expect(response.status).to eq(200)
+        expect(JSON.parse(response.body)['result']).to eq true
+      end
+
+      xit 'creates complete campaign in one step, verifies and launches ad campaign' do
+        options = {
+          creative_group: {
+            'name' => 'Creative Group Name',
+            'productName' =>  'amazing product',
+            'privacyPolicyUrl' => 'http://privacy_url'
+          },
+          ad: {
+            'type' => 'Mobile',
+            'name' =>  'Ad name',
+            'headerText' => 'get your ad on this phone today',
+            'bodyText' => 'this is mobile ad body copy'
+          },
+          image: { 'type' => 'LogoImage' },
+          file: file,
+          campaign: {
+            'name' => 'Campaign name',
+            'verticals' =>  82,
+            'offerIncentiveCategory' => 5,
+            'collectedFields' => 'firstname,lastname,email,companyname',
+            'budget' => 50
+        }}
+
+        client.create_complete_campaign(options)
+        campaign_id = client.last_response_id
+        client.verify_campaign(campaign_id)
+        client.launch_campaign(campaign_id)
+
+        expect(client.last_response.status).to eq(200)
+        expect(JSON.parse(client.last_response.body)['result']).to eq true
       end
     end
   end

data/spec/spec_helper.rb

@@ -1,4 +1,8 @@
 require 'ad_leads'
 require 'rspec'
 
-
+RSpec.configure do |config|
+  config.before :each do
+    Logger.stub(:new) { double(:logger, error: nil) }
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ad_leads
 version: !ruby/object:Gem::Version
-  version: 0.1.6.1
+  version: 0.1.7
 platform: ruby
 authors:
 - Dinshaw
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-09 00:00:00.000000000 Z
+date: 2014-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -123,19 +123,16 @@ files:
 - ad_leads.gemspec
 - lib/ad_leads.rb
 - lib/ad_leads/ad.rb
-- lib/ad_leads/base.rb
 - lib/ad_leads/campaign.rb
 - lib/ad_leads/campaign_helpers.rb
 - lib/ad_leads/client.rb
 - lib/ad_leads/configuration.rb
 - lib/ad_leads/creative_group.rb
-- lib/ad_leads/etag.rb
 - lib/ad_leads/image.rb
 - lib/ad_leads/promotion.rb
 - lib/ad_leads/token.rb
 - lib/ad_leads/version.rb
 - spec/ad_leads/ad_spec.rb
-- spec/ad_leads/base_spec.rb
 - spec/ad_leads/campaign_spec.rb
 - spec/ad_leads/client_spec.rb
 - spec/ad_leads/configuration_spec.rb
@@ -173,7 +170,6 @@ specification_version: 4
 summary: Ruby Wrapper for AdLeads API
 test_files:
 - spec/ad_leads/ad_spec.rb
-- spec/ad_leads/base_spec.rb
 - spec/ad_leads/campaign_spec.rb
 - spec/ad_leads/client_spec.rb
 - spec/ad_leads/configuration_spec.rb

data/lib/ad_leads/base.rb

@@ -1,19 +0,0 @@
-class AdLeads::Base
-  attr_accessor :response
-
-  def create!(params)
-    self.response = client.post(root_path, params)
-  end
-
-  def client
-    @client ||= AdLeads::Client.new
-  end
-
-  def id
-    @id ||= JSON.parse(response.body)['data'].first
-  end
-
-  def status
-    response.status
-  end
-end

data/lib/ad_leads/etag.rb

@@ -1,30 +0,0 @@
-module AdLeads::Etag
-  def etag_path
-    # must be implemented in including class
-  end
-
-  def refresh_etag!
-    @etag = client.get(etag_path).headers['Etag']
-  end
-
-  def etag
-    @etag ||= refresh_etag!
-  end
-
-  def with_etag(count = 1, &block)
-    raise MismatchError if count > 3
-
-    response = yield
-    count += 1
-
-    if response.status == 412
-      self.refresh_etag!
-      with_etag(count) do
-        yield
-      end
-    end
-
-  end
-
-  class MismatchError < StandardError; end
-end

data/spec/ad_leads/base_spec.rb

@@ -1,20 +0,0 @@
-require 'spec_helper'
-
-describe AdLeads::Base do
-  let(:base) { AdLeads::Base.new() }
-
-  describe '#id' do
-    let(:response) { double(:response, body: '{ "data": [1] }') }
-    before { base.response = response }
-
-    it 'parses ID from JSON response body' do
-      expect(base.id).to eq 1
-    end
-  end
-
-  describe 'client' do
-    it 'returns an instance of AdLeads::Client' do
-      expect(base.client).to be_a AdLeads::Client
-    end
-  end
-end