ppc 2.0.3 → 2.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 644d36e63a1131b4c40e51a9774a8fc3fcdce623
-  data.tar.gz: ec46a7efe0d2740a765e9bc2a13f6417bff8a439
+  metadata.gz: 8c1ffce2f8c4545b7ae1489322d55a0ef2c03511
+  data.tar.gz: 58e7f48a6389464bf1c9a68d5f01c6d27f4546d6
 SHA512:
-  metadata.gz: 9126d0b364445da25d82be3ae6fb14a4c1741d90f461d8d1826ff299d0d225f4f61c6f3291e3a0b91159c52ccbe6691ed913fa1294d352e5fcaf514be54134ee
-  data.tar.gz: 4097196b9a88796223fe0f830053630fdbb284941f2c4f060999840daaad1959571c0ee7fd64979c2ad979843e938ac21de029d13977ecd835d367ee5d7a91a6
+  metadata.gz: 4e9518dd1d57f4dd9a053b8ba3fc1e18e5821eecc928421e360127d51b2e31203268d830fbd54741b00ab4141258c4baf36ccc084527453b08cdaeee2096f66d
+  data.tar.gz: e789f19103d66d2cac478bb27372b1c207b2a5b53eaeba1036d380b9d8afa47290d02b672fb7d5cd4d19d8b06559cf4a91f8f29b61c0c5eea5078859eaed9c83

data/README.md

@@ -9,6 +9,12 @@ ppc
 ----------
 #How to use it ?
 
