lib/salesforce/config.rb in activeforce-1.9.1 vs lib/salesforce/config.rb in activeforce-1.10.0

@@ -4,15 +4,15 @@
     DEFAULT_API_VERSION = "22.0"
 
     include Blockenspiel::DSL
     include Blockenspiel::DSLSetupMethods
 
-    dsl_attr_accessor :session_id, :server_instance, :user_id, :soap_endpoint_url
+    dsl_attr_accessor :session_id, :server_instance, :server_domain, :user_id, :soap_endpoint_url
 
     [
       :username, :password, :api_version, :use_sandbox?, :use_full_length_ids?,
-      :login_url, :session_id, :server_instance, :soap_endpoint_url, :soap_enterprise_namespace,
+      :login_url, :session_id, :server_instance, :server_domain, :soap_endpoint_url, :soap_enterprise_namespace,
       :user_id, :server_url, :server_host, :async_url, :configured?, :on_login_failure ].each do |method_name|
       eval <<-RUBY
       def self.#{method_name}
         instance.#{method_name}
       end
@@ -49,11 +49,11 @@
 
     def api_version(val = nil)
       if val
         @api_version = val.to_f.to_s
       else
-        @api_version || DEFAULT_API_VERSION
+        @api_version ||= DEFAULT_API_VERSION
       end
     end
 
     def use_sandbox?
       @use_sandbox || false
@@ -86,18 +86,18 @@
     def soap_enterprise_namespace
       'urn:enterprise.soap.sforce.com'
     end
 
     def server_url
-      "https://#{server_instance}.salesforce.com/services/data/v#{api_version}"
+      "https://#{server_instance}.#{server_domain}/services/data/v#{api_version}"
     end
 
     def server_host
-      "https://#{server_instance}.salesforce.com"
+      "https://#{server_instance}.#{server_domain}"
     end
 
     def async_url
-      "https://#{server_instance}.salesforce.com/services/async/#{api_version}"
+      "https://#{server_instance}.#{server_domain}/services/async/#{api_version}"
     end
 
     def login_url
       login_url_base + api_version
     end