topsy 0.4.0 → 0.5.0

data/lib/topsy/client.rb

@@ -3,7 +3,7 @@ module Topsy
     include HTTParty
     format :json
     base_uri "http://otter.topsy.com"
-    @@windows = {:all => 'a', :auto => 'auto', :week => 'w', :day => 'd', :month => 'm', :hour => 'h', :realtime => 'realtime'}
+    @@windows = {:all => 'a', :week => 'w', :day => 'd', :month => 'm', :hour => 'h', :realtime => 'realtime'}
     
     # Returns info about API rate limiting
     #
@@ -25,12 +25,12 @@ module Topsy
     #
     # @param [String] q the search query string
     # @param [Hash] options method options
-    # @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 [Symbol] :window Time window for results. (default: :all) Options: :dynamic most relevant, :hour last hour, :day last day, :week last week, :month last month, :all all time. You can also use the h6 (6 hours) d3 (3 days) syntax. 
     # @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)
     # @return [Hashie::Mash]
     def experts(q, options={})
-      options[:window] = @@windows[options[:window]] if options[:window]
+      options = set_window_or_default(options)
       handle_response(self.class.get("/experts.json", :query => {:q => q}.merge(options)))
     end
     
@@ -74,7 +74,7 @@ module Topsy
     #
     # @param [String] q the search query string
     # @param [Hash] options method options
-    # @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 [Symbol] :window Time window for results. (default: :all) Options: :dynamic most relevant, :hour last hour, :day last day, :week last week, :month last month, :all all time. You can also use the h6 (6 hours) d3 (3 days) syntax. 
     # @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
@@ -86,7 +86,7 @@ module Topsy
       else
         q += " site:#{options.delete(:site)}" if options[:site]
       end
-      options[:window] = @@windows[options[:window]] if options[:window]
+      options = set_window_or_default(options)
       results = handle_response(self.class.get("/search.json", :query => {:q => q}.merge(options)))
       Topsy::Page.new(results,Topsy::LinkSearchResult)
     end
@@ -163,6 +163,11 @@ module Topsy
     end
 
     private
+    
+      def set_window_or_default(options)
+        options[:window] = @@windows[options[:window]] if options[:window] && @@windows[options[:window]]
+        options
+      end
 
       def handle_response(response)
         raise_errors(response)

data/lib/topsy/version.rb

@@ -1,3 +1,3 @@
 module Topsy
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/test/test_topsy.rb

@@ -109,6 +109,16 @@ class TestTopsy < Test::Unit::TestCase
         results = Topsy.search(:site => 'thechangelog.com', :window => :hour)
       end
       
+      should "handle hash queries with explicit window" do
+        stub_get("/search.json?q=site%3Athechangelog.com&window=h3", "search.json")
+        results = Topsy.search(:site => 'thechangelog.com', :window => 'h3')
+      end
+      
+      should "handle hash queries with explicit window with undefined terms" do
+        stub_get("/search.json?q=site%3Athechangelog.com&window=dynamic", "search.json")
+        results = Topsy.search(:site => 'thechangelog.com', :window => :dynamic)
+      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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: topsy
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
   prerelease: 
 platform: ruby
 authors:
@@ -14,7 +14,7 @@ date: 2011-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: hashie
-  requirement: &70155566700020 !ruby/object:Gem::Requirement
+  requirement: &70188716824680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.0.0
   type: :runtime
   prerelease: false
-  version_requirements: *70155566700020
+  version_requirements: *70188716824680
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70155566699020 !ruby/object:Gem::Requirement
+  requirement: &70188716824040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -33,10 +33,10 @@ dependencies:
         version: 0.8.1
   type: :runtime
   prerelease: false
-  version_requirements: *70155566699020
+  version_requirements: *70188716824040
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70155566698240 !ruby/object:Gem::Requirement
+  requirement: &70188716823180 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 2.11.3
   type: :development
   prerelease: false
-  version_requirements: *70155566698240
+  version_requirements: *70188716823180
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70155566697520 !ruby/object:Gem::Requirement
+  requirement: &70188716822580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: 0.9.10
   type: :development
   prerelease: false
-  version_requirements: *70155566697520
+  version_requirements: *70188716822580
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70155566696540 !ruby/object:Gem::Requirement
+  requirement: &70188716821960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.3.0
   type: :development
   prerelease: false
-  version_requirements: *70155566696540
+  version_requirements: *70188716821960
 - !ruby/object:Gem::Dependency
   name: jnunemaker-matchy
-  requirement: &70155566694860 !ruby/object:Gem::Requirement
+  requirement: &70188716821140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -77,7 +77,7 @@ dependencies:
         version: 0.4.0
   type: :development
   prerelease: false
-  version_requirements: *70155566694860
+  version_requirements: *70188716821140
 description: Wrapper for the Topsy API
 email: wynn.netherland@gmail.com
 executables: []