query 0.1.25 → 0.1.28

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7e5167ec8d897abe4697f19e8bfc2d43bc569c4e
-  data.tar.gz: 8d043368a21d1d9ad618cf5b41966ab3f256c641
+  metadata.gz: e8d3d289a2e63a1c88194c7b13a954927c5c5d99
+  data.tar.gz: 6efec7b1990e7216d9bcfd2a049f3f58b4e3e5a6
 SHA512:
-  metadata.gz: 78e8dae9bb5ce55a90d3b2b1ec0825bf91153245d64d6f95d1e97bdae55b52ec52fe57ce989aa3d58897f09c7399ce3e2c9a24eb3e4c34dad64f837cd7215256
-  data.tar.gz: 5b41c3903724261500b4bf2a8d036b9f1d1ed067e4bba8625cd3262acd4d3a7fa96fe7ff7a75156b33336e49335f711a7290f3c0dfe5a787796b87544b1443f5
+  metadata.gz: c1083ec4211a68b2311831c01b9e22e4ada3de8f4119a9d2da43d3c44407f69b2902ab7321b69902d32f8f98aa0921a240588533156ef1cc2976937a13f90bc3
+  data.tar.gz: 9cbe62910dc172dd29af51e6ddc74ec36d36ee1b20201a9cbc00961467a745c51f49400ced9a62818ad0304bc9e1475764d80312c4a848184e47ad423f1fd8f7

data/Gemfile

@@ -1,4 +1,3 @@
-
-source 'http://ruby.taobao.org'
+source 'https://ruby.taobao.org'
 # Specify your gem's dependencies in query.gemspec
 gemspec

data/LICENSE

@@ -1,20 +1,21 @@
 The MIT License (MIT)
 
-Copyright (c) 2013 seoaqua
+Copyright (c) 2015 Warriors Of the Night
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of
-this software and associated documentation files (the "Software"), to deal in
-the Software without restriction, including without limitation the rights to
-use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of
-the Software, and to permit persons to whom the Software is furnished to do so,
-subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
 The above copyright notice and this permission notice shall be included in all
 copies or substantial portions of the Software.
 
 THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS
-FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
-COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER
-IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN
-CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README.md

@@ -13,31 +13,34 @@ opt = {
 puts ::Query::Engine::Baidu.suggestions('abc',opt)
 ```
 
-#to get the result list by querying "abc"
+#### to get the result list by querying "abc"
 
+```ruby
 Query::Engine::Baidu.new.query("abc").ranks().each do |id,value|
     puts id,value
 end
+````
+#### to get the result list with host "www.abc.com.cn" by querying "abc"
 
-#to get the result list with host "www.abc.com.cn" by querying "abc"
-
+```ruby
 Query::Engine::Baidu.new.query("abc").ranks("www.abc.com.cn").each do |id,value|
     puts id,value
 end
+```
+#### to get the result list with host which fit the regex /com.cn/ by querying "abc"
 
-#to get the result list with host which fit the regex /com.cn/ by querying "abc"
-
+```ruby
 Query::Engine::Baidu.new.query("abc").ranks(/com.cn/).each do |id,value|
     puts id,value
 end
-
-# to get the top rank of host "www.abc.com.cn" by querying "abc"
+```
+#### to get the top rank of host "www.abc.com.cn" by querying "abc"
 
 ```ruby
 puts Query::Engine::Baidu.new.query("abc").rank("www.abc.com.cn")
-#[3,1,2,4] => [rank_seo, rank_top_ads, rank_right_ads, rank_bottom_ads]
+[3,1,2,4] => [rank_seo, rank_top_ads, rank_right_ads, rank_bottom_ads]
 ```
 
-TODO:
-查询结果不多,翻页不存在时的处理,及rspec
-增加其他搜索引擎
+#### TODO:
+* 查询结果不多,翻页不存在时的处理,及rspec
+* 增加其他搜索引擎

data/lib/query.rb

@@ -4,11 +4,14 @@ class MyFilter
     # set.any? { |x| x.to_s.downcase == str.downcase}
   end
 end
-require 'query/result'
-require 'query/engine'
+
+require 'require_all'
+require 'uri'
+require 'httparty'
+require_all "#{__dir__}/query"
 
 module Query
   def self.get_redirect_url(url)
-    Net::HTTP.get_response(URI(url)).response['location']
+    Net::HTTP.get_response(URI(url)).response['location'] || url
   end
 end

data/lib/query/engine.rb

@@ -8,10 +8,3 @@ module Query
     end
   end
 end
-require 'httparty'
-require 'query/engine/baidu'
-require 'query/engine/baidu_mobile'
-require 'query/engine/qihu'
-require 'query/engine/qihu_mobile'
-require 'query/engine/sogou'
-require 'query/engine/sogou_mobile'

data/lib/query/engine/baidu.rb

@@ -8,7 +8,7 @@ module Query
         :headers => {"User-Agent" => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_1) AppleWebKit/537.73.11 (KHTML, like Gecko) Version/7.0.1 Safari/537.73.11'}
       }
 
-      def self.suggestions(query,options = {})
+      def self.suggestions(query,options = [])
         require 'json'
         query = URI.encode(query)
         suggestions = HTTParty.get("https://sp0.baidu.com/5a1Fazu8AA54nxGko9WTAnF6hhy/su?wd=#{query}&json=1&p=3&sid=&req=2&csor=0&cb=jQuery1102036467162938788533_1437556180622&_=#{(Time.now.to_f*1000).to_i}",options)

data/lib/query/engine/baidu_mobile.rb

@@ -1,26 +1,41 @@
 module Query
-    module Engine
-        class BaiduMobile
-            include Query::Engine
-            BaseUri = 'http://m.baidu.com/s?'
-            Options = {
-                :headers => {"User-Agent" => 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_2 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8H7 Safari/6533.18.5'}
-            }
+  module Engine
+    class BaiduMobile
+      include Query::Engine
+      Host = 'm.baidu.com'
+      Options = {
+        :headers => {"User-Agent" => 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_2 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8H7 Safari/6533.18.5'}
+      }
 
-            #基本查询,相当于从搜索框直接输入关键词查询
-            def query(wd)
-                queryStr = "word=#{wd}"
-                uri = URI.encode((BaseUri + queryStr))
-                # begin
-                    res = HTTParty.get(uri,Options)
-                    r = Query::Result::BaiduMobile.new(res)
-                    r.baseuri = uri
-                    r
-                # rescue Exception => e
-                    # warn "#{__FILE__} #{__LINE__} #{uri} fetch error: #{e.to_s}"
-                    # return false
-                # end
-            end
+      #基本查询,相当于从搜索框直接输入关键词查询
+      def self.query(wd, params={})
+        q = Array.new
+        q << "word=#{URI.encode(wd)}"
+        q << "rn=#{@perpage.to_i}" if @perpage
+        # Join arguments
+        params.each do |k, v|
+          q << "#{k.to_s}=#{v.to_s}"
         end
+        uri = URI::HTTP.build(:host=>Host,:path=>'/s',:query=>q.join('&'))
+        # begin
+          res = HTTParty.get(uri, Options)
+          r = Query::Result::BaiduMobile.new(res)
+          r.baseuri, r.options = uri, Options
+          r
+        # rescue Exception => e
+            # warn "#{__FILE__} #{__LINE__} #{uri} fetch error: #{e.to_s}"
+            # return false
+        # end
+      end
+
+      def self.suggestions(query,options = {})
+        require 'json'
+        query = URI.encode(query)
+
+        suggestions = HTTParty.get("https://m.baidu.com/su?callback=jsonp11&wd=#{query}",options).to_s
+        suggestions = suggestions.force_encoding('GB18030').encode('UTF-8')
+        suggestions = suggestions.split('s:[')[1].delete(']});').split(',').uniq
+      end
     end
+  end
 end

data/lib/query/engine/qihu_mobile.rb

@@ -1,2 +1,24 @@
 module Query
-end
+	module Engine
+		class QihuMobile
+			Host = "m.haosou.com"
+      Options = {
+        :headers => {"User-Agent" => 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_9_1) AppleWebKit/537.73.11 (KHTML, like Gecko) Version/7.0.1 Safari/537.73.11'}
+        }
+      def self.query(wd, params={})
+        q = Array.new
+        q << "q=#{URI.encode(wd)}"
+        #q << "rn=#{@perpage.to_i}" if @perpage
+        # Join arguments
+        params.each do |k, v|
+          q << "#{k.to_s}=#{v.to_s}"
+        end
+        uri = URI::HTTP.build(:host=>Host,:path=>'/s',:query=>q.join('&'))
+        res = HTTParty.get(uri, Options)
+        r = Query::Result::QihuMobile.new(res)
+        r.baseuri, r.options = uri, Options  
+        r
+      end
+    end
+  end
+end

data/lib/query/engine/sm_mobile.rb

@@ -0,0 +1,32 @@
+module Query
+  module Engine
+    class SMobile
+      include Query::Engine
+      Host = 'm.sm.cn'
+      Options = {
+        :headers => {"User-Agent" => 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_2 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8H7 Safari/6533.18.5'}
+      }
+
+      #基本查询,相当于从搜索框直接输入关键词查询
+      def self.query(wd, params={})
+        q = Array.new
+        q << "q=#{URI.encode(wd)}"
+        #q << "rn=#{@perpage.to_i}" if @perpage
+        # Join arguments
+        params.each do |k, v|
+          q << "#{k.to_s}=#{v.to_s}"
+        end
+        uri = URI::HTTP.build(:host=>Host,:path=>'/s',:query=>q.join('&'))
+        # begin
+          res = HTTParty.get(uri, Options)
+          r = Query::Result::SMobile.new(res)
+          r.baseuri, r.options = uri, Options  
+          r
+        # rescue Exception => e
+            # warn "#{__FILE__} #{__LINE__} #{uri} fetch error: #{e.to_s}"
+            # return false
+        # end
+      end            
+    end
+  end
+end

data/lib/query/engine/sogou_mobile.rb

@@ -1,21 +1,25 @@
 module Query
-	module Engine
-		class SogouMobile
-			include Query::Engine
-			BaseUri = 'http://wap.sogou.com/web/searchList.jsp'
-			Options = {
-				:headers => {"User-Agent" => 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_2 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8H7 Safari/6533.18.5'}
-			}
-			class << self
-				def query(wd)
-				queryStr = "keyword=#{wd}"
-				uri = URI.encode(BaseUri + "?" + queryStr)
-				res = HTTParty.get(uri,Options)
-				r = Query::Result::SogouMobile.new(res)
-				r.baseuri = uri
-				r
-				end
-			end
-		end
-	end
+  module Engine
+    class SogouMobile
+      include Query::Engine
+      Host = 'wap.sogou.com'
+      Options = {
+        :headers => {"User-Agent" => 'Mozilla/5.0 (iPhone; U; CPU iPhone OS 4_3_2 like Mac OS X; en-us) AppleWebKit/533.17.9 (KHTML, like Gecko) Version/5.0.2 Mobile/8H7 Safari/6533.18.5'}
+      }
+      def self.query(wd, params={})
+        q = Array.new
+        q << "keyword=#{URI.encode(wd)}"
+        #q << "rn=#{@perpage.to_i}" if @perpage
+        # Join arguments
+        params.each do |k, v|
+          q << "#{k.to_s}=#{v.to_s}"
+        end
+        uri = URI::HTTP.build(:host=>Host,:path=>'/web/searchList.jsp',:query=>q.join('&'))
+        res = HTTParty.get(uri, Options)
+        r = Query::Result::SogouMobile.new(res)
+        r.baseuri, r.options = uri, Options  
+        r
+      end
+    end
+  end
 end

data/lib/query/result.rb

@@ -1,6 +1,6 @@
 module Query
   module Result
-    attr_accessor :baseuri,:pagenumber,:perpage
+    attr_accessor :baseuri,:pagenumber,:perpage,:options
     def initialize(page)
       @page = Nokogiri::HTML page
       @pagenumber = 1
@@ -32,24 +32,13 @@ module Query
 
     def next
       return false unless next_url
-      @next_url = URI.join(@baseuri,next_url).to_s
-      next_page = HTTParty.get @next_url
-      next_page = self.class.new(next_page)
-      next_page.baseuri = @next_url
-      next_page.pagenumber = @pagenumber + 1
-      next_page.perpage = @perpage
-      r = next_page
-      r.baseuri = @next_url
+      @next_url = URI.join(@baseuri, next_url)
+      next_page = HTTParty.get(@next_url, @options)
+      r = self.class.new(next_page)
+      r.pagenumber, r.perpage, r.options, r.baseuri = @pagenumber + 1, @perpage, @options, @baseuri
       r
     end
   end
 end
-require 'nokogiri'
-require "addressable/uri"
-require 'query/result/baidu'
-require 'query/result/baidu_mobile'
-require 'query/result/baidu_mobile_api'
-require 'query/result/qihu'
-require 'query/result/qihu_mobile'
-require 'query/result/sogou'
-require 'query/result/sogou_mobile'
+require "nokogiri"
+require "addressable/uri"

data/lib/query/result/baidu.rb

@@ -2,54 +2,44 @@ module Query
   module Result
     class Baidu
       include Query::Result
-      def seo_ranks
-        return @ranks unless @ranks.nil?
-        @page.search("//*[@class='result']|//*[@class='result-op']|//*[@class='result-op c-container']|//*[@class='result c-container']").map.with_index do |table,index|
-          parse_seo(table).merge({:rank => index + 1})
-        end
+
+      def html
+        @page.to_html
       end
 
-      # def ads_top
-      #   @page.search("//*[@class='result']/preceding-sibling::*[contains(@class,'EC_result')]").map.with_index do |div, index|
-      #     parse_ad(div).merge(:rank => index + 1)
-      #   end
-      # end
+      def relatives
+        @page.search("//div[@id='rs']/table/tr/th/a").map{|tag| tag.text}
+      end
 
-      def ads_left
-        @page.xpath("//div[@id='content_left']//*[contains(@class,'EC_result')]",MyFilter.new).map.with_index do |div,index|
-          parse_ad(div)#.merge(:rank => index + 1)
+      def seo_ranks
+        return @ranks unless @ranks.nil?
+        @page.search("//div[@id='content_left']/*[contains(@class, 'result')]").map.with_index do |div,index|
+          parse_seo(div).merge(:rank => (index + 1) + (@pagenumber -1) * 10)
         end
       end
 
       def ads_top
-        ads_left.uniq.map.with_index do |ad,index|
-          ad.merge(:rank => index + 1)
+        @page.search("//div[@id='content_left']/*[not(contains(@class, 'result') or contains(@class, 'leftBlock') or name()='br' or @id='rs_top_new' or @id='super_se_tip' or @class='rs') and position()<=7]").map.with_index do |div, index|
+          parse_ad(div).merge(:rank => (index + 1) + (@pagenumber -1) * 10)
         end
       end
 
       def ads_bottom
-        # @page.search("//*[@class='result']/following-sibling::*[contains(@class,'EC_result')]").map.with_index do |div,index|
-        #   parse_ad(div)#.merge(:rank => index + 1)
-        # end
-        ads_top
+        @page.search("//div[@id='content_left']/*[not(contains(@class, 'result') or contains(@class, 'leftBlock') or name()='br' or @id='rs_top_new' or @id='super_se_tip' or @class='rs') and position()>=11]").map.with_index do |div, index|
+          parse_ad(div).merge(:rank => (index + 1) + (@pagenumber -1) * 10)
+        end
       end
 
       def ads_right
-        @page.search("//div[@id='ec_im_container']/div[@id]").map.with_index do |div,index|
-          a = div.search('a').first
-          url = div.search("*[@class='EC_url']").first.text
-          url = "http://#{url}"
-          {
-            :rank => index + 1,
-            :text => a.text.strip,
-            :href => a['href'].strip,
-            :host => Addressable::URI.parse(URI.encode(url)).host
-          }
+        @page.search("//div[@id='ec_im_container']/div[contains(@class, 'EC_idea')]").map.with_index do |div,index|
+          parse_ad(div).merge(:rank => (index + 1) + (@pagenumber -1) * 10)
         end
       end
 
       def count
-        @count ||= @page.search("//span[@class='nums']").map{|num|num.content.gsub(/\D/,'').to_i unless num.nil?}.first
+        node = @page.search("//div[@class='nums']") + @page.search("//span[@class='nums']")
+        @count ||= node.map{|num|num.content.gsub(/\D/,'').to_i unless num.nil?}.first
+        @count
       end
 
       def related_keywords
@@ -71,36 +61,42 @@ module Query
       private
       def parse_ad(div)
         #@todo  should be :
-        #title = div.xpath("*[contains(@class,'ec_title')]",MyFilter.new).first
-        title = div.xpath(".//*[contains(@class,'ec_title')]",MyFilter.new).first
-        url = div.xpath(".//*[contains(@class,'ec_url')]",MyFilter.new).first
+        title = %w(div[1]/h3/a tbody/tr[2]/td/a[1] a[1]).inject(nil){|ans, xpath| ans || div.xpath(xpath).first}
+        url   = %w(div[3]/span tbody/tr[2]/td/a[2] a[3]/font[last()]).inject(nil){|ans, xpath| ans || div.xpath(xpath).first}
         url = url.nil? ? 'www.baidu.com' : url.text
         url = "http://" + url
-        {
-          :text => title.text,
-          :href => title['href'],
-          :host => Addressable::URI.parse(URI.encode(url)).host
-        }
-      end
 
-      def parse_seo(table)
-        url = %w( span[@class="g"]  span[@class="c-showurl"] span[@class="op_wiseapp_showurl"] div[@class="op_zhidao_showurl"]).map do |xpath|
-          span = table.search(xpath).first
-          span.text.sub(/\d{4}-\d{1,2}-\d{1,2}/,'').strip if span
-        end.compact.first
-        if url and !url.empty?
-          host = Addressable::URI.parse(URI.encode("http://#{url}")).host
-        else
-          host = nil
+        begin
+          {
+            :text => title.text.strip,
+            :href => title['href'].to_s.strip,
+            :host => Addressable::URI.parse(URI.encode(url)).host
+          }
+        rescue Exception => e
+          warn "Error in parse_ad method : " + e.message
+          {}
         end
-        href = table.search('a').first['href']
-        href = href.strip if href
+      end
 
-        {
-          :text => table.search("h3").first.text.strip,
-          :href => href,
-          :host => host
-        }
+      def parse_seo(div)
+        title = %w(div[1]/h3/a h3/a div/div[1]/div[1]/div tr[2]/td/table/tr/td/h3/a).inject(nil){|ans, xpath| ans || div.xpath(xpath).first}
+        url   = %w(span[@class="g"] span[@class="c-showurl"]/span[@class="c-showurl"] span[@class="c-showurl"] span[@class="op_wiseapp_showurl"] div[@class="op_zhidao_showurl"]).inject(nil){|ans, xpath| ans || div.search(xpath).first}
+        url = url.nil? ? 'www.baidu.com' : url.text.sub(/\d{4}-\d{1,2}-\d{1,2}/,'').strip
+        url = "http://" + url
+        # url = Query::get_redirect_url(title['href'].to_s.strip) if url.include?('elong.com') && title['href']
+        # url = 'http://www.baidu.com' if url.empty?
+
+        begin
+          {
+            :is_vr=> div['class'].include?("result-op"),
+            :text => title.text.strip,
+            :href => title['href'].to_s.strip,
+            :host => Addressable::URI.parse(URI.encode(url)).host
+          }
+        rescue Exception => e
+          warn "Error in parse_seo method : " + e.message
+          {}
+        end
       end
     end
   end