sklik-api 0.1.4 → 0.1.5

data/VERSION

@@ -1 +1 @@
-0.1.4
+0.1.5

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

@@ -59,7 +59,7 @@ Example of input hash
       #initialize adgroups
       @adtexts = []
       if args[:ads] && args[:ads].size > 0
-        args[:ads].each do |adtext|
+        args[:ads].select{|a| !a.nil? }.each do |adtext|
           @adtexts << SklikApi::Adtext.new(adtext.merge(:adgroup => self))
         end
       end
@@ -67,9 +67,11 @@ Example of input hash
       #initialize adgroups
       @keywords = []
       if args[:keywords] && args[:keywords].size > 0
-        args[:keywords].each do |keyword|
+        args[:keywords].select{|k| !k.nil? }.each do |keyword|
           if keyword.is_a?(Hash)
             @keywords << SklikApi::Keyword.new(keyword.merge(:adgroup => self))
+          elsif keyword.is_a?(SklikApi::Keyword)
+            @keywords << SklikApi::Keyword.new(:keyword => keyword.args[:keyword] || keyword.args[:name], :adgroup => self)
           else
             @keywords << SklikApi::Keyword.new(:keyword => keyword, :adgroup => self)
           end
@@ -324,57 +326,62 @@ Example of input hash
           ## KEYWORDS
           ############
 
-          #update keywords
-          keywords_error = []
-          @new_keywords = @keywords.clone
-          delete_first = true
-          while @new_keywords && @new_keywords.size > 0 do
-            begin
-              connection.call('keywords.set', @args[:adgroup_id], @new_keywords[0..199].collect{|k| k.create_args.last }, delete_first) do |params|
-                log_error params[:statusMessage] if params[:statusMessage] != "OK"
+          #update keywords only when setted
+          if @keywords.size > 0
+            #update keywords
+            keywords_error = []
+            @new_keywords = @keywords.clone
+            delete_first = true
+            while @new_keywords && @new_keywords.size > 0 do
+              begin
+                connection.call('keywords.set', @args[:adgroup_id], @new_keywords[0..199].collect{|k| k.create_args.last }, delete_first) do |params|
+                  log_error params[:statusMessage] if params[:statusMessage] != "OK"
+                end
+              rescue Exception => e
+                log_error e.message
               end
-            rescue Exception => e
-              log_error e.message
+              @new_keywords = @new_keywords[200..-1]
+              delete_first = false
             end
-            @new_keywords = @new_keywords[200..-1]
-            delete_first = false
           end
 
           ############
           ## ADTEXTS
           ############
+  
+          #update adtexts only when setted
+          if @adtexts.size > 0          
+            #create new adtexts and delete old
+            @saved_adtexts = adtexts.inject({}){|o,a| o[a.uniq_identifier] = a ; o}
+            @new_adtexts = @adtexts.inject({}){|o,a| o[a.uniq_identifier] = a ; o}
+
+            #adtexts to be deleted
+            (@saved_adtexts.keys - @new_adtexts.keys).each do |k|
+              puts "deleting adtext #{@saved_adtexts[k]} in #{@args[:name]}"
+              #don't try to remove already removed adtext
+              @saved_adtexts[k].remove  unless @saved_adtexts[k].args[:status] == :stopped
+            end
 
-          #create new adtexts and delete old
-          @saved_adtexts = adtexts.inject({}){|o,a| o[a.uniq_identifier] = a ; o}
-          @new_adtexts = @adtexts.inject({}){|o,a| o[a.uniq_identifier] = a ; o}
-
-          #adtexts to be deleted
-          (@saved_adtexts.keys - @new_adtexts.keys).each do |k|
-            puts "deleting adtext #{@saved_adtexts[k]} in #{@args[:name]}"
-            #don't try to remove already removed adtext
-            @saved_adtexts[k].remove  unless @saved_adtexts[k].args[:status] == :stopped
-          end
-
-          #adtexts to be created
-          (@new_adtexts.keys - @saved_adtexts.keys).each do |k|
-            puts "creating new adtext #{k} in #{@args[:name]}"
-            begin
-              @new_adtexts[k].save
-            rescue Exception => e
-              #take care about error message -> do it nicer
-              if /There is error from sklik ad.create: Invalid parameters/ =~ e.message
-                log_error "Problem with creating #{@new_adtexts[k].args} in adgroup #{@args[:name]}"
-              else
-                log_error e.message
+            #adtexts to be created
+            (@new_adtexts.keys - @saved_adtexts.keys).each do |k|
+              puts "creating new adtext #{k} in #{@args[:name]}"
+              begin
+                @new_adtexts[k].save
+              rescue Exception => e
+                #take care about error message -> do it nicer
+                if /There is error from sklik ad.create: Invalid parameters/ =~ e.message
+                  log_error "Problem with creating #{@new_adtexts[k].args} in adgroup #{@args[:name]}"
+                else
+                  log_error e.message
+                end
               end
             end
-          end
 
-          #check status to be running
-          (@new_adtexts.keys & @saved_adtexts.keys).each do |k|
-            @saved_adtexts[k].restore if @saved_adtexts[k].args[:status] == :stopped
+            #check status to be running
+            (@new_adtexts.keys & @saved_adtexts.keys).each do |k|
+              @saved_adtexts[k].restore if @saved_adtexts[k].args[:status] == :stopped
+            end
           end
-
         rescue Exception => e
           log_error e.message
         end

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

@@ -95,7 +95,7 @@ Example of input hash
     end
 
     def strip_match_type keyword
-      keyword.gsub(/(\[|\]|\")/, "").gsub(/^-/, "")
+      "#{keyword}".gsub(/(\[|\]|\")/, "").gsub(/^-/, "")
     end
 
     def get_math_type keyword
@@ -203,7 +203,8 @@ Example of input hash
       if @keyword_data
         @keyword_data
       else
-        @keyword_data = @args      end
+        @keyword_data = @args
+      end
     end
 
 

data/sklik-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sklik-api"
-  s.version = "0.1.4"
+  s.version = "0.1.5"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ondrej Bartas"]
-  s.date = "2013-06-26"
+  s.date = "2013-07-16"
   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/helper.rb

@@ -18,5 +18,7 @@ $LOAD_PATH.unshift(File.dirname(__FILE__))
 require 'sklik-api'
 require './test/fake_web'
 
+SklikApi.logger = Logger.new('log/sklik_api_test.log')
+
 class Test::Unit::TestCase
 end

data/test/unit/adgroup_test.rb

@@ -56,15 +56,16 @@ class AdgroupTest < Test::Unit::TestCase
     end
 
     should "be found/get by id" do
-      adgroup = SklikApi::Adgroup.get(7053769)
+      adgroup_id = SklikApi::Campaign.find(@campaign.args[:campaign_id]).adgroups.first.args[:adgroup_id]
+      adgroup = SklikApi::Adgroup.get(adgroup_id)
       assert_not_nil adgroup
       assert adgroup.is_a?(SklikApi::Adgroup), "return SklikApi::Adgroup"
 
-      adgroup = SklikApi::Adgroup.find(adgroup_id: 7053769).first
+      adgroup = SklikApi::Adgroup.find(adgroup_id: adgroup_id).first
       assert_not_nil adgroup
       assert adgroup.is_a?(SklikApi::Adgroup), "return SklikApi::Adgroup"
 
-      adgroup = SklikApi::Adgroup.find(campaign_id: 'doesnt matter', adgroup_id: 7053769).first
+      adgroup = SklikApi::Adgroup.find(campaign_id: 'doesnt matter', adgroup_id: adgroup_id).first
       assert_not_nil adgroup
       assert adgroup.is_a?(SklikApi::Adgroup), "return SklikApi::Adgroup"
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sklik-api
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-26 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
@@ -304,7 +304,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -67005859409429857
+      hash: 4110349452567973535
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: