intridea-tweetstream 0.1.1 → 0.1.3

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.3

data/lib/tweetstream/client.rb

@@ -65,9 +65,9 @@ module TweetStream
     def track(*keywords, &block)
       query_params = keywords.pop if keywords.last.is_a?(::Hash)
       query_params ||= {}
-      start('statuses/filter', query_params.merge(:track => keywords.join(',')), &block)
+      filter(query_params.merge(:track => keywords), &block)
     end
-    
+
     # Returns public statuses from or in reply to a set of users. Mentions 
     # ("Hello @user!") and implicit replies ("@user Hello!" created without 
     # pressing the reply "swoosh") are not matched. Requires integer user
@@ -75,11 +75,26 @@ module TweetStream
     def follow(*user_ids, &block)
       query_params = user_ids.pop if user_ids.last.is_a?(::Hash)
       query_params ||= {}
-      start('statuses/filter', query_params.merge(:follow => user_ids.join(',')), &block)
+      filter(query_params.merge(:follow => user_ids), &block)
+    end
+    
+    # Make a call to the statuses/filter method of the Streaming API,
+    # you may provide <tt>:follow</tt>, <tt>:track</tt> or both as options
+    # to follow the tweets of specified users or track keywords. This
+    # method is provided separately for cases when it would conserve the
+    # number of HTTP connections to combine track and follow.
+    def filter(query_params = {}, &block)
+      [:follow, :track].each do |param|
+        if query_params[param].is_a?(Array)
+          query_params[param] = query_params[param].collect{|q| q.to_s}.join(',')
+        elsif query_params[param]
+          query_params[param] = query_params[param].to_s
+        end
+      end
+      start('statuses/filter', query_params, &block)
     end
 
-    #:nodoc:
-    def start(path, query_parameters = {}, &block)
+    def start(path, query_parameters = {}, &block) #:nodoc:
       uri = build_uri(path, query_parameters)
       
       Yajl::HttpStream.get(uri, :symbolize_keys => true) do |hash|
@@ -89,13 +104,11 @@ module TweetStream
  
     protected
 
-    #:nodoc:
-    def build_uri(path, query_parameters = {})
+    def build_uri(path, query_parameters = {}) #:nodoc:
       URI.parse("http://#{self.username}:#{self.password}@stream.twitter.com/1/#{path}.json#{build_query_parameters(query_parameters)}")
     end
 
-    #:nodoc:
-    def build_query_parameters(query)
+    def build_query_parameters(query) #:nodoc:
       return '' unless query && query.is_a?(::Hash) && query.size > 0
       pairs = []
       

data/lib/tweetstream/daemon.rb

@@ -31,8 +31,7 @@ class TweetStream::Daemon < TweetStream::Client
     super(user, pass)
   end
   
-  #:nodoc:
-  def start(path, query_parameters = {}, &block)
+  def start(path, query_parameters = {}, &block) #:nodoc:
     Daemons.run_proc(@app_name || 'tweetstream', :multiple => true) do
       super(path, query_parameters, &block)
     end

data/lib/tweetstream/hash.rb

@@ -1,6 +1,5 @@
-#:nodoc:
-class TweetStream::Hash < ::Hash
-  def initialize(other_hash)
+class TweetStream::Hash < ::Hash #:nodoc: all
+  def initialize(other_hash = {})
     other_hash.keys.each do |key|
       self[key.to_sym] = other_hash[key]
     end

data/spec/tweetstream/client_spec.rb

@@ -107,6 +107,11 @@ describe TweetStream::Client do
       @client.should_receive(:start).once.with('statuses/filter', :follow => '123,456')
       @client.follow(123, 456)
     end
+    
+    it '#filter should make a call to "statuses/filter" with the query params provided' do
+      @client.should_receive(:start).once.with('statuses/filter', :follow => '123')
+      @client.filter(:follow => 123)
+    end
   end
 
   describe '#track' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: intridea-tweetstream
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
+  version: 0.1.3
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-09-22 00:00:00 -07:00
+date: 2009-09-23 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -56,7 +56,6 @@ files:
 - README.rdoc
 - Rakefile
 - VERSION
-- lib/tracker.rb
 - lib/tweetstream.rb
 - lib/tweetstream/client.rb
 - lib/tweetstream/daemon.rb

data/lib/tracker.rb

@@ -1,12 +0,0 @@
-require 'rubygems'
-require 'tweetstream'
-require 'logger'
-
-File.open('tracker.log', File::WRONLY | File::APPEND | File::CREAT) do |file|
-  log = Logger.new(file)
-
-  TweetStream::Daemon.new('mbleigh','hotmail', 'tracker').track('fail') do |status|
-    log.info "[#{status.user.screen_name}] #{status.text}"
-    puts "[#{status.user.screen_name}] #{status.text}"
-  end
-end