baidu-tuiguang 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 758f53d595078896de5479bb92a1a17cb4537a0a
-  data.tar.gz: 79c5828c64b38d00f3bdfc159b0c74dd21a05e91
+  metadata.gz: af00a2da8c08836a6f99a6153de28f0ad0a0dbd7
+  data.tar.gz: 9467ab33800680b41ad7b47c1f5ef00a4776ca12
 SHA512:
-  metadata.gz: 3b8effd90cc0e48f67453f08e63572479398252940a98f373412d8b9b546e6a3552ba367f655ab68bf9578371ba1766a493c1f0b94ec0f62ee7754b51fe2893c
-  data.tar.gz: 43fe7262f4fe9d5ada7fbad9b2d0474fe8cf621107091fa6585ffb13a64a1925ec9bc3ec78f195bc0601c7e14b38df0ebeba1f692c4fbb865d7b17aa84af3eb6
+  metadata.gz: aa164a9752e962c21651827333b4eff42b65c803aa04a017f87bb6f376aac14fb722dbaba7a38f5dea6c90627dd0d27691f20ec29e2734a769b9d2a8a2c091a5
+  data.tar.gz: f039446cef6f9738616a18b0cf66638be954bb62d1c4217837a9f81b039e24899c246bab2578234548cb05cbae4774664e3f220623df7111d3c270608e6dc727

data/lib/baidu/tuiguang.rb

@@ -10,7 +10,7 @@ module Baidu
   module Tuiguang
     class Action
       attr_reader :req_url
-      attr_reader :req_data
+      attr_reader :req_params
       attr_reader :resp
 
       def initialize(cookies)
@@ -26,6 +26,7 @@ module Baidu
               'id' => item['planid'],
               'name' => item['planname'],
               'pause' => item['pausestat'] == 1,
+              'status' => '',
               'mobile_price_ratio' => item['mPriceFactor'],
           }
         end
@@ -33,35 +34,24 @@ module Baidu
       end
 
 
-      def groups(plan_id = nil, page = 1, page_size = 20)
+      def groups(plan_id, page = 1, page_size = 20)
         today = Time.now.to_date
-        level_cond = {}
-        if !plan_id.nil?
-          level_cond = {"levelCond": {"planid": plan_id}}
-        end
-        data = request("path": 'vega/GET/mtllist/unit', "params": {"fields": ["unitid", "planid", "pausestat", "unitname", "planname", "unitbid", "unitMPriceFactor", "shows", "clks", "paysum", "trans", "avgprice", "unitstat", "matchPriceFactor", "matchPriceStatus", "phonetrans", "clkrate", "extbind", "allnegativecnt", "showpay", "deviceprefer", "mPriceFactor", "adtype", "finebidstatus", "atstatus", "atbid", "planatbid", "bidprefer", "pcpricefactor", "planPcpricefactor"], "pageNo": page, "pageSize": page_size, "startTime": today, "endTime": today}.merge(level_cond))
+        data = request("path": 'vega/GET/mtllist/unit', "params": {"fields": ["unitid", "planid", "pausestat", "unitname", "planname", "unitbid", "unitMPriceFactor", "shows", "clks", "paysum", "trans", "avgprice", "unitstat", "matchPriceFactor", "matchPriceStatus", "phonetrans", "clkrate", "extbind", "allnegativecnt", "showpay", "deviceprefer", "mPriceFactor", "adtype", "finebidstatus", "atstatus", "atbid", "planatbid", "bidprefer", "pcpricefactor", "planPcpricefactor"], "pageNo": page, "pageSize": page_size, "startTime": today, "endTime": today, "levelCond": {"planid": plan_id}})
         result = {'data' => [], 'count' => data['totalCount']}
         data['listData'].each do |item|
           result['data'] << {
               'id' => item['unitid'],
               'name' => item['unitname'],
               'pause' => item['pausestat'] == 1,
-              'plan_id' => item['planid'],
-              'plan_name' => item['planname']
+              'status' => ''
           }
         end
         result
       end
 
-      def keywords(plan_id = nil, group_id = nil, page = 1, page_size = 20)
+      def keywords(plan_id, group_id, page = 1, page_size = 20)
         today = Time.now.to_date
