twitter-userstream 0.1.1 → 0.1.2

data/VERSION

@@ -1 +1 @@
-0.1.1
+0.1.2

data/lib/userstream.rb

@@ -1,5 +1,6 @@
-require 'eventmachine'
+#require 'eventmachine'
 require 'em-http'
+require 'em-http/middleware/oauth'
 require 'yajl'
 require 'pp'
 require 'load_path_find'
@@ -36,10 +37,10 @@ class Userstream
 
   attr_reader :consumer_token, :consumer_secret, :fill_in
 
-  def initialize(options = nil)
-    @consumer_token = options && options[:consumer_token]
-    @consumer_secret = options && options[:consumer_secret]
-    @fill_in = options && options[:fill_in]
+  def initialize(options = {})
+    @consumer_token = options[:consumer_token]
+    @consumer_secret = options[:consumer_secret]
+    @fill_in = options[:fill_in]
     @connect_url = "https://userstream.twitter.com/2/user.json"
     @handlers = Handlers.new(*HandlerTypes.map{|h| []})
     @on_connect_called = {}
@@ -98,12 +99,14 @@ class Userstream
   
   def connect(*users)
     unless EM.reactor_running?
-      EM.run { connect(*users) }
+      EM.run do
+         connect(*users) 
+      end
     else
       @users.concat(users)
       @user_adder ||= EM.add_periodic_timer(1) {
         users_to_connect = @users.slice!(0, 10)
-        if users_to_connect && !users_to_connect.empty?
+        if users_to_connect && users_to_connect.any?
           users_to_connect.each do |user|
             connect_single(user)
           end

data/lib/userstream/connect.rb

@@ -22,23 +22,15 @@ class Userstream
 
     def get_connection(user, url, method, extras = nil)
       options = extras ? extras.merge(:timeout => 0) : {:timeout => 0}
-      if user.oauth?
-        request = EM::HttpRequest.new(url)
-        request.send(method, options) do |client|
-          twitter_oauth_consumer.sign!(client, twitter_oauth_access_token(user.access_token, user.access_secret))
-        end
-      else
-        http = EM::HttpRequest.new(url).send(method, options.merge(:head => {'authorization' => [user.name, user.password]}))
-      end
-      
-    end
-
-    def twitter_oauth_consumer
-      OAuth::Consumer.new(consumer_token, consumer_secret, :site => "http://twitter.com")
-    end
-
-    def twitter_oauth_access_token(token=nil,secret=nil)
-      OAuth::AccessToken.new(twitter_oauth_consumer, token, secret)
+      oauthconfig = {
+        :consumer_key     => consumer_token,
+        :consumer_secret  => consumer_secret,
+        :access_token     => user.access_token,
+        :access_token_secret => user.access_secret
+      }
+      request = EM::HttpRequest.new(url)
+      request.use EventMachine::Middleware::OAuth, oauthconfig
+      request.send(method, options)       
     end
   end
 end

metadata

@@ -1,172 +1,169 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: twitter-userstream
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.1.2
   prerelease: 
-  version: 0.1.1
 platform: ruby
-authors: 
+authors:
 - Joshua Hull
 - Fabien Penso
 - Noah Horton
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-05-14 00:00:00 -07:00
+date: 2011-05-30 00:00:00.000000000 -07:00
 default_executable: chirp_growl
-dependencies: 
-- !ruby/object:Gem::Dependency 
+dependencies:
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &2156310400 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156310400
+- !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  requirement: &2156309560 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156309560
+- !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &2156308200 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156308200
+- !ruby/object:Gem::Dependency
   name: load_path_find
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  requirement: &2156306740 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *id004
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156306740
+- !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &id005 !ruby/object:Gem::Requirement 
+  requirement: &2156297780 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *id005
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156297780
+- !ruby/object:Gem::Dependency
   name: rainbow
-  requirement: &id006 !ruby/object:Gem::Requirement 
+  requirement: &2156296880 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id006
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156296880
+- !ruby/object:Gem::Dependency
   name: growl
-  requirement: &id007 !ruby/object:Gem::Requirement 
+  requirement: &2156296380 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id007
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156296380
+- !ruby/object:Gem::Dependency
   name: json
-  requirement: &id008 !ruby/object:Gem::Requirement 
+  requirement: &2156295760 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *id008
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156295760
+- !ruby/object:Gem::Dependency
   name: eventmachine
-  requirement: &id009 !ruby/object:Gem::Requirement 
+  requirement: &2156295080 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.12.10
   type: :runtime
   prerelease: false
-  version_requirements: *id009
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156295080
+- !ruby/object:Gem::Dependency
   name: em-http-request
-  requirement: &id010 !ruby/object:Gem::Requirement 
+  requirement: &2156294300 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.2.7
   type: :runtime
   prerelease: false
-  version_requirements: *id010
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156294300
+- !ruby/object:Gem::Dependency
   name: yajl-ruby
-  requirement: &id011 !ruby/object:Gem::Requirement 
+  requirement: &2156293500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.7.5
   type: :runtime
   prerelease: false
-  version_requirements: *id011
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156293500
+- !ruby/object:Gem::Dependency
   name: load_path_find
-  requirement: &id012 !ruby/object:Gem::Requirement 
+  requirement: &2156291900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.0.5
   type: :runtime
   prerelease: false
-  version_requirements: *id012
-- !ruby/object:Gem::Dependency 
+  version_requirements: *2156291900
+- !ruby/object:Gem::Dependency
   name: oauth
-  requirement: &id013 !ruby/object:Gem::Requirement 
+  requirement: &2156290840 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 0.4.0
   type: :runtime
   prerelease: false
-  version_requirements: *id013
+  version_requirements: *2156290840
 description: Eventmachine-based Twitter Userstream client
 email: noah@involver.com
-executables: 
+executables:
 - chirp_growl
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - Gemfile
 - Gemfile.lock
 - Rakefile
@@ -190,30 +187,26 @@ files:
 has_rdoc: true
 homepage: https://github.com/nhorton/twitter-userstream
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
 rubygems_version: 1.6.2
 signing_key: 
 specification_version: 3
 summary: Eventmachine-based Twitter Userstream client
 test_files: []
-