baidu-tuiguang 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: af00a2da8c08836a6f99a6153de28f0ad0a0dbd7
-  data.tar.gz: 9467ab33800680b41ad7b47c1f5ef00a4776ca12
+  metadata.gz: 8f7cfd9e817799bddadf9fc3a85c0f777e091b5e
+  data.tar.gz: dfcb1d19776ae3245cdd277c26b2d4b2a08bde59
 SHA512:
-  metadata.gz: aa164a9752e962c21651827333b4eff42b65c803aa04a017f87bb6f376aac14fb722dbaba7a38f5dea6c90627dd0d27691f20ec29e2734a769b9d2a8a2c091a5
-  data.tar.gz: f039446cef6f9738616a18b0cf66638be954bb62d1c4217837a9f81b039e24899c246bab2578234548cb05cbae4774664e3f220623df7111d3c270608e6dc727
+  metadata.gz: 828310e8a8303e2a4ef6f63fb68218939dc7844221367020912e63a0a30fecef30d5bb5e7ad7addcbf6308daaebc112363122494fd100245f6382416e5bb9f17
+  data.tar.gz: a38160ed804790fce2e22f6414fa9138d1d1ab4741f10ac9564f0914032cf7ecd6cb760f595a53b3a5cd516afbb73990cae16d7e80dbc386f50967496daa3ce5

data/lib/baidu/tuiguang.rb

@@ -9,17 +9,22 @@ require 'date'
 module Baidu
   module Tuiguang
     class Action
-      attr_reader :req_url
-      attr_reader :req_params
-      attr_reader :resp
+      attr_reader :url
+      attr_reader :params
+      attr_reader :res
 
       def initialize(cookies)
         @cookies = cookies
       end
 
+      def basic_info
+        data = request("path": 'GET/authInfo', "params": {})
+        {'username' => data['username']}
+      end
+
       def plans(page = 1, page_size = 20)
         today = Time.now.to_date
-        data = request(path: 'vega/GET/mtllist/plan', params: {"fields": ["planid", "pausestat", "planname", "shows", "clks", "paysum", "trans", "avgprice", "plandynamicideastat", "acctdynamicideastat", "mPriceFactor", "planstat", "remarketingstat", "deviceprefer", "wregion", "qrstat1", "phonetrans", "allipblackcnt", "clkrate", "wbudget", "plancyc", "showprob", "allnegativecnt", "showpay", "adtype", "acctdynamictagsublinkstat", "acctdynamictitlestat", "acctdynamichotredirectstat", "plandynamictagsublinkstat", "plandynamictitlestat", "plandynamichotredirectstat", "plandynamictitlelist", "plandynamictitleabstract", "acctdynamictitlelist", "acctdynamictitleabstract", "acctscenarizedstatus", "planscenarizedphrasestatus", "atstatus", "atbid", "atbudget", "bidprefer", "pcpricefactor", "inpeople", "remarketingPauseStat", "robotAPlanState"], "levelCond": {"userid": "23597360"}, "pageNo": page, "pageSize": page_size, "startTime": today, "endTime": today})
+        data = request(path: 'vega/GET/mtllist/plan', params: {"fields": ["planid", "pausestat", "planname", "shows", "clks", "paysum", "trans", "avgprice", "plandynamicideastat", "acctdynamicideastat", "mPriceFactor", "planstat", "remarketingstat", "deviceprefer", "wregion", "qrstat1", "phonetrans", "allipblackcnt", "clkrate", "wbudget", "plancyc", "showprob", "allnegativecnt", "showpay", "adtype", "acctdynamictagsublinkstat", "acctdynamictitlestat", "acctdynamichotredirectstat", "plandynamictagsublinkstat", "plandynamictitlestat", "plandynamichotredirectstat", "plandynamictitlelist", "plandynamictitleabstract", "acctdynamictitlelist", "acctdynamictitleabstract", "acctscenarizedstatus", "planscenarizedphrasestatus", "atstatus", "atbid", "atbudget", "bidprefer", "pcpricefactor", "inpeople", "remarketingPauseStat", "robotAPlanState"], "levelCond": {"userid": cookies_params['__cas__id__3']}, "pageNo": page, "pageSize": page_size, "startTime": today, "endTime": today})
         result = {'data' => [], 'count' => data['totalCount']}
         data['listData'].each do |item|
           result['data'] << {
@@ -91,23 +96,39 @@ module Baidu
       end
 
       def keyword_pause(keyword_id)
-        request("path": 'vega/MOD/keyword', "params": {"winfoid": [keyword_id.to_i], "items": {"pausestat": 1}})
+        keyword_pause_and_enable(keyword_id)
       end
 
       def keyword_enable(keyword_id)
-        request("path": 'vega/MOD/keyword', "params": {"winfoid": [keyword_id.to_i], "items": {"pausestat": 0}})
+        keyword_pause_and_enable(keyword_id, false)
+      end
+
+      def keywords_pause(keyword_ids = [])
+        keywords_pause_and_enable(keyword_ids)
+      end
+
+      def keywords_enable(keyword_ids = [])
+        keywords_pause_and_enable(keyword_ids, false)
+      end
+
+      def keyword_pause_and_enable(keyword_id, pause = true)
+        request("path": 'vega/MOD/keyword', "params": {"winfoid": [keyword_id.to_i], "items": {"pausestat": pause ? 1 : 0}})
+      end
+
+      def keywords_pause_and_enable(keyword_ids = [], pause = true)
+        request("path": 'vega/MOD/adkeyword', "params": {"checkAll": false, "mtlCond": {"levelCond": {"userid": cookies_params['__cas__id__3']}}, "mtlIds": keyword_ids.map {|keyword_id| keyword_id.to_s}, "items": {"pausestat": pause}})
       end
 
       def request(params = {})
-        @req_params = params
         params.merge!(
             "userid": cookies_params['__cas__id__3'],
-            "token": cookies_params['__cas__st__3'],
-            "reqid": "",
-            "eventId": ""
+            "token": cookies_params['__cas__st__3']
         )
+        @params = params
         params[:"params"] = params[:"params"].to_json
-        url = URI(@req_url = "http://fengchao.baidu.com/nirvana/request.ajax?#{URI.encode_www_form(path: params[:"path"], reqid: '')}")
+        url = URI('http://fengchao.baidu.com/nirvana/request.ajax')
+        url.query = URI.encode_www_form(path: params[:"path"])
+        @url = url.to_s
         http = Net::HTTP.new(url.host, url.port)
         request = Net::HTTP::Post.new(url)
         request["accept"] = '*/*'
@@ -125,13 +146,19 @@ module Baidu
         request.body = URI.encode_www_form(params)
         response = http.request(request)
         raise RequestError, "HTTP Response: #{response.code} #{response.message}" unless response.is_a?(Net::HTTPSuccess)
-        @resp = response.read_body
+        @res = response.read_body
         if response['Content-Encoding'] && response['Content-Encoding'].include?('gzip')
-          @resp = Zlib::GzipReader.new(StringIO.new(@resp)).read
+          @res = Zlib::GzipReader.new(StringIO.new(@res)).read
         end
-        result = JSON.parse(@resp)
+        result = JSON.parse(@res)
         raise LoginExpired if result['redirect'] && result['redirecturl'] && result['redirecturl'].include?('http://cas.baidu.com')
-        raise Error.new result['error'], result['status'] unless result['status'].to_i == 200
+        unless result['status'].to_i == 200
+          if params[:"path"] == 'vega/MOD/keyword'
+            raise Error.new result['error'].map {|k, v| v['winfoid']['message']}.join('; '), result['status']
+          else
+            raise Error.new result['error'], result['status']
+          end
+        end
         result['data']
       end
 
@@ -142,7 +169,7 @@ module Baidu
         @cookies.split(%r(; ?)).each do |cooky|
           items = cooky.split('=', 2)
           params[items[0]] = items[1]
-        end
+        end unless @cookies.nil?
         params
       end
     end

data/lib/baidu/tuiguang/version.rb

@@ -1,5 +1,5 @@
 module Baidu
   module Tuiguang
-    VERSION = "0.1.1"
+    VERSION = "0.1.2"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baidu-tuiguang
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Xiao Jie
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-04-21 00:00:00.000000000 Z
+date: 2017-04-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler