gscraper 0.2.4 → 0.3.0

data/lib/gscraper/version.rb

@@ -1,5 +1,4 @@
 #
-#--
 # GScraper - A web-scraping interface to various Google Services.
 #
 # Copyright (c) 2007-2009 Hal Brodigan (postmodern.mod3 at gmail.com)
@@ -17,9 +16,9 @@
 # You should have received a copy of the GNU General Public License
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-#++
 #
 
 module GScraper
-  VERSION = '0.2.4'
+  # The version of GScraper
+  VERSION = '0.3.0'
 end

data/spec/extensions/uri/query_params_spec.rb

@@ -35,4 +35,12 @@ describe "URI::QueryParams" do
     @uri.query = 'u=3'
     @uri.query_params['u'].should == '3'
   end
+
+  it "should properly escape query param values" do
+    @uri.query_params['x'] = '1&2'
+    @uri.query_params['y'] = 'one=two'
+    @uri.query_params['z'] = '?'
+
+    @uri.to_s.should == "http://www.test.com/page.php?x=1%262&y=one%3Dtwo&z=%3F"
+  end
 end

data/spec/gscraper_spec.rb

@@ -1,8 +1,13 @@
 require 'spec_helper'
 
 require 'gscraper/gscraper'
+require 'gscraper/version'
 
 describe "GScraper" do
+  it "should have a VERSION constant" do
+    GScraper.should be_const_defined('VERSION')
+  end
+
   describe "User-Agent support" do
     it "should have a default User-Agent string" do
       GScraper.user_agent.should_not be_nil
@@ -11,19 +16,19 @@ describe "GScraper" do
 
   describe "Proxy support" do
     it "should provide a :host key" do
-      GScraper.proxy.has_key?(:host).should == true
+      GScraper.proxy.should have_key(:host)
     end
 
     it "should provide a :port key" do
-      GScraper.proxy.has_key?(:port).should == true
+      GScraper.proxy.should have_key(:port)
     end
 
     it "should provide a :user key" do
-      GScraper.proxy.has_key?(:user).should == true
+      GScraper.proxy.should have_key(:user)
     end
 
     it "should provide a :password key" do
-      GScraper.proxy.has_key?(:password).should == true
+      GScraper.proxy.should have_key(:password)
     end
   end
 end

data/spec/has_pages_examples.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 shared_examples_for "has Pages" do
-
   it "should have a first page" do
     @query.first_page.should_not be_nil
   end
@@ -15,5 +14,4 @@ shared_examples_for "has Pages" do
     pages.should_not be_nil
     pages.length.should == 2
   end
-
 end

data/spec/has_sponsored_links_examples.rb

@@ -1,6 +1,8 @@
 require 'spec_helper'
+require 'helpers/uri'
 
 shared_examples_for "has Sponsored Links" do
+  include Helpers
 
   it "should have ads" do
     @links.length.should_not == 0
@@ -41,5 +43,4 @@ shared_examples_for "has Sponsored Links" do
       uri_should_be_valid(url)
     end
   end
-
 end

data/spec/helpers/query.rb

@@ -1 +1,3 @@
-DEFAULT_QUERY = 'Ruby'
+module Helpers
+  DEFAULT_QUERY = 'Ruby'
+end

data/spec/helpers/uri.rb

@@ -1,7 +1,9 @@
 require 'uri'
 
-def uri_should_be_valid(uri)
-  uri.scheme.should_not be_nil
-  uri.host.should_not be_nil
-  uri.path.should_not be_nil
+module Helpers
+  def uri_should_be_valid(uri)
+    uri.scheme.should_not be_nil
+    uri.host.should_not be_nil
+    uri.path.should_not be_nil
+  end
 end

data/spec/page_has_results_examples.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 shared_examples_for "Page has Results" do
-
   it "should have results" do
     @page.length.should_not == 0
   end
