sklik-api 0.0.5 → 0.0.6

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/sklik-api/campaign.rb

@@ -46,6 +46,9 @@ Example of input hash
       #variable where are saved current data from system
       @campaign_data = nil
       
+      #variable for storing errors
+      @errors = []
+      
       #initialize adgroups
       @adgroups = []
       if args[:ad_groups] && args[:ad_groups].size > 0
@@ -58,6 +61,10 @@ Example of input hash
       super args
     end
     
+    def errors
+      @errors 
+    end
+    
     def self.find args = {}
       out = []
       super(NAME, args[:customer_id]).each do |campaign|
@@ -173,13 +180,29 @@ Example of input hash
         remove if (@args[:status] == :stopped) || (@args[:status].nil? && before_status == :stopped)
       else                    #do save
         #create campaign
-        create
+        begin
+          create
+        rescue Exception => e
+          @errors << e.message
+          return false
+        end
         
-        #create adgroups
-        @adgroups.each{ |adgroup| adgroup.save }
+        begin
+          #create adgroups
+          @adgroups.each{ |adgroup| adgroup.save }
         
-        @campaign_data = @args
-        return true
+          @campaign_data = @args
+          raise ArgumentError, "Problem with creating campaign datas" unless @errors.size == 0
+          return true
+        rescue Exception => e
+          @errors << e.message
+          #update name
+          update :name => "#{@args[:name]} FAILED ON CREATION - #{Time.now.strftime("%Y.%m.%d %H:%M:%S")}"
+          #remove campaign
+          remove
+          #return false because error occured
+          return false
+        end
       end
     end
   end

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

@@ -114,10 +114,38 @@ Example of input hash
         create
         
         #create adtexts
-        @adtexts.each{ |adtext| adtext.save }
+        @adtexts.each do |adtext| 
+          begin 
+            adtext.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 #{adtext.args} in adgroup #{@args[:name]}"
+            else
+              @campaign.errors << e.message
+            end
+          end
+        end
+          
         
         #create keywords
-        @keywords.each{ |keyword| keyword.save }
+        keywords_error = []
+        @keywords.each do |keyword| 
+          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
+            end
+          end
+        end
+        if keywords_error.size > 0
+          @campaign.errors << "Problem with creating keywords: #{keywords_error.join(", ")} in adgroup #{@args[:name]}"
+        end
+        
       end
     end
 

data/lib/sklik-api/connection.rb

@@ -62,18 +62,19 @@ class SklikApi
         if param[:status] == 200
           return yield(param)
         elsif param[:status] == 406
-          raise ArgumentError, "Sklik returned: #{param[:statusMessage]} \n #{args.inspect}"
+          raise ArgumentError, "Sklik returned: #{method}: #{param[:statusMessage]} #{args.inspect}"
         elsif param[:statusMessage] == "Session has expired or is malformed."
           raise ArgumentError, "session has expired"
         else
           raise ArgumentError, "There is error from sklik #{method}: #{param[:statusMessage]}"
         end
       rescue Exception => e
+        retry_count -= 1
         pp "Rescuing from request by: #{e.class} - #{e.message}"
         #if session expired then get new one! and retry
         get_session(true) if e.message == "session has expired"
-
-        retry_count -= 1
+        #don't retry if there is problem with Invalid paramaters od Data
+        retry_count = 0 if e.message.include?("Invalid") 
         retry if retry_count > 0
         raise e
       end

data/sklik-api.gemspec

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

data/test/unit/campaign.rb

@@ -81,7 +81,9 @@ class CampaignTest < Test::Unit::TestCase
     context "create" do
       setup do
         @campaign = SklikApi::Campaign.new(@test_campaign_hash)
-        @campaign.save
+        unless @campaign.save
+          puts "ERROR: \n #{@campaign.errors.join("\n")}"
+        end
       end
         
       should "be created with right parameters and updated" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sklik-api
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
   prerelease: 
 platform: ruby
 authors:
@@ -13,7 +13,7 @@ date: 2012-03-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70147319983680 !ruby/object:Gem::Requirement
+  requirement: &70136834352200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70147319983680
+  version_requirements: *70136834352200
 - !ruby/object:Gem::Dependency
   name: unicode
-  requirement: &70147319982980 !ruby/object:Gem::Requirement
+  requirement: &70136834351460 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70147319982980
+  version_requirements: *70136834351460
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70147320016580 !ruby/object:Gem::Requirement
+  requirement: &70136834385140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70147320016580
+  version_requirements: *70136834385140
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70147320015980 !ruby/object:Gem::Requirement
+  requirement: &70136834384520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70147320015980
+  version_requirements: *70136834384520
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70147320015280 !ruby/object:Gem::Requirement
+  requirement: &70136834383820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70147320015280
+  version_requirements: *70136834383820
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70147320014580 !ruby/object:Gem::Requirement
+  requirement: &70136834383140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147320014580
+  version_requirements: *70136834383140
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &70147320014020 !ruby/object:Gem::Requirement
+  requirement: &70136834382540 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147320014020
+  version_requirements: *70136834382540
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70147320013440 !ruby/object:Gem::Requirement
+  requirement: &70136834381980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.8.2
   type: :development
   prerelease: false
-  version_requirements: *70147320013440
+  version_requirements: *70136834381980
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70147320012880 !ruby/object:Gem::Requirement
+  requirement: &70136834381440 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147320012880
+  version_requirements: *70136834381440
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &70147320012240 !ruby/object:Gem::Requirement
+  requirement: &70136834380720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.2.5
   type: :development
   prerelease: false
-  version_requirements: *70147320012240
+  version_requirements: *70136834380720
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70147320011500 !ruby/object:Gem::Requirement
+  requirement: &70136834380060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70147320011500
+  version_requirements: *70136834380060
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70147320010900 !ruby/object:Gem::Requirement
+  requirement: &70136834379420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147320010900
+  version_requirements: *70136834379420
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70147320010280 !ruby/object:Gem::Requirement
+  requirement: &70136834378820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147320010280
+  version_requirements: *70136834378820
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &70147320009700 !ruby/object:Gem::Requirement
+  requirement: &70136834378220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70147320009700
+  version_requirements: *70136834378220
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70147320029580 !ruby/object:Gem::Requirement
+  requirement: &70136834398080 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -175,7 +175,7 @@ dependencies:
         version: 0.9.10
   type: :development
   prerelease: false
-  version_requirements: *70147320029580
+  version_requirements: *70136834398080
 description: Sklik advertising PPC api for creating campaigns and updating them when
   they runs
 email: ondrej@bartas.cz
@@ -222,7 +222,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -1450517545880020329
+      hash: -1796875428906502888
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: