twitter-login 0.2.3 → 0.3.0

data/lib/twitter/login.rb

@@ -1,7 +1,11 @@
-require 'twitter'
+require 'oauth'
+require 'yajl'
 require 'rack/request'
 require 'hashie/mash'
 
+module Twitter
+end
+
 class Twitter::Login
   attr_reader :options
   
@@ -41,13 +45,12 @@ class Twitter::Login
   
   module Helpers
     def twitter_client
-      oauth = twitter_oauth
-      oauth.authorize_from_access(*session[:twitter_access_token])
-      Twitter::Base.new oauth
+      OAuth::AccessToken.new(twitter_oauth, *session[:twitter_access_token])
     end
     
     def twitter_oauth
-      Twitter::OAuth.new Twitter::Login.consumer_key, Twitter::Login.secret
+      OAuth::Consumer.new Twitter::Login.consumer_key, Twitter::Login.secret,
+        :site => 'http://api.twitter.com'
     end
     
     def twitter_user
@@ -87,17 +90,18 @@ class Twitter::Login
   
   def redirect_to_twitter(request)
     # create a request token and store its parameter in session
-    oauth.set_callback_url(request.url)
-    request.session[:twitter_request_token] = [oauth.request_token.token, oauth.request_token.secret]
+    request_token = oauth.get_request_token(:oauth_callback => request.url)
+    request.session[:twitter_request_token] = [request_token.token, request_token.secret]
     # redirect to Twitter authorization page
-    redirect oauth.request_token.authorize_url
+    redirect request_token.authorize_url
   end
   
   def handle_twitter_authorization(request)
-    authorize_from_request(request)
+    access_token = authorize_from_request(request)
+    response = access_token.get('/1/account/verify_credentials.json')
     
     # get and store authenticated user's info from Twitter
-    request.session[:twitter_user] = twitter.verify_credentials.to_hash
+    request.session[:twitter_user] = Yajl::Parser.parse response.body
     
     # pass the request down to the main app
     response = begin
@@ -129,10 +133,12 @@ class Twitter::Login
   # replace the request token in session with access token
   def authorize_from_request(request)
     rtoken, rsecret = request.session[:twitter_request_token]
-    oauth.authorize_from_request(rtoken, rsecret, request[:oauth_verifier])
+    request_token = OAuth::RequestToken.new(oauth, rtoken, rsecret)
+    access_token = request_token.get_access_token(:oauth_verifier => request[:oauth_verifier])
     
     request.session.delete(:twitter_request_token)
-    request.session[:twitter_access_token] = [oauth.access_token.token, oauth.access_token.secret]
+    request.session[:twitter_access_token] = [access_token.token, access_token.secret]
+    return access_token
   end
   
   def redirect_to_return_path(request)
@@ -144,10 +150,9 @@ class Twitter::Login
   end
   
   def oauth
-    @oauth ||= Twitter::OAuth.new options[:consumer_key], options[:secret], :sign_in => true
-  end
-  
-  def twitter
-    Twitter::Base.new oauth
+    @oauth ||= OAuth::Consumer.new(options[:consumer_key], options[:secret],
+      :site => 'http://api.twitter.com',
+      :authorize_path => '/oauth/authenticate'
+    )
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twitter-login
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 19
   prerelease: false
   segments: 
   - 0
-  - 2
   - 3
-  version: 0.2.3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -15,29 +15,61 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-08-15 00:00:00 +02:00
+date: 2010-09-06 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: twitter
+  name: oauth
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
       - !ruby/object:Gem::Version 
-        hash: 49
+        hash: 11
         segments: 
         - 0
-        - 9
-        - 5
-        version: 0.9.5
+        - 4
+        - 2
+        version: 0.4.2
   type: :runtime
   version_requirements: *id001
 - !ruby/object:Gem::Dependency 
-  name: rspec
+  name: yajl-ruby
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 13
+        segments: 
+        - 0
+        - 7
+        - 7
+        version: 0.7.7
+  type: :runtime
+  version_requirements: *id002
+- !ruby/object:Gem::Dependency 
+  name: hashie
+  prerelease: false
+  requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 19
+        segments: 
+        - 0
+        - 2
+        - 2
+        version: 0.2.2
+  type: :runtime
+  version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: rspec
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -49,11 +81,11 @@ dependencies:
         - 9
         version: 1.2.9
   type: :development
-  version_requirements: *id002
+  version_requirements: *id004
 - !ruby/object:Gem::Dependency 
   name: fakeweb
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  requirement: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ~>
@@ -65,7 +97,7 @@ dependencies:
         - 8
         version: 1.2.8
   type: :development
-  version_requirements: *id003
+  version_requirements: *id005
 description: Rack middleware for Sinatra, Rails, and other web frameworks that provides user login functionality through Twitter.
 email: mislav.marohnic@gmail.com
 executables: []