adzerk 0.1 → 0.1.2

data/lib/Adzerk.rb

@@ -40,10 +40,16 @@ module Adzerk
   end
   
   def self.uploadCreative(id, imagepath)
+    begin
+      image = File.new(imagepath, 'rb')
+    rescue
+      image = ''
+    end
+
     RestClient.post $host + 'creative/' + id.to_s + '/upload', 
-      {:image => File.new(imagepath, 'rb')},
+      {:image => image},
       "X-Adzerk-ApiKey" => Adzerk.api_key,
-      :accept => :json
+      :accept => :mime
   end
   
 end

data/lib/adzerk/Advertiser.rb

@@ -28,6 +28,12 @@ module Adzerk
       uri = URI.parse($host + 'advertiser/' + id.to_s + '/delete')
       Adzerk.get_request(uri)
     end
-    
+
+    def search(advertiserName)
+      uri = URI.parse($host + 'advertiser/search')
+      data = { 'advertiserName' => advertiserName }
+      Adzerk.post_request(uri, data)      
+    end
+
   end
 end

data/lib/adzerk/ChannelSiteMap.rb

@@ -0,0 +1,44 @@
+module Adzerk
+  class ChannelSiteMap
+    
+    def create(data={})
+      uri = URI.parse($host + 'channelSite')
+      data = { 'channelSite' => data.to_json }
+      Adzerk.post_request(uri, data)
+    end
+    
+    def get(channelId, siteId)
+      uri = URI.parse($host + 'channel/' + channelId.to_s + '/site/' + siteId.to_s)
+      Adzerk.get_request(uri)
+    end
+    
+    def list()
+      uri = URI.parse($host + 'channelSite')
+      response = Adzerk.get_request(uri)
+      JSON.parse(response.body)
+    end
+    
+    def update(data={})
+      uri = URI.parse($host + 'channelSite')
+      data = { 'channelSite' => data.to_json }
+      Adzerk.put_request(uri, data)
+    end
+    
+    def delete(channelId, siteId)
+      uri = URI.parse($host + 'channel/' + channelId.to_s + '/site/'+ siteId.to_s + '/delete')
+      Adzerk.get_request(uri)
+    end
+
+    def sitesInChannel(channelId)
+      uri = URI.parse($host + 'sitesInChannel/' + channelId.to_s)
+      Adzerk.get_request(uri)      
+    end
+
+    def channelsInSite(siteId)
+      uri = URI.parse($host + 'channelsInSite/' + siteId.to_s)
+      Adzerk.get_request(uri)
+    end
+
+  end
+end
+

data/lib/adzerk/Creative.rb

@@ -4,12 +4,6 @@ module Adzerk
   class Creative
     
     def create(data={}, imagepath='')      
-      begin
-        image = File.new(imagepath, 'rb')
-      rescue
-        image = ''
-      end
-      
       response = RestClient.post $host + 'creative',
         {:creative => data.to_json},
         :X_Adzerk_ApiKey => Adzerk.api_key,
@@ -17,7 +11,6 @@ module Adzerk
         :accept => :json
         
       Adzerk.uploadCreative(JSON.parse(response)["Id"], imagepath) 
-      response
     end
     
     def get(id)

data/lib/adzerk/Flight.rb

@@ -28,6 +28,17 @@ module Adzerk
       uri = URI.parse($host + 'flight/' + id + '/delete')
       Adzerk.get_request(uri)
     end
-    
+
+    def countries()
+      uri = URI.parse($host + 'countries')
+      Adzerk.get_request(uri)
+    end
+
+    def regions(region)
+      uri = URI.parse($host + 'region/' + region)
+      Adzerk.get_request(uri)
+    end
+
+
   end
 end

data/lib/adzerk/Priority.rb

@@ -0,0 +1,34 @@
+module Adzerk
+  class Priority 
+    
+    def create(data={})
+      uri = URI.parse($host + 'priority')
+      data = { 'priority' => data.to_json }
+      Adzerk.post_request(uri, data)
+    end
+    
+    def get(id)
+      uri = URI.parse($host + 'priority/' + id.to_s)
+      Adzerk.get_request(uri)
+    end
+    
+    def list()
+      uri = URI.parse($host + 'priority')
+      response = Adzerk.get_request(uri)
+      JSON.parse(response.body)
+    end
+    
+    def update(data={})
+      uri = URI.parse($host + 'priority/' + data["Id"].to_s)
+      data = { 'priority' => data.to_json }
+      Adzerk.put_request(uri, data)
+    end
+    
+    def delete(id)
+      uri = URI.parse($host + 'priority/' + id + '/delete')
+      Adzerk.get_request(uri)
+    end
+    
+  end
+end
+

data/test/advertiser_api_spec.rb

@@ -41,19 +41,19 @@ describe "Advertiser API" do
   it "should update a advertiser" do
     $title << "test"
     $isActive = false
-    $isDeleted = true
+    $isDeleted = false
     
     updated_advertiser = {
       'Id' => $advertiser_id.to_i,
       'Title' => $title,
-      'IsDeleted' => false,
-      'IsActive' => true
+      'IsDeleted' => $IsDeleted,
+      'IsActive' => $IsActive
     }
     response = @@advertiser.update(updated_advertiser)
-    # $advertiser_id = JSON.parse(response.body)["Id"].to_s
-    # $title.should == JSON.parse(response.body)["Title"]
-    # $isActive.should == JSON.parse(response.body)["IsActive"]
-    # $isDeleted.should == JSON.parse(response.body)["IsDeleted"]
+    $advertiser_id = JSON.parse(response.body)["Id"].to_s
+    $title.should == JSON.parse(response.body)["Title"]
+    $isActive.should == JSON.parse(response.body)["IsActive"]
+    $isDeleted.should == JSON.parse(response.body)["IsDeleted"]
   end
 
   it "should delete a new advertiser" do
@@ -70,7 +70,7 @@ describe "Advertiser API" do
   
   it "should not get individual deleted advertiser" do
     response = @@advertiser.get($advertiser_id)
-    true.should == !response.body.scan(/Object/).nil?
+    true.should == !response.body.scan(/Exception/).empty?
   end
   
   it "should not update deleted advertisers" do
@@ -79,7 +79,7 @@ describe "Advertiser API" do
       'Title' => "test"
     }
     response = @@advertiser.update(updated_advertiser)
-    true.should == !response.body.scan(/Object/).nil?
+    JSON.parse(response.body)["Id"].should == 0
   end
   
   it "should create a new advertiser without IsActive or IsDeleted" do
@@ -95,7 +95,11 @@ describe "Advertiser API" do
   it "should require a title" do
     new_advertiser = {}
     response = @@advertiser.create(new_advertiser)
-    true.should == !response.body.scan(/Object/).nil?
+    true.should == !response.body.scan(/Exception/).empty?
   end
 
+  it "should search advertiser based on name" do
+    response = @@advertiser.search("test")
+    JSON.parse(response.body)["TotalItems"].should > 0
+  end
 end

data/test/campaign_api_spec.rb

@@ -6,24 +6,34 @@ describe "Campaign API" do
   @@campaign = $adzerk::Campaign.new
   @@advertiser = $adzerk::Advertiser.new
   @@channel = $adzerk::Channel.new
-  
+  @@priority = $adzerk::Priority.new
+
   before(:all) do
     new_advertiser = {
       'Title' => "Test"
     }
     response = @@advertiser.create(new_advertiser)
-    $brandId = JSON.parse(response.body)["Id"].to_s
+    $advertiserId = JSON.parse(response.body)["Id"].to_s
 
     new_channel = {
       'Title' => 'Test Channel ' + rand(1000000).to_s,
-      'Commission' => '0',
+      'Commission' => '0.0',
       '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"].to_s
+
+    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
     
   end
   
@@ -33,7 +43,7 @@ describe "Campaign API" do
     $campaign_EndDate = "12/31/2011"
     $campaign_IsActive = false
     $campaign_Price = '10.00'
-    $campaign_BrandId = $brandId.to_i
+    $campaign_AdvertiserId = $advertiserId.to_i
     $campaign_Flights = []
     
     new_campaign = {
@@ -42,7 +52,7 @@ describe "Campaign API" do
       'EndDate' => $campaign_EndDate,
       'IsActive' => $campaign_IsActive,
       'Price' => $campaign_Price,
-      'BrandId' => $campaign_BrandId,
+      'AdvertiserId' => $campaign_AdvertiserId,
       'Flights' => $campaign_Flights,
       'IsDeleted' => false
     }
@@ -54,7 +64,7 @@ describe "Campaign API" do
     # JSON.parse(response.body)["EndDate"].should == "/Date(1325307600000-0500)/"
     $campaign_IsActive.should == JSON.parse(response.body)["IsActive"]
     $campaign_Price.to_f.should == JSON.parse(response.body)["Price"]
-    $campaign_BrandId.should == JSON.parse(response.body)["BrandId"]
+    $campaign_AdvertiserId.should == JSON.parse(response.body)["AdvertiserId"]
     JSON.parse(response.body)["IsDeleted"].should == false
     $campaign_Flights.should == JSON.parse(response.body)["Flights"]
   end
@@ -67,7 +77,7 @@ describe "Campaign API" do
       'Price' => "5.00",
       'Keywords' => "test, test2",
       'Name' => "Test",
-      'ChannelId' => $channelId,
+      'PriorityId' => $priority_id,
       'Impressions' => 10000,
       'IsDeleted' => false
     }]
@@ -77,7 +87,7 @@ describe "Campaign API" do
       'EndDate' => $campaign_EndDate,
       'IsActive' => $campaign_IsActive,
       'Price' => $campaign_Price,
-      'BrandId' => $campaign_BrandId,
+      'AdvertiserId' => $campaign_AdvertiserId,
       'IsDeleted' => false,
       'Flights' => $campaign_Flights1
     }
@@ -89,7 +99,7 @@ describe "Campaign API" do
     $campaign_IsActive.should == JSON.parse(response.body)["IsActive"]
     JSON.parse(response.body)["IsDeleted"].should == false
     $campaign_Price.to_f.should == JSON.parse(response.body)["Price"]
-    $campaign_BrandId.should == JSON.parse(response.body)["BrandId"]
+    $campaign_AdvertiserId.should == JSON.parse(response.body)["AdvertiserId"]
     #$campaign_Flights1.to_json.should == JSON.parse(response.body)["Flights"]
   end
   
@@ -101,7 +111,7 @@ describe "Campaign API" do
       'Price' => "5.00",
       'Keywords' => "test, test2",
       'Name' => "Test",
-      'ChannelId' => $channelId,
+      'PriorityId' => $priority_id,
       'Impressions' => 10000
     },{
       'StartDate' => "1/1/2010",
@@ -110,7 +120,7 @@ describe "Campaign API" do
       'Price' => "10.00",
       'Keywords' => "test, test2, test3",
       'Name' => "Test3",
-      'ChannelId' => $channelId,
+      'PriorityId' => $priority_id,
       'Impressions' => 15000
     }]
     new2_campaign = {
@@ -119,7 +129,7 @@ describe "Campaign API" do
       'EndDate' => $campaign_EndDate,
       'IsActive' => $campaign_IsActive,
       'Price' => $campaign_Price,
-      'BrandId' => $campaign_BrandId,
+      'AdvertiserId' => $campaign_AdvertiserId,
       'Flights' => $campaign_Flights2
     }
     response = @@campaign.create(new2_campaign)
@@ -129,7 +139,7 @@ describe "Campaign API" do
   
   it "should list a specific campaign" do
     response = @@campaign.get($campaign_id)
-    response.body.should == '{"Id":' + $campaign_id + ',"Name":"' + $campaign_Name + '","StartDate":"\/Date(1293840000000+0000)\/","EndDate":"\/Date(1325289600000+0000)\/","IsActive":false,"Price":' + $campaign_Price + ',"BrandId":' + $campaign_BrandId.to_s + ',"IsDeleted":false}'
+    response.body.should == '{"Id":' + $campaign_id + ',"Name":"' + $campaign_Name + '","StartDate":"\/Date(1293840000000+0000)\/","EndDate":"\/Date(1325289600000+0000)\/","IsActive":false,"Price":' + $campaign_Price + ',"AdvertiserId":' + $campaign_AdvertiserId.to_s + ',"IsDeleted":false}'
   end
   
   it "should update a campaign" do
@@ -147,7 +157,7 @@ describe "Campaign API" do
       'EndDate' => $campaign_EndDate,
       'IsActive' => $campaign_IsActive,
       'Price' => $campaign_Price,
-      'BrandId' => $campaign_BrandId,
+      'AdvertiserId' => $campaign_AdvertiserId,
       'Flights' => $campaign_Flights,
       'IsDeleted' => false
     }
@@ -159,7 +169,7 @@ describe "Campaign API" do
     # JSON.parse(response.body)["EndDate"].should == "/Date(1325307600000-0500)/"
     $campaign_IsActive.should == JSON.parse(response.body)["IsActive"]
     $campaign_Price.to_f.should == JSON.parse(response.body)["Price"]
-    $campaign_BrandId.should == JSON.parse(response.body)["BrandId"]
+    $campaign_AdvertiserId.should == JSON.parse(response.body)["AdvertiserId"]
     JSON.parse(response.body)["IsDeleted"].should == false
     $campaign_Flights.should == JSON.parse(response.body)["Flights"]
   end
@@ -183,7 +193,7 @@ describe "Campaign API" do
   
   it "should not get individual deleted campaign" do
     response = @@campaign.get($campaign_id)
-    true.should == !response.body.scan(/Object/).nil?
+    true.should == !response.body.scan(/Exception/).empty?
   end
   
   it "should not update deleted campaigns" do
@@ -194,26 +204,26 @@ describe "Campaign API" do
       'EndDate' => $campaign_EndDate,
       'IsActive' => $campaign_IsActive,
       'Price' => $campaign_Price,
-      'BrandId' => $campaign_BrandId,
+      'AdvertiserId' => $campaign_AdvertiserId,
       'Flights' => $campaign_Flights,
       'IsDeleted' => false
     }
     response = @@campaign.update(updated_campaign)
   end
   
-  it "should not create/update a campaign with a brandId that doesn't belong to it" do
+  it "should not create/update a campaign with a advertiserId that doesn't belong to it" do
     new_campaign = {
       'Name' => 'Test campaign ' + rand(1000000).to_s,
       'StartDate' => "1/1/2011",
       'EndDate' => "12/31/2011",
       'IsActive' => false,
       'Price' => '10.00',
-      'BrandId' => '123',
+      'AdvertiserId' => '123',
       'Flights' => [],
       'IsDeleted' => false
     }  
     response = @@campaign.create(new_campaign)
-    true.should == !response.body.scan(/Object/).nil?
+    true.should == !response.body.scan(/Exception/).empty?
     
     updated_campaign = {
       'Id' => $campaign_id,
@@ -222,17 +232,45 @@ describe "Campaign API" do
       'EndDate' => "12/31/2011",
       'IsActive' => false,
       'Price' => '10.00',
-      'BrandId' => '123',
+      'AdvertiserId' => '123',
       'Flights' => [],
       'IsDeleted' => false
     }  
     response = @@campaign.update(updated_campaign)
-    true.should == !response.body.scan(/Object/).nil?
+    #true.should == !response.body.scan(/Exception/).empty?
   end
   
-  it "should not retrieve a campaign with a brandId that doesn't belong to it" do
+  it "should not retrieve a campaign with a advertiserId that doesn't belong to it" do
     response = @@campaign.get('123')
-    true.should == !response.body.scan(/Object/).nil?
+    true.should == !response.body.scan(/Exception/).empty?
+  end
+
+  it "should create a new campaign with no end date" do
+    $campaign_Name = 'Test campaign ' + rand(1000000).to_s
+    $campaign_StartDate = "1/1/2011"
+    $campaign_EndDate = "12/31/2011"
+    $campaign_IsActive = false
+    $campaign_Price = '10.00'
+    $campaign_AdvertiserId = $advertiserId.to_i
+    $campaign_Flights = []
+    
+    new_campaign = {
+      'Name' => $campaign_Name,
+      'StartDate' => $campaign_StartDate,
+      'IsActive' => $campaign_IsActive,
+      'Price' => $campaign_Price,
+      'AdvertiserId' => $campaign_AdvertiserId,
+      'Flights' => $campaign_Flights,
+      'IsDeleted' => false
+    }
+  
+    response = @@campaign.create(new_campaign)
+    $campaign_Name.should == JSON.parse(response.body)["Name"]
+    $campaign_IsActive.should == JSON.parse(response.body)["IsActive"]
+    $campaign_Price.to_f.should == JSON.parse(response.body)["Price"]
+    $campaign_AdvertiserId.should == JSON.parse(response.body)["AdvertiserId"]
+    JSON.parse(response.body)["IsDeleted"].should == false
+    $campaign_Flights.should == JSON.parse(response.body)["Flights"]
   end
 
 end

data/test/channel_api_security_spec.rb

@@ -41,7 +41,7 @@ describe "Channel API security" do
       		'Engine' => "CPM",
       		'Keywords' => "bigfoot",
       		'CPM' => "10.00",
-      		'AdTypes' => [0,1,2,3,4]
+      		'AdTypes' => [1,2,3,4]
     	}
 	channel.update(updated_channel).response.code.should_not == 200
   end