duck-duck-go 1.0.2 → 1.1.0

data/CHANGES

@@ -1,3 +1,6 @@
+1.1.0 13-04-2011
+  - Support for skip_disambiguation queries
+
 1.0.2 08-04-2011
   - Add CHANGES file
 

data/Rakefile

@@ -20,7 +20,6 @@ begin
     gem.authors = ["andrewrjones"]
     gem.add_dependency('httpclient')
     gem.add_dependency('json')
-    gem.files.exclude 'scripts'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
   Jeweler::GemcutterTasks.new
@@ -52,3 +51,37 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('LICENSE')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
+
+# dumps out the result of the query, in JSON and Ruby
+# used during development
+task :search_dump do
+  require 'rubygems'
+  require 'httpclient'
+  require 'json'
+  require 'pp'
+  
+  unless ENV.include?("query")
+    raise "usage: rake search_dump query=___"
+  end
+  
+  args = {
+    'q' => ENV['query'],
+    'o' => 'json'
+  }
+  if ENV.include?("skip_disambiguation")
+    args['d'] = 1
+  end
+  
+  
+  http = HTTPClient.new
+  json = http.get_content('http://api.duckduckgo.com/', args)
+  ruby = JSON.parse(json)
+  
+  puts 'JSON'
+  puts '----'
+  puts json
+  puts
+  puts 'Ruby'
+  puts '----'
+  pp ruby
+end

data/VERSION

@@ -1 +1 @@
-1.0.2
+1.1.0

data/duck-duck-go.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{duck-duck-go}
-  s.version = "1.0.2"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["andrewrjones"]
-  s.date = %q{2011-04-08}
+  s.date = %q{2011-04-13}
   s.description = %q{A Ruby library to access the DuckDuckGo Zero Click Info API.}
   s.email = %q{andrew@arjones.co.uk}
   s.extra_rdoc_files = [

data/lib/duck_duck_go.rb

@@ -33,8 +33,16 @@ module DuckDuckGo
     
     # Run a query against Duck Duck Go
     # Returns an instance of DuckDuckGo::ZeroClickInfo
-    def zeroclickinfo(query)
-      data = @http.get_content(@url, { 'q' => query, 'o' => 'json' })
+    def zeroclickinfo(query, skip_disambiguation = false)
+      args = {
+        'q' => query,
+        'o' => 'json'
+      }
+      if(skip_disambiguation)
+        args['d'] = 1
+      end
+      
+      data = @http.get_content(@url, args)
   
       # parse the JSON and return an instance
       # of the ZeroClickInfo class

data/test/tc_live.rb

@@ -30,6 +30,23 @@ class TestLive < Test::Unit::TestCase
     assert_equal("A", zci.type)
   end
   
+  def test_skip_disambiguation
+    ddg = DuckDuckGo.new(nil, true)
+    zci = ddg.zci('Bill Gates')
+    
+    assert_instance_of(DuckDuckGo::ZeroClickInfo, zci)
+    assert_equal("D", zci.type)
+    
+    sleep(5)
+    
+    zci = ddg.zci('Bill Gates', true)
+    
+    assert_instance_of(DuckDuckGo::ZeroClickInfo, zci)
+    assert_equal("Bill Gates", zci.heading)
+    assert_equal("Wikipedia", zci.abstract_source)
+    assert_equal("A", zci.type)
+  end
+  
   # questions do not currently get a response on the api
   def test_answer
     ddg = DuckDuckGo.new

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 1
+  - 1
   - 0
-  - 2
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors: 
 - andrewrjones
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-08 00:00:00 +01:00
+date: 2011-04-13 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency