tweetstream 2.0.0 → 2.0.1

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+Version 2.0.1
+=============
+
+* Fixed Twitter gem objects
+* Added on_unauthorized callback method (koenpunt)
+
 Version 2.0.0
 =============
 
@@ -5,7 +11,7 @@ Version 2.0.0
 * Switched to [em-twitter](https://github.com/spagalloco/em-twitter) for underlying streaming lib
 * Switched to Twitter gem objects instead of custom hashes, see [47e5cd3d21a9562b3d959bc231009af460b37567](https://github.com/intridea/tweetstream/commit/47e5cd3d21a9562b3d959bc231009af460b37567) for details (sferik)
 * Made OAuth the default authentication method
-* Removed on_interval callback
+* Removed on_interval callback method
 * Removed parser configuration option
 
 Version 1.1.5

data/Gemfile

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

data/lib/tweetstream/client.rb

@@ -220,6 +220,22 @@ module TweetStream
       end
     end
 
+    # Set a Proc to be run when an HTTP status 401 is encountered while
+    # connecting to Twitter. This could happen when system clock drift
+    # has occured.
+    #
+    # If no block is given, it will return the currently set
+    # unauthorized proc. When a block is given, the TweetStream::Client
+    # object is returned to allow for chaining.
+    def on_unauthorized(&block)
+      if block_given?
+        @on_unauthorized = block
+        self
+      else
+        @on_unauthorized
+      end
+    end
+
     # Set a Proc to be run when a direct message is encountered in the
     # processing of the stream.
     #
@@ -353,6 +369,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
+      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
       direct_message_proc = query_parameters.delete(:direct_message) || self.on_direct_message
@@ -377,7 +394,7 @@ module TweetStream
       @stream = EM::Twitter::Client.connect(stream_params)
       @stream.each do |item|
         begin
-          hash = MultiJson.decode(item)
+          hash = MultiJson.decode(item, :symbolize_keys => true)
         rescue MultiJson::DecodeError
           error_proc.call("MultiJson::DecodeError occured in stream: #{item}") if error_proc.is_a?(Proc)
           next
@@ -388,20 +405,20 @@ module TweetStream
           next
         end
 
-        if hash['control'] && hash['control']['control_uri']
-          @control_uri = hash['control']['control_uri']
+        if hash[:control] && hash[:control][:control_uri]
+          @control_uri = hash[:control][:control_uri]
           require 'tweetstream/site_stream_client'
           @control = TweetStream::SiteStreamClient.new(@control_uri, options)
           @control.on_error(&self.on_error)
-        elsif 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['scrub_geo'] && hash['scrub_geo']['up_to_status_id']
-          scrub_geo_proc.call(hash['scrub_geo']['up_to_status_id'], hash['scrub_geo']['user_id']) if scrub_geo_proc.is_a?(Proc)
-        elsif hash['limit'] && hash['limit']['track']
-          limit_proc.call(hash['limit']['track']) if limit_proc.is_a?(Proc)
-        elsif hash['direct_message']
-          yield_message_to direct_message_proc, Twitter::DirectMessage.new(hash['direct_message'])
-        elsif hash['text'] && hash['user']
+        elsif 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[:scrub_geo] && hash[:scrub_geo][:up_to_status_id]
+          scrub_geo_proc.call(hash[:scrub_geo][:up_to_status_id], hash[:scrub_geo][:user_id]) if scrub_geo_proc.is_a?(Proc)
+        elsif hash[:limit] && hash[:limit][:track]
+          limit_proc.call(hash[:limit][:track]) if limit_proc.is_a?(Proc)
+        elsif hash[:direct_message]
+          yield_message_to direct_message_proc, Twitter::DirectMessage.new(hash[:direct_message])
+        elsif hash[:text] && hash[:user]
           @last_status = Twitter::Status.new(hash)
           yield_message_to timeline_status_proc, @last_status
 
@@ -415,7 +432,7 @@ module TweetStream
                 yield @last_status, self
             end
           end
-        elsif hash['for_user']
+        elsif hash[:for_user]
           @message = hash
 
           if block_given?
@@ -437,6 +454,10 @@ module TweetStream
         error_proc.call(message) if error_proc.is_a?(Proc)
       end
 
+      @stream.on_unauthorized do
+        unauthorized_proc.call if unauthorized_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/version.rb

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

data/spec/tweetstream/client_spec.rb

@@ -57,7 +57,8 @@ describe TweetStream::Client do
         :on_max_reconnects => true,
         :on_reconnect => true,
         :connection_completed => true,
-        :on_no_data_received => true
+        :on_no_data_received => true,
+        :on_unauthorized => true
       )
       EM.stub!(:run).and_yield
       EM::Twitter::Client.stub!(:connect).and_return(@stream)
@@ -147,7 +148,7 @@ describe TweetStream::Client do
             yielded_hash = hash
           end.track('abc')
           yielded_hash.should_not be_nil
-          yielded_hash['id'].should == 1234
+          yielded_hash[:id].should == 1234
         end
         it 'yields itself if block has an arity of 2' do
           hash = {:id => 1234}
@@ -325,7 +326,7 @@ describe TweetStream::Client do
     end
   end
 
-  %w(on_delete on_limit on_inited on_reconnect on_no_data_received).each do |proc_setter|
+  %w(on_delete on_limit on_inited on_reconnect on_no_data_received on_unauthorized).each do |proc_setter|
     describe "##{proc_setter}" do
       it 'should set when a block is given' do
         proc = Proc.new{|a,b| puts a }
@@ -371,6 +372,7 @@ describe TweetStream::Client do
         :on_reconnect => true,
         :connection_completed => true,
         :on_no_data_received => true,
+        :on_unauthorized => true,
         :stop => true
       )
       EM::Twitter::Client.stub!(:connect).and_return(@stream)
@@ -406,7 +408,8 @@ describe TweetStream::Client do
         :on_max_reconnects => true,
         :on_reconnect => true,
         :connection_completed => true,
-        :on_no_data_received => true
+        :on_no_data_received => true,
+        :on_unauthorized => true
       )
       EM.stub!(:run).and_yield
       EM::Twitter::Client.stub!(:connect).and_return(@stream)
@@ -449,7 +452,8 @@ describe TweetStream::Client do
           :on_max_reconnects => true,
           :on_reconnect => true,
           :connection_completed => true,
-          :on_no_data_received => true
+          :on_no_data_received => true,
+          :on_unauthorized => true
         )
         EM.stub!(:run).and_yield
         EM::Twitter::Client.stub!(:connect).and_return(@stream)
@@ -548,9 +552,9 @@ describe TweetStream::Client do
               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'
+            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)

data/spec/tweetstream_spec.rb

@@ -15,7 +15,8 @@ describe TweetStream do
         :on_max_reconnects => true,
         :on_reconnect => true,
         :connection_completed => true,
-        :on_no_data_received => true
+        :on_no_data_received => true,
+        :on_unauthorized => 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', '~> 2.2'
+  s.add_dependency 'twitter', '~> 3.0.0.rc.1'
   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.0
+  version: 2.0.1
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-01 00:00:00.000000000 Z
+date: 2012-06-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: em-twitter
-  requirement: &70257167536020 !ruby/object:Gem::Requirement
+  requirement: &70341058157740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,21 +22,21 @@ dependencies:
         version: '0.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70257167536020
+  version_requirements: *70341058157740
 - !ruby/object:Gem::Dependency
   name: twitter
-  requirement: &70257167535420 !ruby/object:Gem::Requirement
+  requirement: &70341058157100 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 3.0.0.rc.1
   type: :runtime
   prerelease: false
-  version_requirements: *70257167535420
+  version_requirements: *70341058157100
 - !ruby/object:Gem::Dependency
   name: daemons
-  requirement: &70257167534760 !ruby/object:Gem::Requirement
+  requirement: &70341058156560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: '1.1'
   type: :runtime
   prerelease: false
-  version_requirements: *70257167534760
+  version_requirements: *70341058156560
 - !ruby/object:Gem::Dependency
   name: multi_json
-  requirement: &70257167534140 !ruby/object:Gem::Requirement
+  requirement: &70341058155840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -55,10 +55,10 @@ dependencies:
         version: '1.3'
   type: :runtime
   prerelease: false
-  version_requirements: *70257167534140
+  version_requirements: *70341058155840
 - !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &70257167533360 !ruby/object:Gem::Requirement
+  requirement: &70341058154820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -66,10 +66,10 @@ dependencies:
         version: 1.0.2
   type: :runtime
   prerelease: false
-  version_requirements: *70257167533360
+  version_requirements: *70341058154820
 - !ruby/object:Gem::Dependency
   name: guard-rspec
-  requirement: &70257167532700 !ruby/object:Gem::Requirement
+  requirement: &70341058153760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257167532700
+  version_requirements: *70341058153760
 - !ruby/object:Gem::Dependency
   name: json
-  requirement: &70257167538780 !ruby/object:Gem::Requirement
+  requirement: &70341058152780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257167538780
+  version_requirements: *70341058152780
 - !ruby/object:Gem::Dependency
   name: pry
-  requirement: &70257167515140 !ruby/object:Gem::Requirement
+  requirement: &70341058152120 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -99,10 +99,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257167515140
+  version_requirements: *70341058152120
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70257167514640 !ruby/object:Gem::Requirement
+  requirement: &70341058151700 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -110,10 +110,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257167514640
+  version_requirements: *70341058151700
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &70257167514040 !ruby/object:Gem::Requirement
+  requirement: &70341058151240 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -121,10 +121,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257167514040
+  version_requirements: *70341058151240
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70257167513580 !ruby/object:Gem::Requirement
+  requirement: &70341058150560 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -132,10 +132,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257167513580
+  version_requirements: *70341058150560
 - !ruby/object:Gem::Dependency
   name: simplecov
-  requirement: &70257167513160 !ruby/object:Gem::Requirement
+  requirement: &70341058133520 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -143,10 +143,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257167513160
+  version_requirements: *70341058133520
 - !ruby/object:Gem::Dependency
   name: webmock
-  requirement: &70257167512660 !ruby/object:Gem::Requirement
+  requirement: &70341058132360 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -154,10 +154,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257167512660
+  version_requirements: *70341058132360
 - !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &70257167512080 !ruby/object:Gem::Requirement
+  requirement: &70341058130880 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -165,10 +165,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257167512080
+  version_requirements: *70341058130880
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &70257167511540 !ruby/object:Gem::Requirement
+  requirement: &70341058129920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -176,7 +176,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70257167511540
+  version_requirements: *70341058129920
 description: TweetStream allows you to easily consume the Twitter Streaming API utilizing
   the YAJL Ruby gem.
 email: