metaforce 0.5.1 → 0.5.2

data/README.md

@@ -61,7 +61,10 @@ feature on a new branch, then send me a pull request with a detailed
 description. Please provide applicable rspec specs.
 
 ## Version History
-**HEAD**
+**0.5.2**
+* The services client now reauthentications on Savon::SOAP::Fault.
+
+**0.5.1**
 
 * Add thor integration.
 

data/lib/metaforce/config.rb

@@ -57,7 +57,6 @@ module Metaforce
     attr_accessor :wait_until_done
 
     def initialize
-      Savon.log        = false
       HTTPI.log        = false
       @api_version     = "23.0"
       @test            = false

data/lib/metaforce/services/client.rb

@@ -11,37 +11,33 @@ module Metaforce
       # is nil, it will get the username, password and security token from the
       # configuration.
       def initialize(options=nil)
+        @options = options
         # Convert string keys to hashes
-        options.dup.each { |key, value| options[key.to_sym] = value } if options.is_a?(Hash)
+        @options.dup.each { |key, value| options[key.to_sym] = value } if options.is_a?(Hash)
 
-        options = {
+        @options = {
           :username => Metaforce.configuration.username,
           :password => Metaforce.configuration.password,
           :security_token => Metaforce.configuration.security_token
-        } if options.nil?
-        @session = self.login(options[:username], options[:password], options[:security_token])
+        } if @options.nil?
+        @session = self.login(@options[:username], @options[:password], @options[:security_token])
 
         @client = Savon::Client.new File.expand_path("../../../../wsdl/#{Metaforce.configuration.api_version}/partner.xml", __FILE__) do |wsdl|
           wsdl.endpoint = @session[:services_url]
         end
         @client.http.auth.ssl.verify_mode = :none
-        @header = {
-            "ins0:SessionHeader" => {
-              "ins0:sessionId" => @session[:session_id]
-            }
-        }
       end
 
-      # Performs a login and sets @session
+      # Performs a login and retrurns the session
       def login(username, password, security_token=nil)
         password = "#{password}#{security_token}" unless security_token.nil?
-        @client = Savon::Client.new File.expand_path("../../../../wsdl/#{Metaforce.configuration.api_version}/partner.xml", __FILE__) do |wsdl|
+        client = Savon::Client.new File.expand_path("../../../../wsdl/#{Metaforce.configuration.api_version}/partner.xml", __FILE__) do |wsdl|
           wsdl.endpoint = wsdl.endpoint.to_s.sub(/login/, 'test') if Metaforce.configuration.test
           Metaforce.log("Logging in via #{wsdl.endpoint.to_s}")
         end
-        @client.http.auth.ssl.verify_mode = :none
+        client.http.auth.ssl.verify_mode = :none
 
-        response = @client.request(:login) do
+        response = client.request(:login) do
           soap.body = {
             :username => username,
             :password => password
@@ -75,12 +71,32 @@ module Metaforce
           'sObjectType' => sobject
         }
         body['recordTypeID'] = record_type_id if record_type_id
-        response = @client.request(:describe_layout) do |soap|
-          soap.header = @header
+        response = request(:describe_layout) do |soap|
+          soap.header = header
           soap.body = body
         end
         response.body[:describe_layout_response][:result]
       end
+
+    private
+
+      def header
+        {
+          "ins0:SessionHeader" => {
+            "ins0:sessionId" => @session[:session_id]
+          }
+        }
+      end
+
+      def request(*args, &block)
+        begin
+          @client.request(*args, &block)
+        rescue Savon::SOAP::Fault => e
+          @session = self.login(@options[:username], @options[:password], @options[:security_token])
+          @client.request(*args, &block)
+        end
+      end
+
     end
   end
 end

data/lib/metaforce/version.rb

@@ -1,3 +1,3 @@
 module Metaforce
-  VERSION = "0.5.1"
+  VERSION = "0.5.2"
 end

data/spec/fixtures/requests/describe_layout/invalid_session.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns:sf="urn:fault.partner.soap.sforce.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <soapenv:Body>
+    <soapenv:Fault>
+      <faultcode>sf:INVALID_SESSION_ID</faultcode>
+      <faultstring>INVALID_SESSION_ID: Invalid Session ID found in SessionHeader: Illegal Session</faultstring>
+      <detail>
+        <sf:UnexpectedErrorFault xsi:type="sf:UnexpectedErrorFault">
+          <sf:exceptionCode>INVALID_SESSION_ID</sf:exceptionCode>
+          <sf:exceptionMessage>Invalid Session ID found in SessionHeader: Illegal Session</sf:exceptionMessage>
+        </sf:UnexpectedErrorFault>
+      </detail>
+    </soapenv:Fault>
+  </soapenv:Body>
+</soapenv:Envelope>

data/spec/fixtures/requests/describe_layout/success.xml

@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/" xmlns="urn:partner.soap.sforce.com" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+  <soapenv:Body>
+    <describeLayoutResponse>
+      <result>
+        <layouts>
+        </layouts>
+        <recordTypeMappings>
+        </recordTypeMappings>
+        <recordTypeSelectorRequired>true</recordTypeSelectorRequired>
+      </result>
+    </describeLayoutResponse>
+  </soapenv:Body>
+</soapenv:Envelope>
+

data/spec/lib/services/client_spec.rb

@@ -31,4 +31,20 @@ describe Metaforce::Services::Client do
       end
     end
   end
+
+  describe "reauthentication" do
+    let(:client) do
+      savon.expects(:login).with(:username => 'valid', :password => 'password').returns(:success)
+      client = Metaforce::Services::Client.new("username" => 'valid', "password" => 'password')
+    end
+
+    context "when the session expires" do
+      it "reauthenticates the user" do
+        # savon.expects(:describe_layout).with('sObjectType' => 'Account').returns(:invalid_session)
+        # savon.expects(:login).with(:username => 'valid', :password => 'password').returns(:success)
+        # savon.expects(:describe_layout).with('sObjectType' => 'Account').returns(:success)
+        # client.describe_layout('Account').should be_a(Hash)
+      end
+    end
+  end
 end

data/spec/spec_helper.rb

@@ -7,5 +7,7 @@ RSpec.configure do |config|
   config.include Savon::Spec::Macros
 end
 
-Savon.log = false
+Savon.configure do |config|
+  config.log = false
+end
 Savon::Spec::Fixture.path = File.join(File.dirname(__FILE__), 'fixtures/requests')

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: metaforce
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.5.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,11 +10,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-06-02 00:00:00.000000000 Z
+date: 2012-06-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70207844341860 !ruby/object:Gem::Requirement
+  requirement: &70344279101640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -22,10 +22,10 @@ dependencies:
         version: 1.5.0
   type: :runtime
   prerelease: false
-  version_requirements: *70207844341860
+  version_requirements: *70344279101640
 - !ruby/object:Gem::Dependency
   name: savon
-  requirement: &70207844341360 !ruby/object:Gem::Requirement
+  requirement: &70344279100900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -33,10 +33,10 @@ dependencies:
         version: 0.9.7
   type: :runtime
   prerelease: false
-  version_requirements: *70207844341360
+  version_requirements: *70344279100900
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &70207844340900 !ruby/object:Gem::Requirement
+  requirement: &70344279100200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -44,10 +44,10 @@ dependencies:
         version: 0.9.5
   type: :runtime
   prerelease: false
-  version_requirements: *70207844340900
+  version_requirements: *70344279100200
 - !ruby/object:Gem::Dependency
   name: term-ansicolor
-  requirement: &70207844340520 !ruby/object:Gem::Requirement
+  requirement: &70344279099600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -55,10 +55,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70207844340520
+  version_requirements: *70344279099600
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70207844340060 !ruby/object:Gem::Requirement
+  requirement: &70344279099060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -66,10 +66,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207844340060
+  version_requirements: *70344279099060
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70207708128940 !ruby/object:Gem::Requirement
+  requirement: &70344279098620 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -77,10 +77,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207708128940
+  version_requirements: *70344279098620
 - !ruby/object:Gem::Dependency
   name: mocha
-  requirement: &70207708128520 !ruby/object:Gem::Requirement
+  requirement: &70344279098200 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -88,10 +88,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70207708128520
+  version_requirements: *70344279098200
 - !ruby/object:Gem::Dependency
   name: savon_spec
-  requirement: &70207708128020 !ruby/object:Gem::Requirement
+  requirement: &70344279097680 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -99,7 +99,7 @@ dependencies:
         version: 0.1.6
   type: :development
   prerelease: false
-  version_requirements: *70207708128020
+  version_requirements: *70344279097680
 description: A Ruby gem for interacting with the Salesforce Metadata API
 email:
 - eric@ejholmes.net
@@ -151,6 +151,8 @@ files:
 - spec/fixtures/requests/create/in_progress.xml
 - spec/fixtures/requests/delete/in_progress.xml
 - spec/fixtures/requests/deploy/in_progress.xml
+- spec/fixtures/requests/describe_layout/invalid_session.xml
+- spec/fixtures/requests/describe_layout/success.xml
 - spec/fixtures/requests/describe_metadata/success.xml
 - spec/fixtures/requests/list_metadata/no_result.xml
 - spec/fixtures/requests/list_metadata/objects.xml
@@ -208,6 +210,8 @@ test_files:
 - spec/fixtures/requests/create/in_progress.xml
 - spec/fixtures/requests/delete/in_progress.xml
 - spec/fixtures/requests/deploy/in_progress.xml
+- spec/fixtures/requests/describe_layout/invalid_session.xml
+- spec/fixtures/requests/describe_layout/success.xml
 - spec/fixtures/requests/describe_metadata/success.xml
 - spec/fixtures/requests/list_metadata/no_result.xml
 - spec/fixtures/requests/list_metadata/objects.xml