From 4bbbee2f464a2b909184c7bfd7cb1febf5823d42 Mon Sep 17 00:00:00 2001
From: Jordan Ritter <jpr5@darkridge.com>
Date: Thu, 8 Sep 2011 23:56:06 -0700
Subject: [PATCH] Implement better pattern and correct handling of faultcodes
 from SF.

Further connection-related faults should just be extended with addition
when/then's + new SalesforceAdapter::Connection::Errors exception class, as
necessary.
---
 lib/dm-salesforce-adapter/connection.rb | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/lib/dm-salesforce-adapter/connection.rb b/lib/dm-salesforce-adapter/connection.rb
index dea775e..ee9db4f 100644
--- a/lib/dm-salesforce-adapter/connection.rb
+++ b/lib/dm-salesforce-adapter/connection.rb
@@ -97,10 +97,10 @@ def login
       begin
         result = driver.login(:username => @username, :password => @password).result
       rescue SOAP::FaultError => error
-        if error.faultcode.to_s =~ /INVALID_LOGIN/
-          raise LoginFailed, error.faultstring.to_s
-        else
-          raise error
+        case error.faultcode.text
+        when "sf:INVALID_LOGIN" then raise LoginFailed, error.faultstring.text
+        # ...
+        else raise error
         end
       end
       driver.endpoint_url = result.serverUrl
@@ -127,17 +127,16 @@ def with_reconnection(&block)
       yield
     rescue SOAP::FaultError => error
       retry_count ||= 0
-      if error.faultcode.to_s =~ /INVALID_SESSION_ID/
+
+      case error.faultcode.text
+      when "sf:INVALID_SESSION_ID" then
         DataMapper.logger.debug "Got a invalid session id; reconnecting" if DataMapper.logger
         @driver = nil
         login
         retry_count += 1
         retry unless retry_count > 5
-      else
-        raise error
+      else raise error
       end
-
-      raise SessionTimeout, "The Salesforce session could not be established"
     end
   end
 end