tweetstream 2.0.1 → 2.1.0

data/Gemfile

@@ -1,5 +1,3 @@
 source 'https://rubygems.org'
 
-gem 'twitter', :github => 'jnunemaker/twitter'
-
 gemspec

data/README.md

@@ -213,7 +213,7 @@ JSON parser and it will be used to parse responses.
 Sometimes the Streaming API will send messages other than statuses.
 Specifically, it does so when a status is deleted or rate limitations
 have caused some tweets not to appear in the stream. To handle these,
-you can use the on_delete and on_limit methods. Example:
+you can use the on_delete, on_limit and on_enhance_your_calm methods. Example:
 
 ```ruby
 @client = TweetStream::Client.new
@@ -226,6 +226,10 @@ end
   # do something
 end
 
+@client.on_enhance_your_calm do
+  # do something
+end
+
 @client.track('intridea')
 ```
 

data/lib/tweetstream.rb

@@ -1,11 +1,19 @@
 require 'tweetstream/configuration'
 require 'tweetstream/client'
-require 'tweetstream/error'
 require 'tweetstream/daemon'
 
 module TweetStream
   extend Configuration
 
+  class ReconnectError < StandardError
+    attr_accessor :timeout, :retries
+    def initialize(timeout, retries)
+      self.timeout = timeout
+      self.retries = retries
+      super("Failed to reconnect after #{retries} tries.")
+    end
+  end
+
   class << self
     # Alias for TweetStream::Client.new
     #

data/lib/tweetstream/client.rb

@@ -1,8 +1,8 @@
 require 'cgi'
+require 'em-twitter'
 require 'eventmachine'
 require 'multi_json'
 require 'twitter'
-require 'em-twitter'
 require 'uri'
 
 module TweetStream
@@ -118,21 +118,22 @@ module TweetStream
     end
 
     # Make a call to the userstream api for currently authenticated user
-    def userstream(&block)
+    def userstream(query_params = {}, &block)
       stream_params = { :host => "userstream.twitter.com", :path => "/2/user.json" }
-      start('', :extra_stream_parameters => stream_params, &block)
+      query_params.merge!(:extra_stream_parameters => stream_params)
+      start('', query_params, &block)
     end
 
     # Make a call to the userstream api
     def sitestream(user_ids = [], query_params = {}, &block)
       stream_params = { :host => "sitestream.twitter.com", :path => '/2b/site.json' }
-      sitestream_params = {
+      query_params.merge!({
         :method => :post,
         :follow => user_ids,
         :extra_stream_parameters => stream_params
-      }
-      sitestream_params.merge!(:with => 'followings') if query_params[:followings]
-      start('', sitestream_params, &block)
+      })
+      query_params.merge!(:with => 'followings') if query_params.delete(:followings)
+      start('', query_params, &block)
     end
 
     # Set a Proc to be run when a deletion notice is received
@@ -348,6 +349,21 @@ module TweetStream
       end
     end
 
+    # Set a Proc to be run when enhance_your_calm signal is received.
+    #
+    #     @client = TweetStream::Client.new
+    #     @client.on_enhance_your_calm do
+    #       # do something, your account has been blocked
+    #     end
+    def on_enhance_your_calm(&block)
+      if block_given?
+        @on_enhance_your_calm = block
+        self
+      else
+        @on_enhance_your_calm
+      end
+    end
+
     # connect to twitter while starting a new EventMachine run loop
     def start(path, query_parameters = {}, &block)
       if EventMachine.reactor_running?
@@ -369,6 +385,7 @@ module TweetStream
       scrub_geo_proc = query_parameters.delete(:scrub_geo) || self.on_scrub_geo
       limit_proc = query_parameters.delete(:limit) || self.on_limit
       error_proc = query_parameters.delete(:error) || self.on_error
+      enhance_your_calm_proc = query_parameters.delete(:enhance_your_calm) || self.on_error
       unauthorized_proc = query_parameters.delete(:unauthorized) || self.on_unauthorized
       reconnect_proc = query_parameters.delete(:reconnect) || self.on_reconnect
       inited_proc = query_parameters.delete(:inited) || self.on_inited
@@ -405,6 +422,8 @@ module TweetStream
           next
         end
 
+        Twitter.identity_map = false
+
         if hash[:control] && hash[:control][:control_uri]
           @control_uri = hash[:control][:control_uri]
           require 'tweetstream/site_stream_client'
@@ -458,6 +477,10 @@ module TweetStream
         unauthorized_proc.call if unauthorized_proc.is_a?(Proc)
       end
 
+      @stream.on_enhance_your_calm do
+        enhance_your_calm_proc.call if enhance_your_calm_proc.is_a?(Proc)
+      end
+
       @stream.on_reconnect do |timeout, retries|
         reconnect_proc.call(timeout, retries) if reconnect_proc.is_a?(Proc)
       end

data/lib/tweetstream/site_stream_client.rb

@@ -28,67 +28,39 @@ module TweetStream
     end
 
     def info(&block)
-      error_msg = 'Failed to retrieve SiteStream info.'
-
-      http = connection.get(:path => info_path)
-      http.callback do
-        if http.response_header.status == 200
-          block.call http.response if block && block.kind_of?(Proc)
-        else
-          @on_error.call(error_msg) if @on_error && @on_error.kind_of?(Proc)
-        end
-      end
-      http.errback do
-        @on_error.call(error_msg) if @on_error && @on_error.kind_of?(Proc)
-      end
+      options = { :error_msg => 'Failed to retrieve SiteStream info.' }
+      request(:get, info_path, options, &block)
     end
 
     def add_user(user_id, &block)
-      error_msg = 'Failed to add user to SiteStream'
-      user_management(add_user_path, user_id, error_msg, &block)
+      options = {
+                  :error_msg => 'Failed to add user to SiteStream',
+                  :body => { 'user_id' => normalized_user_ids(user_id) }
+                }
+
+      request(:post, add_user_path, options, &block)
     end
 
     def remove_user(user_id, &block)
-      error_msg = 'Failed to remove user from SiteStream.'
-      user_management(remove_user_path, user_id, error_msg, &block)
+      options = {
+                  :error_msg => 'Failed to remove user from SiteStream.',
+                  :body => { 'user_id' => normalized_user_ids(user_id) }
+                }
+
+      request(:post, remove_user_path, options, &block)
     end
 
     def friends_ids(user_id, &block)
-      error_msg = 'Failed to retrieve SiteStream friends ids.'
-
-      http = connection.post(:path => friends_ids_path, :body => { 'user_id' => user_id })
-      http.callback do
-        if http.response_header.status == 200
-          block.call http.response if block && block.kind_of?(Proc)
-        else
-          @on_error.call(error_msg) if @on_error && @on_error.kind_of?(Proc)
-        end
-      end
-      http.errback do
-        @on_error.call(error_msg) if @on_error && @on_error.kind_of?(Proc)
-      end
+      options = { :error_msg => 'Failed to retrieve SiteStream friends ids.',
+                  :body => { 'user_id' => user_id }
+                }
+      request(:post, friends_ids_path, options, &block)
     end
 
     private
 
-    def user_management(path, user_id, error_msg, &block)
-      user_id = user_id.join(',') if user_id.kind_of?(Array)
-
-      http = connection.post(:path => path, :body => { 'user_id' => user_id })
-      http.callback do
-        if http.response_header.status == 200
-          block.call if block && block.kind_of?(Proc)
-        else
-          @on_error.call(error_msg) if @on_error && @on_error.kind_of?(Proc)
-        end
-      end
-      http.errback do
-        @on_error.call(error_msg) if @on_error && @on_error.kind_of?(Proc)
-      end
-    end
-
     def connection
-      return @conn if @conn
+      return @conn if defined?(@conn)
 
       @conn = EventMachine::HttpRequest.new('https://sitestream.twitter.com/')
       @conn.use EventMachine::Middleware::OAuth, oauth_configuration
@@ -119,5 +91,32 @@ module TweetStream
     def friends_ids_path
       @config_uri + '/friends/ids.json'
     end
+
+    def request(method, path, options, &block)
+      error_msg = options.delete(:error_msg)
+
+      http = connection.send(method, options.merge(:path => path))
+      http.callback do
+        if http.response_header.status == 200
+          if block && block.kind_of?(Proc)
+            if block.arity == 1
+              block.call http.response
+            else
+              block.call
+            end
+          end
+        else
+          @on_error.call(error_msg) if @on_error && @on_error.kind_of?(Proc)
+        end
+      end
+      http.errback do
+        @on_error.call(error_msg) if @on_error && @on_error.kind_of?(Proc)
+      end
+    end
+
+    def normalized_user_ids(user_id)
+      user_id.join(',') if user_id.kind_of?(Array)
+    end
+
   end
 end

data/lib/tweetstream/version.rb

@@ -1,3 +1,3 @@
 module TweetStream
-  VERSION = '2.0.1' unless defined?(TweetStream::VERSION)
+  VERSION = '2.1.0' unless defined?(TweetStream::VERSION)
 end

data/spec/spec_helper.rb

@@ -17,7 +17,7 @@ def sample_tweets
   return @tweets if @tweets
 
   @tweets = []
-  Yajl::Parser.parse(File.open(File.dirname(__FILE__) + '/data/statuses.json', 'r'), :symbolize_keys => true) do |hash|
+  Yajl::Parser.parse(fixture('statuses.json'), :symbolize_keys => true) do |hash|
     @tweets << hash
   end
   @tweets
@@ -27,7 +27,7 @@ def sample_direct_messages
   return @direct_messages if @direct_messages
 
   @direct_messages = []
-  Yajl::Parser.parse(File.open(File.dirname(__FILE__) + '/data/direct_messages.json', 'r')) do |hash|
+  Yajl::Parser.parse(fixture('direct_messages.json'), :symbolize_keys => true) do |hash|
     @direct_messages << hash
   end
   @direct_messages

data/spec/tweetstream/client_authentication_spec.rb

@@ -0,0 +1,81 @@
+require 'spec_helper'
+
+describe TweetStream::Client do
+  before do
+    @stream = stub("EM::Twitter::Client",
+      :connect => true,
+      :unbind => true,
+      :each => true,
+      :on_error => true,
+      :on_max_reconnects => true,
+      :on_reconnect => true,
+      :connection_completed => true,
+      :on_no_data_received => true,
+      :on_unauthorized => true,
+      :on_enhance_your_calm => true
+    )
+    EM.stub!(:run).and_yield
+    EM::Twitter::Client.stub!(:connect).and_return(@stream)
+  end
+
+  describe "basic auth" do
+    before do
+      TweetStream.configure do |config|
+        config.username = 'tweetstream'
+        config.password = 'rubygem'
+        config.auth_method = :basic
+      end
+
+      @client = TweetStream::Client.new
+    end
+
+    it 'should try to connect via a JSON stream with basic auth' do
+      EM::Twitter::Client.should_receive(:connect).with(
+        :path => URI.parse('/1/statuses/filter.json'),
+        :method => 'POST',
+        :user_agent => TweetStream::Configuration::DEFAULT_USER_AGENT,
+        :on_inited => nil,
+        :params => {:track => 'monday'},
+        :basic => {
+          :username => 'tweetstream',
+          :password => 'rubygem'
+        }
+      ).and_return(@stream)
+
+      @client.track('monday')
+    end
+  end
+
+  describe "oauth" do
+    before do
+      TweetStream.configure do |config|
+        config.consumer_key = '123456789'
+        config.consumer_secret = 'abcdefghijklmnopqrstuvwxyz'
+        config.oauth_token = '123456789'
+        config.oauth_token_secret = 'abcdefghijklmnopqrstuvwxyz'
+        config.auth_method = :oauth
+      end
+
+      @client = TweetStream::Client.new
+    end
+
+    it 'should try to connect via a JSON stream with oauth' do
+      EM::Twitter::Client.should_receive(:connect).with(
+        :path => URI.parse('/1/statuses/filter.json'),
+        :method => 'POST',
+        :user_agent => TweetStream::Configuration::DEFAULT_USER_AGENT,
+        :on_inited => nil,
+        :params => {:track => 'monday'},
+        :oauth => {
+          :consumer_key => '123456789',
+          :consumer_secret => 'abcdefghijklmnopqrstuvwxyz',
+          :token => '123456789',
+          :token_secret => 'abcdefghijklmnopqrstuvwxyz'
+        }
+      ).and_return(@stream)
+
+      @client.track('monday')
+    end
+  end
+
+end

data/spec/tweetstream/client_site_stream_spec.rb