@@ -9,5 +8,4 @@ shared_examples_for "Page has Results" do
   it "should have the maximum amount of results per page" do
     @page.length.should == @query.results_per_page
   end
-
 end

data/spec/search/ajax_query_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'helpers/query'
 require 'has_pages_examples'
 require 'page_has_results_examples'
 require 'search/page_has_results_examples'
@@ -6,9 +7,10 @@ require 'search/page_has_results_examples'
 require 'gscraper/search/ajax_query'
 
 describe GScraper::Search::AJAXQuery do
+  include Helpers
 
   before(:all) do
-    @query = GScraper::Search::AJAXQuery.new(:query => DEFAULT_QUERY)
+    @query = GScraper::Search::AJAXQuery.new(:query => Helpers::DEFAULT_QUERY)
     @page = @query.first_page
   end
 
@@ -17,7 +19,6 @@ describe GScraper::Search::AJAXQuery do
   it_should_behave_like "Page has Search Results"
 
   describe "Search URL" do
-
     before(:all) do
       @uri = @query.search_url
     end
@@ -57,7 +58,7 @@ describe GScraper::Search::AJAXQuery do
     end
 
     it "should have a 'q' query-param" do
-      @uri.query_params['q'].should == DEFAULT_QUERY
+      @uri.query_params['q'].should == Helpers::DEFAULT_QUERY
     end
 
     it "should have a default 'sig' query-param" do
@@ -74,11 +75,9 @@ describe GScraper::Search::AJAXQuery do
       v = @uri.query_params['v']
       v.should == GScraper::Search::AJAXQuery::DEFAULT_VERSION
     end
-
   end
 
   describe "page specific URLs" do
-
     before(:all) do
       @uri = @query.page_url(2)
     end
@@ -86,17 +85,15 @@ describe GScraper::Search::AJAXQuery do
     it "should have a 'start' query-param" do
       @uri.query_params['start'].should == @query.results_per_page
     end
-
   end
 
   describe "queries from AJAX search URLs" do
-
     before(:all) do
       @version = '1.0'
       @language = 'en'
       @sig = '582c1116317355adf613a6a843f19ece'
       @key = 'notsupplied'
-      @query = GScraper::Search::AJAXQuery.from_url("http://www.google.com/uds/GwebSearch?v=#{@version}&lstkp=0&rsz=large&hl=#{@language}&callback=google.search.WebSearch.RawCompletion&sig=#{@sig}&q=#{DEFAULT_QUERY}&gss=.com&context=0&key=#{@key}")
+      @query = GScraper::Search::AJAXQuery.from_url("http://www.google.com/uds/GwebSearch?v=#{@version}&lstkp=0&rsz=large&hl=#{@language}&callback=google.search.WebSearch.RawCompletion&sig=#{@sig}&q=#{Helpers::DEFAULT_QUERY}&gss=.com&context=0&key=#{@key}")
     end
 
     it "should have a version" do
@@ -116,9 +113,7 @@ describe GScraper::Search::AJAXQuery do
     end
 
     it "should have a query" do
-      @query.query.should == DEFAULT_QUERY
+      @query.query.should == Helpers::DEFAULT_QUERY
     end
-
   end
-
 end

data/spec/search/page_has_results_examples.rb

@@ -1,7 +1,6 @@
 require 'spec_helper'
 
 shared_examples_for "Page has Search Results" do
-
   it "should have incremental ranks" do
     ranks = @page.ranks
 
@@ -37,5 +36,4 @@ shared_examples_for "Page has Search Results" do
   it "should have atleast one cached URL" do
     @page.cached_urls.length.should_not == 0
   end
-
 end

data/spec/search/web_query_spec.rb

@@ -1,4 +1,5 @@
 require 'spec_helper'
+require 'helpers/query'
 require 'has_pages_examples'
 require 'page_has_results_examples'
 require 'has_sponsored_links_examples'
@@ -7,9 +8,10 @@ require 'search/page_has_results_examples'
 require 'gscraper/search/web_query'
 
 describe GScraper::Search::WebQuery do
+  include Helpers
 
   before(:all) do
-    @query = GScraper::Search::WebQuery.new(:query => DEFAULT_QUERY)
+    @query = GScraper::Search::WebQuery.new(:query => Helpers::DEFAULT_QUERY)
     @page = @query.first_page
     @links = @query.sponsored_links
   end
@@ -20,7 +22,6 @@ describe GScraper::Search::WebQuery do
   it_should_behave_like "has Sponsored Links"
 
   describe "Search URL" do
-
     before(:all) do
       @uri = @query.search_url
     end
@@ -30,17 +31,15 @@ describe GScraper::Search::WebQuery do
     end
 
     it "should have a 'q' query-param" do
-      @uri.query_params['q'].should == DEFAULT_QUERY
+      @uri.query_params['q'].should == Helpers::DEFAULT_QUERY
     end
 
     it "should have a 'num' query-param" do
       @uri.query_params['num'].should == @query.results_per_page
     end
-
   end
 
   describe "page specific URLs" do
-
     before(:all) do
       @uri = @query.page_url(2)
     end
@@ -52,13 +51,11 @@ describe GScraper::Search::WebQuery do
     it "should have a 'sa' query-param" do
       @uri.query_params['sa'].should == 'N'
     end
-
   end
 
   describe "queries from Web search URLs" do
-
     before(:all) do
-      @query = GScraper::Search::WebQuery.from_url("http://www.google.com/search?sa=N&start=0&q=#{DEFAULT_QUERY}&num=20")
+      @query = GScraper::Search::WebQuery.from_url("http://www.google.com/search?sa=N&start=0&q=#{Helpers::DEFAULT_QUERY}&num=20")
     end
 
     it "should have a results-per-page" do
@@ -66,13 +63,11 @@ describe GScraper::Search::WebQuery do
     end
 
     it "should have a query" do
-      @query.query.should == DEFAULT_QUERY
+      @query.query.should == Helpers::DEFAULT_QUERY
     end
-
   end
 
   it "should have atleast one similar query URL" do
     @page.similar_urls.length.should_not == 0
   end
-
 end

data/spec/spec_helper.rb

@@ -1,6 +1,12 @@
 require 'rubygems'
-gem 'rspec', '>=1.1.3'
-require 'spec'
+require 'bundler'
+
+begin
+  Bundler.setup(:runtime, :test)
+rescue Bundler::BundlerError => e
+  STDERR.puts e.message
+  STDERR.puts "Run `bundle install` to install missing gems"
+  exit e.status_code
+end
 
-require 'helpers/query'
-require 'helpers/uri'
+require 'spec'

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: gscraper
 version: !ruby/object:Gem::Version 
-  version: 0.2.4
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - Postmodern
@@ -9,106 +14,194 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-03-18 00:00:00 -07:00
+date: 2010-07-02 00:00:00 -07:00
 default_executable: 
 dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: json_pure
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
+  type: :runtime
+  prerelease: false
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
   name: mechanize
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 0
+        - 0
+        version: 1.0.0
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: bundler
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 9
+        - 19
+        version: 0.9.19
+  type: :development
+  prerelease: false
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rake
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 0.9.0
-    version: 
+        segments: 
+        - 0
+        - 8
+        - 7
+        version: 0.8.7
+  type: :development
+  prerelease: false
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
-  name: hoe
+  name: jeweler
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ~>
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 1
+        - 4
+        - 0
+        version: 1.4.0
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  version_requirements: *id005
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  requirement: &id006 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        version: 1.10.0
-    version: 
+        segments: 
+        - 1
+        - 3
+        - 0
+        version: 1.3.0
+  type: :development
+  prerelease: false
+  version_requirements: *id006
 description: GScraper is a web-scraping interface to various Google Services.
-email: 
-- postmodern.mod3@gmail.com
+email: postmodern.mod3@gmail.com
 executables: []
 
 extensions: []
 
 extra_rdoc_files: 
-- History.txt
-- COPYING.txt
-- Manifest.txt
-- README.txt
+- ChangeLog.md
+- README.md
 files: 
-- History.txt
+- .gitignore
+- .specopts
+- .yardopts
 - COPYING.txt
-- Manifest.txt
-- README.txt
+- ChangeLog.md
+- Gemfile
+- README.md
 - Rakefile
-- lib/gscraper/extensions/uri/query_params.rb
-- lib/gscraper/extensions/uri/http.rb
-- lib/gscraper/extensions/uri.rb
+- gscraper.gemspec
+- lib/gscraper.rb
 - lib/gscraper/extensions.rb
+- lib/gscraper/extensions/uri.rb
+- lib/gscraper/extensions/uri/http.rb
+- lib/gscraper/extensions/uri/query_params.rb
+- lib/gscraper/gscraper.rb
+- lib/gscraper/has_pages.rb
 - lib/gscraper/licenses.rb
 - lib/gscraper/page.rb
-- lib/gscraper/has_pages.rb
-- lib/gscraper/sponsored_ad.rb
-- lib/gscraper/sponsored_links.rb
-- lib/gscraper/search/result.rb
+- lib/gscraper/search.rb
+- lib/gscraper/search/ajax_query.rb
 - lib/gscraper/search/page.rb
 - lib/gscraper/search/query.rb
-- lib/gscraper/search/web_query.rb
-- lib/gscraper/search/ajax_query.rb
+- lib/gscraper/search/result.rb
 - lib/gscraper/search/search.rb
-- lib/gscraper/search.rb
-- lib/gscraper/gscraper.rb
+- lib/gscraper/search/web_query.rb
+- lib/gscraper/sponsored_ad.rb
+- lib/gscraper/sponsored_links.rb
 - lib/gscraper/version.rb
-- lib/gscraper.rb
-- tasks/spec.rb
-- spec/spec_helper.rb
-- spec/helpers/uri.rb
-- spec/helpers/query.rb
-- spec/extensions/uri/query_params_spec.rb
 - spec/extensions/uri/http_spec.rb
+- spec/extensions/uri/query_params_spec.rb
+- spec/gscraper_spec.rb
 - spec/has_pages_examples.rb
-- spec/page_has_results_examples.rb
 - spec/has_sponsored_links_examples.rb
+- spec/helpers/query.rb
+- spec/helpers/uri.rb
+- spec/page_has_results_examples.rb
+- spec/search/ajax_query_spec.rb
 - spec/search/page_has_results_examples.rb
 - spec/search/query_spec.rb
-- spec/search/ajax_query_spec.rb
 - spec/search/web_query_spec.rb
-- spec/gscraper_spec.rb
-has_rdoc: true
-homepage: http://gscraper.rubyforge.org/
+- spec/spec_helper.rb
+has_rdoc: yard
+homepage: http://github.com/postmodern/gscraper
+licenses: 
+- GPL-2
 post_install_message: 
-rdoc_options: 
-- --main
-- README.txt
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 734300353
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
-rubyforge_project: gscraper
-rubygems_version: 1.3.1
+rubyforge_project: 
+rubygems_version: 1.3.7
 signing_key: 
-specification_version: 2
+specification_version: 3
 summary: GScraper is a web-scraping interface to various Google Services.
-test_files: []
-
+test_files: 
+- spec/extensions/uri/http_spec.rb
+- spec/extensions/uri/query_params_spec.rb
+- spec/gscraper_spec.rb
+- spec/has_pages_examples.rb
+- spec/has_sponsored_links_examples.rb
+- spec/helpers/query.rb
+- spec/helpers/uri.rb
+- spec/page_has_results_examples.rb
+- spec/search/ajax_query_spec.rb
+- spec/search/page_has_results_examples.rb
+- spec/search/query_spec.rb
+- spec/search/web_query_spec.rb
+- spec/spec_helper.rb