+### Add ppc and savon(version3) to Gemfile
+```ruby
+gem "savon", git: "https://github.com/savonrb/savon", branch: "version3"
+gem "ppc", "~>2.0.3"
+```
+
 ### Create an objects:
 ```ruby
     param = {

data/lib/ppc.rb

@@ -3,7 +3,7 @@ require 'ppc/operation'
 require 'ppc/ext'
 module PPC
 
-  VERSION = "2.0.3"
+  VERSION = "2.0.4"
 
   protected
   def print_debug(var,varname=nil)

data/lib/ppc/api.rb

@@ -14,17 +14,8 @@ module PPC
   module API
 
     @map = nil
-    @debug = false
     @match_types = nil
 
-    def debug_on
-      @debug = true
-    end
-
-    def debug_off
-      @debug = false
-    end
-
     def request_uri(param = {})
       raise 'you need build the uri'
     end
@@ -62,7 +53,7 @@ module PPC
       end
 
       # 是否显示http通信输出
-      http.set_debug_output( $stdout ) if @debug
+      http.set_debug_output( $stdout ) if ENV["DEBUG"]
       http.use_ssl = true
       if http_method == 'delete'
         req = Net::HTTP::Delete.new(uri.path, http_header)

data/lib/ppc/api/baidu/bulk.rb

@@ -52,17 +52,17 @@ module PPC
               raise file_id[:failure][0]['message']
             end
 
-            puts "file_id: #{file_id}" if @debug
+            puts "file_id: #{file_id}" if ENV["DEBUG"]
 
             loop do
               state = state( auth, file_id )[:result].to_s
               raise "invalid file state: #{state}" unless %w(1 2 3 null).include? state
               break if state == '3'
-              puts "waiting for #{file_id} to be ready. current state:#{state}" if @debug
+              puts "waiting for #{file_id} to be ready. current state:#{state}" if ENV["DEBUG"]
               sleep 3
             end
 
-            puts "#{file_id} is ready" if @debug
+            puts "#{file_id} is ready" if ENV["DEBUG"]
             return path( auth, file_id )
 
           rescue => e

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

@@ -72,67 +72,67 @@ module PPC
         #################################
         # useful function for operation #
         #################################
-        def self.query_report( auth, param = {}, debug = false )
+        def self.query_report( auth, param = {} )
           param[:type]   ||= 'query'
           param[:fields] ||=  %w(click impression)
           param[:level]  ||= 'pair'
           param[:range]  ||= 'account'
           param[:unit]   ||= 'day'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
-        def self.creative_report( auth, param = {}, debug = false )
+        def self.creative_report( auth, param = {} )
           param[:type]   ||= 'creative'
           param[:fields] ||=  %w(impression click cpc cost ctr cpm position conversion)
           param[:level]  ||= 'creative'
           param[:range]  ||= 'creative'
           param[:unit]   ||= 'day'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
-        def self.keyword_report( auth, param = {}, debug = false )
+        def self.keyword_report( auth, param = {} )
           param[:type]   ||= 'keyword'
           param[:fields] ||=  %w(impression click cpc cost ctr cpm position conversion)
           param[:level]  ||= 'keywordid'
           param[:range]  ||= 'keywordid'
           param[:unit]   ||= 'day'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
-        def self.account_report( auth, param = {}, debug = false )
+        def self.account_report( auth, param = {} )
           param[:type]   ||= 'account'
           param[:fields] ||=  %w(impression click cpc cost ctr cpm conversion)
           param[:level]  ||= 'account'
           param[:unit]   ||= 'day'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
-        def self.plan_report( auth, param = {}, debug = false )
+        def self.plan_report( auth, param = {} )
           param[:type]   ||= 'plan'
           param[:fields] ||=  %w(impression click cpc cost ctr cpm conversion)
           param[:level]  ||= 'plan'
           param[:unit]   ||= 'day'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
-        def self.group_report( auth, param = {}, debug = false )
+        def self.group_report( auth, param = {} )
           param[:type]   ||= 'group'
           param[:fields] ||=  %w(impression click cpc cost ctr cpm conversion)
           param[:level]  ||= 'group'
           param[:unit]   ||= 'day'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
-        def self.download_report( auth, param, debug = false )
+        def self.download_report( auth, param )
           p param
           response = get_id( auth, param )
           if response[:succ]
             id = response[:result]
-            p "Got report id:" + id.to_s if debug 
+            p "Got report id:" + id.to_s if ENV["DEBUG"] 
             loop do
               sleep 2 
               break if get_state( auth, id )[:result].to_s[/(Finished|3)/]
-              p "Report is not generated, waiting..." if debug 
+              p "Report is not generated, waiting..." if ENV["DEBUG"] 
             end
 
             url = get_url( auth, id )[:result]

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

@@ -57,15 +57,15 @@ module PPC
         ############################
         # Interfaces for operation #
         ############################
-        def self.keyword_report( auth, param, debug = false )
-          download_report(auth, 'keyword', param, debug )
+        def self.keyword_report( auth, param )
+          download_report(auth, 'keyword', param )
         end
 
-        def self.creative_report( auth, param, debug = false )
-          download_report(auth, 'creative', param, debug)
+        def self.creative_report( auth, param )
+          download_report(auth, 'creative', param )
         end
         
-        def self.download_report(auth, type, param, debug = false)
+        def self.download_report(auth, type, param )
           # deal_with time
           is_now = Date.today == Date.parse(param[:startDate])
         

data/lib/ppc/api/sm.rb

@@ -28,7 +28,7 @@ module PPC
         result is the processed response body.
         '''
         result = {}
-        result[:succ] = response['header']['desc'] =='success'
+        result[:succ] = response['header']['desc'][/(success|执行成功)/] ? true : false
         result[:failure] = response['header']['failures']
         result[:result] = func[ response['body'][key] ] rescue nil
         result[:no_quota] = (response['header']['failures']['code'] == '8501') rescue false

data/lib/ppc/api/sm/bulk.rb

@@ -45,7 +45,7 @@ module PPC
               raise "获取task id 失败"
             end
 
-            puts "task_id: #{task_id}" if @debug
+            puts "task_id: #{task_id}" if ENV["DEBUG"]
 
             loop do
               file_id = get_file_id( auth, task_id )[:result]

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

@@ -70,63 +70,63 @@ module PPC
         #################################
         # useful function for operation #
         #################################
-        def self.query_report( auth, param = {}, debug = false )
+        def self.query_report( auth, param = {} )
           param[:type]   ||= 'query'
           param[:fields] ||=  %w(click impression)
           param[:range]  ||= 'account'
           param[:unit]   ||= 'day'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
-        def self.creative_report( auth, param = {}, debug = false )
+        def self.creative_report( auth, param = {} )
           param[:type]   ||= 'creative'
           param[:fields] ||=  %w(click impression)
           param[:range]  ||= 'account'
           param[:unit]   ||= 'day'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
-        def self.keyword_report( auth, param = {}, debug = false )
+        def self.keyword_report( auth, param = {} )
           param[:type]   ||= 'keyword'
           param[:fields] ||=  %w(click impression cost cpc ctr)
           param[:range]  ||= 'account'
           param[:unit]   ||= 'day'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
-        def self.account_report( auth, param = {}, debug = false )
+        def self.account_report( auth, param = {} )
           param[:type]   ||= 'account'
           param[:fields] ||=  %w(click impression cost cpc ctr)
           param[:range]  ||= 'account'
           param[:unit]   ||= 'day'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
-        def self.plan_report( auth, param = {}, debug = false )
+        def self.plan_report( auth, param = {} )
           param[:type]   ||= 'plan'
           param[:fields] ||=  %w(click impression cost cpc ctr)
           param[:range]  ||= 'plan'
           param[:unit]   ||= 'day'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
-        def self.group_report( auth, param = {}, debug = false )
+        def self.group_report( auth, param = {} )
           param[:type]   ||= 'group'
           param[:fields] ||=  %w(click impression cost cpc ctr)
           param[:range]  ||= 'group'
           param[:unit]   ||= 'day'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
-        def self.download_report( auth, param, debug = false )
+        def self.download_report( auth, param )
           response = get_id( auth, param )
           if response[:succ]
             id = response[:result]
-            p "Got report id:" + id.to_s if debug
+            p "Got report id:" + id.to_s if ENV["DEBUG"]
             loop do
               sleep 2
               break if get_state( auth, id )[:result] == 'FINISHED'
-              p "Report is not generated, waiting..." if debug
+              p "Report is not generated, waiting..." if ENV["DEBUG"]
             end
             fileId = get_fileId(auth, id)[:result]
             return get_file(auth, fileId).force_encoding("utf-8")

data/lib/ppc/api/sogou.rb

@@ -31,14 +31,14 @@ module PPC
         }
         operation.body = {  (method+'Request').to_sym => params }
         # debug print
-        debug_print( operation ) if @debug
+        debug_print( operation ) if ENV["DEBUG"]
         result = operation.call.hash[:envelope]
         #extract header and body
         response = { }
         response[:header] = result[:header][:res_header]
         response[:body] = result[:body][ (method + "Response").snake_case.to_sym ]
         # debug print
-        puts response if @debug
+        puts response if ENV["DEBUG"]
         return response
       end
 

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

@@ -67,7 +67,7 @@ module PPC
           end
         end
 
-        def self.rank_report(auth, device = 0, debug)
+        def self.rank_report(auth, device = 0 )
           url = download_cpc_rank(auth, device)[:result]
           file = "sogou_rank_#{Time.now.to_i}.zip"
           File.open(file, "w"){|f| f.puts open(url).read} 

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

@@ -64,16 +64,16 @@ module PPC
         ###########################
         # intreface for Operation #
         ###########################
-        def self.download_report( auth, param, debug = false )
+        def self.download_report( auth, param )
           response = get_id( auth, param )
           if response[:succ]
             id = response[:result]
-            p "Got report id:" + id.to_s if debug 
+            p "Got report id:" + id.to_s if ENV["DEBUG"] 
             times = 0
             loop do
               raise "The speed of get_status is too slow." if (times += 1) > 10
               break if get_state( auth, id )[:result] == 'Finished'
-              p "Report is not generated, waiting..." if debug 
+              p "Report is not generated, waiting..." if ENV["DEBUG"] 
               sleep 5
             end
 
@@ -84,47 +84,47 @@ module PPC
           end
         end
 
-        def self.query_report( auth, param = {}, debug = false )
+        def self.query_report( auth, param = {} )
           param[:type]   ||= 'query'
           param[:fields] ||=  %w(click)
           param[:range]  ||= 'account'
           param[:unit]   ||= 'day'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
-        def self.creative_report( auth, param = {}, debug = false )
+        def self.creative_report( auth, param = {} )
           param[:type]   ||= 'creative'
           param[:fields] ||=  %w( cost cpc click impression ctr )
           param[:range]  ||= 'account'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
-        def self.keyword_report( auth, param = {}, debug = false )
+        def self.keyword_report( auth, param = {} )
           param[:type]   ||= 'keyword'
           param[:fields] ||=  %w( cost cpc click impression ctr )
           param[:range]  ||= 'account'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
-        def self.account_report( auth, param = {}, debug = false )
+        def self.account_report( auth, param = {} )
           param[:type]   ||= 'account'
           param[:fields] ||=  %w( cost cpc click impression ctr )
           param[:range]  ||= 'account'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
-        def self.plan_report( auth, param = {}, debug = false )
+        def self.plan_report( auth, param = {} )
           param[:type]   ||= 'plan'
           param[:fields] ||=  %w( cost cpc click impression ctr )
           param[:range]  ||= 'plan'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
-        def self.group_report( auth, param = {}, debug = false )
+        def self.group_report( auth, param = {} )
           param[:type]   ||= 'group'
           param[:fields] ||=  %w( cost cpc click impression ctr)
           param[:range]  ||= 'group'
-          download_report( auth, param, debug )
+          download_report( auth, param )
         end
 
       end # Repost

data/lib/ppc/operation/report.rb

@@ -2,36 +2,36 @@ module PPC
   module Operation
     module Report
 
-      def download_report( param = {}, debug = false )
-        call( "report" ).download_report( @auth, param, debug )
+      def download_report( param = {} )
+        call( "report" ).download_report( @auth, param )
       end
 
-      def query_report( param = {}, debug = false )
-        call( "report" ).query_report( @auth, param, debug )
+      def query_report( param = {} )
+        call( "report" ).query_report( @auth, param )
       end
 
-      def creative_report( param = {}, debug = false )
-        call( "report" ).creative_report( @auth, param, debug )
+      def creative_report( param = {} )
+        call( "report" ).creative_report( @auth, param )
       end
 
-      def keyword_report( param = {}, debug = false )
-        call( "report" ).keyword_report( @auth, param, debug )
+      def keyword_report( param = {} )
+        call( "report" ).keyword_report( @auth, param )
       end
 
-      def account_report( param = {}, debug = false )
-        call( "report" ).account_report( @auth, param, debug )
+      def account_report( param = {} )
+        call( "report" ).account_report( @auth, param )
       end
 
-      def plan_report( param = {}, debug = false )
-        call( "report" ).plan_report( @auth, param, debug )
+      def plan_report( param = {} )
+        call( "report" ).plan_report( @auth, param )
       end
 
-      def group_report( param = {}, debug = false )
-        call( "report" ).group_report( @auth, param, debug )
+      def group_report( param = {} )
+        call( "report" ).group_report( @auth, param )
       end
 
-      def rank_report( device = 0, debug = false )
-        call( "bulk" ).rank_report( @auth, device, debug)
+      def rank_report( device = 0 )
+        call( "bulk" ).rank_report( @auth, device )
       end
 
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ppc
 version: !ruby/object:Gem::Version
-  version: 2.0.3
+  version: 2.0.4
 platform: ruby
 authors:
 - Chienli Ma
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-20 00:00:00.000000000 Z
+date: 2016-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty