tweetstream 0.1.9 → 0.3.0

data/README.rdoc

@@ -82,7 +82,7 @@ options when you make your method call:
     TweetStream::Client.new('user','pass').track('intridea',
       :delete => Proc.new{ |status_id, user_id| # do something },
       :limit => Proc.new{ |skip_count| # do something }
-    ) do |status
+    ) do |status|
       # do something with the status like normal
     end
     
@@ -114,7 +114,7 @@ It is also possible to create a daemonized script quite easily
 using the TweetStream library:
 
   # The third argument is an optional process name
-  TweetStream::Client.new('username','password', 'tracker').track('term1', 'term2') do |status|
+  TweetStream::Daemon.new('username','password', 'tracker').track('term1', 'term2') do |status|
     # do something in the background
   end
   

data/Rakefile

@@ -12,7 +12,7 @@ begin
     gem.authors = ["Michael Bleigh"]
     gem.files = FileList["[A-Z]*", "{lib,spec}/**/*"] - FileList["**/*.log"]
     gem.add_development_dependency "rspec"
-    gem.add_dependency 'yajl-ruby', '>= 0.6.3'
+    gem.add_dependency 'yajl-ruby', '>= 0.6.6'
     gem.add_dependency 'daemons'
     # gem is a Gem::Specification... see http://www.rubygems.org/read/chapter/20 for additional settings
   end
@@ -38,6 +38,7 @@ Spec::Rake::SpecTask.new(:rcov) do |spec|
   spec.libs << 'lib' << 'spec'
   spec.pattern = 'spec/**/*_spec.rb'
   spec.rcov = true
+  spec.rcov_opts = %w{--exclude "spec\/*,gems\/*"}
 end
 
 task :spec => :check_dependencies

data/VERSION

@@ -1 +1 @@
-0.1.9
+0.3.0

data/lib/tweetstream/client.rb

@@ -146,8 +146,10 @@ module TweetStream
       args = [uri]
       args << build_post_body(query_parameters) if method == :post
       args << {:symbolize_keys => true}
-      
-      Yajl::HttpStream.send(method, *args) do |hash|
+
+      @stream = Yajl::HttpStream.new
+
+      @stream.send(method, *args) do |hash|
         if hash[:delete] && hash[:delete][:status]
           delete_proc.call(hash[:delete][:status][:id], hash[:delete][:status][:user_id]) if delete_proc.is_a?(Proc)
         elsif hash[:limit] && hash[:limit][:track]
@@ -167,6 +169,11 @@ module TweetStream
     def self.stop
       raise TweetStream::Terminated
     end
+
+    # Terminate the currently running TweetStream.
+    def stop
+      @stream.terminate unless @stream.nil?
+    end
  
     protected
 

data/spec/tweetstream/client_spec.rb

@@ -62,12 +62,14 @@ describe TweetStream::Client do
     end
 
     it 'should make a call to Yajl::HttpStream' do
-      Yajl::HttpStream.should_receive(:get).once.with(URI.parse('http://abc:def@stream.twitter.com/1/cool.json'), :symbolize_keys => true).and_return({})
+      Yajl::HttpStream.should_receive(:new).and_return(y = mock("Yajl::HttpStream"))
+      y.should_receive(:get).once.with(URI.parse('http://abc:def@stream.twitter.com/1/cool.json'), :symbolize_keys => true).and_return({})
       @client.start('cool')
     end
 
     it 'should yield a TwitterStream::Status for each update' do
-      Yajl::HttpStream.should_receive(:post).once.with(URI.parse('http://abc:def@stream.twitter.com/1/statuses/filter.json'), 'track=musicmonday', :symbolize_keys => true).and_yield(sample_tweets[0])
+      Yajl::HttpStream.should_receive(:new).and_return(y = mock("Yajl::HttpStream"))
+      y.should_receive(:post).once.with(URI.parse('http://abc:def@stream.twitter.com/1/statuses/filter.json'), 'track=musicmonday', :symbolize_keys => true).and_yield(sample_tweets[0])
       @client.track('musicmonday') do |status|
         status.is_a?(TweetStream::Status).should be_true
         @yielded = true
@@ -76,7 +78,8 @@ describe TweetStream::Client do
     end
     
     it 'should wrap Yajl errors in TweetStream errors' do
-      Yajl::HttpStream.should_receive(:get).once.with(URI.parse('http://abc:def@stream.twitter.com/1/cool.json'), :symbolize_keys => true).and_raise(Yajl::HttpStream::InvalidContentType)
+      Yajl::HttpStream.should_receive(:new).and_return(y = mock("Yajl::HttpStream"))
+      y.should_receive(:get).once.with(URI.parse('http://abc:def@stream.twitter.com/1/cool.json'), :symbolize_keys => true).and_raise(Yajl::HttpStream::InvalidContentType)
       lambda{@client.start('cool')}.should raise_error(TweetStream::ConnectionError)
     end
     
@@ -88,7 +91,8 @@ describe TweetStream::Client do
         @called = false
         @proc = Proc.new{|*args| @called = true }
         @client.send("on_#{special_method}", &@proc)
-        Yajl::HttpStream.should_receive(:post).once.with(URI.parse('http://abc:def@stream.twitter.com/1/statuses/filter.json'), "track=musicmonday", :symbolize_keys => true).and_yield(special_object)
+        Yajl::HttpStream.should_receive(:new).and_return(y = mock("Yajl::HttpStream"))
+        y.should_receive(:post).once.with(URI.parse('http://abc:def@stream.twitter.com/1/statuses/filter.json'), "track=musicmonday", :symbolize_keys => true).and_yield(special_object)
         @client.track('musicmonday')
         @called.should == true
       end
@@ -96,7 +100,8 @@ describe TweetStream::Client do
       it "should accept a proc on a :#{special_method} option if a #{special_method} object is given" do
         @called = false
         @proc = Proc.new{|*args| @called = true }
-        Yajl::HttpStream.should_receive(:post).once.with(URI.parse('http://abc:def@stream.twitter.com/1/statuses/filter.json'), "track=musicmonday", :symbolize_keys => true).and_yield(special_object)
+        Yajl::HttpStream.should_receive(:new).and_return(y = mock("Yajl::HttpStream"))
+        y.should_receive(:post).once.with(URI.parse('http://abc:def@stream.twitter.com/1/statuses/filter.json'), "track=musicmonday", :symbolize_keys => true).and_yield(special_object)
         @client.track('musicmonday', special_method => @proc)
         @called.should == true
       end
@@ -174,7 +179,8 @@ describe TweetStream::Client do
     it 'should not cause a TweetStream to crash with a real exception' do
       @client = TweetStream::Client.new('abc','def')
       @statuses = []
-      Yajl::HttpStream.should_receive(:post).once.with(URI.parse('http://abc:def@stream.twitter.com/1/statuses/filter.json'), 'track=musicmonday', :symbolize_keys => true).and_yield(sample_tweets[0])
+      Yajl::HttpStream.should_receive(:new).and_return(y = mock("Yajl::HttpStream"))
+      y.should_receive(:post).once.with(URI.parse('http://abc:def@stream.twitter.com/1/statuses/filter.json'), 'track=musicmonday', :symbolize_keys => true).and_yield(sample_tweets[0])
       @client.track('musicmonday') do |status|
         @statuses << status
         TweetStream::Client.stop
@@ -182,4 +188,16 @@ describe TweetStream::Client do
       @statuses.size.should == 1
     end
   end
+
+  describe 'instance .stop' do
+    it 'should stop to receive the stream' do
+      @client = TweetStream::Client.new('abc','def')
+      Yajl::HttpStream.should_receive(:new).and_return(y = mock('Yajl::HttpStream'))
+      y.should_receive(:post)
+      y.should_receive(:terminate).once
+
+      @client.follow('10')
+      @client.stop
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tweetstream
 version: !ruby/object:Gem::Version 
-  version: 0.1.9
+  version: 0.3.0
 platform: ruby
 authors: 
 - Michael Bleigh
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-20 00:00:00 -04:00
+date: 2009-12-03 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -30,7 +30,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.6.3
+        version: 0.6.6
     version: 
 - !ruby/object:Gem::Dependency 
   name: daemons