activeforce 1.9.1 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6ea91427358fe2a99e7e387cd93f2fb29e2d46f4
-  data.tar.gz: 5896f0d50d1fe3c34db359eaf163202b90d254c0
+  metadata.gz: 69123682a6ac617075d98685ea650011159ccd3c
+  data.tar.gz: c9e794312166984a669adb8751e02d24f372b952
 SHA512:
-  metadata.gz: 671e1b7c312c8b3cacde63befeb14456f845de87d0da6537272f727c2118adafa6e5d7592dc6688056a5751875b7949ffbe57a3ba84cf6e49c97aae74114084e
-  data.tar.gz: e7421931c6ae2de95efa9a5be5686ffab6e3e4bb3ecf4618c11a8d0c64e277bbd3ac6df6d88fc09cf7b1b1e6192fea55db13bdfbcf920f8401f6d165349859a9
+  metadata.gz: a6ef3998eb4a67f84adf2c430b2e2e7885547360d21946b302021c8c966f9f76fc631079a71aecfefd08251966c87ac66e62ea2ca8facf20340a9085b408e708
+  data.tar.gz: 57b871a7e9294e09710b09c29f24e3ab4d1ff9e6a33e4825d23007f4fcba0f73defc8b12a0e5257ed3f175e8363ad7689441a5bb47a3fdd220768f009e6c58c2

data/.gitignore

@@ -16,3 +16,5 @@ tmp
 .yardoc
 _yardoc
 doc/
+
+Gemfile.lock

data/.travis.yml

@@ -0,0 +1,17 @@
+language: ruby
+rvm:
+  - 2.1.4
+  - 2.0.0
+  - 1.9.3
+  - ruby-head
+
+sudo: false
+
+matrix:
+  allow_failures:
+    - rvm: ruby-head
+
+gemfile:
+  - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile
+  - gemfiles/4.2.gemfile

data/Appraisals

@@ -0,0 +1,11 @@
+appraise "4.0" do
+  gem "rails", "~> 4.0.0"
+end
+
+appraise "4.1" do
+  gem "rails", "~> 4.1.0"
+end
+
+appraise "4.2" do
+  gem "rails", "~> 4.2"
+end

data/Gemfile

@@ -1,7 +1,6 @@
-source "http://rubygems.org"
+source "https://rubygems.org"
 
 gemspec
 
+gem 'appraisal'
 gem 'mocha', '0.14.0', :require => false
-gem "yard", "~> 0.6.0"
-gem "bundler", "~> 1.0"

data/README.md

@@ -1,7 +1,12 @@
 # ActiveForce
 