@@ -0,0 +1,125 @@
+require 'spec_helper'
+
+describe TweetStream::Client do
+  before(:each) do
+    TweetStream.configure do |config|
+      config.consumer_key = 'abc'
+      config.consumer_secret = 'def'
+      config.oauth_token = '123'
+      config.oauth_token_secret = '456'
+    end
+    @client = TweetStream::Client.new
+
+    @stream = stub("EM::Twitter::Client",
+      :connect => true,
+      :unbind => true,
+      :each => true,
+      :on_error => true,
+      :on_max_reconnects => true,
+      :on_reconnect => true,
+      :connection_completed => true,
+      :on_no_data_received => true,
+      :on_unauthorized => true,
+      :on_enhance_your_calm => true
+    )
+    EM.stub!(:run).and_yield
+    EM::Twitter::Client.stub!(:connect).and_return(@stream)
+  end
+
+  describe "Site Stream support" do
+    context "when calling #sitestream" do
+      it "sends the sitestream host" do
+        EM::Twitter::Client.should_receive(:connect).with(hash_including(:host => "sitestream.twitter.com")).and_return(@stream)
+        @client.sitestream
+      end
+
+      it "uses the sitestream uri" do
+        EM::Twitter::Client.should_receive(:connect).with(hash_including(:path => "/2b/site.json")).and_return(@stream)
+        @client.sitestream
+      end
+
+      it 'supports "with followings" when followings set as a boolean' do
+        @client.should_receive(:start).once.with('', hash_including(:with => 'followings')).and_return(@stream)
+        @client.sitestream(['115192457'], :followings => true)
+      end
+
+      it 'supports "with followings" when followings set as an option' do
+        @client.should_receive(:start).once.with('', hash_including(:with => 'followings')).and_return(@stream)
+        @client.sitestream(['115192457'], :with => 'followings')
+      end
+
+      it 'supports "with user"' do
+        @client.should_receive(:start).once.with('', hash_including(:with => 'user')).and_return(@stream)
+        @client.sitestream(['115192457'], :with => 'user')
+      end
+
+      it 'supports "replies all"' do
+        @client.should_receive(:start).once.with('', hash_including(:replies => 'all')).and_return(@stream)
+        @client.sitestream(['115192457'], :replies => 'all')
+      end
+
+      context 'control management' do
+        before do
+          @control_response = {"control" =>
+            {
+              "control_uri" =>"/2b/site/c/01_225167_334389048B872A533002B34D73F8C29FD09EFC50"
+            }
+          }
+        end
+        it 'assigns the control_uri' do
+          @stream.should_receive(:each).and_yield(@control_response.to_json)
+          @client.sitestream
+
+          @client.control_uri.should eq("/2b/site/c/01_225167_334389048B872A533002B34D73F8C29FD09EFC50")
+        end
+
+        it 'instantiates a SiteStreamClient' do
+          @stream.should_receive(:each).and_yield(@control_response.to_json)
+          @client.sitestream
+
+          @client.control.should be_kind_of(TweetStream::SiteStreamClient)
+        end
+
+        it "passes the client's on_error to the SiteStreamClient" do
+          called = false
+          @client.on_error { |err| called = true }
+          @stream.should_receive(:each).and_yield(@control_response.to_json)
+          @client.sitestream
+
+          @client.control.on_error.call
+
+          called.should be_true
+        end
+      end
+
+      context 'data handling' do
+        before do
+          tweet = sample_tweets[0]
+          @ss_message = {'for_user' => '12345', 'message' => {'id' => 123, 'user' => {'screen_name' => 'monkey'}, 'text' => 'Oo oo aa aa'}}
+        end
+
+        it 'yields a site stream message' do
+          @stream.should_receive(:each).and_yield(@ss_message.to_json)
+          yielded_status = nil
+          @client.sitestream do |message|
+            yielded_status = message
+          end
+          yielded_status.should_not be_nil
+          yielded_status[:for_user].should == '12345'
+          yielded_status[:message][:user][:screen_name].should == 'monkey'
+          yielded_status[:message][:text].should == 'Oo oo aa aa'
+        end
+        it 'yields itself if block has an arity of 2' do
+          @stream.should_receive(:each).and_yield(@ss_message.to_json)
+          yielded_client = nil
+          @client.sitestream do |_, client|
+            yielded_client = client
+          end
+          yielded_client.should_not be_nil
+          yielded_client.should == @client
+        end
+      end
+    end
+  end
+
+end

data/spec/tweetstream/client_spec.rb

@@ -58,49 +58,43 @@ describe TweetStream::Client do
         :on_reconnect => true,
         :connection_completed => true,
         :on_no_data_received => true,
-        :on_unauthorized => true
+        :on_unauthorized => true,
+        :on_enhance_your_calm => true
       )
       EM.stub!(:run).and_yield
       EM::Twitter::Client.stub!(:connect).and_return(@stream)
     end
 
-    it 'should try to connect via a JSON stream with basic auth' do
-      EM::Twitter::Client.should_receive(:connect).with(
-        :path => URI.parse('/1/statuses/filter.json'),
-        :method => 'POST',
-        :user_agent => TweetStream::Configuration::DEFAULT_USER_AGENT,
-        :on_inited => nil,
-        :params => { :track => 'monday'},
-        :oauth => {
-          :consumer_key => 'abc',
-          :consumer_secret => 'def',
-          :token => '123',
-          :token_secret => '456'
-        }
-      ).and_return(@stream)
-
-      @client.track('monday')
+    it 'connects if the reactor is already running' do
+      EM.stub!(:reactor_running?).and_return(true)
+      @client.should_receive(:connect)
+      @client.track('abc')
+    end
+
+    it 'starts the reactor if not already running' do
+      EM.should_receive(:run).once
+      @client.track('abc')
     end
 
     describe '#each' do
-      it 'should call the appropriate parser' do
+      it 'calls the appropriate parser' do
         @client = TweetStream::Client.new
         MultiJson.should_receive(:decode).and_return({})
         @stream.should_receive(:each).and_yield(sample_tweets[0].to_json)
         @client.track('abc','def')
       end
 
-      it 'should yield a Twitter::Status' do
+      it 'yields a Twitter::Status' do
         @stream.should_receive(:each).and_yield(sample_tweets[0].to_json)
         @client.track('abc'){|s| s.should be_kind_of(Twitter::Status)}
       end
 
-      it 'should also yield the client if a block with arity 2 is given' do
+      it 'yields the client if a block with arity 2 is given' do
         @stream.should_receive(:each).and_yield(sample_tweets[0].to_json)
         @client.track('abc'){|s,c| c.should == @client}
       end
 
-      it 'should include the proper values' do
+      it 'includes the proper values' do
         tweet = sample_tweets[0]
         tweet[:id] = 123
         tweet[:user][:screen_name] = 'monkey'
@@ -113,7 +107,7 @@ describe TweetStream::Client do
         end
       end
 
-      it 'should call the on_scrub_geo if specified' do
+      it 'should call the on_scrub_geo callback if specified' do
         scrub_geo = '{ "scrub_geo": { "user_id": 1234, "user_id_str": "1234", "up_to_status_id":9876, "up_to_status_id_string": "9876" } }'
         @stream.should_receive(:each).and_yield(scrub_geo)
         @client.on_scrub_geo do |up_to_status_id, user_id|
@@ -122,7 +116,7 @@ describe TweetStream::Client do
         end.track('abc')
       end
 
-      it 'should call the delete if specified' do
+      it 'calls the on_delete callback' do
         delete = '{ "delete": { "status": { "id": 1234, "user_id": 3 } } }'
         @stream.should_receive(:each).and_yield(delete)
         @client.on_delete do |id, user_id|
@@ -131,7 +125,7 @@ describe TweetStream::Client do
         end.track('abc')
       end
 
-      it 'should call the on_limit if specified' do
+      it 'calls the on_limit callback' do
         limit = '{ "limit": { "track": 1234 } }'
         @stream.should_receive(:each).and_yield(limit)
         @client.on_limit do |track|
@@ -192,8 +186,8 @@ describe TweetStream::Client do
       context 'using on_direct_message' do
         it 'yields a DirectMessage' do
           direct_message = sample_direct_messages[0]
-          direct_message["direct_message"]["id"] = 1234
-          direct_message["direct_message"]["sender"]["screen_name"] = "coder"
+          direct_message[:direct_message][:id] = 1234
+          direct_message[:direct_message][:sender][:screen_name] = "coder"
           @stream.should_receive(:each).and_yield(direct_message.to_json)
           yielded_dm = nil
           @client.on_direct_message do |dm|
@@ -238,9 +232,7 @@ describe TweetStream::Client do
       end
 
       it 'should return the block when defined' do
-        @client.on_error do |m|
-          puts 'ohai'
-        end
+        @client.on_error { |m| true; }
         @client.on_error.should be_kind_of(Proc)
       end
 
@@ -252,10 +244,7 @@ describe TweetStream::Client do
     describe '#on_max_reconnects' do
       it 'should raise a ReconnectError' do
         @stream.should_receive(:on_max_reconnects).and_yield(30, 20)
-        lambda{@client.track('abc')}.should raise_error(TweetStream::ReconnectError) do |e|
-          e.timeout.should == 30
-          e.retries.should == 20
-        end
+        lambda{@client.track('abc')}.should raise_error(TweetStream::ReconnectError, "Failed to reconnect after 20 tries.")
       end
     end
   end
@@ -326,7 +315,7 @@ describe TweetStream::Client do
     end
   end
 
-  %w(on_delete on_limit on_inited on_reconnect on_no_data_received on_unauthorized).each do |proc_setter|
+  %w(on_delete on_limit on_inited on_reconnect on_no_data_received on_unauthorized on_enhance_your_calm).each do |proc_setter|
     describe "##{proc_setter}" do
       it 'should set when a block is given' do
         proc = Proc.new{|a,b| puts a }
@@ -373,6 +362,7 @@ describe TweetStream::Client do
         :connection_completed => true,
         :on_no_data_received => true,
         :on_unauthorized => true,
+        :on_enhance_your_calm => true,
         :stop => true
       )
       EM::Twitter::Client.stub!(:connect).and_return(@stream)
@@ -390,184 +380,4 @@ describe TweetStream::Client do
       @client.stop_stream
     end
   end
