sklik-api 0.1.3 → 0.1.4

data/VERSION

@@ -1 +1 @@
-0.1.3
+0.1.4

data/lib/sklik-api.rb

@@ -42,6 +42,10 @@ class SklikApi
     @use_rollback.nil? || @use_rollback
   end
 
+  def self.logger= logger
+    @logger = logger
+  end
+
   def self.logger
     @logger ||= Logger.new(STDOUT)
   end

data/lib/sklik-api/connection.rb

@@ -68,6 +68,9 @@ class SklikApi
         SklikApi.log(:debug, "Response from api: #{param.inspect}") unless method == "client.login"
         if [200].include?(param[:status])
           return yield(param)
+        elsif param[:status] == 204 #Already removed
+          SklikApi.log(:info, "Trying to #{method} of #{args.inspect} but object is already in this status")
+          return true
         elsif param[:status] == 400
           raise SklikApi::InvalidArguments, "Calling method: #{method} with invalid arguments: #{args}, #{param.inspect}"
         elsif param[:status] == 404

data/lib/sklik-api/sklik_object.rb

@@ -54,9 +54,6 @@ class SklikApi
         begin
           connection.call("#{self.class::NAME}.restore", @args["#{self.class.to_s.downcase.split(":").last}_id".to_sym] ) { |param| true }
         rescue Exception => e
-          # if there is a problem but returned Not removed
-          # return true, becasue it says it is restored
-          return true if e.message == "Rescuing from request by: ArgumentError - There is error from sklik #{self.class.to_s.downcase}.restore: Not removed"
           raise e
         end
       end

data/sklik-api.gemspec

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

@@ -44,6 +44,22 @@ class CampaignIntegrationTest < Test::Unit::TestCase
       assert_equal SklikApi::Campaign.get(campaign.args[:campaign_id]).args[:status], :stopped
     end
 
+    should "remove and restore multiple times" do
+      campaign = SklikApi::Campaign.new(@only_campaign_hash)
+      assert campaign.save, "Problem with creating campaing: #{campaign.errors}"
+      assert_nothing_raised do
+        assert SklikApi::Campaign.get(campaign.args[:campaign_id]).remove, "Campaign should be removed"
+        assert_equal SklikApi::Campaign.get(campaign.args[:campaign_id]).args[:status], :stopped, "Campaign should have stopped status"
+        assert SklikApi::Campaign.get(campaign.args[:campaign_id]).remove, "Campaign should be removed second time without exception"
+        assert_equal SklikApi::Campaign.get(campaign.args[:campaign_id]).args[:status], :stopped, "Campaign should have stopped status for second time"
+        assert SklikApi::Campaign.get(campaign.args[:campaign_id]).restore, "Campaign should be restored"
+        assert_equal SklikApi::Campaign.get(campaign.args[:campaign_id]).args[:status], :running, "Campaign should have running status"
+        assert SklikApi::Campaign.get(campaign.args[:campaign_id]).restore, "Campaign should be restored second time without exception"
+        assert_equal SklikApi::Campaign.get(campaign.args[:campaign_id]).args[:status], :running, "Campaign should have running status for second time"
+      end
+    end
+
+
     should "find" do
       assert_equal SklikApi::Campaign.find(@campaign.args[:campaign_id]).to_hash.to_a.sort, @only_campaign_hash.to_a.sort
       assert_equal SklikApi::Campaign.find(campaign_id: @campaign.args[:campaign_id]).first.to_hash.to_a.sort, @only_campaign_hash.to_a.sort

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sklik-api
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.4
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-23 00:00:00.000000000 Z
+date: 2013-06-26 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: 88735919641886214
+      hash: -67005859409429857
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: