mbleigh-twitter-auth 0.1.13 → 0.1.14

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
 :major: 0
 :minor: 1
-:patch: 13
+:patch: 14

data/app/controllers/sessions_controller.rb

@@ -48,7 +48,7 @@ class SessionsController < ApplicationController
     cookies[:remember_token] = @user.remember_me
 
     authentication_succeeded 
-  rescue Net::HTTPServerException, Net::HTTPFatalError => e
+  rescue Net::HTTPServerException, Net::HTTPFatalError, TwitterAuth::Dispatcher::Error => e
     case e.message
       when '401 "Unauthorized"'
         authentication_failed('This authentication request is no longer valid. Please try again.') and return

data/app/models/twitter_auth/oauth_user.rb

@@ -6,14 +6,16 @@ module TwitterAuth
       end
 
       base.extend TwitterAuth::OauthUser::ClassMethods
+      base.extend TwitterAuth::Dispatcher::Shared
     end
     
     module ClassMethods
       def identify_or_create_from_access_token(token, secret=nil)
         raise ArgumentError, 'Must authenticate with an OAuth::AccessToken or the string access token and secret.' unless (token && secret) || token.is_a?(OAuth::AccessToken)
-
-        user_info = JSON.parse(token.get('/account/verify_credentials.json').body)
-
+        
+        response = token.get(TwitterAuth.path_prefix + '/account/verify_credentials.json')
+        user_info = handle_response(response)
+        
         if user = User.find_by_login(user_info['screen_name'])
           user.assign_twitter_attributes(user_info)
           user.access_token = token.token

data/lib/twitter_auth.rb

@@ -10,6 +10,10 @@ module TwitterAuth
     config['base_url'] || 'https://twitter.com'    
   end
 
+  def self.path_prefix
+    URI.parse(base_url).path
+  end
+
   def self.api_timeout
     config['api_timeout'] || 10
   end

data/lib/twitter_auth/dispatcher/basic.rb

@@ -13,6 +13,7 @@ module TwitterAuth
       end
 
       def request(http_method, path, body=nil, *arguments)
+        path = TwitterAuth.path_prefix + path
         path = append_extension_to(path)
 
         response = TwitterAuth.net.start{ |http|

data/lib/twitter_auth/dispatcher/oauth.rb

@@ -14,8 +14,9 @@ module TwitterAuth
       end
 
       def request(http_method, path, *arguments)
+        path = TwitterAuth.path_prefix + path
         path = append_extension_to(path)
-       
+
         response = super
 
         handle_response(response)

data/lib/twitter_auth/dispatcher/shared.rb

@@ -15,6 +15,8 @@ module TwitterAuth
           rescue JSON::ParserError
             response.body
           end
+        when Net::HTTPUnauthorized
+          raise TwitterAuth::Dispatcher::Error, 'The credentials provided did not authorize the user.'
         else
           message = begin
             JSON.parse(response.body)['error']

data/spec/twitter_auth_spec.rb

@@ -1,7 +1,7 @@
 require File.dirname(__FILE__) + '/spec_helper'
 
 describe TwitterAuth do
-  describe '#base_url' do
+  describe '.base_url' do
     it 'should have default to https://twitter.com' do
       TwitterAuth.stub!(:config).and_return({})
       TwitterAuth.base_url.should == 'https://twitter.com'
@@ -13,6 +13,18 @@ describe TwitterAuth do
     end
   end
 
+  describe ".path_prefix" do
+    it 'should be blank if the base url does not have a path' do
+      TwitterAuth.stub!(:base_url).and_return("https://twitter.com:443")
+      TwitterAuth.path_prefix.should == ""
+    end
+
+    it 'should return the path prefix if one exists' do
+      TwitterAuth.stub!(:base_url).and_return("https://api.presentlyapp.com/api/twitter")
+      TwitterAuth.path_prefix.should == "/api/twitter"
+    end
+  end
+
   describe '.api_timeout' do
     it 'should default to 10' do
       TwitterAuth.stub!(:config).and_return({})

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: mbleigh-twitter-auth
 version: !ruby/object:Gem::Version 
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors: 
 - Michael Bleigh