adzerk 0.1.2 → 0.1.3

data/lib/adzerk/Creative.rb

@@ -3,7 +3,11 @@ require "rest_client"
 module Adzerk
   class Creative
     
-    def create(data={}, imagepath='')      
+    def create(data={}, imagepath='')
+      #uri = URI.parse($host + "creative/")
+      #data = { 'creative' => data.to_json }
+      #response = Adzerk.post_request(uri, data)
+
       response = RestClient.post $host + 'creative',
         {:creative => data.to_json},
         :X_Adzerk_ApiKey => Adzerk.api_key,

data/lib/adzerk/Zone.rb

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

data/test/advertiser_api_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require './spec_helper'
 
 describe "Advertiser API" do
   
@@ -100,6 +100,7 @@ describe "Advertiser API" do
 
   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

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require './spec_helper.rb'
 
 describe "Campaign API" do
   
@@ -138,8 +138,11 @@ describe "Campaign API" do
   end
   
   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 + ',"AdvertiserId":' + $campaign_AdvertiserId.to_s + ',"IsDeleted":false}'
+    response = @@campaign.get($campaign_id2)
+    (response.body.scan($campaign_id2).empty?).should == false
+    (response.body.scan('"Flights":[]').empty?).should == true
+    (response.body.scan('"Flights":[').empty?).should == false
+    (response.body.scan($campaign_Name).empty?).should == false
   end
   
   it "should update a campaign" do
@@ -173,6 +176,38 @@ describe "Campaign API" do
     JSON.parse(response.body)["IsDeleted"].should == false
     $campaign_Flights.should == JSON.parse(response.body)["Flights"]
   end
+
+  it "should deactivate a campaign" 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_Flights = []
+    
+    new_campaign = {
+      'Id' => $campaign_id,
+      'Name' => $campaign_Name,
+      'StartDate' => $campaign_StartDate,
+      'EndDate' => $campaign_EndDate,
+      'IsActive' => $campaign_IsActive,
+      'Price' => $campaign_Price,
+      'AdvertiserId' => $campaign_AdvertiserId,
+      'Flights' => $campaign_Flights,
+      'IsDeleted' => false
+    }
+  
+    response = @@campaign.update(new_campaign)
+    $campaign_id = JSON.parse(response.body)["Id"].to_s
+    $campaign_Name.should == JSON.parse(response.body)["Name"]
+    # JSON.parse(response.body)["StartDate"].should == "/Date(1293858000000-0500)/"
+    # 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_AdvertiserId.should == JSON.parse(response.body)["AdvertiserId"]
+    JSON.parse(response.body)["IsDeleted"].should == false
+    $campaign_Flights.should == JSON.parse(response.body)["Flights"]
+  end
   
   it "should list all campaigns" do
     result = @@campaign.list()

data/test/channel_api_security_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require './spec_helper'
 require 'net/http'
 describe "Channel API security" do
 

data/test/channel_api_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require './spec_helper'
 
 describe "Channel API" do
   

data/test/creative_api_spec.rb

@@ -1,4 +1,4 @@
-require 'spec_helper'
+require './spec_helper'
 
 describe "Creative API" do
   
@@ -14,18 +14,19 @@ describe "Creative API" do
     $advertiserId = JSON.parse(response.body)["Id"]
   end
   
-  it "should create a creative" do
-    $Title = 'Test creative ' + rand(1000000).to_s
-    $ImageName = ""
-    $Url = "http://adzerk.com"
-    $Body = "Test text"
-    $AdvertiserId = $advertiserId
-    $AdTypeId = 18
-    $IsActive = true
-    $Alt = "test alt"
-    $IsDeleted = false
-    $IsSync = false
-    
+  it "should create a creative using old api spec" do
+      $Title = 'Test creative ' + rand(1000000).to_s
+      $ImageName = ""
+      $Url = "http://adzerk.com"
+      $Body = "Test text"
+      $AdvertiserId = $advertiserId
+      $AdTypeId = 18
+      $IsActive = true
+      $Alt = "test alt"
+      $IsDeleted = false
+      $IsSync = false
+      $IsHTMLJS = true
+      $ScriptBody = "<html>"
     new_creative = {
       'Title' => $Title,
       'ImageName' => $ImageName,
@@ -49,7 +50,36 @@ describe "Creative API" do
     JSON.parse(response.body)["Alt"].should == $Alt
     JSON.parse(response.body)["IsDeleted"].should == $IsDeleted
     JSON.parse(response.body)["IsSync"].should == $IsSync
-    
+  end
+
+  it "should create a creative using new api fields" do
+    new_creative = {
+      'Title' => $Title,
+      'ImageName' => $ImageName,
+      'Url' => $Url,
+      'Body' => $Body,
+      'AdvertiserId' => $AdvertiserId,
+      'AdTypeId' => $AdTypeId,
+      'IsActive' => $IsActive,
+      'Alt' => $Alt,
+      'IsDeleted' => $IsDeleted,
+      'IsSync' => $IsSync,
+      'IsHTMLJS' => $IsHTMLJS,
+      'ScriptBody' => $ScriptBody
+    }
+    response = @@creative.create(new_creative, '250x250.gif')
+    $creative_id = JSON.parse(response)["Id"].to_s
+    JSON.parse(response.body)["Title"].should == $Title
+    JSON.parse(response.body)["Url"].should == $Url
+    JSON.parse(response.body)["Body"].should == $Body
+    JSON.parse(response.body)["AdvertiserId"].should == $AdvertiserId
+    JSON.parse(response.body)["AdTypeId"].should == $AdTypeId
+    JSON.parse(response.body)["IsActive"].should == $IsActive
+    JSON.parse(response.body)["Alt"].should == $Alt
+    JSON.parse(response.body)["IsDeleted"].should == $IsDeleted
+    JSON.parse(response.body)["IsSync"].should == $IsSync
+    JSON.parse(response.body)["IsHTMLJS"].should == $IsHTMLJS
+    JSON.parse(response.body)["ScriptBody"].should == $ScriptBody
   end
 
   it "should get a specific creative" do
@@ -93,6 +123,38 @@ describe "Creative API" do
     JSON.parse(response.body)["IsSync"].should == $IsSync
   end
 
+  it "should update a specific creative with html ad" do
+    update_creative = {
+      'Id' => $creative_id.to_i,
+      'Title' => $Title,
+      'ImageName' => $ImageName,
+      'Url' => $Url,
+      'Body' => $Body,
+      'AdvertiserId' => $AdvertiserId,
+      'AdTypeId' => $AdTypeId,
+      'IsActive' => $IsActive,
+      'Alt' => $Alt,
+      'IsDeleted' => $IsDeleted,
+      'IsSync' => $IsSync,
+      'IsHTMLJS' => true,
+      'ScriptBody' => "<html></html>"
+    }
+    response = @@creative.update(update_creative)
+    JSON.parse(response.body)["Id"].should == $creative_id.to_i
+    JSON.parse(response.body)["Title"].should == $Title
+    JSON.parse(response.body)["Url"].should == $Url
+    JSON.parse(response.body)["Body"].should == $Body
+    JSON.parse(response.body)["AdvertiserId"].should == $AdvertiserId
+    JSON.parse(response.body)["AdTypeId"].should == $AdTypeId
+    JSON.parse(response.body)["IsActive"].should == $IsActive
+    JSON.parse(response.body)["Alt"].should == $Alt
+    JSON.parse(response.body)["IsDeleted"].should == $IsDeleted
+    JSON.parse(response.body)["IsSync"].should == $IsSync
+    JSON.parse(response.body)["IsHTMLJS"].should == true 
+    JSON.parse(response.body)["ScriptBody"].should == "<html></html>"
+  end
+
+
   it "should list all creatives for an advertiser" do
     response = @@creative.list($AdvertiserId)
     entry = response["Items"].last.to_json
@@ -108,6 +170,25 @@ describe "Creative API" do
     JSON.parse(entry)["IsSync"].should == $IsSync
   end
 
+  #it "should update a creative with no adtype and preserve the adtype" do
+    #updated_creative = {
+      #'Id' => $creative_id,
+      #'Title' => 'test',
+      #'Body' => 'test',
+      #'AdvertiserId' => $advertiserId,
+      ##'AdTypeId' => 18,
+      #'IsActive' => true,
+      #'Alt' => "",
+      #'IsDeleted' => false,
+      #'IsSync' => false 
+    #}
+    #response = @@creative.update(updated_creative)
+    #JSON.parse(response.body)["Title"].should == 'test'
+    #JSON.parse(response.body)["Body"].should == 'test'
+    #JSON.parse(response.body)["AdvertiserId"].should == $advertiserId
+    #JSON.parse(response.body)["AdTypeId"].should == $AdTypeId
+  #end
+
   it "should delete the creatives after creating it" do
     response = @@creative.delete($creative_id)
     response.body.should == "OK"

data/test/creative_map_api_spec.rb

@@ -1,15 +1,17 @@
-require 'spec_helper'
+require './spec_helper'
 
 describe "Creative Flight API" do
   
   $creative_url = 'http://www.adzerk.com'
   @@map = $adzerk::CreativeMap.new
+  @@creative = $adzerk::Creative.new
   @@advertiser = $adzerk::Advertiser.new
   @@channel = $adzerk::Channel.new
   @@campaign = $adzerk::Campaign.new
   @@site = $adzerk::Site.new
   @@flight = $adzerk::Flight.new
   @@priority = $adzerk::Priority.new
+  @@zone = $adzerk::Zone.new
   
   before(:all) do
     new_advertiser = {
@@ -79,6 +81,14 @@ describe "Creative Flight API" do
     }
     response = @@site.create(new_site)
     $siteId = JSON.parse(response.body)["Id"]
+    
+    new_zone = {
+      'Name' => 'Test Zone ' + rand(10000000).to_s,
+      'SiteId' => $siteId,
+    }
+    response = @@zone.create(new_zone)
+    $zoneId = JSON.parse(response.body)["Id"]
+
   end
   
   it "should create a creative" do
@@ -91,16 +101,16 @@ describe "Creative Flight API" do
     $FlightId = $flightId
     $MapId = 0
     $AdTypeId = 18
-    $ZoneId = 0
+    $ZoneId = $zoneId
     $SiteId = $siteId
     $SizeOverride = false
     $Iframe = false
     $PublisherAccountId = 372
-    $ScriptBody = nil
+    $ScriptBody = '<html>' 
     $Impressions = 100000
-    $Percentage = 0
-    $DistributionType = 0
-    $AdFormatId = 0
+    $Percentage = 50
+    $DistributionType = 1 
+    $IsHTMLJS = true
     $IsActive = true
     $Alt = "test alt"
     $IsDeleted = false
@@ -109,17 +119,14 @@ describe "Creative Flight API" do
     new_creative = {
       'CampaignId' => $CampaignId,
       'FlightId' => $FlightId,
-      #'MapId' => $MapId,
-      #'ZoneId' => $ZoneId,
       'SizeOverride' => $SizeOverride,
       'Iframe' => $Iframe,
       'PublisherAccountId' => $PublisherAccountId,
-      'ScriptBody' => $ScriptBody,
       'Impressions' => $Impressions,
       'Percentage' => $Percentage,
       'SiteId' => $SiteId,
-      #'DistributionType' => $DistributionType,
-      'AdFormatId' => $AdFormatId,
+      'ZoneId' => $ZoneId,
+      'DistributionType' => $DistributionType,
       'IsActive' => $IsActive,
       'IsDeleted' => $IsDeleted,
       'Creative' => {
@@ -128,6 +135,8 @@ describe "Creative Flight API" do
         'Body' => $Body,
         'AdvertiserId' => $AdvertiserId,
         'AdTypeId' => $AdTypeId,
+        'IsHTMLJS' => $IsHTMLJS,
+        'ScriptBody' => $ScriptBody,
         'IsActive' => $IsActive,
         'Alt' => $Alt,
         'IsDeleted' => $IsDeleted,
@@ -136,51 +145,50 @@ describe "Creative Flight API" do
     }
     response = @@map.create(new_creative)
     Adzerk.uploadCreative(JSON.parse(response.body)["Creative"]["Id"].to_s, "250x250.gif") 
-    $creative_id = JSON.parse(response.body)["Id"].to_s
+    $map_id= JSON.parse(response.body)["Id"].to_s
     JSON.parse(response.body)["Creative"]["Title"].should == $Title
     JSON.parse(response.body)["Creative"]["Url"].should == $Url
     JSON.parse(response.body)["Creative"]["Body"].should == $Body
     JSON.parse(response.body)["Creative"]["AdvertiserId"].should == $AdvertiserId
     JSON.parse(response.body)["CampaignId"].should == $CampaignId
     JSON.parse(response.body)["FlightId"].should == $FlightId
-    #JSON.parse(response.body)["MapId"].should == $MapId
     JSON.parse(response.body)["Creative"]["AdTypeId"].should == $AdTypeId
-    #JSON.parse(response.body)["ZoneId"].should == $ZoneId
-    JSON.parse(response.body)["SiteId"].should == $SiteId
+    JSON.parse(response.body)["ZoneId"].should == $zoneId
+    JSON.parse(response.body)["SiteId"].should == $siteId
     JSON.parse(response.body)["SizeOverride"].should == $SizeOverride
     JSON.parse(response.body)["PublisherAccountId"].should == $PublisherAccountId
-    JSON.parse(response.body)["ScriptBody"].should == $ScriptBody
     JSON.parse(response.body)["Impressions"].should == $Impressions
     JSON.parse(response.body)["Percentage"].should == $Percentage
-    #JSON.parse(response.body)["DistributionType"].should == $DistributionType
-    JSON.parse(response.body)["AdFormatId"].should == $AdFormatId
+    JSON.parse(response.body)["DistributionType"].should == $DistributionType
+    JSON.parse(response.body)["Creative"]["IsHTMLJS"].should == $IsHTMLJS
+    JSON.parse(response.body)["Creative"]["ScriptBody"].should == $ScriptBody
     JSON.parse(response.body)["Creative"]["IsActive"].should == $IsActive
     JSON.parse(response.body)["Creative"]["Alt"].should == $Alt
     JSON.parse(response.body)["IsDeleted"].should == $IsDeleted
     JSON.parse(response.body)["Creative"]["IsSync"].should == $IsSync
+    $creative_id_id = JSON.parse(response.body)["Creative"]["Id"]
   end
   
   it "should list all creatives for a flight" do
     response = @@map.list($FlightId)
     entry = response["Items"].last.to_json
-    $creative_id = JSON.parse(entry)["Id"]
+    $map_id = JSON.parse(entry)["Id"]
     JSON.parse(entry)["Creative"]["Title"].should == $Title
     JSON.parse(entry)["Creative"]["Url"].should == $Url
     JSON.parse(entry)["Creative"]["Body"].should == $Body
     JSON.parse(entry)["Creative"]["AdvertiserId"].should == $AdvertiserId
-    #JSON.parse(entry)["CampaignId"].should == $CampaignId
-    #JSON.parse(entry)["FlightId"].should == $FlightId
-    #JSON.parse(entry)["MapId"].should == $MapId
+    JSON.parse(entry)["CampaignId"].should == $CampaignId
+    JSON.parse(entry)["FlightId"].should == $FlightId
     JSON.parse(entry)["Creative"]["AdTypeId"].should == $AdTypeId
-    #JSON.parse(entry)["ZoneId"].should == $ZoneId
+    JSON.parse(entry)["ZoneId"].should == $ZoneId
     JSON.parse(entry)["SiteId"].should == $SiteId
-    JSON.parse(entry)["SizeOverride"].should == $SizeOverride
+    #JSON.parse(entry)["SizeOverride"].should == $SizeOverride
     #JSON.parse(entry)["PublisherAccountId"].should == $PublisherAccountId
-    JSON.parse(entry)["ScriptBody"].should == $ScriptBody
     #JSON.parse(entry)["Impressions"].should == $Impressions
     JSON.parse(entry)["Percentage"].should == $Percentage
-    #JSON.parse(entry)["DistributionType"].should == $DistributionType
-    #JSON.parse(entry)["AdFormatId"].should == $AdFormatId
+    JSON.parse(entry)["DistributionType"].should == $DistributionType
+    JSON.parse(entry)["Creative"]["IsHTMLJS"].should == $IsHTMLJS
+    JSON.parse(entry)["Creative"]["ScriptBody"].should == $ScriptBody
     JSON.parse(entry)["Creative"]["IsActive"].should == $IsActive
     JSON.parse(entry)["Creative"]["Alt"].should == $Alt
     JSON.parse(entry)["IsDeleted"].should == $IsDeleted
@@ -188,25 +196,24 @@ describe "Creative Flight API" do
   end
   
   it "should get a specific creative" do
-    response = @@map.get($creative_id, $flightId)
-    JSON.parse(response.body)["Id"].should == $creative_id
+    response = @@map.get($map_id, $flightId)
+    JSON.parse(response.body)["Id"].should == $map_id
     JSON.parse(response.body)["Creative"]["Title"].should == $Title
     JSON.parse(response.body)["Creative"]["Url"].should == $Url
     JSON.parse(response.body)["Creative"]["Body"].should == $Body
     JSON.parse(response.body)["Creative"]["AdvertiserId"].should == $AdvertiserId
-    #JSON.parse(response.body)["CampaignId"].should == $CampaignId
-    #JSON.parse(response.body)["FlightId"].should == $FlightId
-    #JSON.parse(response.body)["MapId"].should == $MapId
+    JSON.parse(response.body)["CampaignId"].should == $CampaignId
+    JSON.parse(response.body)["FlightId"].should == $FlightId
     JSON.parse(response.body)["Creative"]["AdTypeId"].should == $AdTypeId
-    #JSON.parse(response.body)["ZoneId"].should == $ZoneId
+    JSON.parse(response.body)["ZoneId"].should == $ZoneId
     JSON.parse(response.body)["SiteId"].should == $SiteId
-    JSON.parse(response.body)["SizeOverride"].should == $SizeOverride
+    #JSON.parse(response.body)["SizeOverride"].should == $SizeOverride
     #JSON.parse(response.body)["PublisherAccountId"].should == $PublisherAccountId
-    JSON.parse(response.body)["ScriptBody"].should == $ScriptBody
     #JSON.parse(response.body)["Impressions"].should == $Impressions
+    JSON.parse(response.body)["Creative"]["IsHTMLJS"].should == $IsHTMLJS
+    JSON.parse(response.body)["Creative"]["ScriptBody"].should == $ScriptBody
     JSON.parse(response.body)["Percentage"].should == $Percentage
-    #JSON.parse(response.body)["DistributionType"].should == $DistributionType
-    #JSON.parse(response.body)["AdFormatId"].should == $AdFormatId
+    JSON.parse(response.body)["DistributionType"].should == $DistributionType
     JSON.parse(response.body)["Creative"]["IsActive"].should == $IsActive
     JSON.parse(response.body)["Creative"]["Alt"].should == $Alt
     JSON.parse(response.body)["IsDeleted"].should == $IsDeleted
@@ -215,59 +222,71 @@ describe "Creative Flight API" do
   end
   
   it "should update a specific creative" do
-    update_creative = {
-      'Id' => $creative_id.to_i,
-      'Title' => $Title,
-      'ImageName' => $ImageName,
-      'Url' => $Url,
-      'Body' => $Body,
-      'AdvertiserId' => $AdvertiserId,
+   updated_creative = {
+      'Id' => $map_id,
       'CampaignId' => $CampaignId,
       'FlightId' => $FlightId,
-      'MapId' => $MapId,
-      'AdTypeId' => $AdTypeId,
-      'ZoneId' => $ZoneId,
+      'SizeOverride' => $SizeOverride,
+      'Iframe' => $Iframe,
+      'PublisherAccountId' => $PublisherAccountId,
+      'Impressions' => $Impressions + 100,
+      'Percentage' => $Percentage,
       'SiteId' => $SiteId,
+      'ZoneId' => $zoneId,
+      'IsActive' => $IsActive,
+      'IsDeleted' => $IsDeleted,
+      'Creative' => {
+        'Id' => @@creativeId
+      }
+    }
+    response = @@map.create(updated_creative)
+    Adzerk.uploadCreative(JSON.parse(response.body)["Creative"]["Id"].to_s, "250x250.gif") 
+    JSON.parse(response.body)["Creative"]["Title"].should == $Title
+    JSON.parse(response.body)["Creative"]["Url"].should == $Url
+    JSON.parse(response.body)["Creative"]["Body"].should == $Body
+    JSON.parse(response.body)["Creative"]["AdvertiserId"].should == $AdvertiserId
+    JSON.parse(response.body)["CampaignId"].should == $CampaignId
+    JSON.parse(response.body)["FlightId"].should == $FlightId
+    JSON.parse(response.body)["Creative"]["AdTypeId"].should == $AdTypeId
+    JSON.parse(response.body)["ZoneId"].should == $zoneId
+    JSON.parse(response.body)["SiteId"].should == $SiteId
+    JSON.parse(response.body)["SizeOverride"].should == $SizeOverride
+    JSON.parse(response.body)["PublisherAccountId"].should == $PublisherAccountId
+    JSON.parse(response.body)["Impressions"].should == $Impressions + 100
+    JSON.parse(response.body)["Percentage"].should == $Percentage
+    JSON.parse(response.body)["Creative"]["IsActive"].should == $IsActive
+    JSON.parse(response.body)["Creative"]["Alt"].should == $Alt
+    JSON.parse(response.body)["IsDeleted"].should == $IsDeleted
+    JSON.parse(response.body)["Creative"]["IsSync"].should == $IsSync
+  end
+
+  it "should update the scriptBody tag on a nested creative" do
+    updated_creative = {
+      'Id' => $map_id,
+      'CampaignId' => $CampaignId,
+      'FlightId' => $FlightId,
+      'ZoneId' => $ZoneId,
       'SizeOverride' => $SizeOverride,
       'Iframe' => $Iframe,
       'PublisherAccountId' => $PublisherAccountId,
-      'ScriptBody' => $ScriptBody,
       'Impressions' => $Impressions,
       'Percentage' => $Percentage,
-      'DistributionType' => $DistributionType,
-      'AdFormatId' => $AdFormatId,
+      'SiteId' => $SiteId,
       'IsActive' => $IsActive,
-      'Alt' => $Alt,
-      'IsDeleted' => $IsDeleted,
-      'IsSync' => $IsSync
+      'IsDeleted' => nil,
+      'Creative' => {
+        'Id' => @@creativeId,
+        'IsHTMLJS' => true,
+        'ScriptBody' => '<html></html>',
+        'Title' => 'test'
+      }
     }
-    response = @@map.update(update_creative)
-    #JSON.parse(response.body)["Id"].should == $creative_id
-    #JSON.parse(response.body)["Creative"]["Title"].should == $Title
-    #JSON.parse(response.body)["Creative"]["Url"].should == $Url
-    #JSON.parse(response.body)["Creative"]["Body"].should == $Body
-    #JSON.parse(response.body)["Creative"]["AdvertiserId"].should == $AdvertiserId
-    #JSON.parse(response.body)["CampaignId"].should == $CampaignId
-    #JSON.parse(response.body)["FlightId"].should == $FlightId
-    #JSON.parse(response.body)["MapId"].should == $MapId
-    #JSON.parse(response.body)["Creative"]["AdTypeId"].should == $AdTypeId
-    #JSON.parse(response.body)["ZoneId"].should == $ZoneId
-    #JSON.parse(response.body)["SiteId"].should == $SiteId
-    #JSON.parse(response.body)["SizeOverride"].should == $SizeOverride
-    #JSON.parse(response.body)["PublisherAccountId"].should == $PublisherAccountId
-    #JSON.parse(response.body)["ScriptBody"].should == $ScriptBody
-    #JSON.parse(response.body)["Impressions"].should == $Impressions
-    #JSON.parse(response.body)["Percentage"].should == $Percentage
-    #JSON.parse(response.body)["DistributionType"].should == $DistributionType
-    #JSON.parse(response.body)["AdFormatId"].should == $AdFormatId
-    #JSON.parse(response.body)["Creative"]["IsActive"].should == $IsActive
-    #JSON.parse(response.body)["Creative"]["Alt"].should == $Alt
-    #JSON.parse(response.body)["IsDeleted"].should == $IsDeleted
-    #JSON.parse(response.body)["Creative"]["IsSync"].should == $IsSync
+    response = @@map.update(updated_creative)
+    response.body.scan(/Exception/).should == []
   end
   
   it "should delete the creatives after creating it" do
-    response = @@map.delete($creative_id, $FlightId)
+    response = @@map.delete($map_id, $FlightId)
     response.body.should == "OK"
   end
   
@@ -278,16 +297,14 @@ describe "Creative Flight API" do
       'SizeOverride' => $SizeOverride,
       'Iframe' => $Iframe,
       'PublisherAccountId' => $PublisherAccountId,
-      'ScriptBody' => $ScriptBody,
       'Impressions' => $Impressions,
       'SiteId' => $SiteId,
       'Percentage' => $Percentage,
-      'AdFormatId' => $AdFormatId,
       'IsActive' => $IsActive,
       'IsDeleted' => $IsDeleted
     }
     response = @@map.create(map)
-    true.should == !response.body.scan(/Exception/).empty?
+    response.body.scan(/This campaign is not part/).should_not == []
   end
   
   it "should not create a map when flightId is forbidden" do
@@ -297,16 +314,14 @@ describe "Creative Flight API" do
       'SizeOverride' => $SizeOverride,
       'Iframe' => $Iframe,
       'PublisherAccountId' => $PublisherAccountId,
-      'ScriptBody' => $ScriptBody,
       'Impressions' => $Impressions,
       'SiteId' => $SiteId,
       'Percentage' => $Percentage,
-      'AdFormatId' => $AdFormatId,
       'IsActive' => $IsActive,
       'IsDeleted' => $IsDeleted
     }
     response = @@map.create(map)
-    true.should == !response.body.scan(/Exception/).empty?
+    response.body.scan(/This flight is not part/).should_not == []
   end
     
   it "should create a map when there is no creative object, just id" do
@@ -316,11 +331,9 @@ describe "Creative Flight API" do
       'SizeOverride' => $SizeOverride,
       'Iframe' => $Iframe,
       'PublisherAccountId' => $PublisherAccountId,
-      'ScriptBody' => $ScriptBody,
       'Impressions' => $Impressions,
       'SiteId' => $SiteId,
       'Percentage' => $Percentage,
-      'AdFormatId' => $AdFormatId,
       'IsActive' => $IsActive,
       'IsDeleted' => $IsDeleted,
       'Creative' => {
@@ -328,7 +341,7 @@ describe "Creative Flight API" do
       }
     }
     response = @@map.create(map)
-    false.should == !response.body.scan(/Exception/).empty?
+    response.body.scan(/Exception/).should == []
   end
 
   it "should not create a map when there is no creative object, just id that belongs to a different advertiser" do
@@ -338,11 +351,9 @@ describe "Creative Flight API" do
       'SizeOverride' => $SizeOverride,
       'Iframe' => $Iframe,
       'PublisherAccountId' => $PublisherAccountId,
-      'ScriptBody' => $ScriptBody,
       'Impressions' => $Impressions,
       'SiteId' => $SiteId,
       'Percentage' => $Percentage,
-      'AdFormatId' => $AdFormatId,
       'IsActive' => $IsActive,
       'IsDeleted' => $IsDeleted,
       'Creative' => {
@@ -350,8 +361,77 @@ describe "Creative Flight API" do
       }
     }
     response = @@map.create(map)
-    true.should == !response.body.scan(/Exception/).empty?
+    response.body.scan(/That creative belongs to an advertiser/).should_not == []
   end
 
+  it "should create a map with and invalid siteId" do
+    new_creative = {
+      'CampaignId' => $CampaignId,
+      'FlightId' => $FlightId,
+      'ZoneId' => $ZoneId,
+      'SizeOverride' => $SizeOverride,
+      'Iframe' => $Iframe,
+      'PublisherAccountId' => $PublisherAccountId,
+      'Impressions' => $Impressions,
+      'Percentage' => $Percentage,
+      'SiteId' => 0,
+      'IsActive' => $IsActive,
+      'IsDeleted' => $IsDeleted,
+      'Creative' => {
+        'Title' => $Title,
+        'Url' => $Url,
+        'Body' => $Body,
+        'AdvertiserId' => $AdvertiserId,
+        'AdTypeId' => $AdTypeId,
+        'IsActive' => $IsActive,
+        'Alt' => $Alt,
+        'IsDeleted' => $IsDeleted,
+        'IsSync' => $IsSync
+      }
+    }
+    response = @@map.create(new_creative)
+    response.body.scan(/This site does not belong to your network/).should_not == []
+  end
+
+  it "should test if IsHTMLJS is getting written over" do
+    creative = {
+      'Title' => 'Test Creative ' + rand(1000).to_s,
+      'Url' => 'http://adzerk.com/',
+      'Body' => 'test',
+      'AdvertiserId' => $advertiserId,
+      'AdTypeId' => 18,
+      'IsHTMLJS' => true,
+      'ScriptBody' => '<html>test</html>',
+      'IsActive' => true,
+      'Alt' => 'test',
+      'IsDeleted' => false,
+      'IsSync' => false
+    }
+    response = @@creative.create(creative, '250x250.gif')
+    creativeId = JSON.parse(response.body)["Id"]
+    JSON.parse(response.body)["IsHTMLJS"].should == true
+    JSON.parse(response.body)["ScriptBody"].should == '<html>test</html>'
+
+    map = {
+      'CampaignId' => $campaignId,
+      'FlightId' => $flightId,
+      'ZoneId' => $zoneId,
+      'SizeOverride' => $SizeOverride,
+      'Iframe' => $Iframe,
+      'PublisherAccountId' => $PublisherAccountId,
+      'Impressions' => $Impressions,
+      'Percentage' => $Percentage,
+      'SiteId' => $siteId,
+      'IsActive' => $IsActive,
+      'IsDeleted' => $IsDeleted,
+      'Creative' => {
+        'Id' => creativeId
+      }
+    }
+    map_response = @@map.create(map)
+
+    JSON.parse(map_response.body)["Creative"]["IsHTMLJS"].should == true
+    JSON.parse(map_response.body)["Creative"]["ScriptBody"].should == '<html>test</html>'
+  end
 
 end