sklik-api 0.0.10 → 0.0.11

data/VERSION

@@ -1 +1 @@
-0.0.10
+0.0.11

data/lib/sklik-api/campaign.rb

@@ -68,7 +68,8 @@ Example of input hash
     def self.find args = {}
       out = []
       super(NAME, args[:customer_id]).each do |campaign|
-        if args[:campaign_id].nil? || (args[:campaign_id] && args[:campaign_id].to_i == campaign[:id].to_i)
+        if (args[:campaign_id].nil? || (args[:campaign_id] && args[:campaign_id].to_i == campaign[:id].to_i)) && #find by campaign id
+          (args[:status].nil? || (args[:status] && args[:status] == fix_status(campaign))) # find by status
           out << SklikApi::Campaign.new( 
             :campaign_id => campaign[:id],
             :customer_id => args[:customer_id], 
@@ -109,6 +110,10 @@ Example of input hash
       end
     end
     
+    def adgroups
+      Adgroup.find(self)
+    end
+
     def to_hash
       if @campaign_data
         @campaign_data
@@ -173,7 +178,7 @@ Example of input hash
       @args.merge!(args)
       save
     end
-    
+
     def save 
       if @args[:campaign_id]  #do update
         #get current status of campaign

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

@@ -76,6 +76,25 @@ Example of input hash
       end
     end
     
+    def keywords_stats from, to
+      output = []
+      keywords = Keyword.find(self)
+      keywords.in_groups_of(100, false).each do |keywords_group|
+        out = connection.call("keywords.stats", keywords_group.collect{|k| k.args[:keyword_id]}, from, to ) { |param|
+          param[:keywordStats]
+        }
+        out.each do |kw_stats|
+          kws = keywords_group.select{|k| k.args[:keyword_id] == kw_stats["keywordId"]}
+          if kws.size == 1
+            kw = keywords_group.delete(kws.first)
+            kw.stats = {:fulltext => underscore_hash_keys(kw_stats["stats"]) }
+            output << kw
+          end
+        end
+      end
+      output
+    end
+
     def to_hash
       if @adgroup_data
         @adgroup_data

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

@@ -78,7 +78,7 @@ Example of input hash
        end
      end
 
-     def to_hash
+    def to_hash
       if @adtext_data
         @adtext_data
       else

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

@@ -69,35 +69,35 @@ Example of input hash
     end
     
     def self.find adgroup, args = {}
-       out = []
-       super(NAME, adgroup.args[:adgroup_id]).each do |keyword|
-         if args[:keyword_id].nil? || (args[:keyword_id] && args[:keyword_id].to_i == keyword[:id].to_i)
-           out << SklikApi::Keyword.new( 
-             adgroup,
-             :keyword_id => keyword[:id],
-             :keyword => apply_math_type(keyword[:name], keyword[:matchType] ),
-             :status => fix_status(keyword)
-           )
-         end
-       end
-       out
-     end
+      out = []
+      super(NAME, adgroup.args[:adgroup_id]).each do |keyword|
+        if args[:keyword_id].nil? || (args[:keyword_id] && args[:keyword_id].to_i == keyword[:id].to_i)
+          out << SklikApi::Keyword.new( 
+            adgroup,
+            :keyword_id => keyword[:id],
+            :keyword => apply_math_type(keyword[:name], keyword[:matchType] ),
+            :status => fix_status(keyword)
+          )
+        end
+      end
+      out
+    end
 
-     def self.fix_status keyword
-       if keyword[:removed] == true
-         return :stopped
-       elsif keyword[:status] == "active"
-         return :running
-       elsif keyword[:status] == "suspend"
-         return :paused
-       elsif keyword[:status] == "nonactive"
-         return :paused_by_low_cpc
-       else
-         return :unknown
-       end
-     end
+    def self.fix_status keyword
+      if keyword[:removed] == true
+        return :stopped
+      elsif keyword[:status] == "active"
+        return :running
+      elsif keyword[:status] == "suspend"
+        return :paused
+      elsif keyword[:status] == "nonactive"
+        return :paused_by_low_cpc
+      else
+        return :unknown
+      end
+    end
 
-     def to_hash
+    def to_hash
       if @keyword_data
         @keyword_data
       else

data/lib/sklik-api/sklik_object.rb

@@ -62,6 +62,20 @@ class SklikApi
         @args["#{self.class.to_s.downcase.split(":").last}_id".to_sym] = out
         @args
       end
+
+      def stats= item
+        @stats = item
+      end
+
+      def stats
+        @stats ||= {}
+      end
+      
+      def get_stats from, to
+        @stats ||= connection.call("#{self.class::NAME}.stats", @args["#{self.class.name.to_s.split("::").last.underscore}_id".to_sym], from, to ) { |param|
+           {:fulltext => underscore_hash_keys(param[:fulltext]), :context => underscore_hash_keys(param[:context]) }
+        }
+      end
             
       def update_object
         out = connection.call("#{self.class::NAME}.setAttributes", *update_args ) { |param| true }
@@ -78,6 +92,10 @@ class SklikApi
       def to_hash
         raise(NoMethodError, "Please implement 'to_hash' method in class: #{self.class} - should return hash which contains all data")
       end
+
+      def underscore_hash_keys hash
+        hash.inject({ }) { |x, (k,v)| x[k.underscore.to_sym] = v; x }
+      end
     end
   end
 end

data/sklik-api.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "sklik-api"
-  s.version = "0.0.10"
+  s.version = "0.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Ondrej Bartas"]
-  s.date = "2012-07-11"
+  s.date = "2012-07-12"
   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/unit/campaign.rb

@@ -70,6 +70,12 @@ class CampaignTest < Test::Unit::TestCase
       assert SklikApi::Campaign.find(:customer_id => 192495).size > 0
     end
     
+    should "return stats" do
+      assert_nothing_raised do
+        SklikApi::Campaign.find(:campaign_id => 390265).first.get_stats Date.today, Date.today
+      end
+    end
+
     should "have hash stored inside" do
       assert_equal @campaign.args, @test_campaign_hash 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: sklik-api
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-11 00:00:00.000000000 Z
+date: 2012-07-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70173302687720 !ruby/object:Gem::Requirement
+  requirement: &70121742435280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70173302687720
+  version_requirements: *70121742435280
 - !ruby/object:Gem::Dependency
   name: unicode
-  requirement: &70173302687020 !ruby/object:Gem::Requirement
+  requirement: &70121742434640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *70173302687020
+  version_requirements: *70121742434640
 - !ruby/object:Gem::Dependency
   name: text
-  requirement: &70173302720720 !ruby/object:Gem::Requirement
+  requirement: &70121742433900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 0.2.0
   type: :runtime
   prerelease: false
-  version_requirements: *70173302720720
+  version_requirements: *70121742433900
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &70173302720120 !ruby/object:Gem::Requirement
+  requirement: &70121742467680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *70173302720120
+  version_requirements: *70121742467680
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70173302719460 !ruby/object:Gem::Requirement
+  requirement: &70121742467120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 3.1.0
   type: :runtime
   prerelease: false
-  version_requirements: *70173302719460
+  version_requirements: *70121742467120
 - !ruby/object:Gem::Dependency
   name: rack-test
-  requirement: &70173302718740 !ruby/object:Gem::Requirement
+  requirement: &70121742466380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70173302718740
+  version_requirements: *70121742466380
 - !ruby/object:Gem::Dependency
   name: shoulda-context
-  requirement: &70173302718160 !ruby/object:Gem::Requirement
+  requirement: &70121742465720 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70173302718160
+  version_requirements: *70121742465720
 - !ruby/object:Gem::Dependency
   name: turn
-  requirement: &70173302717580 !ruby/object:Gem::Requirement
+  requirement: &70121742465120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -98,10 +98,10 @@ dependencies:
         version: 0.8.2
   type: :development
   prerelease: false
-  version_requirements: *70173302717580
+  version_requirements: *70121742465120
 - !ruby/object:Gem::Dependency
   name: minitest
-  requirement: &70173302717020 !ruby/object:Gem::Requirement
+  requirement: &70121742464560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,10 +109,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70173302717020
+  version_requirements: *70121742464560
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &70173302716340 !ruby/object:Gem::Requirement
+  requirement: &70121742463940 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -120,10 +120,10 @@ dependencies:
         version: 1.2.5
   type: :development
   prerelease: false
-  version_requirements: *70173302716340
+  version_requirements: *70121742463940
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70173302715660 !ruby/object:Gem::Requirement
+  requirement: &70121742463300 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -131,10 +131,10 @@ dependencies:
         version: 1.8.3
   type: :development
   prerelease: false
-  version_requirements: *70173302715660
+  version_requirements: *70121742463300
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70173302715020 !ruby/object:Gem::Requirement
+  requirement: &70121742462620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -142,10 +142,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70173302715020
+  version_requirements: *70121742462620
 - !ruby/object:Gem::Dependency
   name: thin
-  requirement: &70173302714400 !ruby/object:Gem::Requirement
+  requirement: &70121742461960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -153,10 +153,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70173302714400
+  version_requirements: *70121742461960
 - !ruby/object:Gem::Dependency
   name: shotgun
-  requirement: &70173302713820 !ruby/object:Gem::Requirement
+  requirement: &70121742461380 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -164,10 +164,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70173302713820
+  version_requirements: *70121742461380
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &70173302713200 !ruby/object:Gem::Requirement
+  requirement: &70121742460800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - =
@@ -175,7 +175,7 @@ dependencies:
         version: 0.9.10
   type: :development
   prerelease: false
-  version_requirements: *70173302713200
+  version_requirements: *70121742460800
 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: -4528822956475968733
+      hash: -547141581635858768
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: