adcloud 0.7.2 → 0.7.3

data/.gitignore

@@ -12,10 +12,13 @@ doc
 # bundler
 .bundle
 
+# not wanted in gems
+Gemfile.lock
+
 # jeweler generated
 pkg
 
-# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore: 
+# Have editor/IDE/OS specific files you need to ignore? Consider using a global gitignore:
 #
 # * Create a file at ~/.gitignore
 # * Include files you want ignored

data/RELEASE_NOTES.md

@@ -1,6 +1,12 @@
 Release Notes
 =============
 
+### 0.7.3
+
+* Allow campaig and advertisement updates
+* Make performance data available
+* Incorporate webhooks api changes
+
 ### 0.7.2
 
 * Add campaign and advertisement attributes

data/lib/adcloud/campaign_performance_data.rb

@@ -0,0 +1,14 @@
+module Adcloud
+  class CampaignPerformanceData < Adcloud::Entity
+    include Virtus
+
+    attribute :_meta, Hash
+    attribute :items, Array[Adcloud::CampaignPerformanceDataEntry]
+
+    def self.find_by_campaign_ids(campaign_ids)
+      result = connection.get(self.api_endpoint, { :campaign_ids => campaign_ids.join(',') })
+      self.new(result)
+    end
+
+  end
+end

data/lib/adcloud/campaign_performance_data_entry.rb

@@ -0,0 +1,18 @@
+module Adcloud
+  class CampaignPerformanceDataEntry
+    include Virtus
+
+    attribute :budget_delivered, Float
+    attribute :budget_delivered_today, Float
+    attribute :budget_limit_today, Float
+    attribute :campaign_id, Integer
+    attribute :clicks_delivered, Integer
+    attribute :clicks_delivered_today, Integer
+    attribute :impressions_delivered, Integer
+    attribute :impressions_delivered_today, Integer
+    attribute :leads_delivered, Integer
+    attribute :leads_delivered_today, Integer
+    attribute :performance, Float
+
+  end
+end

data/lib/adcloud/entity.rb

@@ -29,6 +29,14 @@ module Adcloud
       false
     end
 
+    def update
+      result = connection.put("#{self.class.api_endpoint}/#{id}", { self.class.api_name => attributes_for_update })
+      true
+    rescue Adcloud::BadRequestError => ex
+      derive_errors_from_error(ex)
+      false
+    end
+
     def destroy
       result = connection.delete("#{self.class.api_endpoint}/#{id}")
       self
@@ -99,6 +107,10 @@ module Adcloud
       self.attributes.reject { |i| [:id, :_meta].include?(i) }
     end
 
+    def attributes_for_update
+      self.attributes.reject { |i| [:_meta].include?(i) }
+    end
+
   end
 
 end

data/lib/adcloud/version.rb

@@ -1,3 +1,3 @@
 module Adcloud
-  VERSION = '0.7.2'
+  VERSION = '0.7.3'
 end

data/lib/adcloud/webhook.rb

@@ -21,7 +21,7 @@ module Adcloud
     def process!
       self.events.each do |event|
         proc = case event.type
-        when 'TopicPrice.update'
+        when 'TopicDiscount.update'
           :on_topic_price_update
         when 'Booking.update'
           :on_campaign_update

data/lib/adcloud.rb

@@ -15,6 +15,8 @@ module Adcloud
   autoload :ApiError, "adcloud/api_error"
   autoload :Authentication, "adcloud/authentication"
   autoload :Campaign, "adcloud/campaign"
+  autoload :CampaignPerformanceData, "adcloud/campaign_performance_data"
+  autoload :CampaignPerformanceDataEntry, "adcloud/campaign_performance_data_entry"
   autoload :Connection, "adcloud/connection"
   autoload :Customer, "adcloud/customer"
   autoload :Entity, "adcloud/entity"

data/test/adcloud/campaign_performance_data_test.rb

@@ -0,0 +1,34 @@
+# -*- encoding : utf-8 -*-
+require 'test_helper'
+
+describe Adcloud::CampaignPerformanceData do
+  subject { Adcloud::CampaignPerformanceData }
+
+  let(:connection) { stub }
+
+  describe ".find_by_campaign_ids" do
+    let(:response_data) { { "_meta" => {"page" => 1, "per_page" => 2, "size" => 2, "sort" => {}, "total_count" => 2, "total_pages" => 1, "type" => "Array<CampaignPerformanceData>", "uuid" => "542fe08151374ceaf8e97dfbc22d480d"}, "items" => [{"budget_delivered" => 0.0, "budget_delivered_today" => 0.0, "budget_limit_today" => 100.0, "campaign_id" => 101, "clicks_delivered" => 0, "clicks_delivered_today" => 0, "impressions_delivered" => 0, "impressions_delivered_today" => 0, "leads_delivered" => 0, "leads_delivered_today" => 0, "performance" => 0.0 }, {"budget_delivered" => 0.0, "budget_delivered_today" => 0.0, "budget_limit_today" => 100.0, "campaign_id" => 102, "clicks_delivered" => 0, "clicks_delivered_today" => 0, "impressions_delivered" => 0, "impressions_delivered_today" => 0, "leads_delivered" => 0, "leads_delivered_today" => 0, "performance" => 0.0 } ] } }
+
+    before do
+      subject.stubs(:connection => connection)
+      connection.stubs(:get).returns(response_data)
+    end
+
+    it 'access the api at the correct path' do
+      subject.connection.expects(:get).with('campaign_performance_data', { campaign_ids: '101,102' })
+      subject.find_by_campaign_ids([101, 102])
+    end
+
+    it 'returns a campaign performance data set' do
+      subject.find_by_campaign_ids([101, 102]).must_be_instance_of(Adcloud::CampaignPerformanceData)
+    end
+
+    it 'creates report entries for all items' do
+      subject.find_by_campaign_ids([101, 102]).items.first.must_be_instance_of(Adcloud::CampaignPerformanceDataEntry)
+    end
+
+    it 'parses the entry data correctly' do
+      subject.find_by_campaign_ids([101, 102]).items.first[:budget_limit_today].must_equal 100.0
+    end
+  end
+end

data/test/adcloud/entity_test.rb

@@ -134,6 +134,27 @@ describe Adcloud::Entity do
     end
   end
 
+  describe '#update' do
+    before { subject.stubs(:connection => connection) }
+
+    describe 'when submitting a valid object' do
+      let(:response) { { '_meta' => { 'status' => 200 }, 'id' => 1 } }
+
+      it 'sends a request to the api' do
+        car = subject.new(:id => 1, :name => 'Audi')
+        attributes = car.attributes
+        attributes.delete(:_meta)
+        connection.expects(:put).with('cars/1', { 'car' => attributes }).returns(response)
+        car.update
+      end
+
+      it 'returns true' do
+        connection.stubs(:put).returns(response)
+        subject.new.update.must_equal true
+      end
+    end
+  end
+
   describe '.create' do
     it 'creates a new car' do
       car = subject.new

data/test/adcloud/webhook_test.rb

@@ -1,7 +1,7 @@
 require 'test_helper'
 
 describe Adcloud::Webhook do
-  let(:event_payload) { '{"id":"2","country_id":"1","guidance_price_cpc":"1.49","guidance_price_cpm":"0.6","variance":"20.00","modified":"2012-09-04 14:21:20","created":"2012-04-10 20:40:24","_meta":{"is_test_data":true,"model":"TopicPrice","event":"TopicPrice.update","updated_fields":["guidance_price_cpc","guidance_price_cpm"],"id":"2"}}' }
+  let(:event_payload) { '{"id":"2","country_id":"1","guidance_price_cpc":"1.49","guidance_price_cpm":"0.6","variance":"20.00","modified":"2012-09-04 14:21:20","created":"2012-04-10 20:40:24","_meta":{"is_test_data":true,"model":"TopicPrice","event":"TopicDiscount.update","updated_fields":["guidance_price_cpc","guidance_price_cpm"],"id":"2"}}' }
   let(:payload) { "[#{event_payload}]" }
 
   subject { Adcloud::Webhook.new(payload) }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: adcloud
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.3
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-08 00:00:00.000000000 Z
+date: 2012-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: minitest
@@ -179,6 +179,8 @@ files:
 - lib/adcloud/api_error.rb
 - lib/adcloud/authentication.rb
 - lib/adcloud/campaign.rb
+- lib/adcloud/campaign_performance_data.rb
+- lib/adcloud/campaign_performance_data_entry.rb
 - lib/adcloud/campaign_state.rb
 - lib/adcloud/connection.rb
 - lib/adcloud/customer.rb
@@ -197,6 +199,7 @@ files:
 - lib/adcloud/webhook_event.rb
 - test/adcloud/advertisement_test.rb
 - test/adcloud/authentication_test.rb
+- test/adcloud/campaign_performance_data_test.rb
 - test/adcloud/campaign_test.rb
 - test/adcloud/connection_test.rb
 - test/adcloud/customer_test.rb
@@ -236,6 +239,7 @@ summary: Wrapper for adcloud API
 test_files:
 - test/adcloud/advertisement_test.rb
 - test/adcloud/authentication_test.rb
+- test/adcloud/campaign_performance_data_test.rb
 - test/adcloud/campaign_test.rb
 - test/adcloud/connection_test.rb
 - test/adcloud/customer_test.rb