sklik-api 0.0.12 → 0.0.13

data/Gemfile

@@ -1,10 +1,10 @@
 source "http://rubygems.org"
 
 gem "json"
-gem "unicode", "~> 0.4.0"
-gem "text", "~> 0.2.0"
-gem "i18n", "~> 0.6.0"
-gem "activesupport", "~> 3.1.0"
+gem "unicode"
+gem "text"
+gem "i18n"
+gem "activesupport"
 
 
 group :development do

data/VERSION

@@ -1 +1 @@
-0.0.12
+0.0.13

data/lib/sklik-api/connection.rb

@@ -18,7 +18,8 @@ class SklikApi
     
     #prepare connection to sklik
     def connection
-      server = XMLRPC::Client.new3(:host => "api.sklik.cz", :path => "/RPC2", :port => 443, :use_ssl => true, :timeout => @args[:timeout])
+      path = (ENV['RACK_ENV'] || ENV['RAILS']) == "test" ? "/sandbox/RPC2" : "/RPC2"
+      server = XMLRPC::Client.new3(:host => "api.sklik.cz", :path => path, :port => 443, :use_ssl => true, :timeout => @args[:timeout])
       server.instance_variable_get(:@http).instance_variable_set(:@verify_mode, OpenSSL::SSL::VERIFY_NONE)
       #fix of UTF-8 encoding
       server.extend(XMLRPCWorkAround)
@@ -59,7 +60,7 @@ class SklikApi
       begin 
         #get response from sklik
         param = connection.call( method, get_session, *args ).symbolize_keys
-        if param[:status] == 200
+        if [200,404].include?(param[:status])
           return yield(param)
         elsif param[:status] == 406
           raise ArgumentError, "Sklik returned: #{method}: #{param[:statusMessage]} #{args.inspect}"

data/lib/sklik-api.rb

@@ -15,7 +15,6 @@ require 'active_support'
 require 'active_support/inflector'
 require 'active_support/inflector/inflections'
 require 'active_support/core_ext/hash/keys'
-require 'active_support/core_ext/class/inheritable_attributes'
 require 'active_support/core_ext'
 
 require 'date'

data/sklik-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sklik-api"
-  s.version = "0.0.12"
+  s.version = "0.0.13"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ondrej Bartas"]
-  s.date = "2012-07-12"
+  s.date = "2012-08-29"
   s.description = "Sklik advertising PPC api for creating campaigns and updating them when they runs"
   s.email = "ondrej@bartas.cz"
   s.extra_rdoc_files = [
@@ -37,8 +37,7 @@ Gem::Specification.new do |s|
     "sklik-api.gemspec",
     "test/fake_web.rb",
     "test/helper.rb",
-    "test/unit/campaign.rb",
-    "test/unit/client.rb"
+    "test/unit/campaign.rb"
   ]
   s.homepage = "http://github.com/ondrejbartas/sklik-api"
   s.licenses = ["MIT"]
@@ -51,10 +50,10 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<json>, [">= 0"])
-      s.add_runtime_dependency(%q<unicode>, ["~> 0.4.0"])
-      s.add_runtime_dependency(%q<text>, ["~> 0.2.0"])
-      s.add_runtime_dependency(%q<i18n>, ["~> 0.6.0"])
-      s.add_runtime_dependency(%q<activesupport>, ["~> 3.1.0"])
+      s.add_runtime_dependency(%q<unicode>, [">= 0"])
+      s.add_runtime_dependency(%q<text>, [">= 0"])
+      s.add_runtime_dependency(%q<i18n>, [">= 0"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_development_dependency(%q<rack-test>, [">= 0"])
       s.add_development_dependency(%q<shoulda-context>, [">= 0"])
       s.add_development_dependency(%q<turn>, ["~> 0.8.2"])
@@ -67,10 +66,10 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<rcov>, ["= 0.9.10"])
     else
       s.add_dependency(%q<json>, [">= 0"])
-      s.add_dependency(%q<unicode>, ["~> 0.4.0"])
-      s.add_dependency(%q<text>, ["~> 0.2.0"])
-      s.add_dependency(%q<i18n>, ["~> 0.6.0"])
-      s.add_dependency(%q<activesupport>, ["~> 3.1.0"])
+      s.add_dependency(%q<unicode>, [">= 0"])
+      s.add_dependency(%q<text>, [">= 0"])
+      s.add_dependency(%q<i18n>, [">= 0"])
+      s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<rack-test>, [">= 0"])
       s.add_dependency(%q<shoulda-context>, [">= 0"])
       s.add_dependency(%q<turn>, ["~> 0.8.2"])
@@ -84,10 +83,10 @@ Gem::Specification.new do |s|
     end
   else
     s.add_dependency(%q<json>, [">= 0"])
-    s.add_dependency(%q<unicode>, ["~> 0.4.0"])
-    s.add_dependency(%q<text>, ["~> 0.2.0"])
-    s.add_dependency(%q<i18n>, ["~> 0.6.0"])
-    s.add_dependency(%q<activesupport>, ["~> 3.1.0"])
+    s.add_dependency(%q<unicode>, [">= 0"])
+    s.add_dependency(%q<text>, [">= 0"])
+    s.add_dependency(%q<i18n>, [">= 0"])
+    s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<rack-test>, [">= 0"])
     s.add_dependency(%q<shoulda-context>, [">= 0"])
     s.add_dependency(%q<turn>, ["~> 0.8.2"])

data/test/unit/campaign.rb

@@ -66,8 +66,7 @@ class CampaignTest < Test::Unit::TestCase
     end
     
     should "be found" do 
-      assert_equal SklikApi::Campaign.find(:campaign_id => 390265).size, 1
-      assert SklikApi::Campaign.find(:customer_id => 192495).size > 0
+      assert SklikApi::Campaign.find().size > 0, "In sklik sandbox should be some campaigns"
     end
     
     should "return stats" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sklik-api
 version: !ruby/object:Gem::Version
-  version: 0.0.12
+  version: 0.0.13
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-12 00:00:00.000000000 Z
+date: 2012-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70187437372220 !ruby/object:Gem::Requirement
+  requirement: &70165102749880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,54 +21,54 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187437372220
+  version_requirements: *70165102749880
 - !ruby/object:Gem::Dependency
   name: unicode
-  requirement: &70187437371520 !ruby/object:Gem::Requirement
+  requirement: &70165102748660 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187437371520
+  version_requirements: *70165102748660
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70187437405280 !ruby/object:Gem::Requirement
+  requirement: &70165102745140 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187437405280
+  version_requirements: *70165102745140
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70187437404600 !ruby/object:Gem::Requirement
+  requirement: &70165102744260 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 0.6.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187437404600
+  version_requirements: *70165102744260
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70187437403940 !ruby/object:Gem::Requirement
+  requirement: &70165102743000 !ruby/object:Gem::Requirement
     none: false
     requirements:
-    - - ~>
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70187437403940
+  version_requirements: *70165102743000
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70187437403220 !ruby/object:Gem::Requirement
+  requirement: &70165086747280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187437403220
+  version_requirements: *70165086747280
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &70187437402640 !ruby/object:Gem::Requirement
+  requirement: &70165086746120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187437402640
+  version_requirements: *70165086746120
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70187437402060 !ruby/object:Gem::Requirement
+  requirement: &70165086745640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.8.2
   type: :development
   prerelease: false
-  version_requirements: *70187437402060
+  version_requirements: *70165086745640
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70187437401520 !ruby/object:Gem::Requirement
+  requirement: &70165086745160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187437401520
+  version_requirements: *70165086745160
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &70187437400840 !ruby/object:Gem::Requirement
+  requirement: &70165086744600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.2.5
   type: :development
   prerelease: false
-  version_requirements: *70187437400840
+  version_requirements: *70165086744600
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70187437400140 !ruby/object:Gem::Requirement
+  requirement: &70165086744020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70187437400140
+  version_requirements: *70165086744020
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70187437399540 !ruby/object:Gem::Requirement
+  requirement: &70165086743500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187437399540
+  version_requirements: *70165086743500
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70187437398900 !ruby/object:Gem::Requirement
+  requirement: &70165086742980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187437398900
+  version_requirements: *70165086742980
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &70187437398300 !ruby/object:Gem::Requirement
+  requirement: &70165086742320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70187437398300
+  version_requirements: *70165086742320
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70187437397680 !ruby/object:Gem::Requirement
+  requirement: &70165086741800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -175,7 +175,7 @@ dependencies:
         version: 0.9.10
   type: :development
   prerelease: false
-  version_requirements: *70187437397680
+  version_requirements: *70165086741800
 description: Sklik advertising PPC api for creating campaigns and updating them when
   they runs
 email: ondrej@bartas.cz
@@ -206,7 +206,6 @@ files:
 - test/fake_web.rb
 - test/helper.rb
 - test/unit/campaign.rb
-- test/unit/client.rb
 homepage: http://github.com/ondrejbartas/sklik-api
 licenses:
 - MIT
@@ -222,7 +221,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3224656535573863894
+      hash: 2939750912901063758
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:

data/test/unit/client.rb

@@ -1,27 +0,0 @@
-# -*- encoding : utf-8 -*-
-require 'helper'
-class ClientTest < Test::Unit::TestCase
-  context "Client" do
-    
-    should "be initialized" do
-      assert_nothing_raised do
-        SklikApi::Client.new()
-      end  
-    end
-
-    should "found all Clients" do
-      assert_equal SklikApi::Client.find().size, 2
-    end
-      
-    should "be found by id" do 
-      assert_equal SklikApi::Client.find(:customer_id => 192107).first.args[:email], "test-ataxo@seznam.cz"
-      assert_equal SklikApi::Client.find(:customer_id => 192495).first.args[:email], "test3-ataxo@seznam.cz"
-    end    
-    
-    should "be found by email" do 
-      assert_equal SklikApi::Client.find(:email => "test-ataxo@seznam.cz").first.args[:customer_id], 192107
-      assert_equal SklikApi::Client.find(:email => "test3-ataxo@seznam.cz").first.args[:customer_id], 192495
-    end    
-    
-  end
-end