topsy 0.2.1 → 0.3.0

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/changelog.markdown

@@ -1,16 +1,10 @@
 # Changelog
 
-### 0.2.1 February, 14, 2010
-
-* Added site: option to search method
-
-    Topsy.search('riak', :site => 'thechangelog.com')
-
-### 0.2.0 January 6, 2010
+## 0.2.0 January 6, 2010
 
 * Ernesto implemented biz objects for all return types, thanks!
 * Added rate_limit info
 
-### 0.1.0 January 1, 2010
+## 0.1.0 January 1, 2010
 
 * Initial version

data/lib/topsy/client.rb

@@ -58,9 +58,7 @@ module Topsy
       Topsy::LinkpostCount.new(count)
     end
     
-    # Returns list list of author profiles that match the query. 
-    #   The query is matched against the nick, name and biography 
-    #   information and the results are sorted by closeness of match and the influence of authors.
+    # Returns list list of author profiles that match the query. The query is matched against the nick, name and biography information and the results are sorted by closeness of match and the influence of authors.
     #
     # @param [String] q the search query string
     # @param [Hash] options method options
@@ -91,15 +89,8 @@ module Topsy
     # @option options [Symbol] :window Time window for results. (default: :auto) Options: :auto - automatically pick the most recent and relevant window. :hour last hour, :day last day, :week last week, :month last month, :all all time
     # @option options [Integer] :page page number of the result set. (default: 1, max: 10)
     # @option options [Integer] :perpage limit number of results per page. (default: 10, max: 50)
-    # @option options [String] :site narrow results to a domain
     # @return [Topsy::Page]
     def search(q, options={})
-      if q.is_a?(Hash)
-        options = q
-        q = "site:#{options.delete(:site)}" if options[:site]
-      else
-        q += " site:#{options.delete(:site)}" if options[:site]
-      end
       options[:window] = @@windows[options[:window]] if options[:window]
       results = handle_response(self.class.get("/search.json", :query => {:q => q}.merge(options)))
       Topsy::Page.new(results,Topsy::LinkSearchResult)

data/test/test_topsy.rb

@@ -106,46 +106,25 @@ class TestTopsy < Test::Unit::TestCase
       results.list.first.url.should == "http://update.gemcutter.org/"
     end
     
-    context "when searching" do
-      
-      should "handle string queries" do
-        stub_get("/search.json?q=NYE&window=m", "search.json")
-        results = Topsy.search("NYE", :window => :month)
-      end
-      
-      should "handle hash queries" do
-        stub_get("/search.json?q=site%3Athechangelog.com&window=h", "search.json")
-        results = Topsy.search(:site => 'thechangelog.com', :window => :hour)
-      end
-      
-      should "handle combined queries" do
-        stub_get("/search.json?q=riak%20site%3Athechangelog.com&window=h", "search.json")
-        results = Topsy.search('riak', :site => 'thechangelog.com', :window => :hour)
-      end
-      
-      should "return a page with a list of link search results for a query" do
-        stub_get("/search.json?q=NYE&window=m", "search.json")
-        results = Topsy.search("NYE", :window => :month)
-        results.class.should == Topsy::Page
-        results.total.should == 117731
-        results.page.should == 1
-        results.perpage.should == 10
-        results.window.should == :month
-        results.list.first.class.should == Topsy::LinkSearchResult
-        results.list.first.score.should == 4.70643044
-        results.list.first.trackback_permalink.should == "http://twitter.com/spin/status/5164154014"
-        results.list.first.hits.should == 397
-        results.list.first.trackback_total.should == 2268
-        results.list.first.topsy_trackback_url.should == "http://topsy.com/trackback?url=http%3A%2F%2Fwww.youtube.com%2Fwatch%3Fv%3DXGK84Poeynk"
-        results.list.first.url.should == "http://www.youtube.com/watch?v=XGK84Poeynk"
-        results.list.first.content.should == "Science, autotuned, with Sagan, Bill Nye, Tyson, Feynman http://bit.ly/2tDk4y win!"
-        results.list.first.title.should == "YouTube - Symphony of Science - 'We Are All Connected' (ft. Sagan, Feynman, deGrasse Tyson & Bill Nye)"
-        results.list.first.highlight.should == "Science, autotuned, with Sagan, Bill <span class=\"highlight-term\">Nye</span>, Tyson, Feynman http://bit.ly/2tDk4y win! " 
-      end
+    should "return a page with a list of link search results for a query" do
+      stub_get("/search.json?q=NYE&window=m", "search.json")
+      results = Topsy.search("NYE", :window => :month)
+      results.class.should == Topsy::Page
+      results.total.should == 117731
+      results.page.should == 1
+      results.perpage.should == 10
+      results.window.should == :month
+      results.list.first.class.should == Topsy::LinkSearchResult
+      results.list.first.score.should == 4.70643044
+      results.list.first.trackback_permalink.should == "http://twitter.com/spin/status/5164154014"
+      results.list.first.hits.should == 397
+      results.list.first.trackback_total.should == 2268
+      results.list.first.topsy_trackback_url.should == "http://topsy.com/trackback?url=http%3A%2F%2Fwww.youtube.com%2Fwatch%3Fv%3DXGK84Poeynk"
+      results.list.first.url.should == "http://www.youtube.com/watch?v=XGK84Poeynk"
+      results.list.first.content.should == "Science, autotuned, with Sagan, Bill Nye, Tyson, Feynman http://bit.ly/2tDk4y win!"
+      results.list.first.title.should == "YouTube - Symphony of Science - 'We Are All Connected' (ft. Sagan, Feynman, deGrasse Tyson & Bill Nye)"
+      results.list.first.highlight.should == "Science, autotuned, with Sagan, Bill <span class=\"highlight-term\">Nye</span>, Tyson, Feynman http://bit.ly/2tDk4y win! " 
     end
-    
-    
-
 
     should "return search counts for a term" do
       stub_get("/searchcount.json?q=Balloon%20Boy", "searchcount.json")

data/topsy.gemspec

@@ -5,16 +5,17 @@
 
 Gem::Specification.new do |s|
   s.name = %q{topsy}
-  s.version = "0.2.1"
+  s.version = "0.3.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Wynn Netherland", "Ernesto Tagwerker"]
-  s.date = %q{2010-02-14}
+  s.date = %q{2010-01-11}
   s.description = %q{Ruby wrapper for the Topsy otterapi}
   s.email = %q{wynn.netherland@gmail.com}
   s.extra_rdoc_files = [
     "LICENSE",
-     "README.markdown"
+     "README.markdown",
+     "TODO"
   ]
   s.files = [
     ".gitignore",

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: topsy
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.3.0
 platform: ruby
 authors: 
 - Wynn Netherland
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-02-14 00:00:00 -06:00
+date: 2010-01-11 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -82,6 +82,7 @@ extensions: []
 extra_rdoc_files: 
 - LICENSE
 - README.markdown
+- TODO
 files: 
 - .gitignore
 - LICENSE