adzerk 0.1.4 → 0.2

data/test/rakefile.rb

@@ -1,20 +1,20 @@
+require 'rubygems'
+require 'rake'
 @files = [
   'advertiser_api_spec.rb',
   'campaign_api_spec.rb',
   'channel_api_spec.rb',
-  'channel_api_security_spec.rb',
+  'channel_site_map_api_spec.rb',
   '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',
-  'csv_export_spec.rb',
+  #'report_api_spec.rb',
+  'security_api_spec.rb',
   'site_api_spec.rb',
-  'priority_api_spec.rb',
-  'zone_api_spec.rb',
-  'channel_site_map_api_spec.rb'
+  'zone_api_spec.rb'
 ]
 
 task :runall do
@@ -22,7 +22,7 @@ task :runall do
   cmd = 'rspec '
 
   @files.each do |file|
-    cmd += file +' '
+    cmd += 'test/' + file +' '
   end
 
   sh "#{cmd}"

data/test/report_api_spec.rb

@@ -1,37 +1,31 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Report API" do
-  
-  $report_url = 'http://www.adzerk.com/'
-  @@report = $adzerk::Reporting.new
+
+  before do
+    @reports = Adzerk::Client.new(API_KEY).reports
+  end
 
   it "create a report" do
-    $startdate = "1/15/2011"
-    $enddate = "12/31/2011"
-    $groupby = ["month"]
-    $top30 = false
-    $exclude3rd = false
-    $istotal = true
-    $params = []
     new_report = {
-      'StartDate' => $startdate,
-      'EndDate' => $enddate,
-      'GroupBy' => $groupby,
-      'Top30countries' => $top30,
-      'Exclude3rdParty' => $exclude3rd,
-      'IsTotal' => $istotal,
-      'Parameters' => $params
+      :start_date => "1/15/2011",
+      :end_date => "12/31/2011",
+      :group_by => ['month'],
+      'Top30countries' => false,
+      :exclude_3rd_party => false,
+      :is_total => true,
+      :parameters => []
     }
-    response = @@report.create_report(new_report)
-    # response.body.should == '{"StartDate":"\/Date(1295067600000-0500)\/","EndDate":"\/Date(1325307600000-0500)\/","Critiera":[],"LoginId":0,"Records":[],"OptionRecords":[],"IsTotal":true,"Grouping":["month"],"TotalImpressions":0,"TotalClicks":0,"TotalCTR":0}'
+    report = @reports.create_report(new_report)
+    report[:is_total].should eq(true)
+    report[:grouping].should eq(["month"])
   end
 
-
   it "should pull a saved custom report" do
+    pending
     $savedReportId = 5280
-    response = @@report.get($savedReportId.to_s)
-
+    response = @reports.retrieve_report($savedReportId.to_s)
     csv_report = response.body
-  end      
+  end
 end
 

data/test/security_api_spec.rb

@@ -0,0 +1,21 @@
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
+require 'net/http'
+
+describe "Channel API security" do
+
+  it "should reject unauthenticated GET requests" 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
+  end
+
+  it "should reject GET requests with null API keys" 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)
+    request.add_field "X-Adzerk-ApiKey", ""
+    http.request(request).response.code.should_not == 200
+  end
+
+end

data/test/site_api_spec.rb

@@ -1,77 +1,63 @@
-require 'spec_helper'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Site API" do
-  
-  $site_url = 'http://www.adzerk.com'
-  @@site = $adzerk::Site.new
-  
+
+  before(:each) do
+    @site_url = 'http://www.adzerk.com'
+    @client = Adzerk::Client.new(API_KEY)
+  end
+
   it "should create a new site" do
     $site_title = 'Test Site ' + rand(1000000).to_s
     new_site = {
      'Title' => $site_title,
-     'Url' => $site_url
+     'Url' => @site_url
     }
-    response = @@site.create(new_site)
-    $site_id = JSON.parse(response.body)["Id"].to_s
-    $site_title.should == JSON.parse(response.body)["Title"]
-    $site_url.should == JSON.parse(response.body)["Url"]
-    $site_pub_id = JSON.parse(response.body)["PublisherAccountId"].to_s
+    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]
+    $site_pub_id = site[:publisher_account_id].to_s
   end
-  
+
   it "should list a specific site" do
-    response = @@site.get($site_id)
-    response.body.should == '{"Id":' + $site_id + ',"Title":"' + $site_title + '","Url":"' + $site_url + '","PublisherAccountId":' + $site_pub_id + ',"IsDeleted":false}'
+    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)
   end
 
   it "should update a site" do
     $site_title = 'Test Site ' + rand(1000000).to_s
-    updated_site = {
-      'Id' => $site_id,
-      'Title' => $site_title + "test",
-      'Url' => $site_url + "test"
-    }
-    response = @@site.update(updated_site)
-    $site_id = JSON.parse(response.body)["Id"].to_s
-    ($site_title + "test").should == JSON.parse(response.body)["Title"]
-    ($site_url + "test").should == JSON.parse(response.body)["Url"]
-    $site_pub_id = JSON.parse(response.body)["PublisherAccountId"].to_s
+    site = @client.sites.update(:id => $site_id,
+                                    :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]
+    $site_pub_id = site[:publisher_account_id].to_s
   end
 
   it "should list all sites" do
-    result = @@site.list()
+    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["PublisherAccountId"].to_s.should == $site_pub_id
+    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
   end
 
   it "should delete a new site" do
-    response = @@site.delete($site_id)
-    response.body.should == 'OK'
+    response = @client.sites.delete($site_id)
+    response.body.should == '"Successfully deleted."'
   end
 
   it "should not list deleted sites" do
-    result = @@site.list()
-    result["Items"].each do |r|
-      r["Id"].to_s.should_not == $site_id
+    result = @client.sites.list
+    result[:items].each do |site|
+      site[:id].to_s.should_not == $site_id
     end
   end
 
-  it "should not get individual deleted sites" do
-    response = @@site.get($site_id)
-    response.body.should == '{"Id":0,"PublisherAccountId":0,"IsDeleted":false}'
-  end
-
-  it "should not update deleted sites" do
-    $site_title = 'Test Site ' + rand(1000000).to_s
-    updated_site = {
-      'Id' => $site_id,
-      'Title' => $site_title,
-      'Url' => $site_url
-    }
-    response = @@site.update(updated_site)
-    response.body.should == '{"Id":0,"PublisherAccountId":0,"IsDeleted":false}'
-  end
-
-end
+end

data/test/spec_helper.rb

@@ -1,24 +1,11 @@
 require "rspec"
 require "json"
 require "net/http"
-require "../lib/Adzerk"
-require "../lib/adzerk/Site"
-require "../lib/adzerk/Zone"
-require "../lib/adzerk/Publisher"
-require "../lib/adzerk/Channel"
-require "../lib/adzerk/Campaign"
-require "../lib/adzerk/Flight"
-require "../lib/adzerk/Login"
-require "../lib/adzerk/Reporting"
-require "../lib/adzerk/Creative"
-require "../lib/adzerk/CreativeMap"
-require "../lib/adzerk/Advertiser"
-require "../lib/adzerk/Invitation"
-require "../lib/adzerk/Priority"
-require "../lib/adzerk/ChannelSiteMap"
+$:.push File.expand_path("../lib", __FILE__)
+require "adzerk"
 
-api_key = ENV["ADZERK_API_KEY"] || 'yourapikey'
-$adzerk = Adzerk.new(api_key)
+API_KEY = ENV['ADZERK_API_KEY'] || 'your_api_key'
+# $adzerk = Adzerk.new(API_KEY)
 
 RSpec.configure do |config|
   config.color_enabled = true

data/test/zone_api_spec.rb

@@ -1,89 +1,63 @@
-require './spec_helper.rb'
+require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Zone API" do
-  
-  @@zone = $adzerk::Zone.new
-  @@site = $adzerk::Site.new
-  
+
+
   before(:all) do
+    @client = Adzerk::Client.new(API_KEY)
+    @zones = @client.zones
+    @sites = @client.sites
     new_site = {
      'Title' => 'Test Site ' + rand(1000000).to_s,
      'Url' => 'http://www.adzerk.com'
     }
-    response = @@site.create(new_site)
-    $site_id = JSON.parse(response.body)["Id"]
+    site = @sites.create(new_site)
+    $site_id = site[:id]
   end
-  
+
   it "should create a new zone" do
     $name = 'Test Zone ' + rand(1000000).to_s
-    new_zone = {
-     'Name' => $name,
-     'SiteId' => $site_id,
-     'IsDeleted' => false
-    }
-    response = @@zone.create(new_zone)
-    $zone_id = JSON.parse(response.body)["Id"].to_s
-    JSON.parse(response.body)["Name"].should == $name
-    JSON.parse(response.body)["SiteId"].should == $site_id
-    JSON.parse(response.body)["IsDeleted"].should == false 
+    zone = @zones.create(:name => $name,
+                         :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
   end
-  
+
   it "should list a specific zone" do
-    response = @@zone.get($zone_id)
-    response.body.should == '{"Id":' + $zone_id + ',"Name":"' + $name + '","SiteId":' + $site_id.to_s + ',"IsDeleted":false}'
+    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)
   end
 
   it "should update a zone" do
     $name = 'Test Zone ' + rand(1000000).to_s
-    updated_zone = {
-     'Id' => $zone_id,
-     'Name' => $name,
-     'SiteId' => $site_id,
-     'IsDeleted' => false
-    }
-    response = @@zone.update(updated_zone)
-    JSON.parse(response.body)["Id"].to_s.should == $zone_id
-    JSON.parse(response.body)["Name"].should == $name
-    JSON.parse(response.body)["SiteId"].should == $site_id
-    JSON.parse(response.body)["IsDeleted"].should == false 
+    zone = @zones.update(:id => $zone_id,
+                             :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)
   end
 
   it "should list all zones" do
-    result = @@zone.list()
+    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["SiteId"].should == $site_id
-    result["Items"].last["IsDeleted"].should == false 
+    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
   end
 
   it "should delete a new zone" do
-    response = @@zone.delete($zone_id)
-    response.body.should == 'OK'
-  end
-
-  it "should not list deleted zones" do
-    result = @@zone.list()
-    result["Items"].each do |r|
-      r["Id"].to_s.should_not == $zone_id
-    end
-  end
-
-  it "should not get individual deleted zones" do
-    response = @@zone.get($zone_id)
-    response.body.should == '{"Id":0,"SiteId":0}'
-  end
-
-  it "should not update deleted zones" do
-    $name = 'Test Zone ' + rand(1000000).to_s
-    updated_zone = {
-     'Id' => $zone_id,
-     'Name' => $name,
-     'SiteId' => $site_id,
-     'IsDeleted' => false
-    }
-    response = @@zone.update(updated_zone)
-    response.body.should == '{"Id":0,"SiteId":0}'
+    response = @zones.delete($zone_id)
+    response.body.should == '"Successfully deleted"'
   end
 
-end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adzerk
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: '0.2'
   prerelease: 
 platform: ruby
 authors:
@@ -9,38 +9,77 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-19 00:00:00.000000000 Z
-dependencies: []
+date: 2012-12-06 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70242664708400 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 2.11.0
+  type: :development
+  prerelease: false
+  version_requirements: *70242664708400
+- !ruby/object:Gem::Dependency
+  name: json
+  requirement: &70242664707900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.7.5
+  type: :runtime
+  prerelease: false
+  version_requirements: *70242664707900
+- !ruby/object:Gem::Dependency
+  name: rest-client
+  requirement: &70242664707440 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 1.6.7
+  type: :runtime
+  prerelease: false
+  version_requirements: *70242664707440
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70242664706980 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - =
+      - !ruby/object:Gem::Version
+        version: 3.2.8
+  type: :runtime
+  prerelease: false
+  version_requirements: *70242664706980
 description: Ruby library for the Adzerk API
 email: kacy@adzerk.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- lib/Adzerk.rb
-- lib/adzerk/Advertiser.rb
-- lib/adzerk/Campaign.rb
-- lib/adzerk/Channel.rb
-- lib/adzerk/ChannelSiteMap.rb
-- lib/adzerk/Creative.rb
-- lib/adzerk/CreativeMap.rb
-- lib/adzerk/Flight.rb
-- lib/adzerk/Invitation.rb
-- lib/adzerk/Login.rb
-- lib/adzerk/Priority.rb
-- lib/adzerk/Publisher.rb
-- lib/adzerk/Reporting.rb
-- lib/adzerk/Site.rb
-- lib/adzerk/Zone.rb
+- lib/adzerk.rb
+- lib/adzerk/advertiser.rb
+- lib/adzerk/api_endpoint.rb
+- lib/adzerk/channel_site_map.rb
+- lib/adzerk/client.rb
+- lib/adzerk/creative.rb
+- lib/adzerk/creative_map.rb
+- lib/adzerk/flight.rb
+- lib/adzerk/invitation.rb
+- lib/adzerk/publisher.rb
+- lib/adzerk/reporting.rb
+- lib/adzerk/util.rb
+- lib/adzerk/version.rb
 - test/advertiser_api_spec.rb
 - test/campaign_api_spec.rb
-- test/channel_api_security_spec.rb
 - test/channel_api_spec.rb
 - test/channel_site_map_api_spec.rb
 - test/creative_api_spec.rb
 - test/creative_map_api_spec.rb
-- test/csv_export_spec.rb
-- test/delivery-test.rb
 - test/flight_api_spec.rb
 - test/invitation_api_spec.rb
 - test/login_api_spec.rb
@@ -48,10 +87,9 @@ files:
 - test/publisher_api_spec.rb
 - test/rakefile.rb
 - test/report_api_spec.rb
+- test/security_api_spec.rb
 - test/site_api_spec.rb
 - test/spec_helper.rb
-- test/test.rb
-- test/test2.rb
 - test/zone_api_spec.rb
 homepage: http://adzerk.com
 licenses: []