twitter-login 0.4.1 → 0.4.2

data/lib/twitter/login.rb

@@ -86,6 +86,14 @@ class Twitter::Login
 
       url << path
     end
+    
+    def xhr?
+      !(env['HTTP_X_REQUESTED_WITH'] !~ /XMLHttpRequest/i)
+    end
+    
+    def wants?(mime_type)
+      env['HTTP_ACCEPT'].to_s.include? mime_type
+    end
   end
   
   protected
@@ -96,7 +104,15 @@ class Twitter::Login
     request.session[:twitter_request_token] = [request_token.token, request_token.secret]
     
     # redirect to Twitter authorization page
-    redirect request_token.authorize_url
+    if request.wants? 'application/json'
+      body = %({"authorize_url":"#{request_token.authorize_url}"})
+      ["200", {'Content-type' => 'application/json'}, [body]]
+    elsif request.xhr? or request.wants? 'application/javascript'
+      body = "window.location.assign('#{request_token.authorize_url}')"
+      ["200", {'Content-type' => 'application/javascript'}, [body]]
+    else
+      redirect request_token.authorize_url
+    end
   end
   
   def handle_twitter_authorization(request)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: twitter-login
 version: !ruby/object:Gem::Version 
-  hash: 13
+  hash: 11
   prerelease: false
   segments: 
   - 0
   - 4
-  - 1
-  version: 0.4.1
+  - 2
+  version: 0.4.2
 platform: ruby
 authors: 
 - "Mislav Marohni\xC4\x87"
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-27 00:00:00 +02:00
+date: 2010-12-19 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency