metaforce 1.0.6 → 1.0.7

data/README.md

@@ -1,6 +1,6 @@
 # Metaforce
 
-[![travis-ci](https://secure.travis-ci.org/ejholmes/metaforce.png)](https://secure.travis-ci.org/ejholmes/metaforce) [![Code Climate](https://codeclimate.com/badge.png)](https://codeclimate.com/github/ejholmes/metaforce) [![Dependency Status](https://gemnasium.com/ejholmes/metaforce.png)](https://gemnasium.com/ejholmes/metaforce)
+[![travis-ci](https://secure.travis-ci.org/ejholmes/metaforce.png)](https://secure.travis-ci.org/ejholmes/metaforce) [![Code Climate](https://codeclimate.com/github/ejholmes/metaforce.png)](https://codeclimate.com/github/ejholmes/metaforce) [![Dependency Status](https://gemnasium.com/ejholmes/metaforce.png)](https://gemnasium.com/ejholmes/metaforce)
 
 Metaforce is a Ruby gem for interacting with the Salesforce [Metadata](http://www.salesforce.com/us/developer/docs/api_meta/index.htm)
 and [Services](http://www.salesforce.com/us/developer/docs/api/index.htm) APIs.

data/lib/metaforce/abstract_client.rb

@@ -36,17 +36,21 @@ module Metaforce
     # attempt to reauthenticate by called the reauthentication handler if
     # present.
     def request(*args, &block)
+      authenticate! unless session_id
+      retries = authentication_retries
       begin
-        authenticate! unless session_id
-        _request(*args, &block)
+        perform_request(*args, &block)
       rescue Savon::SOAP::Fault => e
-        raise e unless e.message =~ /INVALID_SESSION_ID/ && authentication_handler
-        authenticate!
-        _request(*args, &block)
+        if e.message =~ /INVALID_SESSION_ID/ && authentication_handler && retries > 0
+          authenticate!
+          retries -= 1
+          retry
+        end
+        raise
       end
     end
 
-    def _request(*args, &block)
+    def perform_request(*args, &block)
       response = client.request(*args, &block)
       Hashie::Mash.new(response.body)[:"#{args[0]}_response"].result
     end
@@ -54,7 +58,9 @@ module Metaforce
     # Internal Calls the authentication handler, which should set @options to a new
     # hash.
     def authenticate!
-      authentication_handler.call(self, @options)
+      options = authentication_handler.call(self, @options)
+      @options.merge!(options)
+      client.config.soap_header = soap_headers
     end
 
     # A proc object that gets called when the client needs to reauthenticate.
@@ -62,6 +68,10 @@ module Metaforce
       Metaforce.configuration.authentication_handler
     end
 
+    def authentication_retries
+      3
+    end
+
     # Internal: Soap headers to set for authenticate.
     def soap_headers
       { 'ins0:SessionHeader' => { 'ins0:sessionId' => session_id } }

data/lib/metaforce/config.rb

@@ -66,7 +66,7 @@ module Metaforce
 
     def authentication_handler
       @authentication_handler ||= lambda { |client, options|
-        options.merge!(Metaforce.login(options))
+        Metaforce.login(options)
       }
     end
 

data/lib/metaforce/version.rb

@@ -1,3 +1,3 @@
 module Metaforce
-  VERSION = '1.0.6'
+  VERSION = '1.0.7'
 end

data/spec/support/client.rb

@@ -19,7 +19,7 @@ shared_examples 'a client' do
 
     context 'and an authentication handler is present' do
       let(:handler) do
-        proc { |client, options| options = { session_id: 'foo' } }
+        proc { |client, options| { :session_id => 'foo' }  }
       end
 
       before do
@@ -32,6 +32,7 @@ shared_examples 'a client' do
         client.send(:client).should_receive(:request).once.and_return(response)
         handler.should_receive(:call).and_call_original
         client.send(:request, :foo)
+        expect(client.send(:client).config.soap_header).to eq("ins0:SessionHeader"=>{"ins0:sessionId"=>"foo"})
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metaforce
 version: !ruby/object:Gem::Version
-  version: 1.0.6
+  version: 1.0.7
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-06 00:00:00.000000000 Z
+date: 2013-04-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: savon
@@ -283,12 +283,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4443080987431715085
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: -4443080987431715085
 requirements: []
 rubyforge_project: metaforce
 rubygems_version: 1.8.23
@@ -332,4 +338,3 @@ test_files:
 - spec/lib/services/client_spec.rb
 - spec/spec_helper.rb
 - spec/support/client.rb
-has_rdoc: