ppc 1.3.2 → 2.0.0

data/lib/ppc/api/sogou/report.rb

@@ -55,28 +55,11 @@ module PPC
           requesttype[:unitOfTime]         =     Unit_map[ param[:unit] ]        if param[:unit] 
           requesttype[:platform]           =     Device_map[ param[:device] ]    if param[:device]
           requesttype[:idOnly]             =     param[:id_only]                 if param[:id_only]!=nil
-          requesttype[:startDate] = parse_date( param[:startDate] )
-          requesttype[:endDate]   = parse_date( param[:endDate] )
+          requesttype[:startDate]          =     (Time.parse( param[:startDate] ) rescue Time.now - 86400).utc.iso8601
+          requesttype[:endDate]            =     (Time.parse( param[:endDate] ) rescue Time.now - 86400).utc.iso8601
           return requesttype
         end
 
-        private 
-        def self.parse_date( date )
-          """
-          Cast string to time:
-          'YYYYMMDD' => Time
-          """
-          if date
-            y = date[0..3]
-            m = date[4..5]
-            d = date[6..7]
-            date = Time.new( y, m, d )
-          else
-            date = (Time.now - 24*3600)
-          end
-          date.utc.iso8601
-        end
-
         ###########################
         # intreface for Operation #
         ###########################

data/lib/ppc/ext.rb

@@ -7,11 +7,3 @@ class String
     downcase
   end
 end
-class Hash
-  def filter_and_replace_key(key_new, key_old)
-    return self if key_new == key_old
-    value = self.delete(key_old)
-    self[key_new] = value unless value.nil?
-    self
-  end
-end

data/lib/ppc/operation.rb

@@ -4,12 +4,9 @@ module PPC
     attr_accessor :id
     
     def initialize( params )
-      
-      if params[:se] == nil
-        raise 'please specific a search engine'
-      else 
-        @se = params[:se]
-      end
+      raise 'please specific a search engine'                     if params[:se].nil?
+
+      @se = params[:se]
       @id = params[:id]
       @auth = {
         username: params[:username],
@@ -20,13 +17,11 @@ module PPC
       }
       # add support for qihu360
       if @se == 'qihu'
-        raise "you are using qihu service, please enter api_key" if params[:api_key].nil?
-        @auth[:api_key] = params[:api_key]
-      end
-      if @se == 'qihu' && params[:token].nil? 
+        raise "you are using qihu service, please enter api_key"    if params[:api_key].nil?
         raise "you are using qihu service, please enter api_secret" if params[:api_secret].nil?
-        @auth[:api_secret] = params[:api_secret]
-        @auth[:token] = qihu_refresh_token
+        @auth[:api_key]     = params[:api_key]
+        @auth[:api_secret]  = params[:api_secret]
+        @auth[:token]       = qihu_refresh_token if params[:token].nil? 
       end
     end
 
@@ -35,7 +30,7 @@ module PPC
         cipher_aes.encrypt
         cipher_aes.key = @auth[:api_secret][0,16]
         cipher_aes.iv = @auth[:api_secret][16,16]
