activeforce 1.10.0 → 1.10.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 69123682a6ac617075d98685ea650011159ccd3c
-  data.tar.gz: c9e794312166984a669adb8751e02d24f372b952
+  metadata.gz: 5f21729ed39bc14842ed2ca9dd4f76e30d0457a2
+  data.tar.gz: c1529d65db793a5db03f15ae73d153e3cbb3d0bc
 SHA512:
-  metadata.gz: a6ef3998eb4a67f84adf2c430b2e2e7885547360d21946b302021c8c966f9f76fc631079a71aecfefd08251966c87ac66e62ea2ca8facf20340a9085b408e708
-  data.tar.gz: 57b871a7e9294e09710b09c29f24e3ab4d1ff9e6a33e4825d23007f4fcba0f73defc8b12a0e5257ed3f175e8363ad7689441a5bb47a3fdd220768f009e6c58c2
+  metadata.gz: ed40a4f4066b5aa97ba1509d56941814a0e2c4482d3bdefef281630c96ef1268cae58923e4c69bd836646d9d084704539544b008a9cbea4f52f17b5960445e05
+  data.tar.gz: a8703e1454c00b61618276035877637690a4830744cd98b270c7a2fb511ac23e87baa0eb71d6ded9cb40abb8701815c2b12837393568d1642958a98dabd6280a

data/lib/activeforce/version.rb

@@ -1,3 +1,3 @@
 module Activeforce
-  VERSION = '1.10.0'.freeze
+  VERSION = '1.10.1'.freeze
 end

data/lib/salesforce/authentication.rb

@@ -14,7 +14,7 @@ module Salesforce
       Config.instance.session_id        result[:session_id]
 
       host = URI.parse(result[:server_url]).host
-      host_match = host.match(/(?<instance>[a-z0-9\-]+)\.(?<domain>(?:my\.)?salesforce\.com)/)
+      host_match = host.match(/(?<instance>[a-z0-9\-]+(?:\.[a-z]+\d+)?)\.(?<domain>(?:my\.)?salesforce\.com)/)
 
       Config.instance.server_instance   host_match[:instance]
       Config.instance.server_domain     host_match[:domain]

data/test/salesforce/authentication_test.rb

@@ -66,5 +66,22 @@ class Salesforce::AuthenticationTest < ActiveSupport::TestCase
     assert_equal "my.salesforce.com", Salesforce::Config.server_domain
     assert_equal "user_id", Salesforce::Config.user_id
   end
+
+  def test_generate_new_session_id__calls_connection_login__my_domain__sandbox
+    result = {
+      :session_id => "session_id",
+      :server_url => "https://awesome-2000--some-sandbox.na2001.my.salesforce.com/services/Soap/c/22.0/00DQ00000001LRX",
+      :user_id    => "user_id"
+    }
+
+    Salesforce.connection.expects(:login).returns(result)
+
+    assert_equal "session_id", Salesforce::Authentication.generate_new_session_id
+    assert_equal "https://awesome-2000--some-sandbox.na2001.my.salesforce.com/services/Soap/c/22.0/00DQ00000001LRX", Salesforce::Config.soap_endpoint_url
+    assert_equal "session_id", Salesforce::Config.session_id
+    assert_equal "awesome-2000--some-sandbox.na2001", Salesforce::Config.server_instance
+    assert_equal "my.salesforce.com", Salesforce::Config.server_domain
+    assert_equal "user_id", Salesforce::Config.user_id
+  end
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeforce
 version: !ruby/object:Gem::Version
-  version: 1.10.0
+  version: 1.10.1
 platform: ruby
 authors:
 - Tushar Ranka