executrix 1.1.1 → 1.1.2

data/lib/executrix/helper.rb

@@ -32,5 +32,10 @@ module Executrix
       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

data/lib/executrix/http.rb

@@ -77,7 +77,7 @@ module Executrix
       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,10 +112,9 @@ module Executrix
           'Content-Type' => 'text/xml; charset=utf-8',
           'SOAPAction' => 'login'
         }
-        host = sandbox ? 'test.salesforce.com' : 'login.salesforce.com'
         Http::Request.new(
           :post,
-          host,
+          generic_host(sandbox ? 'test' : 'login'),
           "/services/Soap/u/#{api_version}",
           body,
           headers)
@@ -137,7 +136,7 @@ module Executrix
           'X-SFDC-Session' => session_id}
         Http::Request.new(
           :post,
-          "#{instance}.salesforce.com",
+          generic_host(instance),
           "/services/async/#{api_version}/job",
           body,
           headers)
@@ -154,7 +153,7 @@ module Executrix
           'X-SFDC-Session' => session_id}
         Http::Request.new(
           :post,
-          "#{instance}.salesforce.com",
+          generic_host(instance),
           "/services/async/#{api_version}/job/#{job_id}",
           body,
           headers)
@@ -164,7 +163,7 @@ module Executrix
         headers = {'Content-Type' => 'text/csv; charset=UTF-8', 'X-SFDC-Session' => session_id}
         Http::Request.new(
           :post,
-          "#{instance}.salesforce.com",
+          generic_host(instance),
           "/services/async/#{api_version}/job/#{job_id}/batch",
           data,
           headers)
@@ -174,7 +173,7 @@ module Executrix
         headers = {'X-SFDC-Session' => session_id}
         Http::Request.new(
           :get,
-          "#{instance}.salesforce.com",
+          generic_host(instance),
           "/services/async/#{api_version}/job/#{job_id}/batch/#{batch_id}",
           nil,
           headers)
@@ -186,7 +185,7 @@ module Executrix
           'X-SFDC-Session' => session_id}
         Http::Request.new(
           :get,
-          "#{instance}.salesforce.com",
+          generic_host(instance),
           "/services/async/#{api_version}/job/#{job_id}/batch/#{batch_id}/result",
           nil,
           headers)
@@ -203,12 +202,17 @@ module Executrix
           'X-SFDC-Session' => session_id}
         Http::Request.new(
           :get,
-          "#{instance}.salesforce.com",
+          generic_host(instance),
           "/services/async/#{api_version}" \
             "/job/#{job_id}/batch/#{batch_id}/result/#{result_id}",
           nil,
           headers)
       end
+
+      private
+      def self.generic_host prefix
+        "#{prefix}.salesforce.com"
+      end
     end
   end
 end

data/lib/executrix/version.rb

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

data/spec/lib/executrix/helper_spec.rb

@@ -61,4 +61,33 @@ describe Executrix::Helper do
       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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: executrix
 version: !ruby/object:Gem::Version
-  version: 1.1.1
+  version: 1.1.2
   prerelease: 
 platform: ruby
 authors:
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-21 00:00:00.000000000 Z
+date: 2013-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -138,7 +138,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2530201660782709445
+      hash: 203849975840229404
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -147,7 +147,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2530201660782709445
+      hash: 203849975840229404
 requirements: []
 rubyforge_project: executrix
 rubygems_version: 1.8.23