google_search 1.1.0 → 1.2.0

data/Rakefile

@@ -1,37 +1,31 @@
-require 'rubygems'
 require 'rake'
-
-begin
-  require 'jeweler'
-  Jeweler::Tasks.new do |gem|
-    gem.name = "google_search"
-    gem.summary = %Q{Tiny wrapper for Google Search API}
-    # gem.description = %Q{TODO: longer description of your gem}
-    gem.email = "sasa@hakeraj.com"
-    gem.homepage = "http://github.com/fox/google_search"
-    gem.authors = ["Sasa Brankovic"]
-    gem.add_development_dependency "rspec", ">= 1.2.9"
-    gem.add_dependency "activesupport"
-    # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
-  end
-  Jeweler::GemcutterTasks.new
-rescue LoadError
-  puts "Jeweler (or a dependency) not available. Install it with: gem install jeweler"
+require 'jeweler'
+ 
+Jeweler::Tasks.new do |gem|
+  gem.name = "google_search"
+  gem.summary = %Q{Tiny wrapper for Google Search API}
+  # gem.description = %Q{TODO: longer description of your gem}
+  gem.email = "sasa@hakeraj.com"
+  gem.homepage = "http://github.com/fox/google_search"
+  gem.authors = ["Sasa Brankovic"]
+  gem.add_development_dependency "rspec", ">= 2.1.0"
+  gem.add_dependency "json"
+  # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
 end
 
-require 'spec/rake/spectask'
-Spec::Rake::SpecTask.new(:spec) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.spec_files = FileList['spec/**/*_spec.rb']
+Jeweler::RubygemsDotOrgTasks.new
+
+require 'rspec/core'
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new(:spec) do |spec|
+  spec.pattern = FileList['spec/**/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
+RSpec::Core::RakeTask.new(:rcov) do |spec|
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
 end
 
-task :spec => :check_dependencies
 task :default => :spec
 
 require 'rake/rdoctask'
@@ -39,7 +33,7 @@ Rake::RDocTask.new do |rdoc|
   version = File.exist?('VERSION') ? File.read('VERSION') : ""
 
   rdoc.rdoc_dir = 'rdoc'
-  rdoc.title = "google_search #{version}"
+  rdoc.title = "test #{version}"
   rdoc.rdoc_files.include('README*')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end

data/VERSION

@@ -1 +1 @@
-1.1.0
+1.2.0

data/google_search.gemspec

@@ -1,61 +1,58 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{google_search}
-  s.version = "1.1.0"
+  s.version = "1.2.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Sasa Brankovic"]
-  s.date = %q{2010-02-03}
+  s.date = %q{2010-11-21}
   s.email = %q{sasa@hakeraj.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.rdoc"
+    "README.rdoc"
   ]
   s.files = [
     ".document",
-     ".gitignore",
-     "LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION",
-     "google_search.gemspec",
-     "lib/google_search.rb",
-     "lib/google_search/google_search.rb",
-     "lib/google_search/google_search_error.rb",
-     "spec/google_search_paginated_spec.rb",
-     "spec/google_search_spec.rb",
-     "spec/spec.opts",
-     "spec/spec_helper.rb"
+    "LICENSE",
+    "README.rdoc",
+    "Rakefile",
+    "VERSION",
+    "google_search.gemspec",
+    "lib/google_search.rb",
+    "lib/google_search/google_search.rb",
+    "lib/google_search/google_search_error.rb",
+    "spec/google_search_paginated_spec.rb",
+    "spec/google_search_spec.rb",
+    "spec/spec_helper.rb"
   ]
   s.homepage = %q{http://github.com/fox/google_search}
-  s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.5}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Tiny wrapper for Google Search API}
   s.test_files = [
+    "spec/google_search_paginated_spec.rb",
     "spec/google_search_spec.rb",
-     "spec/google_search_paginated_spec.rb",
-     "spec/spec_helper.rb"
+    "spec/spec_helper.rb"
   ]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
-      s.add_development_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<rspec>, [">= 2.1.0"])
+      s.add_runtime_dependency(%q<json>, [">= 0"])
     else
-      s.add_dependency(%q<rspec>, [">= 1.2.9"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
+      s.add_dependency(%q<rspec>, [">= 2.1.0"])
+      s.add_dependency(%q<json>, [">= 0"])
     end
   else
-    s.add_dependency(%q<rspec>, [">= 1.2.9"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
+    s.add_dependency(%q<rspec>, [">= 2.1.0"])
+    s.add_dependency(%q<json>, [">= 0"])
   end
 end
 

data/lib/google_search.rb

@@ -1,6 +1,5 @@
 require 'open-uri'
-require 'active_support'
 require 'cgi'
-
+require 'json'
 require 'google_search/google_search'
 require 'google_search/google_search_error'

data/lib/google_search/google_search.rb

@@ -1,9 +1,4 @@
 class GoogleSearch
-  ##
-  # :singleton-method:
-  # Sets up default options that should be present in every request
-  cattr_accessor :default_options
- 
   ##
   # :singleton-method: web(options)
   
@@ -24,36 +19,53 @@ class GoogleSearch
 
   ##
   # :singleton-method: patent(options)
+  class << self
+    ##
+    # :singleton-method:
+    # Default options that should be present in every request
+    def default_options
+      @default_options ||= {}
+    end
 
-  def self.method_missing(method, args) # :nodoc:
-    raise "Unknown search type '#{method}'" unless self.supported_search_types.include?(method)
-    self.query(method, args)
-  end
-
-  # Yields the search object for number +pages+ specified.
-  # Each page will contain 8 results, +pages+ must be something enumerable
-  def self.with_pages(pages)
-    pages.each do |page|
-      GoogleSearch.with_options :rsz => "large", :start => (page - 1) * 8 do |search|
-        yield search
-      end
+    ##
+    # :singleton-method:
+    # Sets up default options that should be present in every request
+    def default_options=(options)
+      @default_options = options
     end
-  end
 
-  private
-    def self.supported_search_types
-      [:web, :local, :video, :blogs, :news, :books, :images, :patent]
+    def method_missing(method, args) # :nodoc:
+      raise "Unknown search type '#{method}'" unless supported_search_types.include?(method)
+      query(method, args)
     end
-      
-    def self.query(type, options)
-      options = (self.default_options || {}).merge(options)
-      options[:v] = "1.0"
-      
-      query_string = options.collect { |key, value| "#{key}=#{CGI::escape(value.to_s)}" }.join("&")
-      uri = "http://ajax.googleapis.com/ajax/services/search/#{type}?#{query_string}"
-     
-      result = ActiveSupport::JSON.decode(open(uri).read)
-      raise GoogleSearchError, "#{result['responseStatus']} - #{result['responseDetails']}" unless result["responseStatus"] == 200
-      result
+   
+    # Yields the search method for number +pages+ specified.
+    # Each page will contain 8 results, +pages+ must be something enumerable
+    def with_pages(pages)
+      orig_options = default_options.clone 
+      pages.each do |page|
+        default_options.merge!(:rsz => "large", :start => (page - 1) * 8)
+        yield
+      end
+      default_options = orig_options
     end
+
+    private
+      def supported_search_types
+        [:web, :local, :video, :blogs, :news, :books, :images, :patent]
+      end
+        
+      def query(type, options)
+        options = default_options.merge(options)
+        options[:v] = "1.0"
+        
+        query_string = options.collect { |key, value| "#{key}=#{CGI::escape(value.to_s)}" }.join("&")
+        uri = "http://ajax.googleapis.com/ajax/services/search/#{type}?#{query_string}"
+       
+        result = JSON.parse(open(uri).read)
+        raise GoogleSearchError, "#{result['responseStatus']} - #{result['responseDetails']}" unless result["responseStatus"] == 200
+        
+        result
+      end
+  end
 end

data/spec/google_search_paginated_spec.rb

@@ -4,8 +4,8 @@ describe "Doing a paginated search" do
   context "Searching 3 pages" do
     before do
       @results = []
-      GoogleSearch.with_pages(1..3) do |search|
-        @results << search.images(:q => "moon")
+      GoogleSearch.with_pages(1..3) do
+        @results << GoogleSearch.images(:q => "moon")
       end
     end
 
@@ -16,7 +16,7 @@ describe "Doing a paginated search" do
     it "each page results should originate from its page" do
       page = 0
 
-      puts @results.each do 
+      @results.each do 
         |result| 
         page.should == result["responseData"]["cursor"]["currentPageIndex"].to_i
         page += 1

data/spec/spec_helper.rb

@@ -1,32 +1 @@
-$LOAD_PATH.unshift(File.dirname(__FILE__))
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
-
 require 'google_search'
-require 'spec'
-require 'spec/autorun'
-
-Spec::Runner.configure do |config|
-  config.before :all do
-    # The open method, used by GoogleSearch, will get cached so we 
-    # don't bombard Google each time we do testing. Cache is stored 
-    # in tmp/cached_open.
-    GoogleSearch.should_receive(:open).any_number_of_times.and_return { |url| cached_open(url) }
-  end
-end
-
-require 'digest/md5' 
-require 'fileutils'
-
-def cached_open(url) 
-  dir = "tmp/cached_open" 
-  FileUtils::mkdir_p(dir) unless File.exists?(dir)
-  
-  path = File.join(dir, Digest::MD5.hexdigest(url))
-  
-  unless File.exists?(path) 
-    content = open(url).read
-    File.open(path, "w") { |f| f.puts(content) } 
-  end
-  
-  open(path)
-end

metadata

@@ -1,7 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: google_search
 version: !ruby/object:Gem::Version 
-  version: 1.1.0
+  hash: 31
+  prerelease: false
+  segments: 
+  - 1
+  - 2
+  - 0
+  version: 1.2.0
 platform: ruby
 authors: 
 - Sasa Brankovic
@@ -9,29 +15,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-03 00:00:00 +01:00
+date: 2010-11-21 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  prerelease: false
+  requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.9
-    version: 
+        hash: 11
+        segments: 
+        - 2
+        - 1
+        - 0
+        version: 2.1.0
+  type: :development
+  version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  name: json
+  prerelease: false
+  requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
         version: "0"
-    version: 
+  type: :runtime
+  version_requirements: *id002
 description: 
 email: sasa@hakeraj.com
 executables: []
@@ -43,7 +59,6 @@ extra_rdoc_files:
 - README.rdoc
 files: 
 - .document
-- .gitignore
 - LICENSE
 - README.rdoc
 - Rakefile
@@ -54,37 +69,42 @@ files:
 - lib/google_search/google_search_error.rb
 - spec/google_search_paginated_spec.rb
 - spec/google_search_spec.rb
-- spec/spec.opts
 - spec/spec_helper.rb
 has_rdoc: true
 homepage: http://github.com/fox/google_search
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
+      segments: 
+      - 0
       version: "0"
-  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Tiny wrapper for Google Search API
 test_files: 
-- spec/google_search_spec.rb
 - spec/google_search_paginated_spec.rb
+- spec/google_search_spec.rb
 - spec/spec_helper.rb

data/.gitignore

@@ -1,22 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-tmp
-
-## PROJECT::SPECIFIC

data/spec/spec.opts

@@ -1 +0,0 @@
---color