baiduserp 2.0.10 → 2.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9741036cb242d023eb31fadd169a9e4c902b4d85
-  data.tar.gz: 01b875b94d402e09fbaa46f1c30e27fac3eb9cb2
+  metadata.gz: c411628080652da333ee3833dc986e0ede74639c
+  data.tar.gz: 555ff4417a419c469459883781a2e01fc7e2c5e4
 SHA512:
-  metadata.gz: fdaa9048b0fe7108a6e6b4e76eedc11d640c76a912d87c969158c573454649698f2112b0c63f7e8796e8d8f2c4c7aeec72d2728febedba36967cc85cd5671637
-  data.tar.gz: 3a05c17ff239191325a5806a1ca0fad23e0d037da150804a4a69cc3bf9d8541e028920cf1a0ef4da56f6119ae5420801970eb47784d66dee708099a8782a47a0
+  metadata.gz: a7aa377b0ad8b77909eb916394554994bb3e5649b215ae68bf8ff5e794c1297313e9fef5464ece6f85db6af0638358d141f2e749d119dcd574b4f6dccfbe8d27
+  data.tar.gz: 7b1a2a7e8f3c56bd60eef8e148c15aebd913ee27bae78fcf8719923973932f2eda10bd46656818ac10118ab05afd8ebed53eab405d08c9abeb1b5308e1daf7ed

data/lib/baiduserp/client.rb

@@ -15,7 +15,14 @@ module Baiduserp
 
     def self.get_serp(url, retries = 6)
       if retries > 0
-        response = self.get(url)
+        begin
+          response = self.get(url)
+        rescue Timeout::Error => e
+          puts e.class
+          puts e.message
+          sleep(10)
+          retry
+        end
         if response.code == 301
           sleep(rand(60)+60)
           response = self.get_serp(url,retries - 1)

data/lib/baiduserp/parser.rb

@@ -3,6 +3,7 @@ require 'nokogiri'
 require 'uri'
 require 'baiduserp/client'
 require 'baiduserp/helper'
+require 'baiduserp/result'
 
 module Baiduserp
   class Parser
@@ -11,7 +12,7 @@ module Baiduserp
     def parse(html)
       html = html.encode!('UTF-8','UTF-8',:invalid => :replace)
       @file = Hash.new
-      @serp = Hash.new
+      @serp = Baiduserp::Result.new
 
       @file[:html] = html
       @file[:doc] = Nokogiri::HTML(html)

data/lib/baiduserp/result.rb

@@ -0,0 +1,5 @@
+module Baiduserp
+  class Result < Hash
+
+  end
+end

data/lib/baiduserp/version.rb

@@ -1,3 +1,3 @@
 module Baiduserp
-  VERSION = "2.0.10"
+  VERSION = "2.1.1"
 end

data/lib/parsers/pinpaizhuanqu.rb

@@ -1,6 +1,5 @@
 class Baiduserp::Parser
   def _parse_pinpaizhuanqu(file)
-    html = file[:html]
-    html.include?('bs.baidu.com/adcoup-mat') && html.include?('http://clkmk.baidu.com/clkmk-rcv/lnk')
+    file[:doc].search("div[@id='content_left']").first.children[2].name == 'script'
   end
 end

data/lib/parsers/zhixin.rb

@@ -0,0 +1,9 @@
+class Baiduserp::Parser
+  def _parse_zhixin(file)
+    result = []
+    file[:doc].search("div#content_left .result-zxl").each do |zxl|
+      result << {:id => zxl['id'], :tpl => zxl['tpl'], :mu => zxl['mu'] }
+    end
+    result
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: baiduserp
 version: !ruby/object:Gem::Version
-  version: 2.0.10
+  version: 2.1.1
 platform: ruby
 authors:
 - MingQian Zhang
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-11-04 00:00:00.000000000 Z
+date: 2013-11-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -49,6 +49,7 @@ files:
 - lib/baiduserp/client.rb
 - lib/baiduserp/helper.rb
 - lib/baiduserp/parser.rb
+- lib/baiduserp/result.rb
 - lib/baiduserp/version.rb
 - lib/baiduserp.rb
 - lib/parsers/ads_right.rb
@@ -61,6 +62,7 @@ files:
 - lib/parsers/right_personinfo.rb
 - lib/parsers/right_relaperson.rb
 - lib/parsers/right_weather.rb
+- lib/parsers/zhixin.rb
 - bin/baiduserp
 - README.md
 - lib/baiduserp/user_agents.yml