salesforce_adapter 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d132d277394dd4961ca29eb1546506b74a8322f5
-  data.tar.gz: ef41eb49a9629bd650f471aeaff3adb9312516b7
+  metadata.gz: 4f5a0eea6dfc65e80b4152d887240138472b0bc5
+  data.tar.gz: ade8be12c9fe884cdd054a4b58a65e3023599311
 SHA512:
-  metadata.gz: 28f596c1c963367196f38a3d62982b61ec57ecbd1004c5a6792e39f4116f0e3bc680bc19aaf2faeef1c99affa03e5a264b9f4e27adaec522c5c17525733b07a9
-  data.tar.gz: 04a988086f223d0c3ba003c9ae8d7fbc46d602b7f4e2858f6e687a91558a027b3ca1190c3d467296267e882c0f9e0b3314bccabc2787a992e5201aec2a94d289
+  metadata.gz: feaa9eb90bb15e1afc501da8584efc5f9f52b5c1beb3fee5c82c8b56cffff9c6f031f446904e3dc5352218d3238761ef7efba7af63770911ef9193e219d79a43
+  data.tar.gz: 03250258d1c9c21517cadab6812621f2532178a019e696e78732db221f4c5f96edc7c8829549f41d07cc3d3207dceb1015272ff6715062aa2f70eb41ca7eb81e

data/lib/salesforce_adapter/helpers.rb

@@ -9,11 +9,27 @@ module SalesforceAdapter
 
   module Helpers
 
+    # Potential errors raisable if the salesforce API is down
+    TIMEOUT_ERRORS = [
+      Timeout::Error,
+      Errno::EINVAL,
+      Errno::ECONNRESET,
+      Errno::ETIMEDOUT,
+      Errno::EHOSTUNREACH,
+      Errno::ECONNREFUSED,
+      Errno::EPIPE,
+      EOFError,
+      Net::HTTPBadResponse,
+      Net::HTTPHeaderSyntaxError,
+      Net::ProtocolError,
+      SocketError      
+    ]
+
     class << self
 
       # Attemps to run a salesforce operation a given number of times, 
       # Handle timeout errors and sleep between retries
-      def handle_timeout(opts= {}, &block)
+      def handle_timeout(opts= {})
 
         max_tries = opts[:max_tries] || 1
         sleep_between_tries = opts[:sleep_between_tries] || 1
@@ -22,13 +38,26 @@ module SalesforceAdapter
 
         begin
           counter += 1
-          yield
+          yield if block_given?
 
-        rescue Timeout::Error => e
+        # Standard ruby exceptions when a remote host is down
+        rescue *TIMEOUT_ERRORS => e
           raise SalesforceAdapter::SalesforceTimeout.new(e.message) if counter >= max_tries
-
-          sleep sleep_between_tries
+          Kernel.sleep sleep_between_tries
           retry
+
+        # The RForce gem may raise runtime errors if salesforce is down (e.g : when logging in)
+        rescue RuntimeError => e
+
+          if e.message.match /SERVER_UNAVAILABLE/
+            raise SalesforceAdapter::SalesforceTimeout.new(e.message) if counter >= max_tries
+            Kernel.sleep sleep_between_tries
+            retry
+
+          else
+            raise
+          end
+
         end
 
       end

data/lib/salesforce_adapter/rforce_binding.rb

@@ -4,23 +4,6 @@ module SalesforceAdapter
 
   class RforceBinding
 
-    # Potential errors raisable is the salesforce API is down
-    TIMEOUT_ERRORS = [
-      Timeout::Error,
-      Errno::EINVAL,
-      Errno::ECONNRESET,
-      Errno::ETIMEDOUT,
-      Errno::EHOSTUNREACH,
-      Errno::ECONNREFUSED,
-      Errno::EPIPE,
-      EOFError,
-      Net::HTTPBadResponse,
-      Net::HTTPHeaderSyntaxError,
-      Net::ProtocolError,
-      # OpenURI::HTTPError,
-      SocketError      
-    ]
-
     def initialize(url, login, password)
       @url      = url
       @login    = login
@@ -32,9 +15,7 @@ module SalesforceAdapter
 
     # Attempts to login to salesforce
     def login
-      Helpers.handle_timeout(:max_tries => 4, :sleep_between_tries => 2) do
-        @rforce.login( @login , @password )
-      end
+      @rforce.login( @login , @password )
     end
 
 
@@ -51,16 +32,11 @@ module SalesforceAdapter
 
       define_method method_name do |*args, &block|
 
-        begin
+        Helpers.handle_timeout(:max_tries => 4, :sleep_between_tries => 2) do
 
-          # Guarantee the binding is logged in
           login unless logged_in?
-
           @rforce.send method_name, *args, &block
 
-        # Handle timeouts from salesforce
-        rescue *TIMEOUT_ERRORS => e
-          raise SalesforceAdapter::SalesforceTimeout.new(e.message)
         end
 
       end

data/lib/salesforce_adapter/version.rb

@@ -1,3 +1,3 @@
 module SalesforceAdapter
-  VERSION = "1.0.1"
+  VERSION = "1.0.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_adapter
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - ClicRDV
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-04-30 00:00:00.000000000 Z
+date: 2014-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rforce