-
-  describe "basic auth" do
-    before do
-      TweetStream.configure do |config|
-        config.username = 'tweetstream'
-        config.password = 'rubygem'
-        config.auth_method = :basic
-      end
-      @client = TweetStream::Client.new
-
-      @stream = stub("EM::Twitter::Client",
-        :connect => true,
-        :unbind => true,
-        :each => true,
-        :on_error => true,
-        :on_max_reconnects => true,
-        :on_reconnect => true,
-        :connection_completed => true,
-        :on_no_data_received => true,
-        :on_unauthorized => true
-      )
-      EM.stub!(:run).and_yield
-      EM::Twitter::Client.stub!(:connect).and_return(@stream)
-    end
-
-    it 'should try to connect via a JSON stream with oauth' do
-      EM::Twitter::Client.should_receive(:connect).with(
-        :path => URI.parse('/1/statuses/filter.json'),
-        :method => 'POST',
-        :user_agent => TweetStream::Configuration::DEFAULT_USER_AGENT,
-        :on_inited => nil,
-        :params => {:track => 'monday'},
-        :basic => {
-          :username => 'tweetstream',
-          :password => 'rubygem'
-        }
-      ).and_return(@stream)
-
-      @client.track('monday')
-    end
-  end
-
-  describe "oauth" do
-    describe '#start' do
-      before do
-        TweetStream.configure do |config|
-          config.consumer_key = '123456789'
-          config.consumer_secret = 'abcdefghijklmnopqrstuvwxyz'
-          config.oauth_token = '123456789'
-          config.oauth_token_secret = 'abcdefghijklmnopqrstuvwxyz'
-          config.auth_method = :oauth
-        end
-        @client = TweetStream::Client.new
-
-        @stream = stub("EM::Twitter::Client",
-          :connect => true,
-          :unbind => true,
-          :each => true,
-          :on_error => true,
-          :on_max_reconnects => true,
-          :on_reconnect => true,
-          :connection_completed => true,
-          :on_no_data_received => true,
-          :on_unauthorized => true
-        )
-        EM.stub!(:run).and_yield
-        EM::Twitter::Client.stub!(:connect).and_return(@stream)
-      end
-
-      it 'should try to connect via a JSON stream with oauth' do
-        EM::Twitter::Client.should_receive(:connect).with(
-          :path => URI.parse('/1/statuses/filter.json'),
-          :method => 'POST',
-          :user_agent => TweetStream::Configuration::DEFAULT_USER_AGENT,
-          :on_inited => nil,
-          :params => {:track => 'monday'},
-          :oauth => {
-            :consumer_key => '123456789',
-            :consumer_secret => 'abcdefghijklmnopqrstuvwxyz',
-            :token => '123456789',
-            :token_secret => 'abcdefghijklmnopqrstuvwxyz'
-          }
-        ).and_return(@stream)
-
-        @client.track('monday')
-      end
-
-      context "when calling #userstream" do
-        it "sends the userstream host" do
-          EM::Twitter::Client.should_receive(:connect).with(hash_including(:host => "userstream.twitter.com")).and_return(@stream)
-          @client.userstream
-        end
-
-        it "uses the userstream uri" do
-          EM::Twitter::Client.should_receive(:connect).with(hash_including(:path => "/2/user.json")).and_return(@stream)
-          @client.userstream
-        end
-      end
-
-      context "when calling #sitestream" do
-        it "sends the sitestream host" do
-          EM::Twitter::Client.should_receive(:connect).with(hash_including(:host => "sitestream.twitter.com")).and_return(@stream)
-          @client.sitestream
-        end
-
-        it "uses the userstream uri" do
-          EM::Twitter::Client.should_receive(:connect).with(hash_including(:path => "/2b/site.json")).and_return(@stream)
-          @client.sitestream
-        end
-
-        it 'supports the "with followings"' do
-          @client.should_receive(:start).once.with('', hash_including(:with => 'followings')).and_return(@stream)
-          @client.sitestream(['115192457'], :followings => true)
-        end
-
-        context 'control management' do
-          before do
-            @control_response = {"control" =>
-              {
-                "control_uri" =>"/2b/site/c/01_225167_334389048B872A533002B34D73F8C29FD09EFC50"
-              }
-            }
-          end
-          it 'assigns the control_uri' do
-            @stream.should_receive(:each).and_yield(@control_response.to_json)
-            @client.sitestream
-
-            @client.control_uri.should eq("/2b/site/c/01_225167_334389048B872A533002B34D73F8C29FD09EFC50")
-          end
-
-          it 'instantiates a SiteStreamClient' do
-            @stream.should_receive(:each).and_yield(@control_response.to_json)
-            @client.sitestream
-
-            @client.control.should be_kind_of(TweetStream::SiteStreamClient)
-          end
-
-          it "passes the client's on_error to the SiteStreamClient" do
-            called = false
-            @client.on_error { |err| called = true }
-            @stream.should_receive(:each).and_yield(@control_response.to_json)
-            @client.sitestream
-
-            @client.control.on_error.call
-
-            called.should be_true
-          end
-        end
-
-        context 'data handling' do
-          before do
-            tweet = sample_tweets[0]
-            @ss_message = {'for_user' => '12345', 'message' => {'id' => 123, 'user' => {'screen_name' => 'monkey'}, 'text' => 'Oo oo aa aa'}}
-          end
-
-          it 'yields a site stream message' do
-            @stream.should_receive(:each).and_yield(@ss_message.to_json)
-            yielded_status = nil
-            @client.sitestream do |message|
-              yielded_status = message
-            end
-            yielded_status.should_not be_nil
-            yielded_status[:for_user].should == '12345'
-            yielded_status[:message][:user][:screen_name].should == 'monkey'
-            yielded_status[:message][:text].should == 'Oo oo aa aa'
-          end
-          it 'yields itself if block has an arity of 2' do
-            @stream.should_receive(:each).and_yield(@ss_message.to_json)
-            yielded_client = nil
-            @client.sitestream do |_, client|
-              yielded_client = client
-            end
-            yielded_client.should_not be_nil
-            yielded_client.should == @client
-          end
-        end
-      end
-    end
-  end
-
 end