+[![Gem Version](https://badge.fury.io/rb/activeforce.svg)](http://badge.fury.io/rb/activeforce)
+[![Build Status](https://travis-ci.org/appfolio/activeforce.svg?branch=master)](https://travis-ci.org/appfolio/activeforce)
+
 Activeforce provides a clean ActiveRecord-like interface to the SalesForce.com REST API.
 
+Activeforce does not provide any integration with any Appfolio products.
+
 * Detects the schema of the SalesForce Objects on the fly, so that you can interact with the familiar ActiveRecord style attribute accessor methods.
 * Provides full access to all methods provided to the SQL-like Salesforce Object Query Language (SOQL).
 * Integrates with Salesforce.com REST-based BULK API.

data/Rakefile

@@ -11,6 +11,7 @@ rescue Bundler::BundlerError => e
 end
 
 require 'rake'
+require 'appraisal'
 
 require 'bundler/gem_tasks'
 
@@ -22,6 +23,3 @@ Rake::TestTask.new(:test) do |test|
 end
 
 task :default => :test
-
-require 'yard'
-YARD::Rake::YardocTask.new

data/activeforce.gemspec

@@ -21,10 +21,10 @@ Gem::Specification.new do |s|
   s.rubygems_version = "2.0.3"
   s.summary          = "A Simple gem to interact with the Salesforce REST API"
 
-  s.add_dependency(%q<rails>, [">= 3.0"])
+  s.add_dependency(%q<rails>, [">= 4.0", "< 5.0"])
   s.add_dependency(%q<savon>, ["~> 1.0"])
   s.add_dependency(%q<blockenspiel>, [">= 0"])
-  s.add_dependency(%q<rest-client>, [">= 0"])
+  s.add_dependency(%q<rest-client>, [">= 0", '< 2.0'])
   s.add_dependency(%q<fastercsv>, [">= 0"])
 end
 

data/gemfiles/4.0.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "mocha", "0.14.0", :require => false
+gem "rails", "~> 4.0.0"
+
+gemspec :path => "../"

data/gemfiles/4.1.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "mocha", "0.14.0", :require => false
+gem "rails", "~> 4.1.0"
+
+gemspec :path => "../"

data/gemfiles/4.2.gemfile

@@ -0,0 +1,9 @@
+# This file was generated by Appraisal
+
+source "https://rubygems.org"
+
+gem "appraisal"
+gem "mocha", "0.14.0", :require => false
+gem "rails", "~> 4.2"
+
+gemspec :path => "../"

data/lib/activeforce/version.rb

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

data/lib/salesforce/authentication.rb

@@ -12,7 +12,12 @@ module Salesforce
       result = Connection.login    
       Config.instance.soap_endpoint_url result[:server_url]
       Config.instance.session_id        result[:session_id]
-      Config.instance.server_instance   URI.parse(result[:server_url]).host[/(na|cs)\d+/]
+
+      host = URI.parse(result[:server_url]).host
+      host_match = host.match(/(?<instance>[a-z0-9\-]+)\.(?<domain>(?:my\.)?salesforce\.com)/)
+
+      Config.instance.server_instance   host_match[:instance]
+      Config.instance.server_domain     host_match[:domain]
       Config.instance.user_id           result[:user_id]
       Config.session_id
     end

data/lib/salesforce/bulk/batch.rb

@@ -57,7 +57,7 @@ module Salesforce
       end
       
       def temporary_csv_file
-        if Object.const_defined?(:Rails)
+        if Object.const_defined?(:Rails) && Rails.root.present?
           Rails.root.join('tmp', 'files', "#{ Time.now.to_i}#{rand(10000)}.csv")
         else
           File.join("/tmp/#{ Time.now.to_i}#{rand(10000)}.csv")

data/lib/salesforce/config.rb

@@ -6,11 +6,11 @@ module Salesforce
     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}
@@ -51,7 +51,7 @@ module Salesforce
       if val
         @api_version = val.to_f.to_s
       else
-        @api_version || DEFAULT_API_VERSION
+        @api_version ||= DEFAULT_API_VERSION
       end
     end
 
@@ -88,15 +88,15 @@ module Salesforce
     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

data/test/salesforce/authentication_test.rb

@@ -46,7 +46,25 @@ class Salesforce::AuthenticationTest < ActiveSupport::TestCase
     assert_equal "https://cs99.salesforce.com/services/Soap/c/22.0/00DQ00000001LRX", Salesforce::Config.soap_endpoint_url
     assert_equal "session_id", Salesforce::Config.session_id
     assert_equal "cs99", Salesforce::Config.server_instance
+    assert_equal "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
+    result = {
+      :session_id => "session_id",
+      :server_url => "https://awesome-2000.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.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", Salesforce::Config.server_instance
+    assert_equal "my.salesforce.com", Salesforce::Config.server_domain
     assert_equal "user_id", Salesforce::Config.user_id
   end
   
-end
+end

data/test/salesforce/bulk/batch_test.rb

@@ -78,7 +78,7 @@ class Salesforce::Bulk::BatchTest < ActiveSupport::TestCase
   end
   
   def clear_file
-    FileUtils.rm_rf(@batch.filename) if @batch.filename.present?
+    FileUtils.rm_rf(@batch.filename) if @batch.present? && @batch.filename.present?
   end
 end
   

data/test/salesforce/config_test.rb

@@ -39,17 +39,17 @@ class Salesforce::ConfigTest < ActiveSupport::TestCase
   def test_config__on_login_failure
     assert_nil Salesforce::Config.on_login_failure
     
-    @my_stuff = 0
+    my_stuff = 0
     
     Salesforce.configure do
-      on_login_failure { @my_stuff = @my_stuff + 1 }
+      on_login_failure { my_stuff = my_stuff + 1 }
     end
     
     Salesforce::Config.on_login_failure
-    assert_equal 1, @my_stuff
+    assert_equal 1, my_stuff
     Salesforce::Config.on_login_failure
     
-    assert_equal 2, @my_stuff
+    assert_equal 2, my_stuff
   end
   
   def test_config__specific_api_version
@@ -112,6 +112,9 @@ class Salesforce::ConfigTest < ActiveSupport::TestCase
     
     config.server_instance "na99"
     assert_equal "na99", Salesforce::Config.server_instance
+
+    config.server_domain "something.salesforce.com"
+    assert_equal "something.salesforce.com", Salesforce::Config.server_domain
     
     config.user_id "user_id"
     assert_equal "user_id", Salesforce::Config.user_id
@@ -121,9 +124,10 @@ class Salesforce::ConfigTest < ActiveSupport::TestCase
   def test_server_url__and_server_host
     config = Salesforce::Config.instance
     config.server_instance "sa2"
+    config.server_domain "something.salesforce.com"
     config.api_version 99
-    assert_equal "https://sa2.salesforce.com/services/data/v99.0", Salesforce::Config.server_url
-    assert_equal "https://sa2.salesforce.com", Salesforce::Config.server_host
+    assert_equal "https://sa2.something.salesforce.com/services/data/v99.0", Salesforce::Config.server_url
+    assert_equal "https://sa2.something.salesforce.com", Salesforce::Config.server_host
   end
   
   def test_configured
@@ -160,4 +164,4 @@ class Salesforce::ConfigTest < ActiveSupport::TestCase
     Salesforce::Config.instance_variable_set(:@instance, nil)
   end
       
-end
+end

data/test/salesforce/connection/async_test.rb

@@ -1,6 +1,11 @@
 require 'test_helper'
 
 class Salesforce.connection::AsyncTest < ActiveSupport::TestCase
+  setup do
+    Salesforce::Config.instance.server_instance 'awesome-2000'
+    Salesforce::Config.instance.server_domain 'something.salesforce.com'
+  end
+
   def async_post(path, body, options = {})
     as_logged_in_user do
       convert_body RestClient.post(async_api_url(path), body, async_headers(options)), options
@@ -12,7 +17,7 @@ class Salesforce.connection::AsyncTest < ActiveSupport::TestCase
   def test_async_post__json
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     http_body = stub(:body => { :result => 'foo' }.to_json)
-    RestClient.expects(:post).with('https://.salesforce.com/services/async/22.0/path', :body, {'X-SFDC-Session' => 'session_id', :content_type => 'application/json'}).returns(http_body)
+    RestClient.expects(:post).with('https://awesome-2000.something.salesforce.com/services/async/22.0/path', :body, {'X-SFDC-Session' => 'session_id', :content_type => 'application/json'}).returns(http_body)
     assert_equal({'result' => 'foo'}, Salesforce.connection.async_post('path', :body, :format => :json))
   end
   
@@ -26,7 +31,7 @@ class Salesforce.connection::AsyncTest < ActiveSupport::TestCase
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/async/22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/async/22.0/path", e.message
     end
   end
   
@@ -34,14 +39,14 @@ class Salesforce.connection::AsyncTest < ActiveSupport::TestCase
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     error = RestClient::BadRequest.new
     error.stubs(:http_body).returns("<?xml version=\"1.0\" encoding=\"UTF-8\"?><Errors><Error><errorCode>MALFORMED_QUERY</errorCode><message>someproblem</message></Error></Errors>" )
-    RestClient.expects(:post).with('https://.salesforce.com/services/async/22.0/path', :body, {'X-SFDC-Session' => 'session_id', :content_type => 'application/xml'}).raises(error)
+    RestClient.expects(:post).with('https://awesome-2000.something.salesforce.com/services/async/22.0/path', :body, {'X-SFDC-Session' => 'session_id', :content_type => 'application/xml'}).raises(error)
     
     begin
       Salesforce.connection.async_post('path', :body, :format => :xml)
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/async/22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/async/22.0/path", e.message
     end
   end
   
@@ -49,13 +54,13 @@ class Salesforce.connection::AsyncTest < ActiveSupport::TestCase
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     error = RestClient::ResourceNotFound.new
     error.stubs(:http_body).returns("[{\"message\":\"someproblem\",\"errorCode\":\"MALFORMED_QUERY\"}]")
-    RestClient.expects(:post).with('https://.salesforce.com/services/async/22.0/path', :body, {'X-SFDC-Session' => 'session_id', :content_type => 'application/json'}).raises(error)
+    RestClient.expects(:post).with('https://awesome-2000.something.salesforce.com/services/async/22.0/path', :body, {'X-SFDC-Session' => 'session_id', :content_type => 'application/json'}).raises(error)
     begin
       Salesforce.connection.async_post('path', :body, :format => :json)
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/async/22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/async/22.0/path", e.message
     end
   end
   
@@ -63,28 +68,28 @@ class Salesforce.connection::AsyncTest < ActiveSupport::TestCase
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     error = RestClient::ResourceNotFound.new
     error.stubs(:http_body).returns("<?xml version=\"1.0\" encoding=\"UTF-8\"?><Errors><Error><errorCode>MALFORMED_QUERY</errorCode><message>someproblem</message></Error></Errors>" )
-    RestClient.expects(:post).with('https://.salesforce.com/services/async/22.0/path', :body, {'X-SFDC-Session' => 'session_id', :content_type => 'application/xml'}).raises(error)
+    RestClient.expects(:post).with('https://awesome-2000.something.salesforce.com/services/async/22.0/path', :body, {'X-SFDC-Session' => 'session_id', :content_type => 'application/xml'}).raises(error)
     
     begin
       Salesforce.connection.async_post('path', :body, :format => :xml)
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/async/22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/async/22.0/path", e.message
     end
   end
   
   def test_async_post__xml
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     http_body = stub(:body => { :result => 'foo' }.to_xml)
-    RestClient.expects(:post).with('https://.salesforce.com/services/async/22.0/path', :body, {'X-SFDC-Session' => 'session_id', :content_type => 'application/xml'}).returns(http_body)
+    RestClient.expects(:post).with('https://awesome-2000.something.salesforce.com/services/async/22.0/path', :body, {'X-SFDC-Session' => 'session_id', :content_type => 'application/xml'}).returns(http_body)
     assert_equal({'result' => 'foo'}, Salesforce.connection.async_post('path', :body, :format => :xml))
   end
   
   def test_async_get__json
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     http_body = stub(:body => { :result => 'foo' }.to_json)
-    RestClient.expects(:get).with('https://.salesforce.com/services/async/22.0/path', {'X-SFDC-Session' => 'session_id', :content_type => 'application/json'}).returns(http_body)
+    RestClient.expects(:get).with('https://awesome-2000.something.salesforce.com/services/async/22.0/path', {'X-SFDC-Session' => 'session_id', :content_type => 'application/json'}).returns(http_body)
     assert_equal({'result' => 'foo'}, Salesforce.connection.async_get('path', :format => :json))
   end
   
@@ -92,14 +97,14 @@ class Salesforce.connection::AsyncTest < ActiveSupport::TestCase
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     error = RestClient::BadRequest.new
     error.stubs(:http_body).returns("[{\"message\":\"someproblem\",\"errorCode\":\"MALFORMED_QUERY\"}]")
-    RestClient.expects(:get).with('https://.salesforce.com/services/async/22.0/path', {'X-SFDC-Session' => 'session_id', :content_type => 'application/json'}).raises(error)
+    RestClient.expects(:get).with('https://awesome-2000.something.salesforce.com/services/async/22.0/path', {'X-SFDC-Session' => 'session_id', :content_type => 'application/json'}).raises(error)
     
     begin
       Salesforce.connection.async_get('path', :format => :json)
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/async/22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/async/22.0/path", e.message
     end
   end
   
@@ -107,26 +112,26 @@ class Salesforce.connection::AsyncTest < ActiveSupport::TestCase
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     error = RestClient::BadRequest.new
     error.stubs(:http_body).returns("<?xml version=\"1.0\" encoding=\"UTF-8\"?><Errors><Error><errorCode>MALFORMED_QUERY</errorCode><message>someproblem</message></Error></Errors>" )
-    RestClient.expects(:get).with('https://.salesforce.com/services/async/22.0/path', {'X-SFDC-Session' => 'session_id', :content_type => 'application/xml'}).raises(error)
+    RestClient.expects(:get).with('https://awesome-2000.something.salesforce.com/services/async/22.0/path', {'X-SFDC-Session' => 'session_id', :content_type => 'application/xml'}).raises(error)
     
     begin
       Salesforce.connection.async_get('path', :format => :xml)
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/async/22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/async/22.0/path", e.message
     end
   end
   
   def test_async_get__xml
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     http_body = stub(:body => { :result => 'foo' }.to_xml)
-    RestClient.expects(:get).with('https://.salesforce.com/services/async/22.0/path', {'X-SFDC-Session' => 'session_id', :content_type => 'application/xml'}).returns(http_body)
+    RestClient.expects(:get).with('https://awesome-2000.something.salesforce.com/services/async/22.0/path', {'X-SFDC-Session' => 'session_id', :content_type => 'application/xml'}).returns(http_body)
     assert_equal({'result' => 'foo'}, Salesforce.connection.async_get('path', :format => :xml))
   end
   
   def test_async_api_url
-    assert_equal 'https://.salesforce.com/services/async/22.0/path', Salesforce.connection.async_api_url('path')
+    assert_equal 'https://awesome-2000.something.salesforce.com/services/async/22.0/path', Salesforce.connection.async_api_url('path')
   end
   
   

data/test/salesforce/connection/http_methods_test.rb

@@ -1,6 +1,11 @@
 require 'test_helper'
 
 class Salesforce.connection::HttpMethodsTest < ActiveSupport::TestCase
+  setup do
+    Salesforce::Config.instance.server_instance 'awesome-2000'
+    Salesforce::Config.instance.server_domain 'something.salesforce.com'
+  end
+
   def test_content_type_headers
     assert_equal({ :content_type => 'application/json'}, Salesforce.connection.content_type_headers(:format => :json))
     assert_equal({ :content_type => 'application/json'}, Salesforce.connection.content_type_headers(:format => "json"))
@@ -13,7 +18,7 @@ class Salesforce.connection::HttpMethodsTest < ActiveSupport::TestCase
   def test_get__json
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     http_body = stub(:body => { :result => 'foo' }.to_json)
-    RestClient.expects(:get).with('https://.salesforce.com/services/data/v22.0/path', {'Authorization' => 'OAuth session_id', :content_type => 'application/json'}).returns(http_body)
+    RestClient.expects(:get).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', {'Authorization' => 'OAuth session_id', :content_type => 'application/json'}).returns(http_body)
     assert_equal({'result' => 'foo'}, Salesforce.connection.get('path', :format => :json))
   end
   
@@ -21,14 +26,14 @@ class Salesforce.connection::HttpMethodsTest < ActiveSupport::TestCase
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     error = RestClient::BadRequest.new
     error.stubs(:http_body).returns("[{\"message\":\"someproblem\",\"errorCode\":\"MALFORMED_QUERY\"}]")
-    RestClient.expects(:get).with('https://.salesforce.com/services/data/v22.0/path', {'Authorization' => 'OAuth session_id', :content_type => 'application/json'}).raises(error)
+    RestClient.expects(:get).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', {'Authorization' => 'OAuth session_id', :content_type => 'application/json'}).raises(error)
     
     begin
       Salesforce.connection.get('path', :format => :json)
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/data/v22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/data/v22.0/path", e.message
     end
   end
   
@@ -36,28 +41,28 @@ class Salesforce.connection::HttpMethodsTest < ActiveSupport::TestCase
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     error = RestClient::BadRequest.new
     error.stubs(:http_body).returns("<?xml version=\"1.0\" encoding=\"UTF-8\"?><Errors><Error><errorCode>MALFORMED_QUERY</errorCode><message>someproblem</message></Error></Errors>" )
-    RestClient.expects(:get).with('https://.salesforce.com/services/data/v22.0/path', {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).raises(error)
+    RestClient.expects(:get).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).raises(error)
     
     begin
       Salesforce.connection.get('path', :format => :xml)
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/data/v22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/data/v22.0/path", e.message
     end
   end
   
   def test_get__xml
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     http_body = stub(:body => { :result => 'foo' }.to_xml)
-    RestClient.expects(:get).with('https://.salesforce.com/services/data/v22.0/path', {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).returns(http_body)
+    RestClient.expects(:get).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).returns(http_body)
     assert_equal({'result' => 'foo'}, Salesforce.connection.get('path', :format => :xml))
   end
   
   def test_patch__json
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     http_body = stub(:code => 204, :body => '')
-    RestClient.expects(:patch).with('https://.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/json'}).returns(http_body)
+    RestClient.expects(:patch).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/json'}).returns(http_body)
     assert Salesforce.connection.patch('path', :body, :format => :json)
   end
   
@@ -65,13 +70,13 @@ class Salesforce.connection::HttpMethodsTest < ActiveSupport::TestCase
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     error = RestClient::BadRequest.new
     error.stubs(:http_body).returns("[{\"message\":\"someproblem\",\"errorCode\":\"MALFORMED_QUERY\"}]")
-    RestClient.expects(:patch).with('https://.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/json'}).raises(error)
+    RestClient.expects(:patch).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/json'}).raises(error)
     begin
       Salesforce.connection.patch('path', :body, :format => :json)
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/data/v22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/data/v22.0/path", e.message
     end
   end
   
@@ -79,14 +84,14 @@ class Salesforce.connection::HttpMethodsTest < ActiveSupport::TestCase
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     error = RestClient::BadRequest.new
     error.stubs(:http_body).returns("<?xml version=\"1.0\" encoding=\"UTF-8\"?><Errors><Error><errorCode>MALFORMED_QUERY</errorCode><message>someproblem</message></Error></Errors>" )
-    RestClient.expects(:patch).with('https://.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).raises(error)
+    RestClient.expects(:patch).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).raises(error)
     
     begin
       Salesforce.connection.patch('path', :body, :format => :xml)
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/data/v22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/data/v22.0/path", e.message
     end
   end
   
@@ -94,13 +99,13 @@ class Salesforce.connection::HttpMethodsTest < ActiveSupport::TestCase
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     error = RestClient::ResourceNotFound.new
     error.stubs(:http_body).returns("[{\"message\":\"someproblem\",\"errorCode\":\"MALFORMED_QUERY\"}]")
-    RestClient.expects(:patch).with('https://.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/json'}).raises(error)
+    RestClient.expects(:patch).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/json'}).raises(error)
     begin
       Salesforce.connection.patch('path', :body, :format => :json)
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/data/v22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/data/v22.0/path", e.message
     end
   end
   
@@ -108,21 +113,21 @@ class Salesforce.connection::HttpMethodsTest < ActiveSupport::TestCase
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     error = RestClient::ResourceNotFound.new
     error.stubs(:http_body).returns("<?xml version=\"1.0\" encoding=\"UTF-8\"?><Errors><Error><errorCode>MALFORMED_QUERY</errorCode><message>someproblem</message></Error></Errors>" )
-    RestClient.expects(:patch).with('https://.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).raises(error)
+    RestClient.expects(:patch).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).raises(error)
     
     begin
       Salesforce.connection.patch('path', :body, :format => :xml)
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/data/v22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/data/v22.0/path", e.message
     end
   end
   
   def test_patch__xml
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     http_body = stub(:code => 204, :body => '')
-    RestClient.expects(:patch).with('https://.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).returns(http_body)
+    RestClient.expects(:patch).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).returns(http_body)
     assert Salesforce.connection.patch('path', :body, :format => :xml)
   end
   
@@ -130,7 +135,7 @@ class Salesforce.connection::HttpMethodsTest < ActiveSupport::TestCase
   def test_post__json
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     http_body = stub(:body => { :result => 'foo' }.to_json)
-    RestClient.expects(:post).with('https://.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/json'}).returns(http_body)
+    RestClient.expects(:post).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/json'}).returns(http_body)
     assert_equal({'result' => 'foo'}, Salesforce.connection.post('path', :body, :format => :json))
   end
   
@@ -138,13 +143,13 @@ class Salesforce.connection::HttpMethodsTest < ActiveSupport::TestCase
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     error = RestClient::BadRequest.new
     error.stubs(:http_body).returns("[{\"message\":\"someproblem\",\"errorCode\":\"MALFORMED_QUERY\"}]")
-    RestClient.expects(:post).with('https://.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/json'}).raises(error)
+    RestClient.expects(:post).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/json'}).raises(error)
     begin
       Salesforce.connection.post('path', :body, :format => :json)
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/data/v22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/data/v22.0/path", e.message
     end
   end
   
@@ -152,14 +157,14 @@ class Salesforce.connection::HttpMethodsTest < ActiveSupport::TestCase
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     error = RestClient::BadRequest.new
     error.stubs(:http_body).returns("<?xml version=\"1.0\" encoding=\"UTF-8\"?><Errors><Error><errorCode>MALFORMED_QUERY</errorCode><message>someproblem</message></Error></Errors>" )
-    RestClient.expects(:post).with('https://.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).raises(error)
+    RestClient.expects(:post).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).raises(error)
     
     begin
       Salesforce.connection.post('path', :body, :format => :xml)
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/data/v22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/data/v22.0/path", e.message
     end
   end
   
@@ -167,13 +172,13 @@ class Salesforce.connection::HttpMethodsTest < ActiveSupport::TestCase
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     error = RestClient::ResourceNotFound.new
     error.stubs(:http_body).returns("[{\"message\":\"someproblem\",\"errorCode\":\"MALFORMED_QUERY\"}]")
-    RestClient.expects(:post).with('https://.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/json'}).raises(error)
+    RestClient.expects(:post).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/json'}).raises(error)
     begin
       Salesforce.connection.post('path', :body, :format => :json)
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/data/v22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/data/v22.0/path", e.message
     end
   end
   
@@ -181,21 +186,21 @@ class Salesforce.connection::HttpMethodsTest < ActiveSupport::TestCase
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     error = RestClient::ResourceNotFound.new
     error.stubs(:http_body).returns("<?xml version=\"1.0\" encoding=\"UTF-8\"?><Errors><Error><errorCode>MALFORMED_QUERY</errorCode><message>someproblem</message></Error></Errors>" )
-    RestClient.expects(:post).with('https://.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).raises(error)
+    RestClient.expects(:post).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).raises(error)
     
     begin
       Salesforce.connection.post('path', :body, :format => :xml)
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/data/v22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/data/v22.0/path", e.message
     end
   end
   
   def test_post__xml
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     http_body = stub(:body => { :result => 'foo' }.to_xml)
-    RestClient.expects(:post).with('https://.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).returns(http_body)
+    RestClient.expects(:post).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', :body, {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).returns(http_body)
     assert_equal({'result' => 'foo'}, Salesforce.connection.post('path', :body, :format => :xml))
   end
   
@@ -203,14 +208,14 @@ class Salesforce.connection::HttpMethodsTest < ActiveSupport::TestCase
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     error = RestClient::BadRequest.new
     error.stubs(:http_body).returns("<?xml version=\"1.0\" encoding=\"UTF-8\"?><Errors><Error><errorCode>MALFORMED_QUERY</errorCode><message>someproblem</message></Error></Errors>" )
-    RestClient.expects(:delete).with('https://.salesforce.com/services/data/v22.0/path', {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).raises(error)
+    RestClient.expects(:delete).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).raises(error)
     
     begin
       Salesforce.connection.delete('path')
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/data/v22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/data/v22.0/path", e.message
     end
   end
   
@@ -218,25 +223,25 @@ class Salesforce.connection::HttpMethodsTest < ActiveSupport::TestCase
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
     error = RestClient::ResourceNotFound.new
     error.stubs(:http_body).returns("<?xml version=\"1.0\" encoding=\"UTF-8\"?><Errors><Error><errorCode>MALFORMED_QUERY</errorCode><message>someproblem</message></Error></Errors>" )
-    RestClient.expects(:delete).with('https://.salesforce.com/services/data/v22.0/path', {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).raises(error)
+    RestClient.expects(:delete).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).raises(error)
     
     begin
       Salesforce.connection.delete('path')
       assert false, "Shouldn't have gotten here"
     rescue => e
       assert_equal "Salesforce::InvalidRequest", e.class.name
-      assert_equal "MALFORMED_QUERY: someproblem while accessing https://.salesforce.com/services/data/v22.0/path", e.message
+      assert_equal "MALFORMED_QUERY: someproblem while accessing https://awesome-2000.something.salesforce.com/services/data/v22.0/path", e.message
     end
   end
   
   def test_delete__xml
     Salesforce::Authentication.stubs(:session_id).returns('session_id')
-    RestClient.expects(:delete).with('https://.salesforce.com/services/data/v22.0/path', {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).returns(stub(:body => ''))
+    RestClient.expects(:delete).with('https://awesome-2000.something.salesforce.com/services/data/v22.0/path', {'Authorization' => 'OAuth session_id', :content_type => 'application/xml'}).returns(stub(:body => ''))
     assert Salesforce.connection.delete('path')
   end
   
   def test_salesforce_url
-    assert_equal 'https://.salesforce.com/services/data/v22.0/path', Salesforce.connection.salesforce_url("path")
-    assert_equal 'https://.salesforce.com/services/data/23.0/foo', Salesforce.connection.salesforce_url("/services/data/23.0/foo")
+    assert_equal 'https://awesome-2000.something.salesforce.com/services/data/v22.0/path', Salesforce.connection.salesforce_url("path")
+    assert_equal 'https://awesome-2000.something.salesforce.com/services/data/23.0/foo', Salesforce.connection.salesforce_url("/services/data/23.0/foo")
   end  
-end
+end

data/test/salesforce/connection_test.rb

@@ -55,10 +55,10 @@ class Salesforce::ConnectionTest < ActiveSupport::TestCase
   end
   
   def test_as_logged_in_user__invalid_username_password__recovers
-    @on_login_failure_called = false
+    on_login_failure_called = false
 
     Salesforce.configure do 
-      on_login_failure { @on_login_failure_called = true }
+      on_login_failure { on_login_failure_called = true }
     end
     
     xml = <<-XML
@@ -79,14 +79,14 @@ class Salesforce::ConnectionTest < ActiveSupport::TestCase
     end
     
     assert_equal :results, results
-    assert @on_login_failure_called, "Salesforce::Config.on_login_failure was not called upon login failure"
+    assert on_login_failure_called, "Salesforce::Config.on_login_failure was not called upon login failure"
   end
   
   def test_as_logged_in_user__invalid_username_password__doesnt_recover
-    @on_login_failure_called = 0
+    on_login_failure_called = 0
 
     Salesforce.configure do 
-      on_login_failure { @on_login_failure_called += 1 }
+      on_login_failure { on_login_failure_called += 1 }
     end
     
     xml = <<-XML
@@ -104,8 +104,8 @@ class Salesforce::ConnectionTest < ActiveSupport::TestCase
         raise error
       end
     end
-    
-    assert_equal 1, @on_login_failure_called, "Salesforce::Config.on_login_failure was not called upon login failure"
+
+    assert_equal 1, on_login_failure_called, "Salesforce::Config.on_login_failure was not called upon login failure"
   end
   
   def test_as_logged_in_user__invalid_username_password__recovers__no_on_login_failure_hook

data/test/test_helper.rb

@@ -7,7 +7,7 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'test/unit'
+require 'minitest/autorun'
 
 $LOAD_PATH.unshift(File.dirname(__FILE__))
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
@@ -16,8 +16,6 @@ Dir.glob(File.expand_path('../../app/models/salesforce/**.rb', __FILE__)).each {
 
 require 'mocha/setup'
 
-class Test::Unit::TestCase
-end
 
 Time.zone = 'America/Los_Angeles'
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activeforce
 version: !ruby/object:Gem::Version
-  version: 1.9.1
+  version: 1.10.0
 platform: ruby
 authors:
 - Tushar Ranka
@@ -17,14 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '4.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '5.0'
 - !ruby/object:Gem::Dependency
   name: savon
   requirement: !ruby/object:Gem::Requirement
@@ -60,6 +66,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -67,6 +76,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2.0'
 - !ruby/object:Gem::Dependency
   name: fastercsv
   requirement: !ruby/object:Gem::Requirement
@@ -93,6 +105,8 @@ extra_rdoc_files:
 - README.md
 files:
 - ".gitignore"
+- ".travis.yml"
+- Appraisals
 - Gemfile
 - LICENSE.txt
 - README.md
@@ -145,6 +159,9 @@ files:
 - app/models/salesforce/user.rb
 - app/models/salesforce/user_role.rb
 - app/models/salesforce/vote.rb
+- gemfiles/4.0.gemfile
+- gemfiles/4.1.gemfile
+- gemfiles/4.2.gemfile
 - lib/activeforce.rb
 - lib/activeforce/version.rb
 - lib/ruby_187_range_extension.rb
@@ -200,7 +217,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.2.0
+rubygems_version: 2.6.9
 signing_key: 
 specification_version: 4
 summary: A Simple gem to interact with the Salesforce REST API