adzerk 0.1.4 → 0.2

data/test/invitation_api_spec.rb

@@ -1,55 +1,32 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 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
-    site = $adzerk::Site.new
-    site_url = "http://adzerk.com"
-    site_title = 'Test Site ' + rand(1000000).to_s
-    new_site = {
-     'Title' => site_title,
-     'Url' => site_url
-    }
-    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
+  before do
+    @client = Adzerk::Client.new(API_KEY)
+    advertiser = @client.advertisers.create(:title => "Coca cola",
+                                     :is_active => true,
+                                     :is_deleted => false)
+    site = @client.sites.create(:title => 'Adzerk', :url => 'http://www.adzerk.com')
+    @advertiser_id = advertiser[:id].to_s
+    @site_id = site[:id].to_s
   end
 
   it "should create a new publisher invitation" do
-
-    invitation = {
-      'Email' => $email,
-      'SiteId' => $siteId,
-      'AdvertiserId' => $advertiserId
-    }
-  
-    response = @@invite.invite_publisher(invitation)
+    response = @client.invitations.invite_publisher(:email => 'test@adzerk.com',
+                                        :site_id => @site_id,
+                                        :advertiser_id => @advertiser_id)
     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,
-      'AdvertiserId' => $advertiserId
-    }
-  
-    response = @@invite.invite_advertiser(invitation)
+  it "should create a new advertiser invitation" do
+    response = @client.invitations.invite_advertiser(:email => 'test@adzerk.com',
+                                                 :site_id => @site_id,
+                                                 :advertiser_id => @advertiser_id)
     response.body.should_not == ""
     response.body.length.should > 10
     response.body.length.should < 100
   end
-  
-end
+
+end

data/test/login_api_spec.rb

@@ -1,61 +1,36 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Login_API" do
-  
-  $login_url = 'http://www.adzerk.com/'
-  @@login = $adzerk::Login.new
 
-  it "should list all logins" do
-    result = @@login.list()
-    result.length.should > 0
-    #result["Items"].last["Id"].to_s.should == $site_id
+  before do
+    @logins = Adzerk::Client.new(API_KEY).logins
   end
 
   it "should create a new login" do
-    $email = "test+" + rand(10000).to_s + "@adzerk.com"
-    $password = "somepassword"
-    $fullname = "test person"
-    new_login = {
-      'Email' => $email,
-      'Password' => $password,
-      'Name' => $fullname
-    }
-    response = @@login.create(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)["Name"].should == $fullname
+    email = "test@email_#{rand(1000)}.com"
+    login = @logins.create(:email => email,
+                           :password => '1234567',
+                           :name => "John Doe")
+    $login_id = login[:id]
+    login[:email].should eq(email)
+    login[:password].should eq("1234567")
+    login[:name].should eq("John Doe")
   end
-  
-  it "should list a specific login" do
-    response = @@login.get($login_id)
-    response.body.should == '{"Id":' + $login_id.to_s + ',"Email":"'+ $email + '","Password":"","Name":"' + $fullname + '"}'
+
+  it "should list all logins" do
+    logins = @logins.list
+    logins[:items].last[:id].should eq($login_id)
   end
-  
-  it "should update a login" do
-    new_login = {
-      'Id' => $login_id,
-      '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 == ""
-    JSON.parse(response.body)["Name"].should == $fullname
+
+  it "should list a specific login" do
+    login = @logins.get($login_id)
+    login[:name].should eq("John Doe")
   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
+  it "should update a login" do
+    login = @logins.update(:id => $login_id,
+                           :name => "New Name")
+    login[:name].should eq("New Name")
   end
 
-end
+end

data/test/priority_api_spec.rb

@@ -1,105 +1,75 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/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
+    client = Adzerk::Client.new(API_KEY)
+    channels = client.channels
+    channel = channels.
+      create(:title => 'Test Channel ' + rand(1000000).to_s,
+             :commission => '0',
+             :engine => 'CPM',
+             :keywords => 'test',
+             'CPM' => '10.00',
+             :ad_types => [1,2,3,4])
+    $channel_id = channel[:id].to_s
+    @priorities = client.priorities
   end
 
   it "should create a new priority" do
     $priority_name = 'Test priority ' + rand(1000000).to_s
-    $priority_channelId = $channelId
+    $priority_channel_id = $channel_id
     $priority_weight = 1
-    $priority_isDeleted = false
+    $priority_is_deleted = 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"]
+    priority = @priorities.create(:name => $priority_name,
+                                  :channel_id => $priority_channel_id,
+                                  :weight => $priority_weight,
+                                  :is_deleted => $priority_is_deleted)
+    $priority_id = priority[:id].to_s
+    $priority_name.should == priority[:name]
+    $priority_channel_id.to_f.should == priority[:channel_id]
+    $priority_weight.should == priority[:weight]
+    $priority_is_deleted.should == priority[:is_deleted]
   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 + '}'
+    priority = @priorities.get($priority_id)
+    $priority_name.should == priority[:name]
+    $priority_channel_id.to_f.should == priority[:channel_id]
+    $priority_weight.should == priority[:weight]
+    $priority_is_deleted.should == priority[:is_deleted]
+    priority = @priorities.get($priority_id)
   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"]
+    priority = @priorities.
+      update(:id => $priority_id,
+             :name => $priority_name,
+             :channel_id => $priority_channel_id,
+             :weight => 2,
+             :is_deleted => $priority_is_deleted)
+
+    $priority_name.should == priority[:name]
+    $priority_channel_id.to_f.should == priority[:channel_id]
+    priority[:weight].should == 2
+    $priority_is_deleted.should == priority[:is_deleted]
   end
-  
+
   it "should list all priorities" do
-    result = @@priority.list()
+    result = @priorities.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 
+    priority = result[:items].last
+    priority[:id].to_s == $priority_id 
+    $priority_name.should == priority[:name]
+    $priority_channel_id.to_f.should == priority[:channel_id]
+    priority[:weight].should == 2
+    $priority_is_deleted.should == priority[:is_deleted]
   end
-  
+
   it "should delete a new priority" do
-    response = @@priority.delete($priority_id)
-    response.body.should == 'OK'
+    response = @priorities.delete($priority_id)
+    response.body.should == '"Successfully deleted"'
   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/publisher_api_spec.rb

@@ -1,147 +1,81 @@
-require './spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Publisher API" do
-  
-  @@publisher = $adzerk::Publisher.new
-  
+
+  before(:all) do
+    client = Adzerk::Client.new(API_KEY)
+    @publishers = client.publishers
+    @rand = rand(1000000).to_s
+  end
+
   it "should create a new publisher" do
-    $rand = rand(1000000).to_s
-    $publisher_first = 'Test ' + $rand
-    $publisher_last = 'Person ' + $rand
-    $publisher_company = 'Company ' + $rand
-    $publisher_line1 = $rand + 'st'
-    $publisher_line2 = 'Apt. ' + $rand
-    $publisher_city = $rand + 'ville'
-    $publisher_state = 'NC'
-    $publisher_zip = $rand.to_s
-    $publisher_country = 'USA'
-    $publisher_payment_option = "1"
-    $publisher_paypal_email = 'Test' + $rand + '@test.com'
-    $new_publisher = {
-     'FirstName' => $publisher_first,
-     'LastName' => $publisher_last,
-     'CompanyName' => $publisher_company,
-     'Address' => {
-       'Line1' => $publisher_line1,
-       'Line2' => $publisher_line2,
-       'City' => $publisher_city,
-       'StateProvince' => $publisher_state,
-       'PostalCode' => $publisher_zip,
-       'Country' => $publisher_country
+    new_publisher = {
+     :first_Name => 'John' + @rand,
+     :last_name => 'Doe' + @rand,
+     :company_name => 'Company' + @rand,
+     :address => {
+       :line1 => "1001 Invalid St",
+       :line2 => "Unit 302",
+       :city => "San Francisco",
+       :state_province => "CA",
+       :postal_code => "90210",
+       :country => "USA"
      },
-     'PaymentOption' => $publisher_payment_option,
-     'PaypalEmail' => $publisher_paypal_email
+     :payment_option => 1, # this is paypal
+     :paypal_email => "johndoe+" + @rand + "@johndoe.com"
     }
-    response = @@publisher.create($new_publisher)
-    $publisher_id = JSON.parse(response.body)["Id"].to_s
-    $publisher_first.should == JSON.parse(response.body)["FirstName"]
-    $publisher_last.should == JSON.parse(response.body)["LastName"]
-    $publisher_company.should == JSON.parse(response.body)["CompanyName"]
-    JSON.parse(response.body)["PaymentOption"].should == "1"
-    $publisher_paypal_email.should == JSON.parse(response.body)["PaypalEmail"]
-    
-    $address_id = JSON.parse(response.body)["Address"]["Id"].to_s
-    $publisher_line1.should == JSON.parse(response.body)["Address"]["Line1"]
-    $publisher_line2.should == JSON.parse(response.body)["Address"]["Line2"]
-    $publisher_city.should == JSON.parse(response.body)["Address"]["City"]
-    $publisher_state.should == JSON.parse(response.body)["Address"]["StateProvince"]
-    $publisher_zip.should == JSON.parse(response.body)["Address"]["PostalCode"]
-    $publisher_country.should == JSON.parse(response.body)["Address"]["Country"]
+    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
+    $address_id = publisher[:address][:id].to_s
   end
-  
+
   it "should list a specific publisher" do
-     response = @@publisher.get($publisher_id)
-     response.body.should == '{"Id":' + $publisher_id + ',"FirstName":"' + $publisher_first + '","LastName":"' + $publisher_last + '","CompanyName":"' + $publisher_company + '","Address":{"Id":' + $address_id + ',"Line1":"' + $publisher_line1 + '","Line2":"' + $publisher_line2 + '","City":"' + $publisher_city + '","StateProvince":"' + $publisher_state + '","PostalCode":"' + $publisher_zip + '","Country":"' + $publisher_country + '"},"PaypalEmail":"' + $publisher_paypal_email + '","PaymentOption":"PayPal","IsDeleted":false}'
+    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
    end
 
   it "should update a publisher" do
-    $new_publisher = {
-      'Id' => $publisher_id,
-      'FirstName' => $publisher_first + "test",
-      'LastName' => $publisher_last + "test",
-      'CompanyName' => $publisher_company + "test",
-      'Address' => {
-       'Line1' => $publisher_line1 + "test",
-       'Line2' => $publisher_line2 + "test",
-       'City' => $publisher_city + "test",
-       'StateProvince' => $publisher_state + "test",
-       'PostalCode' => $publisher_zip + "test",
-       'Country' => $publisher_country + "test"
-      },
-      'PaymentOption' => $publisher_payment_option,
-      'PaypalEmail' => $publisher_paypal_email + "test"
+    updated_publisher = {
+     :id => $publisher_id,
+     :first_Name => 'Rafael' + @rand,
+     :last_name => 'Doe' + @rand,
+     :company_name => 'Company' + @rand,
+     :address => {
+       :line1 => "1001 Invalid St",
+       :line2 => "Unit 302",
+       :city => "San Francisco",
+       :state_province => "CA",
+       :postal_code => "90210",
+       :country => "USA"
+     },
+     :payment_option => 1, # this is paypal
+     :paypal_email => "johndoe+" + @rand + "@johndoe.com"
     }
-    response = @@publisher.update($new_publisher)
-    $publisher_id = JSON.parse(response.body)["Id"].to_s
-    ($publisher_first + "test").should == JSON.parse(response.body)["FirstName"]
-    ($publisher_last + "test").should == JSON.parse(response.body)["LastName"]
-    ($publisher_company + "test").should == JSON.parse(response.body)["CompanyName"]
-    JSON.parse(response.body)["PaymentOption"].should == "1"
-    ($publisher_paypal_email + "test").should == JSON.parse(response.body)["PaypalEmail"]
-    
-    $address_id = JSON.parse(response.body)["Address"]["Id"].to_s
-    ($publisher_line1 + "test").should == JSON.parse(response.body)["Address"]["Line1"]
-    ($publisher_line2 + "test").should == JSON.parse(response.body)["Address"]["Line2"]
-    ($publisher_city + "test").should == JSON.parse(response.body)["Address"]["City"]
-    ($publisher_state + "test").should == JSON.parse(response.body)["Address"]["StateProvince"]
-    ($publisher_zip + "test").should == JSON.parse(response.body)["Address"]["PostalCode"]
-    ($publisher_country + "test").should == JSON.parse(response.body)["Address"]["Country"]
+    publisher = @publishers.update(updated_publisher)
+    publisher[:first_name].should eq("Rafael" + @rand)
   end
 
   it "should list all publishers" do
-    result = @@publisher.list()
-    result.length.should > 0
-    result["Items"].last["Id"].to_s.should == $publisher_id
-    result["Items"].last["FirstName"].should == $publisher_first + "test"
-    result["Items"].last["LastName"].should == $publisher_last + "test"
-    result["Items"].last["CompanyName"].should == $publisher_company + "test"
-    result["Items"].last["PaymentOption"].should == "PayPal"
-    result["Items"].last["PaypalEmail"].should == $publisher_paypal_email + "test"
-    
-    result["Items"].last["Address"]["Line1"].should == $publisher_line1 + "test"
-    result["Items"].last["Address"]["Line2"].should == $publisher_line2 + "test"
-    result["Items"].last["Address"]["City"].should == $publisher_city + "test"
-    result["Items"].last["Address"]["StateProvince"].should == $publisher_state + "test"
-    result["Items"].last["Address"]["PostalCode"].should == $publisher_zip + "test"
-    result["Items"].last["Address"]["Country"].should == $publisher_country + "test"
-  end
+    publishers = @publishers.list
 
-  it "should delete a new publisher" do
-    response = @@publisher.delete($publisher_id)
-    response.body.should == 'OK'
+    publisher = publishers[:items].last
+    publisher[:id].should eq($publisher_id)
   end
 
-  it "should not list deleted publishers" do
-    result = @@publisher.list()
-    result["Items"].each do |r|
-      r["Id"].to_s.should_not == $publisher_id.to_s
-    end
-  end
-
-  it "should not get individual deleted publishers" do
-    response = @@publisher.get($publisher_id)
-    response.body.should == '{"Id":0,"IsDeleted":false}'
-  end
-
-  it "should not update deleted publishers" do
-    $updated_publisher = {
-      'Id' => $publisher_id,
-      'FirstName' => $publisher_first + "test",
-      'LastName' => $publisher_last + "test",
-      'CompanyName' => $publisher_company + "test",
-      'Address' => {
-        'Line1' => $publisher_line1 + "test",
-        'Line2' => $publisher_line2 + "test",
-        'City' => $publisher_city + "test",
-        'StateProvince' => $publisher_state + "test",
-        'PostalCode' => $publisher_zip + "test",
-        'Country' => $publisher_country + "test"
-      },
-      'PaymentOption' => $publisher_payment_option,
-      'PaypalEmail' => $publisher_paypal_email + "test"
-    }
-    response = @@publisher.update($updated_publisher)
-    response.body.should == '{"Id":0,"IsDeleted":false}'
+  it "should delete a new publisher" do
+    response = @publishers.delete($publisher_id)
+    response.body.should == '"Successfully deleted"'
   end
 
   it "should retrieve publisher earnings" do
@@ -171,9 +105,8 @@ describe "Publisher API" do
 
   it "should retrieve publisher payments for a network" do
     payments = { }
-    response = @@publisher.payments payments
-    response.first.length.should == 5
-    puts response
+    response = @publishers.payments payments
+    #response.first.length.should == 5
   end
 
   it "should retrieve publisher payments for a network with start and end date" do
@@ -181,34 +114,30 @@ describe "Publisher API" do
       'StartDate' => '01/01/2000',
       'EndDate' => '03/01/2000'
     }
-    response = @@publisher.payments payments
+    response = @publishers.payments payments
     response.first.should == nil
-    puts response
   end
 
   it "should retrieve publisher payments for a network with only start date" do
     payments = { 
       'StartDate' => '01/01/2012'
     }
-    response = @@publisher.payments payments
-    response.first.length.should == 5
-    puts response
+    response = @publishers.payments payments
+    #response.first.length.should == 5
   end
 
   it "should retrieve publisher payments for a site" do
     payments = { 
-      'SiteId' => 6872
+      #'SiteId' => 6872
     }
-    response = @@publisher.payments payments
-    puts response
+    response = @publishers.payments payments
   end
 
   it "should retrieve publisher payments for a publisher" do
     payments = { 
-      'PublisherAccountId' => 644
+      #'PublisherAccountId' => 644
     }
-    response = @@publisher.payments payments
-    puts response
+    response = @publishers.payments payments
   end
 
-end
+end