-        encrypted = (cipher_aes.update(Digest::MD5.hexdigest(@auth[:password])) + cipher_aes.final).unpack('H*').join
+        encrypted = (cipher_aes.update(Digest::MD5.hexdigest( @auth[:password])) + cipher_aes.final).unpack('H*').join
         url = "https://api.e.360.cn/account/clientLogin"
         response = HTTParty.post(url,
           :body => {
@@ -59,104 +54,86 @@ module PPC
       eval "::PPC::API::#{@se.capitalize}::#{service.capitalize}"
     end
 
-    # ++++++++ #
-    # Lazy Code #
-    # ++++++++ #
-
-    # helper fucntion
-    def get_obj( ids, service )
-        '''
-        Return service object. 
-        Providing single id, return single object.
-        Providing multiple ids, return Array of objects
-        '''
-        class_obj =  eval "::PPC::Opeartion::#{service.capitalize}"
-        param = @auth
-        param[:se] = @se
-        objs = []
-
-        ids.each do |id|
-          param[:id] = id
-          objs << class_obj.new( param )
-        end
-
-        return objs.length == 1 ? objs[0] : objs 
+    def method_missing(method_name, *args, &block)
+      method = method_name.to_s
+      unit   = self.class.to_s.downcase[/(account|plan|group|keyword|creative|sublink)/]
+      case method
+        when "info"
+          unit == "account" ? call( unit ).send( method, @auth ) : call( unit ).send( method, @auth, [@id].flatten )
+        when "get", "delete", "enable", "pause", "status", "quality"
+          call( unit ).send( method, @auth, [@id].flatten )
+        when "update"
+          call( unit ).send( method, @auth, [args[0].merge(id: @id)].flatten )
+        when "activate"
+          call( unit ).enable( @auth, [@id].flatten )
+        else
+          super
+      end
     end
 
     # +++++ Plan opeartion funcitons +++++ #
     module Plan_operation
-      def get_plan( ids )
-        ::PPC::Opeartion::get_obj( ids, 'plan')
-      end
 
-      def add_plan( plans )
-        call('plan').add(@auth,plans)
-      end
-
-      def update_plan( plans )
-        call('plan').update(@auth,plans)
+      def method_missing(method_name, *args, &block)
+        if method_name.to_s[/_plan$/]
+          call( "plan" ).send(method_name.to_s[/^(get|add|update|delete|enable|pause)/], @auth, [args].flatten )
+        else
+          super
+        end
       end
 
-      def delete_plan( ids )
-        call('plan').delete(@auth,ids)
-      end
     end
 
     # +++++ Group opeartion funcitons +++++ #
     module Group_operation
-      def get_group( ids )
-        ::PPC::Opeartion::get_obj( ids, 'group')
-      end
 
-      def add_group( groups )
-        call('group').add(@auth,groups )
-      end
-
-      def update_group( groups )
-        call('group').update( @auth, groups )
+      def method_missing(method_name, *args, &block)
+        if method_name.to_s[/_group$/]
+          call( "group" ).send(method_name.to_s[/^(get|add|update|delete|enable|pause)/], @auth, [args].flatten )
+        else
+          super
+        end
       end
 
-      def delete_group( ids )
-        call('group').delete( @auth, ids )
-      end
     end
 
     # +++++ Keyword opeartion funcitons +++++ #
     module Keyword_operation
-      def get_keyword( ids )
-        ::PPC::Opeartion::get_obj( ids, 'keyword')
-      end
-      
-      def add_keyword( keywords )
-        call('keyword').add( @auth, keywords )
-      end
 
-      def update_keyword( keywords)
-        call('keyword').update( @auth, keywords )
+      def method_missing(method_name, *args, &block)
+        if method_name.to_s[/_keyword$/]
+          call( "keyword" ).send(method_name.to_s[/^(get|add|update|delete|enable|pause)/], @auth, [args].flatten )
+        else
+          super
+        end
       end
 
-      def delete_keyword( ids )
-         call('keyword').delete( @auth, ids )
-      end
     end
 
     # +++++ Creative opeartion funcitons +++++ #
     module Creative_operation
-      def get_creative( ids )
-        ::PPC::Opeartion::get_obj( ids, 'creative')
-      end
-      
-      def add_creative( creatives )
-        call('creative').add( @auth, creatives )
-      end
 
-      def update_creative( creatives )
-        call('creative').update( @auth, creatives )
+      def method_missing(method_name, *args, &block)
+        if method_name.to_s[/_creative$/]
+          call( "creative" ).send(method_name.to_s[/^(get|add|update|delete|enable|pause)/], @auth, [args].flatten )
+        else
+          super
+        end
       end
 
-      def delete_creative( ids )
-        call('creative').delete( @auth, ids )
+    end
+
+    # +++++ Sublink opeartion funcitons +++++ #
+    module Sublink_operation
+
+      def method_missing(method_name, *args, &block)
+        if method_name.to_s[/_sublink$/]
+          call( "sublink" ).send(method_name.to_s[/^(get|add|update|delete|enable|pause)/], @auth, [args].flatten )
+        else
+          super
+        end
       end
+
     end
 
   end # Opeartion
@@ -172,4 +149,4 @@ require 'ppc/operation/group'
 require 'ppc/operation/plan'
 require 'ppc/operation/keyword'
 require 'ppc/operation/creative'
-
+require 'ppc/operation/sublink'

data/lib/ppc/operation/account.rb

@@ -3,33 +3,24 @@ module PPC
     class Account
       include ::PPC::Operation
 
-      # self operations
-      def info
-        info = call('account').info(@auth)
-        @id = info[:result][:id] if @id == nil
-        return info
-      end
-
-      def update(account)
-        call('account').update(@auth,account)
-      end
-
-      # subobject(plan) operations
       def plans
-        call('plan').all(@auth)
+        call( "plan" ).all( @auth )
       end
 
       def plan_ids
-        call('plan').ids(@auth)
+        call( "plan" ).ids( @auth )
       end
       
-      # some useful keyword operations
-      def keywords(group_id)
-        call( 'keyword' ).search_by_group_id( @auth, group_id )
+      def keywords( group_id )
+        call( "keyword" ).all( @auth, group_id )
       end
 
-      def keyword_ids(group_id)
-        call( 'keyword' ).search_id_by_group_id( @auth, group_id )
+      def keyword_ids( group_id )
+        call( "keyword" ).ids( @auth, group_id )
+      end
+
+      def get_rank( region, keyword )
+        call( "rank" ).getRank( @auth, region, keyword )
       end
       
       # plan operations
@@ -44,6 +35,9 @@ module PPC
       # creative opeartions
       include ::PPC::Operation::Creative_operation
 
+      # sublink opeartion
+      include ::PPC::Operation::Sublink_operation
+
       # report operations
       include ::PPC::Operation::Report
 

data/lib/ppc/operation/creative.rb

@@ -3,26 +3,6 @@ module PPC
     class Creative 
       include ::PPC::Operation
 
-      def info()
-        call( 'creative' ).get( @auth, @id )
-      end
-
-      def update( type )
-        call( 'creative' ).update( @auth, type.merge( id:@id) )
-      end
-
-      def activate()
-        call( 'creative' ).activate( @auth, @id )
-      end
-
-      def status()
-        call( 'creative' ).status( @auth, @id )
-      end
-
-      def delete()
-        call( 'creative' ).delete( @auth, @id )
-      end
-
     end
   end
 end

data/lib/ppc/operation/group.rb

@@ -2,31 +2,29 @@ module PPC
   module Operation
     class Group
       include ::PPC::Operation
-      
-      def info()
-        call('group').get(@auth, @id)
+
+      def keywords
+        call( "keyword" ).all( @auth, [@id].flatten )
       end
 
-      def update( info )
-        info[:id] = @id if (info.is_a? Hash) && info[:id].nil?
-        call('group').update(@auth, info)
+      def keyword_ids
+        call( "keyword" ).ids( @auth, [@id].flatten )
       end
 
-      # =============================== #
-      def keywords()
-        call( 'keyword' ).search_by_group_id( @auth, @id )
+      def creatives
+        call( "creative" ).all( @auth, [@id].flatten )
       end
 
-      def keyword_ids()
-        call( 'keyword' ).search_id_by_group_id( @auth, @id )
+      def creative_ids
+        call( "creative" ).ids( @auth, [@id].flatten )
       end
 
-      def creatives()
-        call( 'creative' ).search_by_group_id( @auth, @id )
+      def sublinks
+        call( "sublink" ).all( @auth, [@id].flatten )
       end
 
-      def creative_ids()
-        call( 'creative' ).search_id_by_group_id( @auth, @id )
+      def sublink_ids
+        call( "sublink" ).ids( @auth, [@id].flatten )
       end
 
       # keyword opeartion
@@ -35,25 +33,18 @@ module PPC
       # creative opeartion
       include ::PPC::Operation::Creative_operation
 
+      # sublink opeartion
+      include ::PPC::Operation::Sublink_operation
+
       # Overwrite add method to provide more function
       def add_keyword( keywords )
-        call('keyword').add( @auth, add_group_id( keywords ) )
+        call( "keyword" ).add( @auth, keywords.map{|keyword| keyword.merge(group_id: @id)} )
       end
 
       def add_creative( creatives )
-        call('creative').add( @auth, add_group_id( creatives ) )
+        call( "creative" ).add( @auth, creatives.map{|creative| creative.merge(group_id: @id)} )
       end
       
-      # Auxilary function
-      private
-      def add_group_id( types )
-        types = [types] unless types.is_a? Array
-        types.each do |type|
-          type.merge!( {group_id:@id} )
-        end
-        return types
-      end
-
     end # Group
   end # Operation
 end # PPC

data/lib/ppc/operation/keyword.rb

@@ -3,33 +3,6 @@ module PPC
     class Keyword
       include ::PPC::Operation
 
-      def info()
-        call( 'keyword' ).get( @auth, @id )
-      end
-
-      def update( type )
-        type.merge(id: @id) if type.is_a? Hash
-        call( 'keyword' ).update( @auth, type )
-      end
-
-      # Todo: Implement Activate method in Sogou API
-      def activate()
-        call( 'keyword' ).activate( @auth, @id )
-      end
-      
-      def status()
-        call( 'keyword' ).status( @auth, @id )
-      end
-
-      def quality()
-        call( 'keyword' ).quality( @auth, @id )
-      end
-
-      def delete( ids = nil )
-        ids ||= @id
-        call( 'keyword' ).delete( @auth, ids )
-      end
-
     end
   end
 end

data/lib/ppc/operation/plan.rb

@@ -4,43 +4,55 @@ module PPC
     class Plan
       include ::PPC::Operation
 
-      def info
-        call('plan').get(@auth,@id)
+      def groups
+        call( "group" ).all( @auth, [@id].flatten )
       end
 
-      def update( plan )
-        call('plan').update( @auth, plan.merge( id:@id ) )
+      def group_ids
+        call( "group" ).ids( @auth, [@id].flatten )
       end
 
-      def groups()
-        result = call('group').search_by_plan_id(@auth, @id)
-        result[:result] = result[:result][0][:groups]
-        return result
+      def keywords( group_ids )
+        call( "keyword" ).all( @auth, [group_ids].flatten )
       end
 
-      def group_ids()
-        result = call('group').search_id_by_plan_id(@auth, @id)
-        result[:result] = result[:result][0][:group_ids]
-        return result
+      def keyword_ids( group_ids )
+        call( "keyword" ).ids( @auth, [group_ids].flatten )
+      end
+
+      def creatives( group_ids )
+        call( "creative" ).all( @auth, [group_ids].flatten )
+      end
+
+      def creative_ids( group_ids )
+        call( "creative" ).ids( @auth, [group_ids].flatten )
+      end
+
+      def sublinks( group_ids )
+        call( "sublink" ).all( @auth, [group_ids].flatten )
+      end
+
+      def sublink_ids( group_ids )
+        call( "sublink" ).ids( @auth, [group_ids].flatten )
       end
 
       # group opeartion
       include ::PPC::Operation::Group_operation
 
+      # keyword opeartion
+      include ::PPC::Operation::Keyword_operation
+
+      # creative opeartion
+      include ::PPC::Operation::Creative_operation
+
+      # sublink opeartion
+      include ::PPC::Operation::Sublink_operation
+
       # Overwirte add_group method to provide more function
       def add_group( groups )
-        call('group').add( @auth, add_plan_id( groups ) )
+        call( "group" ).add( @auth, groups.map{|group| group.merge(plan_id: @id)} )
       end
 
-      # Auxilary function
-      private
-      def add_plan_id( types )
-        types = [types] unless types.is_a? Array
-        types.each do |type|
-          type.merge!({plan_id:@id})
-        end
-        return types
-      end
 
     end # class plan
   end # mudole Opeartion