chirpstream 0.0.5 → 0.0.6

data/Readme.rdoc

@@ -6,7 +6,12 @@ This is an experimental EventMachine-based client for http://chirpstream.twitter
 
 == Fun Things You Can Do At Home
 
-Fire up the 
+Fire up the growl client!
+
+  sudo gem install chirpstream
+  chirp_growl
+  
+Wow! It's growling my tweets! How meta.
 
 == Usage
 
@@ -20,5 +25,6 @@ Fire up the
   chirp.follow {|t| puts "#{t.source.screen_name.foreground(:green)} following #{t.target.screen_name.foreground(:green)}" }
   chirp.favorite {|t| puts "#{t.source.screen_name.foreground(:green)} <3 -> #{t.target_object.text}" }
   chirp.retweet {|t| puts "#{t.source.screen_name.foreground(:green)} RT -> #{t.target_object.text}" }
+  chirp.direct_message {|t| puts "DM : #{t.text} (from #{t.sender.name.foreground(:red)} (#{('@' + t.sender.screen_name).foreground(:green)}))" }
   chirp.connect
 

data/VERSION

@@ -1 +1 @@
-0.0.5
+0.0.6

data/lib/chirpstream.rb

@@ -9,6 +9,7 @@ $LOAD_PATH.add_current
 require 'chirpstream/twitter_object'
 require 'chirpstream/event'
 require 'chirpstream/event/follow'
+require 'chirpstream/event/direct_message'
 require 'chirpstream/event/retweet'
 require 'chirpstream/event/favorite'
 require 'chirpstream/event/delete'
@@ -19,7 +20,7 @@ class Chirpstream
   
   attr_reader :handlers
   
-  Handlers = Struct.new(:friend, :tweet, :follow, :favorite, :retweet, :delete, :reconnect)
+  Handlers = Struct.new(:friend, :tweet, :follow, :favorite, :retweet, :delete, :reconnect, :direct_message)
 
   attr_reader :username, :password
 
@@ -27,7 +28,7 @@ class Chirpstream
     @username = username
     @password = password
     @connect_url = "http://chirpstream.twitter.com/2b/user.json"
-    @handlers = Handlers.new([], [], [], [], [], [], [])
+    @handlers = Handlers.new([], [], [], [], [], [], [], [])
     @data = ''
   end
   
@@ -51,6 +52,10 @@ class Chirpstream
     @handlers.retweet << block
   end
   
+  def direct_message(&block)
+    @handlers.direct_message << block
+  end
+
   def delete(&block)
     @handlers.delete << block
   end
@@ -68,7 +73,7 @@ class Chirpstream
             @handlers.friend.each{|h| h.call(friend)}
           end
         }
-        friend_http = EM::HttpRequest.new("http://api.twitter.com/1/users/lookup.json").post(:body => {'user_id' => friend_ids.join(',')}, :head => {'authorization' => [@username, @password]})
+        friend_http = EM::HttpRequest.new("http://api.twitter.com/1/users/lookup.json").post(:body => {'user_id' => friend_ids.join(',')}, :head => {'authorization' => [@username, @password]}, :timeout => 0)
         http.stream { |chunk|
           parser << chunk
         }
@@ -94,6 +99,15 @@ class Chirpstream
     end
   end
   
+  def dispatch_direct_message(data)
+    unless @handlers.direct_message.empty?
+      dm = DirectMessage.new(self, data)
+      dm.load_all { |f|
+        @handlers.direct_message.each{|h| h.call(f)}
+      }
+    end
+  end
+
   def dispatch_favorite(data)
     unless @handlers.favorite.empty?
       favorite = Favorite.new(self, data)
@@ -127,7 +141,9 @@ class Chirpstream
   end
   
   def handle_tweet(parsed_data)
-    if parsed_data['friends']
+    if parsed_data['direct_message']
+      dispatch_direct_message(parsed_data)
+    elsif parsed_data['friends']
       dispatch_friend(parsed_data)
     elsif parsed_data['text']
       dispatch_tweet(parsed_data)
@@ -163,7 +179,11 @@ class Chirpstream
         connect
       }
       http.stream { |chunk|
-        parser << chunk
+        begin
+          parser << chunk
+        rescue Yajl::ParseError
+          puts "bad chunk: #{chunk.inspect}"
+        end
       }
     end
   end

data/lib/chirpstream/event/direct_message.rb

@@ -0,0 +1,23 @@
+class Chirpstream
+  class DirectMessage < TwitterObject
+    
+		ATTRS = [:coordinates, :recipient, :sender, :sender_screen_name, :text, :id, :recipient_id, :sender_id]
+  
+    attr_accessor *ATTRS
+    user_writer :sender
+  
+		def initialize(base, data = nil)
+			@base = base
+			from_json(data['direct_message']) if data and data['direct_message']
+			yield self if block_given?
+		end
+  
+    def tweet_loadable_id
+      id
+    end
+    
+    def loaded?
+      !text.nil?
+    end
+  end
+end

data/lib/chirpstream/twitter_object.rb

@@ -132,4 +132,4 @@ class TwitterObject
     }
   end
   
-end
+end

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 5
-  version: 0.0.5
+  - 6
+  version: 0.0.6
 platform: ruby
 authors: 
 - Joshua Hull
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-01 00:00:00 -04:00
+date: 2010-05-19 00:00:00 -04:00
 default_executable: chirp_growl
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -91,6 +91,7 @@ files:
 - lib/chirpstream.rb
 - lib/chirpstream/event.rb
 - lib/chirpstream/event/delete.rb
+- lib/chirpstream/event/direct_message.rb
 - lib/chirpstream/event/favorite.rb
 - lib/chirpstream/event/follow.rb
 - lib/chirpstream/event/retweet.rb