chirpstream 0.0.6 → 0.0.7

data/Gemfile

@@ -2,5 +2,6 @@
 source :gemcutter
 gem "eventmachine", ">= 0.12.10"
 gem "em-http-request", ">= 0.2.7"
-gem "json", ">= 1.2.4"
+gem "yajl-ruby", ">= 0.7.5"
 gem "load_path_find", ">= 0.0.5"
+gem "oauth", ">= 0.4.0"

data/Rakefile

@@ -5,12 +5,13 @@ begin
     s.description = s.summary = "Eventmachine-based Chirpstream client"
     s.email = "joshbuddy@gmail.com"
     s.homepage = "http://github.com/joshbuddy/chirpstream"
-    s.authors = ["Joshua Hull"]
+    s.authors = ["Joshua Hull", "Fabien Penso"]
     s.files = FileList["[A-Z]*", "{lib}/**/*", "{bin}/**/*", "{image}/**/*"]
     s.add_dependency 'eventmachine', ">= 0.12.10"
     s.add_dependency 'em-http-request', ">= 0.2.7"
     s.add_dependency 'yajl-ruby', ">= 0.7.5"
     s.add_dependency 'load_path_find', ">= 0.0.5"
+    s.add_dependency 'oauth', ">= 0.4.0"
     s.executables = ['chirp_growl']
   end
   Jeweler::GemcutterTasks.new

data/Readme.rdoc

@@ -28,3 +28,17 @@ Wow! It's growling my tweets! How meta.
   chirp.direct_message {|t| puts "DM : #{t.text} (from #{t.sender.name.foreground(:red)} (#{('@' + t.sender.screen_name).foreground(:green)}))" }
   chirp.connect
 
+== Oauth Usage
+
+  chirp = Chirpstream.new
+  chirp.consumer_token = "XXX"
+  chirp.consumer_secret = "XXX"
+  chirp.access_token = "XXX"
+  chirp.access_secret = "XXX"
+  chirp.reconnect{ puts "reconnecting..." }
+  chirp.tweet {|t| puts "#{t.text} (from #{t.user.name.foreground(:red)} (#{('@' + t.user.screen_name).foreground(:green)}))" }
+  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_oauth

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/lib/chirpstream.rb

@@ -4,6 +4,9 @@ require 'yajl'
 require 'pp'
 require 'load_path_find'
 
+require 'oauth'
+require 'oauth/client/em_http'
+
 $LOAD_PATH.add_current
 
 require 'chirpstream/twitter_object'
@@ -23,8 +26,10 @@ class Chirpstream
   Handlers = Struct.new(:friend, :tweet, :follow, :favorite, :retweet, :delete, :reconnect, :direct_message)
 
   attr_reader :username, :password
+  attr_accessor :consumer_token, :consumer_secret, :access_token, :access_secret
 
-  def initialize(username, password)
+  def initialize(username=nil, password=nil, fill_in = true)
+    @fill_in = fill_in
     @username = username
     @password = password
     @connect_url = "http://chirpstream.twitter.com/2b/user.json"
@@ -73,7 +78,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]}, :timeout => 0)
+        friend_http = EM::HttpRequest.new("http://api.twitter.com/1/users/lookup.json").post(:body => {'user_id' => friend_ids.join(',')}, :head => {'authorization' => [@username, @password]})
         http.stream { |chunk|
           parser << chunk
         }
@@ -84,54 +89,54 @@ class Chirpstream
   def dispatch_tweet(data)
     unless @handlers.tweet.empty?
       tweet = Tweet.new(self, data)
-      tweet.load_all { |t|
+      @fill_in ? tweet.load_all { |t|
         @handlers.tweet.each{|h| h.call(tweet)}
-      }
+      } : @handlers.tweet.each{|h| h.call(tweet)}
     end
   end
   
   def dispatch_follow(data)
     unless @handlers.follow.empty?
       follow = Follow.new(self, data)
-      follow.load_all { |f|
+      @fill_in ? follow.load_all { |f|
         @handlers.follow.each{|h| h.call(f)}
-      }
+      } : @handlers.follow.each{|h| h.call(follow)}
     end
   end
   
   def dispatch_direct_message(data)
     unless @handlers.direct_message.empty?
       dm = DirectMessage.new(self, data)
-      dm.load_all { |f|
+      @fill_in ? dm.load_all { |f|
         @handlers.direct_message.each{|h| h.call(f)}
-      }
+      } : @handlers.direct_message.each{|h| h.call(dm)}
     end
   end
 
   def dispatch_favorite(data)
     unless @handlers.favorite.empty?
       favorite = Favorite.new(self, data)
-      favorite.load_all { |f|
+      @fill_in ? favorite.load_all { |f|
         @handlers.favorite.each{|h| h.call(f)}
-      }
+      } : @handlers.favorite.each{|h| h.call(favorite)}
     end
   end
   
   def dispatch_retweet(data)
     unless @handlers.retweet.empty?
       retweet = Retweet.new(self, data)
-      retweet.load_all { |f|
+      @fill_in ? retweet.load_all { |f|
         @handlers.retweet.each{|h| h.call(f)}
-      }
+      } : @handlers.retweet.each{|h| h.call(retweet)}
     end
   end
     
   def dispatch_delete(data)
     unless @handlers.delete.empty?
       delete = Delete.new(self, data)
-      delete.load_all { |f|
+      @fill_in ? delete.load_all { |f|
         @handlers.delete.each{|h| h.call(f)}
-      }
+      } : @handlers.delete.each{|h| h.call(delete)}
     end
   end
   
@@ -173,7 +178,7 @@ class Chirpstream
     else
       parser = Yajl::Parser.new
       parser.on_parse_complete = method(:handle_tweet)
-      http = EM::HttpRequest.new(@connect_url).get :head => {'authorization' => [@username, @password]}
+      http = EM::HttpRequest.new(@connect_url).get :head => {'authorization' => [@username, @password]}, :timeout => 0
       http.errback { |e, err|
         dispatch_reconnect
         connect
@@ -187,4 +192,40 @@ class Chirpstream
       }
     end
   end
+
+  #
+  # Oauth example
+  #
+  def twitter_oauth_consumer
+    @twitter_oauth_consumer ||= OAuth::Consumer.new(consumer_token, consumer_secret, :site => "http://twitter.com")
+  end
+
+  def twitter_oauth_access_token
+    @twitter_oauth_access_token ||= OAuth::AccessToken.new(twitter_oauth_consumer, access_token, access_secret)
+  end
+
+  def connect_oauth
+    unless EM.reactor_running?
+      EM.run { connect_oauth }
+    else
+      parser = Yajl::Parser.new
+      parser.on_parse_complete = method(:handle_tweet)
+
+      request = EM::HttpRequest.new(@connect_url)
+      http = request.get do |client|
+        twitter_oauth_consumer.sign!(client, twitter_oauth_access_token)
+      end
+      http.errback { |e, err|
+        dispatch_reconnect
+        connect_oauth
+      }
+      http.stream { |chunk|
+        begin
+          parser << chunk
+        rescue Yajl::ParseError
+          puts "bad chunk: #{chunk.inspect}"
+        end
+      }
+    end
+  end
 end

metadata

@@ -5,16 +5,17 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 6
-  version: 0.0.6
+  - 7
+  version: 0.0.7
 platform: ruby
 authors: 
 - Joshua Hull
+- Fabien Penso
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2010-05-19 00:00:00 -04:00
+date: 2010-05-20 00:00:00 -04:00
 default_executable: chirp_growl
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -73,6 +74,20 @@ dependencies:
         version: 0.0.5
   type: :runtime
   version_requirements: *id004
+- !ruby/object:Gem::Dependency 
+  name: oauth
+  prerelease: false
+  requirement: &id005 !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        segments: 
+        - 0
+        - 4
+        - 0
+        version: 0.4.0
+  type: :runtime
+  version_requirements: *id005
 description: Eventmachine-based Chirpstream client
 email: joshbuddy@gmail.com
 executables: