Merge pull request #8 from leifg/custom_instance_name

Need support for custom salesforce instance names

Author: leifg

lib/executrix/helper.rb

@@ -32,5 +32,10 @@ def records_to_csv records
       end
       file_mock.string
     end
+
+    def fetch_instance_from_server_url server_url
+      before_sf = server_url[/^https?:\/\/(.+)\.salesforce\.com/, 1]
+      before_sf.gsub(/-api$/,'')
+    end
   end
 end

lib/executrix/http.rb

@@ -77,7 +77,7 @@ def process_soap_response res
       raise raw_result[:fault][:faultstring] if raw_result[:fault]
 
       login_result = raw_result[:login_response][:result]
-      instance = login_result[:server_url][/^https?:\/\/(\w+)(-api)?/, 1]
+      instance = Helper.fetch_instance_from_server_url(login_result[:server_url])
       login_result.merge(instance: instance)
     end
 
@@ -112,7 +112,6 @@ def self.login sandbox, username, password, api_version
           'Content-Type' => 'text/xml; charset=utf-8',
           'SOAPAction' => 'login'
         }
-        host = sandbox ? 'test.salesforce.com' : 'login.salesforce.com'
         Http::Request.new(
           :post,
           generic_host(sandbox ? 'test' : 'login'),

lib/executrix/version.rb

@@ -1,3 +1,3 @@
 module Executrix
-  VERSION = '1.1.1'
+  VERSION = '1.1.2'
 end

spec/lib/executrix/helper_spec.rb

@@ -61,4 +61,33 @@
       expect(described_class.records_to_csv(input)).to eq(expected_csv)
     end
   end
+
+  describe '.fetch_instance_from_server_url' do
+    let(:basic_api_server_url) {
+      'https://cs7-api.salesforce.com/services/Soap/u/28.0/00CS00000095Y5b'
+    }
+
+    let(:basic_server_url) {
+      'https://eu1.salesforce.com/services/Soap/u/28.0/00EU00000096Y8c'
+    }
+
+    let(:named_server_url) {
+      'https://supercustomname.my.salesforce.com/services/Soap/u/28.0/00EH0000001jNQu'
+    }
+
+    it 'should return correct instance for regular salesforce server url' do
+      expect(described_class.fetch_instance_from_server_url(basic_server_url))
+        .to eq('eu1')
+    end
+
+    it 'should return correct instance for api salesforce server url' do
+      expect(described_class.fetch_instance_from_server_url(basic_api_server_url))
+        .to eq('cs7')
+    end
+
+    it 'should return correct instance for named salesforce server url' do
+      expect(described_class.fetch_instance_from_server_url(named_server_url))
+        .to eq('supercustomname.my')
+    end
+  end
 end