Merge pull request #7 from leifg/generic_host

create host string in one method
propertybase · Jul 4, 2013 · 33f966f · 33f966f
2 parents 6af0549 + 4a17735
commit 33f966f
Showing 1 changed file with 12 additions and 7 deletions.
diff --git a/lib/executrix/http.rb b/lib/executrix/http.rb
@@ -115,7 +115,7 @@ def self.login sandbox, username, password, api_version
         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 +137,7 @@ def self.create_job instance, session_id, operation, sobject, api_version, exter
           'X-SFDC-Session' => session_id}
         Http::Request.new(
           :post,
-          "#{instance}.salesforce.com",
+          generic_host(instance),
           "/services/async/#{api_version}/job",
           body,
           headers)
@@ -154,7 +154,7 @@ def self.close_job instance, session_id, job_id, api_version
           '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 +164,7 @@ def self.add_batch instance, session_id, job_id, data, api_version
         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 +174,7 @@ def self.query_batch instance, session_id, job_id, batch_id, api_version
         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 +186,7 @@ def self.query_batch_result_id instance, session_id, job_id, batch_id, api_versi
           '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 +203,17 @@ def self.query_batch_result_data(instance,
           '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