-        level_cond = {}
-        if !group_id.nil?
-          level_cond = {"levelCond": {"unitid": group_id}}
-        elsif !plan_id.nil?
-          level_cond = {"levelCond": {"planid": plan_id}}
-        end
-        data = request("path": 'vega/GET/mtllist/word', "params": {"fields": ["winfoid", "unitid", "planid", "wordid", "pausestat", "showword", "unitname", "planname", "wordstat", "bid", "unitbid", "pcqscore", "mqscore", "trans", "paysum", "shows", "clks", "avgprice", "wmatch", "shadow_wurl", "shadow_mwurl", "activestat", "wctrl", "wurl", "pageexp", "mwurl", "showqscore", "blockreason", "confidence", "pcblockreason", "pcconfidence", "matchPriceEnableStatus", "clkrate", "showpay", "adtype", "bidprefer", "mPriceGuide", "leftPriceGuide", "left3PriceGuide", "marker", "mconfidence", "mblockreason", "pcqscorecon", "mqscorecon", "pcrelativity", "mrelativity", "pclandpage", "mlandpage", "pclandpagereason", "mlandpagereason", "addfrom", "modfrom"], "pageNo": page, "pageSize": page_size, "startTime": today, "endTime": today}.merge(level_cond))
+        data = request("path": 'vega/GET/mtllist/word', "params": {"fields": ["winfoid", "unitid", "planid", "wordid", "pausestat", "showword", "unitname", "planname", "wordstat", "bid", "unitbid", "pcqscore", "mqscore", "trans", "paysum", "shows", "clks", "avgprice", "wmatch", "shadow_wurl", "shadow_mwurl", "activestat", "wctrl", "wurl", "pageexp", "mwurl", "showqscore", "blockreason", "confidence", "pcblockreason", "pcconfidence", "matchPriceEnableStatus", "clkrate", "showpay", "adtype", "bidprefer", "mPriceGuide", "leftPriceGuide", "left3PriceGuide", "marker", "mconfidence", "mblockreason", "pcqscorecon", "mqscorecon", "pcrelativity", "mrelativity", "pclandpage", "mlandpage", "pclandpagereason", "mlandpagereason", "addfrom", "modfrom"], "pageNo": page, "pageSize": page_size, "startTime": today, "endTime": today, "levelCond": {"unitid": group_id}})
         result = {'data' => [], 'count' => data['totalCount']}
         data['listData'].each do |item|
           match = ''
@@ -87,31 +77,29 @@ module Baidu
               'id' => item['winfoid'],
               'keyword' => item['showword'],
               'status' => status,
+              'mobile_status' => '',
               'pause' => item['pausestat'] == 1,
               'price' => item['bid'],
               'match' => match,
               'quality' => item['pcqscore'],
               'mobile_quality' => item['mqscore'],
               'url' => item['wurl'],
-              'mobile_url' => item['mwurl'],
-              'group_id' => item['wordid'],
-              'group_name' => item['unitname'],
-              'plan_id' => item['planid'],
-              'plan_name' => item['planname']
+              'mobile_url' => item['mwurl']
           }
         end
         result
       end
 
-      def keyword_pause(winfoid)
-        request("path": 'vega/MOD/keyword', "params": {"winfoid": [winfoid.to_i], "items": {"pausestat": 1}})
+      def keyword_pause(keyword_id)
+        request("path": 'vega/MOD/keyword', "params": {"winfoid": [keyword_id.to_i], "items": {"pausestat": 1}})
       end
 
-      def keyword_enable(winfoid)
-        request("path": 'vega/MOD/keyword', "params": {"winfoid": [winfoid.to_i], "items": {"pausestat": 0}})
+      def keyword_enable(keyword_id)
+        request("path": 'vega/MOD/keyword', "params": {"winfoid": [keyword_id.to_i], "items": {"pausestat": 0}})
       end
 
       def request(params = {})
+        @req_params = params
         params.merge!(
             "userid": cookies_params['__cas__id__3'],
             "token": cookies_params['__cas__st__3'],
@@ -134,14 +122,13 @@ module Baidu
         request["pragma"] = 'no-cache'
         request["referer"] = "http://fengchao.baidu.com/nirvana/main.html?userid=#{cookies_params['__cas__id__3']}"
         request["user-agent"] = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_12_4) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/57.0.2987.133 Safari/537.36'
-        request.body = @req_data = URI.encode_www_form(params)
+        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
         if response['Content-Encoding'] && response['Content-Encoding'].include?('gzip')
           @resp = Zlib::GzipReader.new(StringIO.new(@resp)).read
         end
-        # puts @resp
         result = JSON.parse(@resp)
         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

data/lib/baidu/tuiguang/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: baidu-tuiguang
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Xiao Jie