chirpstream 0.0.7 → 0.0.8

data/Gemfile

@@ -4,4 +4,5 @@ gem "eventmachine", ">= 0.12.10"
 gem "em-http-request", ">= 0.2.7"
 gem "yajl-ruby", ">= 0.7.5"
 gem "load_path_find", ">= 0.0.5"
-gem "oauth", ">= 0.4.0"
+gem "oauth", ">= 0.4.0"
+gem 'rainbow'

data/Gemfile.lock

@@ -0,0 +1,47 @@
+--- 
+dependencies: 
+  oauth: 
+    group: 
+    - :default
+    version: ">= 0.4.0"
+  rainbow: 
+    group: 
+    - :default
+    version: ">= 0"
+  em-http-request: 
+    group: 
+    - :default
+    version: ">= 0.2.7"
+  eventmachine: 
+    group: 
+    - :default
+    version: ">= 0.12.10"
+  load_path_find: 
+    group: 
+    - :default
+    version: ">= 0.0.5"
+  yajl-ruby: 
+    group: 
+    - :default
+    version: ">= 0.7.5"
+specs: 
+- addressable: 
+    version: 2.1.2
+- dirge: 
+    version: 0.0.4
+- eventmachine: 
+    version: 0.12.10
+- em-http-request: 
+    version: 0.2.7
+- load_path_find: 
+    version: 0.0.5
+- oauth: 
+    version: 0.4.0
+- rainbow: 
+    version: 1.0.4
+- yajl-ruby: 
+    version: 0.7.6
+hash: d6cefb455573e16292480b49ad20114ca5876dac
+sources: 
+- Rubygems: 
+    uri: http://gemcutter.org

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/chirpstream.rb

@@ -26,7 +26,22 @@ 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
+  attr_accessor :consumer_token, :consumer_secret, :access_token, :access_secret, :fill_in
+
+  def self.basic(username, password, options = nil)
+    chirpstream = new(username, password)
+    chirpstream.fill_in = options[:fill_in] if options && options.key?(:fill_in)
+  end
+
+  def self.oauth(consumer_token, consumer_secret, access_token, access_secret, options = nil)
+    chirpstream = new
+    chirpstream.consumer_token = consumer_token
+    chirpstream.consumer_secret = consumer_secret
+    chirpstream.access_token = access_token
+    chirpstream.access_secret = access_secret
+    chirpstream.fill_in = options[:fill_in] if options && options.key?(:fill_in)
+    chirpstream
+  end
 
   def initialize(username=nil, password=nil, fill_in = true)
     @fill_in = fill_in
@@ -178,7 +193,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]}, :timeout => 0
+      http = new_client(@connect_url, :get)
       http.errback { |e, err|
         dispatch_reconnect
         connect
@@ -204,28 +219,15 @@ class Chirpstream
     @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|
+  def new_client(url, method, extras = nil)
+    options = extras ? extras.merge(:timeout => 0) : {:timeout => 0}
+    if consumer_token
+      request = EM::HttpRequest.new(url)
+      request.send(method, options) 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
-      }
+    else
+      http = EM::HttpRequest.new(url).send(method, options.merge(:head => {'authorization' => [@username, @password]}))
     end
   end
 end

data/lib/chirpstream/twitter_object.rb

@@ -99,7 +99,7 @@ class TwitterObject
         data[id] = parsed
         load_tweet_data(ids, data, &block)
       }
-      http = EM::HttpRequest.new("http://api.twitter.com/1/statuses/show/%s.json" % id).get :head => {'authorization' => [base.username, base.password]}
+      http = base.new_client("http://api.twitter.com/1/statuses/show/%s.json" % id, :get)
       http.stream { |chunk|
         parser << chunk
       }
@@ -126,7 +126,7 @@ class TwitterObject
       end
       yield
     }
-    http = EM::HttpRequest.new("http://api.twitter.com/1/users/lookup.json").post :head => {'authorization' => [base.username, base.password]}, :body => {'user_id' => ids.join(',')}
+    http = base.new_client("http://api.twitter.com/1/users/lookup.json", :post, :body => {'user_id' => ids.join(',')})
     http.stream { |chunk|
       parser << chunk
     }

metadata

@@ -5,8 +5,8 @@ version: !ruby/object:Gem::Version
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Joshua Hull
@@ -98,6 +98,7 @@ extra_rdoc_files: []
 
 files: 
 - Gemfile
+- Gemfile.lock
 - Rakefile
 - Readme.rdoc
 - VERSION