sklik-api 0.0.15 → 0.0.16

data/VERSION

@@ -1 +1 @@
-0.0.15
+0.0.16

data/lib/sklik-api/campaign.rb

@@ -130,7 +130,11 @@ Example of input hash
         @campaign_data
       else
         @campaign_data = @args
-        @campaign_data[:ad_groups] = Adgroup.find(self).collect{|a| a.to_hash}
+        if @args[:status] != :stopped
+          @campaign_data[:ad_groups] = Adgroup.find(self).collect{|a| a.to_hash}
+        else
+          @campaign_data[:ad_groups] = []
+        end
         @campaign_data
       end
     end
@@ -259,6 +263,8 @@ Example of input hash
         #remove it if new status is stopped or status doesn't changed and before it was stopped
         remove if (@args[:status] == :stopped) || (@args[:status].nil? && before_status == :stopped)
 
+        raise ArgumentError, "Problem with updating campaign datas #{@errors}" unless @errors.size == 0
+
         return true
       else                    #do save
         #create campaign

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

@@ -100,8 +100,13 @@ Example of input hash
         @adgroup_data
       else
         @adgroup_data = @args
-        @adgroup_data[:ads] = Adtext.find(self).collect{|a| a.to_hash}
-        @adgroup_data[:keywords] = Keyword.find(self).collect{|k| k.to_hash}
+        if @args[:status] != :stopped
+          @adgroup_data[:ads] = Adtext.find(self).collect{|a| a.to_hash}
+          @adgroup_data[:keywords] = Keyword.find(self).collect{|k| k.to_hash}
+        else
+          @adgroup_data[:ads] = []
+          @adgroup_data[:keywords] = []
+        end
         @adgroup_data
       end
     end
@@ -169,24 +174,21 @@ Example of input hash
         ############
         ## KEYWORDS
         ############
-        #create new keyowrds and delete old
-        @saved_keywords = keywords.inject({}){|o,k| o[k.args[:keyword]] = k ; o}
-        @new_keywords = @keywords.inject({}){|o,k| o[k.args[:keyword]] = k ; o}
-
-        #keywords to be deleted
-        (@saved_keywords.keys - @new_keywords.keys).each do |k|
-          #don't try to remove already removed keyword
-          @saved_keywords[k].remove unless @saved_keywords[k].args[:status] == :stopped
-        end
-
-        #keywords to be created
-        (@new_keywords.keys - @saved_keywords.keys).each do |k|
-          @new_keywords[k].save
-        end
 
-        #check status to be running
-        (@new_keywords.keys & @saved_keywords.keys).each do |k|
-          @saved_keywords[k].restore if @saved_keywords[k].args[:status] == :stopped
+        #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|
+              @campaign.errors << params[:statusMessage] if params[:statusMessage] != "OK"
+            end
+          rescue Exception => e
+            @campaign.errors << e.message
+          end
+          @new_keywords = @new_keywords[200..-1]
+          delete_first = false
         end
 
         ############
@@ -199,13 +201,24 @@ Example of input hash
 
         #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|
-          @new_adtexts[k].save
+          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
+              @campaign.errors << "Problem with creating #{@new_adtexts[k].args} in adgroup #{@args[:name]}"
+            else
+              @campaign.errors << e.message
+            end
+          end
         end
 
         #check status to be running
@@ -235,18 +248,20 @@ Example of input hash
 
         #create keywords
         keywords_error = []
-        @keywords.each do |keyword|
+        @new_keywords = @keywords.clone
+        delete_first = true
+        while @new_keywords && @new_keywords.size > 0 do
           begin
-            keyword.save
-          rescue Exception => e
-            #take care about error message -> do it nicer
-            if /Sklik returned: keyword.create: Invalid data in request/ =~ e.message
-              keywords_error << e.message.split("{:name=>\"").last.split("\", :matchType").first
-            else
-              @campaign.errors << e.message
+            connection.call('keywords.set', @args[:adgroup_id], @new_keywords[0..199].collect{|k| k.create_args.last }, delete_first) do |params|
+              @campaign.errors << params[:statusMessage] if params[:statusMessage] != "OK"
             end
+          rescue Exception => e
+            @campaign.errors << e.message
           end
+          @new_keywords = @new_keywords[200..-1]
+          delete_first = false
         end
+
         if keywords_error.size > 0
           @campaign.errors << "Problem with creating keywords: #{keywords_error.join(", ")} in adgroup #{@args[:name]}"
         end

data/sklik-api.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = "sklik-api"
-  s.version = "0.0.15"
+  s.version = "0.0.16"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ondrej Bartas"]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sklik-api
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -296,7 +296,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2058175083174565127
+      hash: -3350698988788175861
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: