lib/tw/client/stream.rb in tw-1.1.1 vs lib/tw/client/stream.rb in tw-1.2.0

@@ -1,44 +1,42 @@
 
 module Tw
   class Client::Stream
     def initialize(user=nil)
       user = Tw::Auth.get_or_regist_user user
-      UserStream.configure do |config|
+      @client = Twitter::Streaming::Client.new do |config|
         config.consumer_key = Conf['consumer_key']
         config.consumer_secret = Conf['consumer_secret']
-        config.oauth_token = user['access_token']
-        config.oauth_token_secret = user['access_secret']
+        config.access_token = user['access_token']
+        config.access_token_secret = user['access_secret']
       end
-
-      @client = UserStream::Client.new
     end
 
     def user_stream(&block)
       raise ArgumentError, 'block not given' unless block_given?
-      @client.user do |m|
-        if data = tweet?(m)
-          yield data
+      @client.user do |chunk|
+        if tweet = get_if_tweet(chunk)
+          yield tweet
         end
       end
     end
 
     def filter(*track_words, &block)
       raise ArgumentError, 'block not given' unless block_given?
-      @client.filter :track => track_words.join(',') do |m|
-        if data = tweet?(m)
-          yield data
+      @client.filter :track => track_words.join(',') do |chunk|
+        if tweet = get_if_tweet(chunk)
+          yield tweet
         end
       end
     end
 
     private
-    def tweet?(chunk)
-      return false unless chunk.user and chunk.user.screen_name and chunk.text and chunk.created_at and chunk.id
+    def get_if_tweet(chunk)
+      return nil unless chunk.kind_of? Twitter::Tweet
       Tw::Tweet.new(:id => chunk.id,
                     :user => chunk.user.screen_name,
                     :text => chunk.text,
-                    :time => (Time.parse chunk.created_at))
+                    :time => chunk.created_at)
     end
 
   end
 end