topsy 0.3.0 → 0.3.1

data/lib/topsy.rb

@@ -1,9 +1,4 @@
-require 'rubygems'
-
-gem 'hashie', '~> 0.1.3'
 require 'hashie'
-
-gem 'httparty', '~> 0.4.5'
 require 'httparty'
 
 directory = File.expand_path(File.dirname(__FILE__))
@@ -12,6 +7,9 @@ Hash.send :include, Hashie::HashExtensions
 
 
 module Topsy
+  
+  VERSION = "0.3.1"
+  
   class TopsyError < StandardError
     attr_reader :data
 

data/lib/topsy/client.rb

@@ -58,7 +58,9 @@ 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
@@ -89,8 +91,15 @@ 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/lib/topsy/page.rb

@@ -18,6 +18,9 @@ module Topsy
     property :perpage
     property :window
     property :topsy_trackback_url
+    property :last_offset
+    property :offset
+    property :hidden
     
     @@windows = {'a' => :all, 'auto' => :auto, 'w' => :week, 'd' => :day, 'm' => :month, 'h' => :hour}
     

data/test/helper.rb

@@ -11,6 +11,7 @@ require 'shoulda'
 require 'matchy'
 require 'mocha'
 require 'fakeweb'
+require 'redgreen'
 
 
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))

data/test/test_topsy.rb

@@ -106,25 +106,46 @@ class TestTopsy < Test::Unit::TestCase
       results.list.first.url.should == "http://update.gemcutter.org/"
     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! " 
+    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
     end
+    
+    
+
 
     should "return search counts for a term" do
       stub_get("/searchcount.json?q=Balloon%20Boy", "searchcount.json")

metadata

@@ -1,7 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: topsy
 version: !ruby/object:Gem::Version 
-  version: 0.3.0
+  prerelease: false
+  segments: 
+  - 0
+  - 3
+  - 1
+  version: 0.3.1
 platform: ruby
 authors: 
 - Wynn Netherland
@@ -10,88 +15,112 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-01-11 00:00:00 -05:00
+date: 2010-07-27 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: hashie
-  type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 1
+        - 3
         version: 0.1.3
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: httparty
+  name: hashie
+  prerelease: false
+  requirement: *id001
   type: :runtime
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     requirements: 
-    - - ~>
+    - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 5
         version: 0.4.5
-    version: 
+  name: httparty
+  prerelease: false
+  requirement: *id002
+  type: :runtime
 - !ruby/object:Gem::Dependency 
-  name: thoughtbot-shoulda
-  type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 2
+        - 10
+        - 1
         version: 2.10.1
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: jnunemaker-matchy
+  name: shoulda
+  prerelease: false
+  requirement: *id003
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 0
         version: 0.4.0
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: mocha
+  name: jnunemaker-matchy
+  prerelease: false
+  requirement: *id004
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     requirements: 
-    - - "="
+    - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.9.4
-    version: 
-- !ruby/object:Gem::Dependency 
+        segments: 
+        - 1
+        - 2
+        - 5
+        version: 1.2.5
   name: fakeweb
+  prerelease: false
+  requirement: *id005
   type: :development
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 1.2.5
-    version: 
-description: Ruby wrapper for the Topsy otterapi
+        segments: 
+        - 0
+        version: "0"
+  name: yard
+  prerelease: false
+  requirement: *id006
+  type: :development
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id007 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        version: "0"
+  name: redgreen
+  prerelease: false
+  requirement: *id007
+  type: :development
+description: Wrapper for the Topsy API
 email: wynn.netherland@gmail.com
 executables: []
 
 extensions: []
 
-extra_rdoc_files: 
-- LICENSE
-- README.markdown
-- TODO
+extra_rdoc_files: []
+
 files: 
-- .gitignore
-- LICENSE
-- README.markdown
-- Rakefile
-- TODO
-- VERSION
-- changelog.markdown
-- lib/topsy.rb
 - lib/topsy/author.rb
 - lib/topsy/client.rb
 - lib/topsy/link_search_result.rb
@@ -106,56 +135,39 @@ files:
 - lib/topsy/trend.rb
 - lib/topsy/tweet.rb
 - lib/topsy/url_info.rb
-- script/console
-- script/destroy
-- script/generate
-- test/fixtures/authorinfo.json
-- test/fixtures/authorsearch-page2.json
-- test/fixtures/authorsearch.json
-- test/fixtures/credit.json
-- test/fixtures/linkpostcount.json
-- test/fixtures/linkposts-page2.json
-- test/fixtures/linkposts.json
-- test/fixtures/profilesearch.json
-- test/fixtures/related.json
-- test/fixtures/search.json
-- test/fixtures/searchcount.json
-- test/fixtures/stats.json
-- test/fixtures/tags.json
-- test/fixtures/trackbacks.json
-- test/fixtures/trending.json
-- test/fixtures/urlinfo.json
-- test/helper.rb
-- test/test_topsy.rb
-- topsy.gemspec
+- lib/topsy.rb
 has_rdoc: true
-homepage: http://github.com/pengwynn/topsy
+homepage: http://wynnnetherland.com/projects/topsy/
 licenses: []
 
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
+rdoc_options: []
+
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      segments: 
+      - 0
       version: "0"
-  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      version: "0"
-  version: 
+      segments: 
+      - 1
+      - 3
+      - 6
+      version: 1.3.6
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.5
+rubygems_version: 1.3.6
 signing_key: 
 specification_version: 3
-summary: Ruby wrapper for the Topsy otterapi
+summary: Ruby wrapper for the Topsy API
 test_files: 
 - test/helper.rb
 - test/test_topsy.rb

data/.gitignore

@@ -1,27 +0,0 @@
-## Aptana
-.project
-.loadpath
-
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-
-## PROJECT::SPECIFIC
-doc
-.yardoc

data/LICENSE

@@ -1,20 +0,0 @@
-Copyright (c) 2009 Wynn Netherland
-
-Permission is hereby granted, free of charge, to any person obtaining
-a copy of this software and associated documentation files (the
-"Software"), to deal in the Software without restriction, including
-without limitation the rights to use, copy, modify, merge, publish,
-distribute, sublicense, and/or sell copies of the Software, and to
-permit persons to whom the Software is furnished to do so, subject to
-the following conditions:
-
-The above copyright notice and this permission notice shall be
-included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
-EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
-MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
-NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
-LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
-OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

data/README.markdown

@@ -1,102 +0,0 @@
-# Topsy
-
-Simple Ruby wrapper for the [Topsy.com](http://topsy.com) Otter API. Topsy is a search engine powered by tweets.
-
-## Installation
-
-Topsy is hosted on Gemcutter, so:
-
-    gem install gemcutter # if necessary
-    gem tumble # if necessary
-    sudo gem install topsy
-
-## Usage
-    >> Topsy.rate_limit
-    => <#Topsy::RateLimitInfo limit=10000 remaining=10000 reset=1262804400>
-
-    >> Topsy.author_info('http://twitter.com/barackobama')
-    => <#Topsy::Author description="44th President of the United States" influence_level=10 name="Barack Obama" nick="barackobama" topsy_author_url="http://topsy.com/twitter/barackobama" type="twitter" url="http://twitter.com/barackobama">
-
-    >> Topsy.author_search('programming')
-    => <#Topsy::Page list=[<#Topsy::Author descript ... ] page=1 perpage=15 topsy_trackback_url=nil total=97229 window=nil>
-    
-    >> Topsy.author_search('programming', :perpage => 2, :page => 1)
-    => <#Topsy::Page list=[<#Topsy::Author description="Most ... ] page=1 perpage=2 topsy_trackback_url=nil total=100685 window=nil>
-    
-    >> Topsy.link_posts('http://twitter.com/barackobama', :perpage => 2, :page => 2)
-    => <#Topsy::Page list=[<#Topsy::Linkpost content="An important reminder ... ] page=2 perpage=2 topsy_trackback_url=nil total=402 window=nil>
-
-    >> Topsy.link_posts('http://twitter.com/barackobama')
-    => <#Topsy::Page list=[<#Topsy::Linkpost content="An important reminder about health reform on the @Whit... ] page=1 perpage=10 topsy_trackback_url=nil total=402 window=nil>
-    
-    >> Topsy.link_post_count('http://twitter.com/barackobama')
-    => <#Topsy::LinkpostCount all=402 contains=0>
-
-    >> Topsy.url_info('http://etagwerker.com')
-    => <#Topsy::UrlInfo description="" description_attribution="" oneforty="just finished installing wordpress in a linux .." url="http://etagwerker.com/"> 
-    
-    >> Topsy.stats('http://www.google.com')
-    => <#Topsy::Stats all=29869 contains=0 influential=2023 topsy_trackback_url="http://topsy.com/tb/www.google.com/">
-
-    >> Topsy.search('rock')
-    => <#Topsy::Page list=[<#Topsy::LinkSearchResult content="Why 30 Rock is a Rip-Off of The Muppet Show - http://is.gd/15KJZ" .. ]  page=1 perpage=10 topsy_trackback_url=nil total=714429 window="a"> 
-    
-    >> Topsy.search('rock', :perpage => 2, :page => 3)
-    => <#Topsy::Page list=[<#Topsy::LinkSearchResult content="Just released! Beatles Rock Band opening cinematic. Amaz ..." ] page=3 perpage=2 topsy_trackback_url=nil total=714429 window="a">
-    
-    >> Topsy.search('rock', :perpage => 2, :page => 3, :window => 'd')
-    => <#Topsy::Page list=[<#Topsy::LinkSearchResult content="Be a Google Wave Rock Star http://ff.im/-dPdGL" highlight="Be a .. "] page=3 perpage=2 topsy_trackback_url=nil total=6064 window="d">
-    
-    >> Topsy.search_count('rock')
-    => <#Topsy::SearchCounts a=5191790 d=7601 h=206 m=216179 w=45462>
-    
-    >> Topsy.profile_search('Hacker+Rubyist')
-    => <#Topsy::Page list=[<#Topsy::Author description="Hacker; Rubyist; Bit Poet" influence_level=4 name="Ben Bleythi ...">] page=1 perpage=10 topsy_trackback_url=nil total=5 window=nil>
-     
-    >> Topsy.profile_search('Hacker+Rubyist', :perpage => 1, :page => 2)
-    => <#Topsy::Page list=[<#Topsy::Author description="Rubyist, hacker, gamer (video, board and role-playing)... ">] page=2 perpage=1 topsy_trackback_url=nil total=5 window=nil>
-    
-    >> Topsy.related('http://www.twitter.com')
-    => <#Topsy::Page list=[<#Topsy::LinkSearchResult title="New Twitter Feature: Body Counts | Danger Room ... ">] page=1 perpage=10 topsy_trackback_url=nil total=4458 window=nil>
-     
-    >> Topsy.tags('http://twitter.com')
-    => <#Topsy::Page list=[<#Topsy::Tag name="current" url="http://topsy.com/s?q=current">, <#Topsy::Tag name="twe ... ">] page=1 perpage=10 topsy_trackback_url=nil total=1885 window=nil>
-    
-    >> Topsy.trending
-    => <#Topsy::Page list=[<#Topsy::Trend term="u s reopens embassy in yemen" url="http://topsy.com/s?q=u+s%20r ... ">] page=1 perpage=10 topsy_trackback_url=nil total=1434 window=nil>
-    
-    >> Topsy.trending(:page => 3, :perpage => 2)
-    => <#Topsy::Page list=[<#Topsy::Trend term="droid vs iphone" url="http://topsy.com/s?q=droid+vs%20iphone" ... ">] page=3 perpage=2 topsy_trackback_url=nil total=1434 window=nil>
-
-    >> Topsy.trackbacks('http://twitter.com', :perpage => 2, :page => 2)
-    => <#Topsy::Page list=[<#Topsy::Tweet author=<#Topsy::Author influence_level=8 name="tama" photo_url="http://a3.twimg .. ">] page=2 perpage=2 topsy_trackback_url="http://topsy.com/tb/twitter.com/" total=39705 window=nil>
-    
-    >> Topsy.trackbacks('http://twitter.com', :perpage => 2, :page => 2, :contains => 'mashable')
-    => <#Topsy::Page list=[<#Topsy::Tweet author=<#Topsy::Author name="Hannah Grosvenor" photo_url="http://a1.t. ... >] page=2 perpage=2 topsy_trackback_url="http://topsy.com/tb/twitter.com/" total=41 window=nil>
-    
-    # Fetch search results for the query "gemcutter"
-    >> results = Topsy.search("gemcutter")
-    => <#Topsy::Page list=[<#Topsy::LinkSearchResult content="New design ... ]>
-    
-    # Fetch search counts for the query "gemcutter"
-    >> counts = Topsy.search_count("gemcutter")
-    => <#Topsy::SearchCounts a=773 d=6 h=0 m=103 w=24>
-    >> counts.this_week
-    => 24
-    
-Check the [full gem documentation](http://yardoc.org/docs/pengwynn-topsy) and [API docs](http://code.google.com/p/otterapi/wiki/Resources) for more info.
-
-## Note on Patches/Pull Requests
- 
-* Fork the project.
-* Make your feature addition or bug fix.
-* Add tests for it. This is important so I don't break it in a
-  future version unintentionally.
-* Commit, do not mess with rakefile, version, or history.
-  (if you want to have your own version, that is fine but
-   bump version in a commit by itself I can ignore when I pull)
-* Send me a pull request. Bonus points for topic branches.
-
-## Copyright
-
-Copyright (c) 2010 [Wynn Netherland](http://wynnnetherland.com). See LICENSE for details.