adzerk 0.1 → 0.1.2

data/test/flight_api_spec.rb

@@ -7,13 +7,14 @@ describe "Flight API" do
   @@advertiser = $adzerk::Advertiser.new
   @@channel = $adzerk::Channel.new
   @@campaign = $adzerk::Campaign.new
+  @@priority = $adzerk::Priority.new
   
   before(:all) do
     new_advertiser = {
       'Title' => "Test"
     }
     response = @@advertiser.create(new_advertiser)
-    $brandId = JSON.parse(response.body)["Id"]
+    $advertiserId = JSON.parse(response.body)["Id"]
     
     new_channel = {
       'Title' => 'Test Channel ' + rand(1000000).to_s,
@@ -21,18 +22,27 @@ describe "Flight API" do
       'Engine' => 'CPM',
       'Keywords' => 'test',
       'CPM' => '10.00',
-      'AdTypes' => [0,1,2,3,4]
+      'AdTypes' => [1,2,3,4]
     }  
     response = @@channel.create(new_channel)
     $channelId = JSON.parse(response.body)["Id"]
     
+    new_priority = {
+      'Name' => "High Priority Test",
+      'ChannelId' => $channelId,
+      'Weight' => 1,
+      'IsDeleted' => false
+    }
+    response = @@priority.create(new_priority)
+    $priority_id = JSON.parse(response.body)["Id"].to_s
+
     new_campaign = {
       'Name' => 'Test campaign ' + rand(1000000).to_s,
       'StartDate' => "1/1/2011",
       'EndDate' => "12/31/2011",
       'IsActive' => false,
       'Price' => '10.00',
-      'BrandId' => $brandId,
+      'AdvertiserId' => $advertiserId,
       'Flights' => [],
       'IsDeleted' => false
     }  
@@ -59,7 +69,7 @@ describe "Flight API" do
     
     new_flight = {
       'NoEndDate' => false,
-      'ChannelId' => $channelId,
+      'PriorityId' => $priority_id,
       'Name' => $flight_Name,
       'StartDate' => $flight_StartDate,
       'EndDate' => $flight_EndDate,
@@ -79,7 +89,7 @@ describe "Flight API" do
     response = @@flight.create(new_flight)
     $flight_id = JSON.parse(response.body)["Id"].to_s
     JSON.parse(response.body)["NoEndDate"].should == false
-    JSON.parse(response.body)["ChannelId"].should == $channelId
+    JSON.parse(response.body)["PriorityId"].to_s.should == $priority_id
     JSON.parse(response.body)["Name"].should == $flight_Name
     # JSON.parse(response.body)["StartDate"].should == "/Date(1293840000000+0000)/"
     # JSON.parse(response.body)["EndDate"].should == "/Date(1325307600000-0500)/"
@@ -99,7 +109,7 @@ describe "Flight API" do
   
   it "should list a specific flight" do
     response = @@flight.get($flight_id)
-    response.body.should == '{"Id":' + $flight_id + ',"StartDate":"\\/Date(1293840000000+0000)\\/","EndDate":"\\/Date(1325289600000+0000)\\/","Price":15.00,"OptionType":1,"Impressions":10000,"IsUnlimited":false,"IsNoDuplicates":false,"IsFullSpeed":false,"Keywords":"test, test2","Name":"' + $flight_Name + '","CampaignId":' + $campaignId.to_s + ',"ChannelId":0,"IsDeleted":false,"IsActive":true}'
+    response.body.should == '{"Id":' + $flight_id + ',"StartDate":"\\/Date(1293840000000+0000)\\/","EndDate":"\\/Date(1325289600000+0000)\\/","Price":15.00,"OptionType":1,"Impressions":10000,"IsUnlimited":false,"IsNoDuplicates":false,"IsFullSpeed":false,"Keywords":"test, test2","Name":"' + $flight_Name + '","CampaignId":' + $campaignId.to_s + ',"PriorityId":' + $priority_id + ',"IsDeleted":false,"IsActive":true,"GeoTargeting":[]}'
   end
   
   it "should update a flight" do
@@ -122,7 +132,7 @@ describe "Flight API" do
     new_flight = {
       'Id' => $flight_id,
       'NoEndDate' => false,
-      'ChannelId' => $channelId,
+      'PriorityId' => $priority_id,
       'Name' => $u_flight_Name,
       'StartDate' => $u_flight_StartDate,
       'EndDate' => $u_flight_EndDate,
@@ -142,7 +152,7 @@ describe "Flight API" do
     response = @@flight.update(new_flight)
     $flight_id = JSON.parse(response.body)["Id"].to_s
     JSON.parse(response.body)["NoEndDate"].should == false
-    JSON.parse(response.body)["ChannelId"].should == $channelId
+    JSON.parse(response.body)["PriorityId"].to_s.should == $priority_id
     JSON.parse(response.body)["Name"].should == $u_flight_Name
     # JSON.parse(response.body)["StartDate"].should == "/Date(1293840000000+0000)/"
     # JSON.parse(response.body)["EndDate"].should == "/Date(1325307600000-0500)/"
@@ -166,7 +176,7 @@ describe "Flight API" do
     ## Can't test this right now because of paging issues
     # result["Items"].last["Id"].to_s.should == $flight_id
     # result["Items"].last["NoEndDate"].should == false
-    # result["Items"].last["ChannelId"].should == $channelId
+    # result["Items"].last["PriorityId"].should == $priorityId
     # result["Items"].last["Name"].should == $flight_Name
     # result["Items"].last["StartDate"].should == "/Date(1293858000000-0500)/"
     # result["Items"].last["EndDate"].should == "/Date(1325307600000-0500)/"
@@ -184,7 +194,7 @@ describe "Flight API" do
     # result["Items"].last["IsDeleted"].should == $flight_IsDeleted
   end
   
-  it "should not get if campaignId or channelId is forbidden" do
+  it "should not get if campaignId or priorityId is forbidden" do
     response = @@flight.get($flight_id)
     true.should == !response.body.scan(/Object/).nil?
   end
@@ -196,13 +206,13 @@ describe "Flight API" do
 
   it "should not get individual deleted flight" do
     response = @@flight.get($flight_id)
-    response.body.should == '{"Id":0,"ChannelId":0,"IsDeleted":false,"IsActive":false}'
+    response.body.should == '{"Id":0,"PriorityId":0,"IsDeleted":false,"IsActive":false}'
   end
   
   it "should not create/update if campaignId is forbidden" do
     new_flight = {
       'NoEndDate' => false,
-      'ChannelId' => $channelId,
+      'PriorityId' => $priority_id,
       'Name' => $flight_Name,
       'StartDate' => $flight_StartDate,
       'EndDate' => $flight_EndDate,
@@ -225,7 +235,7 @@ describe "Flight API" do
     new_flight = {
       'Id' => $flight_id,
       'NoEndDate' => false,
-      'ChannelId' => $channelId,
+      'PriorityId' => $priority_id,
       'Name' => $flight_Name,
       'StartDate' => $flight_StartDate,
       'EndDate' => $flight_EndDate,
@@ -246,10 +256,10 @@ describe "Flight API" do
     true.should == !response.body.scan(/Object/).nil?
   end
   
-  it "should not create/update if channelId is forbidden" do
+  it "should not create/update if priorityId is forbidden" do
     new_flight = {
       'NoEndDate' => false,
-      'ChannelId' => '123',
+      'PriorityId' => '123',
       'Name' => $flight_Name,
       'StartDate' => $flight_StartDate,
       'EndDate' => $flight_EndDate,
@@ -272,7 +282,7 @@ describe "Flight API" do
     new_flight = {
       'Id' => $flight_id,
       'NoEndDate' => false,
-      'ChannelId' => '123',
+      'PriorityId' => '123',
       'Name' => $flight_Name,
       'StartDate' => $flight_StartDate,
       'EndDate' => $flight_EndDate,
@@ -293,4 +303,69 @@ describe "Flight API" do
     true.should == !response.body.scan(/Object/).nil?
   end
 
+  it "should list the coutries, regions, and metros for geo-targeting" do
+    response = @@flight.countries()
+    true.should == !response.body.scan(/Object/).nil?
+    response = @@flight.regions("NC")
+    true.should == !response.body.scan(/Object/).nil?
+  end
+
+  it "should create a flight with geotargeting" do
+    $geo = [{
+      #'LocationId' => nil,
+      'CountryCode' => 'US',
+      'Region' => 'NC',
+      'MetroCode' => '560'
+    }]
+
+    new_flight = {
+      'NoEndDate' => false,
+      'PriorityId' => $priority_id,
+      'Name' => $flight_Name,
+      'StartDate' => $flight_StartDate,
+      'EndDate' => $flight_EndDate,
+      'NoEndDate' => $flight_NoEndDate,
+      'Price' => $flight_Price,
+      'OptionType' => $flight_OptionType,
+      'Impressions' => $flight_Impressions,
+      'IsUnlimited' => $flight_IsUnlimited,
+      'IsFullSpeed' => $flight_IsFullSpeed,
+      'Keywords' => $flight_Keywords,
+      'UserAgentKeywords' => $flight_UserAgentKeywords,
+      'WeightOverride' => $flight_WeightOverride,
+      'CampaignId' => $flight_CampaignId,
+      'IsActive' => $flight_IsActive,
+      'IsDeleted' => $flight_IsDeleted,
+      'GeoTargeting' => $geo
+    }
+    response = @@flight.create(new_flight)
+    $flight_id = JSON.parse(response.body)["Id"].to_s
+    JSON.parse(response.body)["NoEndDate"].should == false
+    JSON.parse(response.body)["PriorityId"].to_s.should == $priority_id
+    JSON.parse(response.body)["Name"].should == $flight_Name
+    #JSON.parse(response.body)["StartDate"].should == "/Date(1293840000000+0000)/"
+    #JSON.parse(response.body)["EndDate"].should == "/Date(1325307600000-0500)/"
+    JSON.parse(response.body)["NoEndDate"].should == $flight_NoEndDate
+    JSON.parse(response.body)["Price"].should == 15.0
+    JSON.parse(response.body)["OptionType"].should == $flight_OptionType
+    JSON.parse(response.body)["Impressions"].should == $flight_Impressions
+    JSON.parse(response.body)["IsUnlimited"].should == $flight_IsUnlimited
+    JSON.parse(response.body)["IsFullSpeed"].should == $flight_IsFullSpeed
+    JSON.parse(response.body)["Keywords"].should == $flight_Keywords
+    JSON.parse(response.body)["UserAgentKeywords"].should == $flight_UserAgentKeywords
+    JSON.parse(response.body)["WeightOverride"].should == $flight_WeightOverride
+    JSON.parse(response.body)["CampaignId"].should == $flight_CampaignId
+    JSON.parse(response.body)["IsActive"].should == $flight_IsActive
+    JSON.parse(response.body)["IsDeleted"].should == $flight_IsDeleted
+    JSON.parse(response.body)["GeoTargeting"].first["CountryCode"].should == "US"
+    JSON.parse(response.body)["GeoTargeting"].first["Region"].should == "NC"
+    JSON.parse(response.body)["GeoTargeting"].first["MetroCode"].should == 560
+    $location_id = JSON.parse(response.body)["GeoTargeting"].first["LocationId"].to_s
+  end
+
+  it "should get a flight with geotargeting" do
+    response = @@flight.get($flight_id)
+    #response.body.should == '{"Id":' + $flight_id + ',"StartDate":"\\/Date(1293840000000+0000)\\/","EndDate":"\\/Date(1325289600000+0000)\\/","Price":15.00,"OptionType":1,"Impressions":10000,"IsUnlimited":false,"IsNoDuplicates":false,"IsFullSpeed":false,"Keywords":"test, test2","Name":"' + $flight_Name + '","CampaignId":' + $campaignId.to_s + ',"PriorityId":0,"IsDeleted":false,"IsActive":true,"GeoTargeting":[{"LocationId":' + $location_id + ',"CountryCode":"US","Region":"NC","MetroCode":560}]}'
+  end
+
 end

data/test/invitation_api_spec.rb

@@ -4,6 +4,7 @@ describe "Invitation API" do
 
   $invitation_url = 'http://www.adzerk.com/'
   @@invite = $adzerk::Invitation.new
+  @@advertiser = $adzerk::Advertiser.new
   $email = "test+apitest@adzerk.com"
   
   before(:all) do
@@ -16,30 +17,39 @@ describe "Invitation API" do
     }
     response = site.create(new_site)
     $siteId = JSON.parse(response.body)["Id"].to_s
+    new_advertiser = {
+      'Title' => "Test"
+    }
+    response = @@advertiser.create(new_advertiser)
+    $advertiserId = JSON.parse(response.body)["Id"].to_s
   end
 
   it "should create a new publisher invitation" do
 
     invitation = {
       'Email' => $email,
-      'SiteId' => $siteId
+      'SiteId' => $siteId,
+      'AdvertiserId' => $advertiserId
     }
   
     response = @@invite.invite_publisher(invitation)
     response.body.should_not == ""
     response.body.length.should > 10
+    response.body.length.should < 100
   end
   
   it "should create a new advertiser invitation" do
 
     invitation = {
       'Email' => $email,
-      'SiteId' => $siteId
+      'SiteId' => $siteId,
+      'AdvertiserId' => $advertiserId
     }
   
     response = @@invite.invite_advertiser(invitation)
     response.body.should_not == ""
     response.body.length.should > 10
+    response.body.length.should < 100
   end
   
 end

data/test/login_api_spec.rb

@@ -8,7 +8,7 @@ describe "Login_API" do
   it "should list all logins" do
     result = @@login.list()
     result.length.should > 0
-    # result["Items"].last["Id"].to_s.should == $site_id
+    #result["Items"].last["Id"].to_s.should == $site_id
   end
 
   it "should create a new login" do
@@ -29,24 +29,33 @@ describe "Login_API" do
   
   it "should list a specific login" do
     response = @@login.get($login_id)
-    response.body.should == '{"Id":' + $login_id.to_s + ',"Email":"'+ $email + '","Password":"' + $password + '","Name":"' + $fullname + '"}'
+    response.body.should == '{"Id":' + $login_id.to_s + ',"Email":"'+ $email + '","Password":"","Name":"' + $fullname + '"}'
   end
   
   it "should update a login" do
-    $email = "test+" + rand(10000).to_s + "@adzerk.com"
-    $password = "somepassword"
-    $fullname = "test person"
     new_login = {
       'Id' => $login_id,
-      'Email' => $email,
-      'Password' => $password,
       'Name' => $fullname
     }
     response = @@login.update(new_login)
     $login_id = JSON.parse(response.body)["Id"].to_s
     JSON.parse(response.body)["Email"].should == $email
-    JSON.parse(response.body)["Password"].should == $password
+    JSON.parse(response.body)["Password"].should == ""
     JSON.parse(response.body)["Name"].should == $fullname
   end
-  
+
+  it "should not be able update a login's password or email" do
+    new_login = {
+      'Id' => $login_id,
+      'Name' => $fullname,
+      'Password' => "password",
+      'Email' => "test@test.com"
+    }
+    response = @@login.update(new_login)
+    $login_id = JSON.parse(response.body)["Id"].to_s
+    JSON.parse(response.body)["Email"].should == $email
+    JSON.parse(response.body)["Password"].should == ""
+    JSON.parse(response.body)["Name"].should == $fullname
+  end
+
 end

data/test/priority_api_spec.rb

@@ -0,0 +1,105 @@
+require 'spec_helper'
+
+describe "Priority API" do
+  
+  $priority_url = 'http://www.adzerk.com'
+  @@channel = $adzerk::Channel.new
+  @@priority = $adzerk::Priority.new
+
+  before(:all) do
+    new_channel = {
+      'Title' => 'Test Channel ' + rand(1000000).to_s,
+      'Commission' => '0',
+      'Engine' => 'CPM',
+      'Keywords' => 'test',
+      'CPM' => '10.00',
+      'AdTypes' => [1,2,3,4]
+    }  
+    response = @@channel.create(new_channel)
+    $channelId = JSON.parse(response.body)["Id"].to_s
+  end
+
+  it "should create a new priority" do
+    $priority_name = 'Test priority ' + rand(1000000).to_s
+    $priority_channelId = $channelId
+    $priority_weight = 1
+    $priority_isDeleted = false
+
+    new_priority = {
+      'Name' => $priority_name,
+      'ChannelId' => $priority_channelId,
+      'Weight' => $priority_weight,
+      'IsDeleted' => $priority_isDeleted
+    }
+  
+    response = @@priority.create(new_priority)
+    $priority_id = JSON.parse(response.body)["Id"].to_s
+    $priority_name.should == JSON.parse(response.body)["Name"]
+    $priority_channelId.to_f.should == JSON.parse(response.body)["ChannelId"]
+    $priority_weight.should == JSON.parse(response.body)["Weight"]
+    $priority_isDeleted.should == JSON.parse(response.body)["IsDeleted"]
+  end
+  
+  it "should list a specific priority" do
+    response = @@priority.get($priority_id)
+    response.body.should == '{"Id":' + $priority_id + ',"Name":"' + $priority_name + '","ChannelId":' + $priority_channelId.to_s + ',"Weight":' + $priority_weight.to_s + ',"IsDeleted":' + $priority_isDeleted.to_s + '}'
+  end
+  
+  it "should update a priority" do
+    new_priority = {
+      'Id' => $priority_id,
+      'Name' => $priority_name,
+      'ChannelId' => $priority_channelId,
+      'Weight' => $priority_weight,
+      'IsDeleted' => $priority_isDeleted
+    }
+  
+    response = @@priority.update(new_priority)
+    $priority_name.should == JSON.parse(response.body)["Name"]
+    $priority_channelId.to_f.should == JSON.parse(response.body)["ChannelId"]
+    $priority_weight.should == JSON.parse(response.body)["Weight"]
+    $priority_isDeleted.should == JSON.parse(response.body)["IsDeleted"]
+  end
+  
+  it "should list all priorities" do
+    result = @@priority.list()
+    result.length.should > 0
+    result["Items"].last["Id"].to_s.should == $priority_id 
+    result["Items"].last["Name"].should == $priority_name 
+    result["Items"].last["ChannelId"].to_s.should == $priority_channelId 
+    result["Items"].last["Weight"].should == $priority_weight 
+    result["Items"].last["IsDeleted"].should == $priority_isDeleted 
+  end
+  
+  it "should delete a new priority" do
+    response = @@priority.delete($priority_id)
+    response.body.should == 'OK'
+  end
+  
+  it "should not list deleted priorities" do
+    result = @@priority.list()
+    result["Items"].each do |r|
+      r["Id"].to_s.should_not == $priority_id  
+    end
+  end
+  
+  it "should not get individual deleted priority" do
+    response = @@priority.get $priority_id
+    response.body.should == '{"Id":0,"ChannelId":0,"Weight":0,"IsDeleted":false}'
+  end
+  
+  it "should not update deleted priorities" do
+    u_priority = {
+      'Id' => $priority_id,
+      'Name' => $priority_name,
+      'ChannelId' => $priority_channelId,
+      'Weight' => $priority_weight,
+      'IsDeleted' => $priority_isDeleted,
+    }
+  
+    response = @@priority.update(u_priority)
+    response.body.should == '{"Id":0,"ChannelId":0,"Weight":0,"IsDeleted":false}'
+  end
+
+end
+

data/test/rakefile.rb

@@ -6,10 +6,13 @@
   'creative_api_spec.rb',
   'creative_map_api_spec.rb',
   'flight_api_spec.rb',
+  'invitation_api_spec.rb',
   'login_api_spec.rb',
   'publisher_api_spec.rb',
   'report_api_spec.rb',
-  'site_api_spec.rb'
+  'site_api_spec.rb',
+  'priority_api_spec.rb',
+  'channel_site_map_api_spec.rb'
 ]
 
 task :runall do

data/test/spec_helper.rb

@@ -13,7 +13,13 @@ require "../lib/adzerk/Creative"
 require "../lib/adzerk/CreativeMap"
 require "../lib/adzerk/Advertiser"
 require "../lib/adzerk/Invitation"
+require "../lib/adzerk/Priority"
+require "../lib/adzerk/ChannelSiteMap"
 
-# api_key = '0223F375AE09CA4E55A82FFA241A23282485'
-api_key = '114D8867A8C4DA4650AA838A7B9F6B01B7D1'
+api_key = ENV["ADZERK_API_KEY"] || 'yourapikey'
 $adzerk = Adzerk.new(api_key)
+
+RSpec.configure do |config|
+  config.color_enabled = true
+end
+