data/spec/tweetstream/client_userstream_spec.rb

@@ -0,0 +1,63 @@
+require 'spec_helper'
+
+describe TweetStream::Client do
+  before(:each) do
+    TweetStream.configure do |config|
+      config.consumer_key = 'abc'
+      config.consumer_secret = 'def'
+      config.oauth_token = '123'
+      config.oauth_token_secret = '456'
+    end
+    @client = TweetStream::Client.new
+
+    @stream = stub("EM::Twitter::Client",
+      :connect => true,
+      :unbind => true,
+      :each => true,
+      :on_error => true,
+      :on_max_reconnects => true,
+      :on_reconnect => true,
+      :connection_completed => true,
+      :on_no_data_received => true,
+      :on_unauthorized => true,
+      :on_enhance_your_calm => true
+    )
+    EM.stub!(:run).and_yield
+    EM::Twitter::Client.stub!(:connect).and_return(@stream)
+  end
+
+  describe "User Stream support" do
+    context 'when calling #userstream' do
+      it "sends the userstream host" do
+        EM::Twitter::Client.should_receive(:connect).with(hash_including(:host => "userstream.twitter.com")).and_return(@stream)
+        @client.userstream
+      end
+
+      it "uses the userstream uri" do
+        EM::Twitter::Client.should_receive(:connect).with(hash_including(:path => "/2/user.json")).and_return(@stream)
+        @client.userstream
+      end
+
+      it 'supports "replies"' do
+        @client.should_receive(:start).once.with('', hash_including(:replies => 'all')).and_return(@stream)
+        @client.userstream(:replies => 'all')
+      end
+
+      it 'supports "stall_warnings"' do
+        @client.should_receive(:start).once.with('', hash_including(:stall_warnings => 'true')).and_return(@stream)
+        @client.userstream(:stall_warnings => 'true')
+      end
+
+      it 'supports "with followings"' do
+        @client.should_receive(:start).once.with('', hash_including(:with => 'followings')).and_return(@stream)
+        @client.userstream(:with => 'followings')
+      end
+
+      it 'supports "with user"' do
+        @client.should_receive(:start).once.with('', hash_including(:with => 'user')).and_return(@stream)
+        @client.userstream(:with => 'user')
+      end
+    end
+  end
+
+end

data/spec/tweetstream/daemon_spec.rb

@@ -18,4 +18,12 @@ describe TweetStream::Daemon do
       client.app_name.should eq('tweet_tracker')
     end
   end
+
+  describe '#start' do
+    it 'starts the daemon' do
+      client = TweetStream::Daemon.new
+      Daemons.should_receive(:run_proc).once
+      client.track('intridea')
+    end
+  end
 end

data/spec/tweetstream/site_stream_client_spec.rb

@@ -101,6 +101,7 @@ describe TweetStream::SiteStreamClient do
         end
         called.should be_true
       end
+
     end
   end
 
@@ -229,4 +230,4 @@ describe TweetStream::SiteStreamClient do
     end
   end
 
-end
+end

data/spec/tweetstream_spec.rb

@@ -16,7 +16,8 @@ describe TweetStream do
         :on_reconnect => true,
         :connection_completed => true,
         :on_no_data_received => true,
-        :on_unauthorized => true
+        :on_unauthorized => true,
+        :on_enhance_your_calm => true
       )
       EM.stub!(:run).and_yield
       EM::Twitter::Client.stub!(:connect).and_return(@stream)

data/tweetstream.gemspec

@@ -12,7 +12,7 @@ Gem::Specification.new do |s|
   s.homepage    = 'http://github.com/intridea/tweetstream'
 
   s.add_dependency 'em-twitter', '~> 0.1'
-  s.add_dependency 'twitter', '~> 3.0.0.rc.1'
+  s.add_dependency 'twitter', '~> 3.2'
   s.add_dependency 'daemons', '~> 1.1'
   s.add_dependency 'multi_json', '~> 1.3'
   s.add_dependency 'em-http-request', '~> 1.0.2'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: tweetstream
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-26 00:00:00.000000000 Z
+date: 2012-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-twitter
-  requirement: &70341058157740 !ruby/object:Gem::Requirement
+  requirement: &70273353293360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,21 +22,21 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70341058157740
+  version_requirements: *70273353293360
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &70341058157100 !ruby/object:Gem::Requirement
+  requirement: &70273353292340 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 3.0.0.rc.1
+        version: '3.2'
   type: :runtime
   prerelease: false
-  version_requirements: *70341058157100
+  version_requirements: *70273353292340
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70341058156560 !ruby/object:Gem::Requirement
+  requirement: &70273353291760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70341058156560
+  version_requirements: *70273353291760
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70341058155840 !ruby/object:Gem::Requirement
+  requirement: &70273353291280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70341058155840
+  version_requirements: *70273353291280
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70341058154820 !ruby/object:Gem::Requirement
+  requirement: &70273353290820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70341058154820
+  version_requirements: *70273353290820
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70341058153760 !ruby/object:Gem::Requirement
+  requirement: &70273353290200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341058153760
+  version_requirements: *70273353290200
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70341058152780 !ruby/object:Gem::Requirement
+  requirement: &70273353289680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341058152780
+  version_requirements: *70273353289680
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70341058152120 !ruby/object:Gem::Requirement
+  requirement: &70273353289140 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341058152120
+  version_requirements: *70273353289140
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70341058151700 !ruby/object:Gem::Requirement
+  requirement: &70273353288560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341058151700
+  version_requirements: *70273353288560
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70341058151240 !ruby/object:Gem::Requirement
+  requirement: &70273353288060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341058151240
+  version_requirements: *70273353288060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70341058150560 !ruby/object:Gem::Requirement
+  requirement: &70273353287560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341058150560
+  version_requirements: *70273353287560
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70341058133520 !ruby/object:Gem::Requirement
+  requirement: &70273353287060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341058133520
+  version_requirements: *70273353287060
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70341058132360 !ruby/object:Gem::Requirement
+  requirement: &70273353286220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341058132360
+  version_requirements: *70273353286220
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70341058130880 !ruby/object:Gem::Requirement
+  requirement: &70273353259820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341058130880
+  version_requirements: *70273353259820
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70341058129920 !ruby/object:Gem::Requirement
+  requirement: &70273353267580 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,7 +176,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70341058129920
+  version_requirements: *70273353267580
 description: TweetStream allows you to easily consume the Twitter Streaming API utilizing
   the YAJL Ruby gem.
 email:
@@ -206,15 +206,17 @@ files:
 - lib/tweetstream/client.rb
 - lib/tweetstream/configuration.rb
 - lib/tweetstream/daemon.rb
-- lib/tweetstream/error.rb
 - lib/tweetstream/site_stream_client.rb
 - lib/tweetstream/version.rb
-- spec/data/direct_messages.json
-- spec/data/statuses.json
+- spec/fixtures/direct_messages.json
 - spec/fixtures/ids.json
 - spec/fixtures/info.json
+- spec/fixtures/statuses.json
 - spec/spec_helper.rb
+- spec/tweetstream/client_authentication_spec.rb
+- spec/tweetstream/client_site_stream_spec.rb
 - spec/tweetstream/client_spec.rb
+- spec/tweetstream/client_userstream_spec.rb
 - spec/tweetstream/daemon_spec.rb
 - spec/tweetstream/site_stream_client_spec.rb
 - spec/tweetstream_spec.rb
@@ -244,12 +246,15 @@ signing_key:
 specification_version: 3
 summary: TweetStream is a simple wrapper for consuming the Twitter Streaming API.
 test_files:
-- spec/data/direct_messages.json
-- spec/data/statuses.json
+- spec/fixtures/direct_messages.json
 - spec/fixtures/ids.json
 - spec/fixtures/info.json
+- spec/fixtures/statuses.json
 - spec/spec_helper.rb
+- spec/tweetstream/client_authentication_spec.rb
+- spec/tweetstream/client_site_stream_spec.rb
 - spec/tweetstream/client_spec.rb
+- spec/tweetstream/client_userstream_spec.rb
 - spec/tweetstream/daemon_spec.rb
 - spec/tweetstream/site_stream_client_spec.rb
 - spec/tweetstream_spec.rb

data/lib/tweetstream/error.rb

@@ -1,15 +0,0 @@
-module TweetStream
-  class Terminated < ::StandardError; end
-  class Error < ::StandardError; end
-  class ConnectionError < TweetStream::Error; end
-  # A ReconnectError is raised when the maximum number of retries has
-  # failed to re-establish a connection.
-  class ReconnectError < StandardError
-    attr_accessor :timeout, :retries
-    def initialize(timeout, retries)
-      self.timeout = timeout
-      self.retries = retries
-      super("Failed to reconnect after #{retries} tries.")
-    end
-  end
-end