adzerk 0.2 → 0.3

data/test/publisher_api_spec.rb

@@ -26,23 +26,23 @@ describe "Publisher API" do
     }
     publisher = @publishers.create(new_publisher)
     $publisher_id = publisher[:id]
-    publisher[:first_name].should eq('John' + @rand)
-    publisher[:last_name].should eq('Doe' + @rand)
-    publisher[:company_name].should eq('Company' + @rand)
-    publisher[:payment_option].should eq("1")
-    publisher[:paypal_email].should eq("johndoe+" + @rand + "@johndoe.com")
-    publisher[:address].should_not be_nil
+    expect(publisher[:first_name]).to eq('John' + @rand)
+    expect(publisher[:last_name]).to eq('Doe' + @rand)
+    expect(publisher[:company_name]).to eq('Company' + @rand)
+    expect(publisher[:payment_option]).to eq("1")
+    expect(publisher[:paypal_email]).to eq("johndoe+" + @rand + "@johndoe.com")
+    expect(publisher[:address]).not_to be_nil
     $address_id = publisher[:address][:id].to_s
   end
 
   it "should list a specific publisher" do
     publisher = @publishers.get($publisher_id)
-    publisher[:first_name].should eq('John' + @rand)
-    publisher[:last_name].should eq('Doe' + @rand)
-    publisher[:company_name].should eq('Company' + @rand)
-    publisher[:payment_option].should eq("PayPal")
-    publisher[:paypal_email].should eq("johndoe+" + @rand + "@johndoe.com")
-    publisher[:address].should_not be_nil
+    expect(publisher[:first_name]).to eq('John' + @rand)
+    expect(publisher[:last_name]).to eq('Doe' + @rand)
+    expect(publisher[:company_name]).to eq('Company' + @rand)
+    expect(publisher[:payment_option]).to eq("PayPal")
+    expect(publisher[:paypal_email]).to eq("johndoe+" + @rand + "@johndoe.com")
+    expect(publisher[:address]).not_to be_nil
    end
 
   it "should update a publisher" do
@@ -63,81 +63,19 @@ describe "Publisher API" do
      :paypal_email => "johndoe+" + @rand + "@johndoe.com"
     }
     publisher = @publishers.update(updated_publisher)
-    publisher[:first_name].should eq("Rafael" + @rand)
+    expect(publisher[:first_name]).to eq("Rafael" + @rand)
   end
 
   it "should list all publishers" do
     publishers = @publishers.list
 
     publisher = publishers[:items].last
-    publisher[:id].should eq($publisher_id)
+    expect(publisher[:id]).to eq($publisher_id)
   end
 
   it "should delete a new publisher" do
     response = @publishers.delete($publisher_id)
-    response.body.should == '"Successfully deleted"'
-  end
-
-  it "should retrieve publisher earnings" do
-    earnings = {
-      'Channel' => 'all'
-    }
-    #response = @@publisher.earnings earnings
-    #response.first.length.should == 12
-  end
-
-  it "should retrieve publisher earnings for previous month" do
-    earnings = {
-      'Channel' => 'all',
-      'Month' => 'previous'
-    }
-    #response = @@publisher.earnings earnings
-    #response.first.length.should == 12
-  end
-
-  it "should retrieve publisher earnings for individual channel" do
-    earnings = {
-      'Channel' => '1127'
-    }
-    #response = @@publisher.earnings earnings
-    #response.first.length.should == 12
-  end
-
-  it "should retrieve publisher payments for a network" do
-    payments = { }
-    response = @publishers.payments payments
-    #response.first.length.should == 5
-  end
-
-  it "should retrieve publisher payments for a network with start and end date" do
-    payments = { 
-      'StartDate' => '01/01/2000',
-      'EndDate' => '03/01/2000'
-    }
-    response = @publishers.payments payments
-    response.first.should == nil
-  end
-
-  it "should retrieve publisher payments for a network with only start date" do
-    payments = { 
-      'StartDate' => '01/01/2012'
-    }
-    response = @publishers.payments payments
-    #response.first.length.should == 5
-  end
-
-  it "should retrieve publisher payments for a site" do
-    payments = { 
-      #'SiteId' => 6872
-    }
-    response = @publishers.payments payments
-  end
-
-  it "should retrieve publisher payments for a publisher" do
-    payments = { 
-      #'PublisherAccountId' => 644
-    }
-    response = @publishers.payments payments
+    expect(response.body).to eq('"Successfully deleted"')
   end
 
 end

data/test/rakefile.rb

@@ -1,6 +1,7 @@
 require 'rubygems'
 require 'rake'
 @files = [
+  'adtype_api_spec.rb',
   'advertiser_api_spec.rb',
   'campaign_api_spec.rb',
   'channel_api_spec.rb',
@@ -14,7 +15,10 @@ require 'rake'
   #'report_api_spec.rb',
   'security_api_spec.rb',
   'site_api_spec.rb',
-  'zone_api_spec.rb'
+  'zone_api_spec.rb',
+  'site_zone_targeting_api_spec.rb',
+  'geo_targeting_api_spec.rb',
+  'category_api_spec.rb'
 ]
 
 task :runall do

data/test/report_api_spec.rb

@@ -17,8 +17,8 @@ describe "Report API" do
       :parameters => []
     }
     report = @reports.create_report(new_report)
-    report[:is_total].should eq(true)
-    report[:grouping].should eq(["month"])
+    expect(report[:is_total]).to eq(true)
+    expect(report[:grouping]).to eq(["month"])
   end
 
   it "should pull a saved custom report" do

data/test/security_api_spec.rb

@@ -7,7 +7,7 @@ describe "Channel API security" do
     uri = URI.parse(ENV['ADZERK_API_HOST'] + 'channel/')
     http = Net::HTTP.new(uri.host, uri.port)
     request = Net::HTTP::Get.new(uri.request_uri)
-    http.request(request).response.code.should_not == 200
+    expect(http.request(request).response.code).not_to eq(200)
   end
 
   it "should reject GET requests with null API keys" do
@@ -15,7 +15,7 @@ describe "Channel API security" do
     http = Net::HTTP.new(uri.host, uri.port)
     request = Net::HTTP::Get.new(uri.request_uri)
     request.add_field "X-Adzerk-ApiKey", ""
-    http.request(request).response.code.should_not == 200
+    expect(http.request(request).response.code).not_to eq(200)
   end
 
 end

data/test/site_api_spec.rb

@@ -15,17 +15,17 @@ describe "Site API" do
     }
     site = @client.sites.create(:title => $site_title, :url => @site_url)
     $site_id = site[:id].to_s
-    $site_title.should == site[:title]
-    @site_url.should == site[:url]
+    expect($site_title).to eq(site[:title])
+    expect(@site_url).to eq(site[:url])
     $site_pub_id = site[:publisher_account_id].to_s
   end
 
   it "should list a specific site" do
     site = @client.sites.get($site_id)
-    site[:id].should eq($site_id.to_i)
-    site[:title].should eq($site_title)
-    site[:url].should eq(@site_url)
-    site[:publisher_account_id].should eq($site_pub_id.to_i)
+    expect(site[:id]).to eq($site_id.to_i)
+    expect(site[:title]).to eq($site_title)
+    expect(site[:url]).to eq(@site_url)
+    expect(site[:publisher_account_id]).to eq($site_pub_id.to_i)
   end
 
   it "should update a site" do
@@ -34,29 +34,29 @@ describe "Site API" do
                                     :title => $site_title + "test",
                                     :url => @site_url + "test")
     $site_id = site[:id].to_s
-    ($site_title + "test").should == site[:title]
-    (@site_url + "test").should == site[:url]
+    expect($site_title + "test").to eq(site[:title])
+    expect(@site_url + "test").to eq(site[:url])
     $site_pub_id = site[:publisher_account_id].to_s
   end
 
   it "should list all sites" do
     result = @client.sites.list
-    result.length.should > 0
-    result[:items].last[:id].to_s.should == $site_id
-    result[:items].last[:title].should == $site_title + "test"
-    result[:items].last[:url].should == @site_url + "test"
-    result[:items].last[:publisher_account_id].to_s.should == $site_pub_id
+    expect(result.length).to be > 0
+    expect(result[:items].last[:id].to_s).to eq($site_id)
+    expect(result[:items].last[:title]).to eq($site_title + "test")
+    expect(result[:items].last[:url]).to eq(@site_url + "test")
+    expect(result[:items].last[:publisher_account_id].to_s).to eq($site_pub_id)
   end
 
   it "should delete a new site" do
     response = @client.sites.delete($site_id)
-    response.body.should == '"Successfully deleted."'
+    expect(response.body).to eq('"Successfully deleted."')
   end
 
   it "should not list deleted sites" do
     result = @client.sites.list
     result[:items].each do |site|
-      site[:id].to_s.should_not == $site_id
+      expect(site[:id].to_s).not_to eq($site_id)
     end
   end
 

data/test/site_zone_targeting_api_spec.rb

@@ -0,0 +1,134 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe "SiteZoneTargeting API" do
+
+
+  before(:all) do
+    new_advertiser = {
+      'Title' => "Test"
+    }
+    client = Adzerk::Client.new(API_KEY)
+    @flights= client.flights
+    @advertisers = client.advertisers
+    @channels = client.channels
+    @campaigns = client.campaigns
+    @priorities = client.priorities
+    @sitezonetargeting = client.sitezonetargetings
+    @sites = client.sites
+    @zones = client.zones
+    advertiser = @advertisers.create(:title => "test")
+    $advertiserId = advertiser[:id].to_s
+
+    channel = @channels.create(:title => 'Test Channel ' + rand(1000000).to_s,
+                               :commission => '0.0',
+                               :engine => 'CPM',
+                               :keywords => 'test',
+                               'CPM' => '10.00',
+                               :ad_types =>  [1,2,3,4])
+    $channel_id = channel[:id].to_s
+
+    priority = @priorities.create(:name => "High Priority Test",
+                                  :channel_id => $channel_id,
+                                  :weight => 1,
+                                  :is_deleted => false)
+    $priority_id = priority[:id].to_s
+
+    campaign = @campaigns.
+      create(:name => 'Test campaign ' + rand(1000000).to_s,
+             :start_date => "1/1/2011",
+             :end_date => "12/31/2011",
+             :is_active => false,
+             :price => '10.00',
+             :advertiser_id => $advertiserId,
+             :flights => [],
+             :is_deleted => false)
+    $campaign_id = campaign[:id]
+
+    new_flight = {
+      :no_end_date => false,
+      :priority_id => $priority_id,
+      :name => 'Test flight ' + rand(1000000).to_s,
+      :start_date => "1/1/2011",
+      :end_date => "12/31/2011",
+      :no_end_date => false,
+      :price => '15.00',
+      :option_type => 1,
+      :impressions => 10000,
+      :is_unlimited => false,
+      :is_full_speed => false,
+      :keywords => "test, test2",
+      :user_agent_keywords => nil,
+      :weight_override => nil,
+      :campaign_id => $campaign_id,
+      :is_active => true,
+      :is_deleted => false,
+      :goal_type => 1
+    }
+    flight = @flights.create(new_flight)
+    $flight_id = flight[:id].to_s
+
+    site_title = 'Test Site ' + rand(1000000).to_s
+    site = @sites.create(:title => site_title, :url => 'http://www.adzerk.com')
+    $site_id = site[:id].to_s
+
+    zone_name = 'Test Zone ' + rand(1000000).to_s
+    zone = @zones.create(:name => zone_name,
+                         :site_id => $site_id,
+                         :is_deleted => false)
+    $zone_id = zone[:id].to_s
+
+  end
+
+  it "should create a sitezone targeting" do
+    $sitezone_SiteId = $site_id;
+    $sitezone_ZoneId = $zone_id;
+    $sitezone_IsExclude = true;
+
+    new_sitezone = {
+      :site_id => $sitezone_SiteId,
+      :zone_id => $sitezone_ZoneId,
+      :is_exclude => true,
+    }
+ 
+    sitezone = @sitezonetargeting.create($flight_id, new_sitezone)
+    expect(sitezone[:site_id]).to eq($sitezone_SiteId.to_i)
+    expect(sitezone[:zone_id]).to eq($sitezone_ZoneId.to_i)
+    expect(sitezone[:is_exclude]).to eq(true)
+    $sitezone_id = sitezone[:id]
+
+  end
+
+  it "should retrieve a sitezone targeting" do
+    sitezone = @sitezonetargeting.get($flight_id,$sitezone_id)
+    expect(sitezone[:site_id]).to eq($sitezone_SiteId.to_i)
+    expect(sitezone[:zone_id]).to eq($sitezone_ZoneId.to_i)
+    expect(sitezone[:is_exclude]).to eq(true)
+  end
+
+  it "should update a sitezone targeting" do
+    data = {
+      :site_id => $sitezone_SiteId,
+      :zone_id => $sitezone_ZoneId,
+      :is_exclude => false,
+    }
+    sitezone = @sitezonetargeting.update($flight_id,$sitezone_id,data)
+    expect(sitezone[:is_exclude]).to eq(false)
+  end
+
+  it "should delete a sitezone targeting" do
+    sitezone = @sitezonetargeting.delete($flight_id,$sitezone_id)
+    expect(sitezone.body).to include("Successfully deleted")
+  end
+
+  it "should error when deleting a sitezone targeting that does not exist" do
+    expect{ geo = @sitezonetargeting.delete($flight_id,1) }.to raise_error
+  end
+
+  it "should check if a flight is not a part of your network" do
+    non_network_flight = 123;
+    expect{ @sitezonetargeting.delete(non_network_flight,1) }.to raise_error("Flight is not a part of your network")
+    expect{ @sitezonetargeting.get(non_network_flight,1) }.to raise_error("Flight is not a part of your network")
+    expect{ @sitezonetargeting.update(non_network_flight,1,{}) }.to raise_error("Flight is not a part of your network")
+  end
+
+end

data/test/spec_helper.rb

@@ -8,6 +8,6 @@ API_KEY = ENV['ADZERK_API_KEY'] || 'your_api_key'
 # $adzerk = Adzerk.new(API_KEY)
 
 RSpec.configure do |config|
-  config.color_enabled = true
+  config.color = true
 end
 

data/test/util_spec.rb

@@ -0,0 +1,17 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+
+describe Adzerk::Util do
+  describe "#camelize_data(data)" do
+    it "doesn't camelize keys when they are strings" do
+      data = {'No_CAMELcaseString' => 1234}
+      result = Adzerk::Util.camelize_data(data)
+      expect(result['No_CAMELcaseString']).to eql(1234)
+    end
+
+    it "camelizes keys when they are symbols" do
+      data = {:'No_CAMEL_case_Symbol' => 1234}
+      result = Adzerk::Util.camelize_data(data)
+      expect(result['NoCamelCaseSymbol']).to eql(1234)
+    end
+  end
+end

data/test/zone_api_spec.rb

@@ -21,17 +21,17 @@ describe "Zone API" do
                          :site_id => $site_id,
                          :is_deleted => false)
     $zone_id = zone[:id].to_s
-    zone[:name].should == $name
-    zone[:site_id].should == $site_id
-    zone[:is_deleted].should == false
+    expect(zone[:name]).to eq($name)
+    expect(zone[:site_id]).to eq($site_id)
+    expect(zone[:is_deleted]).to eq(false)
   end
 
   it "should list a specific zone" do
     zone = @zones.get($zone_id)
-    zone[:id].should eq($zone_id.to_i)
-    zone[:name].should eq($name)
-    zone[:site_id].should eq($site_id)
-    zone[:is_deleted].should eq(false)
+    expect(zone[:id]).to eq($zone_id.to_i)
+    expect(zone[:name]).to eq($name)
+    expect(zone[:site_id]).to eq($site_id)
+    expect(zone[:is_deleted]).to eq(false)
   end
 
   it "should update a zone" do
@@ -40,24 +40,24 @@ describe "Zone API" do
                              :name => $name,
                              :site_id => $site_id,
                              :is_deleted => false)
-    zone[:id].should eq($zone_id.to_i)
-    zone[:name].should eq($name)
-    zone[:site_id].should eq($site_id)
-    zone[:is_deleted].should eq(false)
+    expect(zone[:id]).to eq($zone_id.to_i)
+    expect(zone[:name]).to eq($name)
+    expect(zone[:site_id]).to eq($site_id)
+    expect(zone[:is_deleted]).to eq(false)
   end
 
   it "should list all zones" do
     result = @zones.list
-    result.length.should > 0
-    result[:items].last[:id].to_s.should == $zone_id
-    result[:items].last[:name].should == $name
-    result[:items].last[:site_id].should == $site_id
-    result[:items].last[:is_deleted].should == false
+    expect(result.length).to be > 0
+    expect(result[:items].last[:id].to_s).to eq($zone_id)
+    expect(result[:items].last[:name]).to eq($name)
+    expect(result[:items].last[:site_id]).to eq($site_id)
+    expect(result[:items].last[:is_deleted]).to eq(false)
   end
 
   it "should delete a new zone" do
     response = @zones.delete($zone_id)
-    response.body.should == '"Successfully deleted"'
+    expect(response.body).to eq('"Successfully deleted"')
   end
 
 end