query 0.1.22 → 0.1.23

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 8d97911820949c91b6587056671a2e0fed35bcae
-  data.tar.gz: 5983436b291c0460ed974edd50e64db91bcac6b2
+  metadata.gz: 9e0dd534e82e96f66579c0d5b9533be3d3f63983
+  data.tar.gz: ccc1e5baee2d1fe441b98bc68fed3be70d603142
 SHA512:
-  metadata.gz: 2671cb7e7abc45bd0ced7dd29d659b896e00ba4ea3971d9391c224c23cd563a53db0ef64ba1e3dc7def2f09bd20137f06095ef66c8bfa98ceca857c87ba3e7cc
-  data.tar.gz: f88b43cdfb4668a73ce30dd1dbd6269dbeef28b22280c9e3f3c6441f7ff9ee747d7e0b40a160fb0d6cc7f4be66eb37f1d40e2dc557dd13935c6d74c4a4b17cc4
+  metadata.gz: 26b548b92c64dd7431b459344c591634a3d24ebe79f6ce2c9632503f4f801ef8f8a502cfbaf3d897190cc954dcc90ce01e4fbf1477d68d4507da0c1a7778be75
+  data.tar.gz: 055fac0339f710c6f931778f1e7072f127684173a16d32bedbc1aedfa05422d7bb4c581a6c5be9994dc6dbf9510966508eb6587f0bdb88e3872c14ebfd0275f2

data/.gitignore

@@ -22,13 +22,9 @@ tmp
 _yardoc
 doc/
 lib/query/.DS_Store
-
 lib/query/.DS_Store
-
 .gemtags
-
 .tags
-
 .tags_sorted_by_file
-
 .DS_Store
+vendor/

data/Gemfile

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

data/README.md

@@ -2,6 +2,7 @@ Query
 ==========
 
 
+
 #to get the result list by querying "abc"
 
 Query::Engine::Baidu.new.query("abc").ranks().each do |id,value|

data/lib/query/engine/baidu.rb

@@ -1,24 +1,25 @@
 module Query
-    module Engine
-        class Baidu
-            include Query::Engine
-            Host = 'www.baidu.com'
-            BaseUri = 'http://www.baidu.com/s?'
-            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.suggestions(wd)
-                require 'json'
-                json = HTTParty.get("http://suggestion.baidu.com/su?wd=#{URI.encode(wd)}&cb=callback").force_encoding('GBK').encode("UTF-8")
-                m = /\[([^\]]*)\]/.match json
-                return JSON.parse m[0]
-            end
-            #to find out the real url for something lik 'www.baidu.com/link?url=7yoYGJqjJ4zBBpC8yDF8xDhctimd_UkfF8AVaJRPKduy2ypxVG18aRB5L6D558y3MjT_Ko0nqFgkMoS'
-            # def url(id)
-            #   a = Mechanize.new
-            #   a.redirect_ok=false
-            #   return a.head("http://www.baidu.com/link?url=#{id}").header['location']
-            # end
+  module Engine
+    class Baidu
+      include Query::Engine
+      Host = 'www.baidu.com'
+      BaseUri = 'http://www.baidu.com/s?'
+      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.suggestions(query)
+        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}")
+        suggestions.force_encoding('GB18030').encode('UTF-8').delete('jQuery1102036467162938788533_1437556180622(').delete(')').scan(/"q": "([^"]+)"/).flatten.uniq
+      end
+      #to find out the real url for something lik 'www.baidu.com/link?url=7yoYGJqjJ4zBBpC8yDF8xDhctimd_UkfF8AVaJRPKduy2ypxVG18aRB5L6D558y3MjT_Ko0nqFgkMoS'
+      # def url(id)
+      #   a = Mechanize.new
+      #   a.redirect_ok=false
+      #   return a.head("http://www.baidu.com/link?url=#{id}").header['location']
+      # end
 
 =begin
             def extend(words,level=3,sleeptime=1)
@@ -38,33 +39,35 @@ module Query
             end
 =end
 
-            def self.popular?(wd)
-                return HTTParty.get("http://index.baidu.com/main/word.php?word=#{URI.encode(wd.encode("GBK"))}").include?"boxFlash"
-            end
+      def self.popular?(wd)
+        return HTTParty.get("http://index.baidu.com/main/word.php?word=#{URI.encode(wd.encode("GBK"))}").include?"boxFlash"
+      end
 
-            def self.query(wd,params={})
-                q = Array.new
-                q << "wd=#{URI.encode(wd)}"
-                q << "rn=#{@perpage.to_i}" if @perpage
-                params.each do |k,v|
-                    q << "#{k.to_s}=#{v.to_s}"
-                end
-                queryStr = q.join("&")
-                #uri = URI.encode((BaseUri + queryStr).encode('GBK'))
-                # uri = URI.encode((BaseUri + queryStr))
-                uri = URI::HTTP.build(:host=>Host,:path=>'/s',:query=>q.join('&'))
-                # begin
-                    # @page = @a.get uri
-                    @page = HTTParty.get(uri,Options)
-                    r = Query::Result::Baidu.new(@page)
-                    r.baseuri = uri
-                    r.pagenumber = 1
-                    r.perpage = @perpage
-                    r
-                # rescue Exception => e
-                #     warn e.to_s
-                #     return false
-                # end
+      def self.query(wd,params={})
+        q = Array.new
+        q << "wd=#{URI.encode(wd)}"
+        q << "rn=#{@perpage.to_i}" if @perpage
+        params.each do |k,v|
+          q << "#{k.to_s}=#{v.to_s}"
+        end
+        queryStr = q.join("&")
+        #uri = URI.encode((BaseUri + queryStr).encode('GBK'))
+        # uri = URI.encode((BaseUri + queryStr))
+        uri = URI::HTTP.build(:host=>Host,:path=>'/s',:query=>q.join('&'))
+        # begin
+        # @page = @a.get uri
+        p uri
+        p Options
+        @page = HTTParty.get(uri,Options)
+        r = Query::Result::Baidu.new(@page)
+        r.baseuri = uri
+        r.pagenumber = 1
+        r.perpage = @perpage
+        r
+        # rescue Exception => e
+        #     warn e.to_s
+        #     return false
+        # end
 =begin
                 query = "#{query}"
                 @uri = BaseUri+URI.encode(query.encode('GBK'))
@@ -75,26 +78,26 @@ module Query
                 @maxpage =10 if @maxpage>10
                 @currpage =0
 =end
-            end
+      end
 
-            #site:xxx.yyy.com
-            def self.query_within(host,query)
-                self.query("#{query} site:#{host}")
-            end
+      #site:xxx.yyy.com
+      def self.query_within(host,query)
+        self.query("#{query} site:#{host}")
+      end
 
-            def self.pages(host)
-                self.query("site:#{host}")
-            end
+      def self.pages(host)
+        self.query("site:#{host}")
+      end
 
-            #domain:xxx.yyy.com/path/file.html
-            def self.links(uri)
-                self.query("domain:\"#{uri}\"")
-            end
+      #domain:xxx.yyy.com/path/file.html
+      def self.links(uri)
+        self.query("domain:\"#{uri}\"")
+      end
 
-            #site:xxx.yyy.com inurl:zzz
-            def self.pages_with(host,string)
-                self.query("site:#{host} inurl:#{string}")
-            end
-        end
+      #site:xxx.yyy.com inurl:zzz
+      def self.pages_with(host,string)
+        self.query("site:#{host} inurl:#{string}")
+      end
     end
-end
+  end
+end

data/lib/query/version.rb

@@ -1,3 +1,3 @@
 module Query
-  VERSION = "0.1.22"
+  VERSION = "0.1.23"
 end

data/query.gemspec

@@ -19,6 +19,7 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "rspec"
   spec.add_development_dependency "rake"
   spec.add_dependency "nokogiri"
   spec.add_dependency "addressable"

data/spec/spec_helper.rb

@@ -1,6 +1,5 @@
 require 'query'
 require 'pathname'
-require 'awesome_print'
 path_root = Pathname.new(__dir__)
 path_samples = File.join(path_root,'samples')
 $sample_qihu = File.join(path_samples,'qihu.html')

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: query
 version: !ruby/object:Gem::Version
-  version: 0.1.22
+  version: 0.1.23
 platform: ruby
 authors:
 - seoaqua
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-17 00:00:00.000000000 Z
+date: 2015-09-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '1.3'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -154,7 +168,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.2
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: I dont have time to write the document yet. Usage is almost within rspec