sklik-api 0.0.13 → 0.0.14

data/README.markdown

@@ -53,6 +53,12 @@ campaign_hash = {
   ]
 }
 
+# This model also support additional params: 
+# :excluded_search_services, :excluded_urls, :total_budget, :total_clicks, 
+#  :ad_selection, :start_date, :end_date, :status, :premise_id 
+# Please look into documentation of api.sklik.cz
+# http://api.sklik.cz/campaign.create.html
+
 #you can set it before every action to sklik api, if you have multiple accounts :-)
 SklikApi::Access.set(
   :email => "your_email@seznam.cz",

data/VERSION

@@ -1 +1 @@
-0.0.13
+0.0.14

data/lib/sklik-api/campaign.rb

@@ -4,6 +4,11 @@ class SklikApi
 
     NAME = "campaign"
 
+    ADDITIONAL_FIELDS = [ 
+      :excludedSearchServices, :excludedUrls, :totalBudget, :totalClicks, 
+      :adSelection, :startDate, :endDate, :premiseId 
+    ]
+
     include Object
 =begin
 Example of input hash
@@ -40,6 +45,12 @@ Example of input hash
     }
   ]
 }
+
+# This model also support additional params: 
+# :excluded_search_services, :excluded_urls, :total_budget, :total_clicks, 
+#  :ad_selection, :start_date, :end_date, :status, :premise_id 
+# Please look into documentation of api.sklik.cz
+# http://api.sklik.cz/campaign.create.html
 =end
     
     def initialize args
@@ -136,7 +147,10 @@ Example of input hash
       args[:status] = status_for_update if status_for_update
       args[:dayBudget] = (@args[:budget] * 100).to_i if @args[:budget]
       args[:context] = @args[:network_setting][:context] ||= true if @args[:network_setting]
-      args[:excludedSearchServices] = @args[:excluded_search_services] if @args[:excluded_search_services]
+      ADDITIONAL_FIELDS.each do |add_info|
+        field_name = add_info.to_s.underscore.to_sym
+        args[add_info] = @args[field_name] if @args[field_name]
+      end
 
       out << args
 
@@ -151,7 +165,11 @@ Example of input hash
       args[:name] = @args[:name]
       args[:dayBudget] = (@args[:budget] * 100).to_i if @args[:budget]
       args[:context] = @args[:network_setting][:context] ||= true if @args[:network_setting]
-      args[:excludedSearchServices] = @args[:excluded_search_services] if @args[:excluded_search_services]
+      ADDITIONAL_FIELDS.each do |add_info|
+        field_name = add_info.to_s.underscore.to_sym
+        args[add_info] = @args[field_name] if @args[field_name]
+      end
+
       out << args
       
       #add customer id on which account campaign should be created

data/lib/sklik-api/campaign_parts/adtext.rb

@@ -4,6 +4,10 @@ class SklikApi
 
     NAME = "ad"
 
+    ADDITIONAL_FIELDS = [ 
+      :premiseMode, :premiseID
+    ]
+
     include Object
 =begin
 Example of input hash
@@ -40,6 +44,12 @@ Example of input hash
       args[:creative3] = @args[:description2]
       args[:clickthruText] = @args[:display_url]
       args[:clickthruUrl] = @args[:url]
+
+      ADDITIONAL_FIELDS.each do |add_info|
+        field_name = add_info.to_s.underscore.to_sym
+        args[add_info] = @args[field_name] if @args[field_name]
+      end
+
       out << args
       
       #return output

data/sklik-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sklik-api"
-  s.version = "0.0.13"
+  s.version = "0.0.14"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ondrej Bartas"]
-  s.date = "2012-08-29"
+  s.date = "2012-10-15"
   s.description = "Sklik advertising PPC api for creating campaigns and updating them when they runs"
   s.email = "ondrej@bartas.cz"
   s.extra_rdoc_files = [

data/test/unit/campaign.rb

@@ -112,7 +112,7 @@ class CampaignTest < Test::Unit::TestCase
         assert_equal campaign_hash[:ad_groups].inject(0){|i,o| i + o[:ads].size}, @test_campaign_hash[:ad_groups].inject(0){|i,o| i + o[:ads].size}, "Campaign should have right ads count"
       end
 
-      should "be created with right parameters and updated" do
+      should "be created with right parameters" do
         
         assert_equal @campaign.args[:status], :running, "Must be running"
         
@@ -124,7 +124,9 @@ class CampaignTest < Test::Unit::TestCase
         assert_equal campaign_hash[:budget].to_f, @test_campaign_hash[:budget].to_f, "budgets should be same"
         assert_equal campaign_hash[:name], @test_campaign_hash[:name], "campaign name should be same"
         assert_equal campaign_hash[:ad_groups].size, @test_campaign_hash[:ad_groups].size, "campaign ad_groups should have same count"
-        
+      end
+
+      should "be created and updated by changing arguments" do
         campaign = SklikApi::Campaign.find(:customer_id => @campaign.args[:customer_id], :campaign_id => @campaign.args[:campaign_id]).first
         new_name = "Test of updated campaign name- #{Time.now.strftime("%Y.%m.%d %H:%M:%S")}"
         campaign.args[:name] = new_name
@@ -140,19 +142,39 @@ class CampaignTest < Test::Unit::TestCase
         
         campaign = SklikApi::Campaign.find(:customer_id => @campaign.args[:customer_id], :campaign_id => @campaign.args[:campaign_id]).first
         campaign.args[:status] = :stopped
-        puts "STOPPINGGGGGG"
         campaign.save
         campaign = SklikApi::Campaign.find(:customer_id => @campaign.args[:customer_id], :campaign_id => @campaign.args[:campaign_id]).first
         assert_equal campaign.args[:status], :stopped, "campaign should be stopped"
 
         campaign = SklikApi::Campaign.find(:customer_id => @campaign.args[:customer_id], :campaign_id => @campaign.args[:campaign_id]).first
         campaign.args[:status] = :paused
-        puts "PAUSINGGGGGGG"
         campaign.save
         campaign = SklikApi::Campaign.find(:customer_id => @campaign.args[:customer_id], :campaign_id => @campaign.args[:campaign_id]).first
         assert_equal campaign.args[:status], :paused, "campaign should be paused"
-
       end
+
+      should "be created and updated by update method" do
+        campaign = SklikApi::Campaign.find(:customer_id => @campaign.args[:customer_id], :campaign_id => @campaign.args[:campaign_id]).first
+        new_name = "Test of updated campaign name- #{Time.now.strftime("%Y.%m.%d %H:%M:%S")}"
+        assert campaign.update(name: new_name), "Should update name"
+        campaign_hash = SklikApi::Campaign.find(:customer_id => @campaign.args[:customer_id], :campaign_id => @campaign.args[:campaign_id]).first.to_hash
+        assert_equal campaign_hash[:name], new_name, "campaign name should be same"
+        
+        campaign = SklikApi::Campaign.find(:customer_id => @campaign.args[:customer_id], :campaign_id => @campaign.args[:campaign_id]).first
+        assert campaign.update(status: :paused), "should update status to paused"
+        campaign_hash = SklikApi::Campaign.find(:customer_id => @campaign.args[:customer_id], :campaign_id => @campaign.args[:campaign_id]).first.to_hash
+        assert_equal campaign_hash[:status], :paused, "campaign should be paused"
+        
+        campaign = SklikApi::Campaign.find(:customer_id => @campaign.args[:customer_id], :campaign_id => @campaign.args[:campaign_id]).first
+        assert campaign.update(status: :stopped), "should update status to stopped"
+        campaign = SklikApi::Campaign.find(:customer_id => @campaign.args[:customer_id], :campaign_id => @campaign.args[:campaign_id]).first
+        assert_equal campaign.args[:status], :stopped, "campaign should be stopped"
+
+        campaign = SklikApi::Campaign.find(:customer_id => @campaign.args[:customer_id], :campaign_id => @campaign.args[:campaign_id]).first
+        assert campaign.update(status: :paused), "should update status to paused"
+        campaign = SklikApi::Campaign.find(:customer_id => @campaign.args[:customer_id], :campaign_id => @campaign.args[:campaign_id]).first
+        assert_equal campaign.args[:status], :paused, "campaign should be paused"
+      end     
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sklik-api
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.14
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-29 00:00:00.000000000 Z
+date: 2012-10-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70165102749880 !ruby/object:Gem::Requirement
+  requirement: &70216085531400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165102749880
+  version_requirements: *70216085531400
 - !ruby/object:Gem::Dependency
   name: unicode
-  requirement: &70165102748660 !ruby/object:Gem::Requirement
+  requirement: &70216085530280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165102748660
+  version_requirements: *70216085530280
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70165102745140 !ruby/object:Gem::Requirement
+  requirement: &70216085526680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165102745140
+  version_requirements: *70216085526680
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70165102744260 !ruby/object:Gem::Requirement
+  requirement: &70216085525780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165102744260
+  version_requirements: *70216085525780
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70165102743000 !ruby/object:Gem::Requirement
+  requirement: &70216085524040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70165102743000
+  version_requirements: *70216085524040
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70165086747280 !ruby/object:Gem::Requirement
+  requirement: &70216085557100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165086747280
+  version_requirements: *70216085557100
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &70165086746120 !ruby/object:Gem::Requirement
+  requirement: &70216085556080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165086746120
+  version_requirements: *70216085556080
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70165086745640 !ruby/object:Gem::Requirement
+  requirement: &70216085555600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.8.2
   type: :development
   prerelease: false
-  version_requirements: *70165086745640
+  version_requirements: *70216085555600
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70165086745160 !ruby/object:Gem::Requirement
+  requirement: &70216085555040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165086745160
+  version_requirements: *70216085555040
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &70165086744600 !ruby/object:Gem::Requirement
+  requirement: &70216085554540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.2.5
   type: :development
   prerelease: false
-  version_requirements: *70165086744600
+  version_requirements: *70216085554540
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70165086744020 !ruby/object:Gem::Requirement
+  requirement: &70216085553980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70165086744020
+  version_requirements: *70216085553980
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70165086743500 !ruby/object:Gem::Requirement
+  requirement: &70216085553440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165086743500
+  version_requirements: *70216085553440
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70165086742980 !ruby/object:Gem::Requirement
+  requirement: &70216085552940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165086742980
+  version_requirements: *70216085552940
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &70165086742320 !ruby/object:Gem::Requirement
+  requirement: &70216085552280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70165086742320
+  version_requirements: *70216085552280
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70165086741800 !ruby/object:Gem::Requirement
+  requirement: &70216085551760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -175,7 +175,7 @@ dependencies:
         version: 0.9.10
   type: :development
   prerelease: false
-  version_requirements: *70165086741800
+  version_requirements: *70216085551760
 description: Sklik advertising PPC api for creating campaigns and updating them when
   they runs
 email: ondrej@bartas.cz
@@ -221,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2939750912901063758
+      hash: 3863493100634809434
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: