activeforce 1.10.5 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: fcd408693ad607e9ac81bdde9a3349e54600cc55613103ecab38ddaaecdbe4b7
-  data.tar.gz: a564ac2c82582660bf8d2a34cc239efec7728f1fa9dba7779564c431d17a0982
+SHA1:
+  metadata.gz: 5e9ce8aeb41b2acdb5c8de782383b1dfa226e190
+  data.tar.gz: 73b5bfd375f25c902c9a47cd2c841f1f303f5d7c
 SHA512:
-  metadata.gz: e27e2ecea57c3a08e31dd845d8d28d99b1aa5f01853c25f2d9e11b07318ccd4ecd596df56fb0e3ece7271a25566e5850a4aa5abc2d91b60108847d59ebd3620d
-  data.tar.gz: 8f91ab47ac2e667bfb5b36be97cb6a7eb14bfbacc4e36507234089f3e3b727e0240575520ee9fe94066b6a10adebb72234d6ca83d20c95c141ef10ac4a1c4220
+  metadata.gz: 2f1bbcf0db4e8c373b6295785915be2223766717a91ef5207e82fe22ebbd1ea9635d568c3e2500141d32d0700b7687178a2e4f2d459696076c0ea9468e67fb8b
+  data.tar.gz: 179f8521cd7f1d9343eda55b3c95110bf53889441b36bbe5a1aafb1b48ad7160eaad35c241277b10f7c8b34b59425f346df11a06d17d41d3a64f0946d81e6208

data/.gitignore

@@ -18,4 +18,3 @@ _yardoc
 doc/
 
 Gemfile.lock
-gemfiles/*.lock

data/.travis.yml

@@ -1,7 +1,9 @@
 language: ruby
 rvm:
-  - 2.6.3
-  - 2.3.3
+  - 2.3.1
+  - 2.2.3
+  - 2.1.4
+  - 2.0.0
   - ruby-head
 
 sudo: false
@@ -9,11 +11,8 @@ sudo: false
 matrix:
   allow_failures:
     - rvm: ruby-head
-  exclude:
-    - rvm: 2.3.3
-      gemfile: gemfiles/6.0.gemfile
 
 gemfile:
-  - gemfiles/5.0.gemfile
-  - gemfiles/5.2.gemfile
-  - gemfiles/6.0.gemfile
+  - gemfiles/4.0.gemfile
+  - gemfiles/4.1.gemfile
+  - gemfiles/4.2.gemfile

data/Appraisals

@@ -1,11 +1,11 @@
-appraise "5.0" do
-  gem "rails", "~> 5.0.0"
+appraise "4.0" do
+  gem "rails", "~> 4.0.0"
 end
 
-appraise "5.2" do
-  gem "rails", "~> 5.2.0"
+appraise "4.1" do
+  gem "rails", "~> 4.1.0"
 end
 
-appraise "6.0" do
-  gem "rails", "~> 6.0.0.rc1"
+appraise "4.2" do
+  gem "rails", "~> 4.2"
 end

data/Rakefile

@@ -20,7 +20,6 @@ Rake::TestTask.new(:test) do |test|
   test.libs << 'lib' << 'test'
   test.pattern = 'test/**/*_test.rb'
   test.verbose = true
-  test.warning = false
 end
 
 task :default => :test

data/activeforce.gemspec

@@ -9,7 +9,7 @@ Gem::Specification.new do |s|
   s.authors          = ["Tushar Ranka", "Andrew Mutz"]
   s.date             = "2013-08-27"
   s.description      = " Activeforce provides a simple to use and extend interface to Salesforce using the REST API"
-  s.email            = ["andrew.mutz@appfolio.com"]
+  s.email            = ["tusharranka@gmail.com", "andrew.mutz@appfolio.com"]
   s.extra_rdoc_files = [
     "LICENSE.txt",
     "README.md"
@@ -19,12 +19,13 @@ Gem::Specification.new do |s|
   s.licenses         = ["MIT"]
   s.require_paths    = ["lib"]
   s.rubygems_version = "2.0.3"
-  s.required_ruby_version = ">= 2.3"
+  s.required_ruby_version = ">= 2.0"
   s.summary          = "A Simple gem to interact with the Salesforce REST API"
 
-  s.add_dependency(%q<rails>, [">= 4.2", "< 6.1"])
-  s.add_dependency(%q<savon>, ["~> 1.0"])
+  s.add_dependency(%q<rails>, [">= 4.0", "< 5.0"])
+  s.add_dependency(%q<savon>, ["~> 2.11"])
   s.add_dependency(%q<blockenspiel>, [">= 0"])
-  s.add_dependency(%q<rest-client>, ["~> 2.0"])
+  s.add_dependency(%q<rest-client>, [">= 0", '< 2.0'])
   s.add_dependency(%q<fastercsv>, [">= 0"])
 end
+

data/gemfiles/{5.2.gemfile → 4.0.gemfile}

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "mocha", "0.14.0", require: false
-gem "rails", "~> 5.2.0"
+gem "mocha", "0.14.0", :require => false
+gem "rails", "~> 4.0.0"
 
-gemspec path: "../"
+gemspec :path => "../"

data/gemfiles/{6.0.gemfile → 4.1.gemfile}

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "mocha", "0.14.0", require: false
-gem "rails", "~> 6.0.0.rc1"
+gem "mocha", "0.14.0", :require => false
+gem "rails", "~> 4.1.0"
 
-gemspec path: "../"
+gemspec :path => "../"

data/gemfiles/{5.0.gemfile → 4.2.gemfile}

@@ -3,7 +3,7 @@
 source "https://rubygems.org"
 
 gem "appraisal"
-gem "mocha", "0.14.0", require: false
-gem "rails", "~> 5.0.0"
+gem "mocha", "0.14.0", :require => false
+gem "rails", "~> 4.2"
 
-gemspec path: "../"
+gemspec :path => "../"

data/lib/activeforce/version.rb

@@ -1,3 +1,3 @@
 module Activeforce
-  VERSION = '1.10.5'.freeze
+  VERSION = '2.0.0'.freeze
 end

data/lib/salesforce/authentication.rb

@@ -12,12 +12,7 @@ module Salesforce
       result = Connection.login    
       Config.instance.soap_endpoint_url result[:server_url]
       Config.instance.session_id        result[:session_id]
-
-      host = URI.parse(result[:server_url]).host
-      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]
+      Config.instance.server_instance   URI.parse(result[:server_url]).host[/(na|cs)\d+/]
       Config.instance.user_id           result[:user_id]
       Config.session_id
     end

data/lib/salesforce/bulk/batch.rb

@@ -7,18 +7,18 @@ module Salesforce
     class Batch
       Result = Struct.new :id, :success, :created, :error
       include ::Salesforce::Attributes
-
+      
       attr_accessor :id, :job, :number_records_failed, :number_records_processed, :state, :state_message, :total_time_processed, :filename, :csv
 
       include Blockenspiel::DSL
-
+      
       def initialize(job)
         self.job = job
         self.filename = temporary_csv_file
         self.csv = CSVLib.open(self.filename, 'w+')
         self.csv << csv_header
       end
-
+            
       def record(record)
         if record.is_a?(Hash)
           self.csv << ordered_values(record)
@@ -26,56 +26,56 @@ module Salesforce
           self.csv << ordered_values(record.attributes)
         end
       end
-
+      
       def ordered_values(record)
         job.csv_columns.map do |col|
           raw_value = record[col.name.to_sym]
           Column.to_csv_value Column.typecast(col.type, raw_value)
         end
       end
-
+        
       def create!
         self.csv.close
         response = ::Salesforce.connection.async_post("job/#{job.id}/batch", File.read(self.filename), :format => :xml, :content_type => 'text/csv')
         assign_attributes!(response)
       end
-
+      
       def update_status
         return state if completed?
         response = ::Salesforce.connection.async_get("job/#{job.id}/batch/#{id}", :format => :xml)
         self.state = response[:state]
       end
-
+      
       def results
         parse_csv_results ::Salesforce.connection.async_get("job/#{job.id}/batch/#{id}/result")
       end
-
+      
       [ :queued, :in_progress, :completed, :failed, :not_processed ].each do |status|
         define_method "#{status}?" do
           self.state == status.to_s.titleize
         end
       end
-
+      
       def temporary_csv_file
-        if Object.const_defined?(:Rails) && Rails.respond_to?(:root) && Rails.root.present?
+        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")
         end
       end
-
+      
       private
-
+      
       def parse_csv_results(results)
          parsed_results = CSVLib.parse(results)
          parsed_results[1..-1].map { |row| Result.new(*row) }
       end
-
+      
       def csv_header
         self.job.csv_columns.map(&:original_name)
       end
-
-
+      
+      
     end
   end
 end

data/lib/salesforce/column.rb

@@ -1,7 +1,7 @@
 module Salesforce
   class Column
     attr_accessor :name, :original_name, :createable, :updateable, :type
-
+    
     SUPPORTED_DATE_RANGE =  Date.parse("1700-01-01")..Date.parse("4000-12-31")
     SUPPORTED_TIME_RANGE =  Time.parse("1902-01-01 00:00:00 UTC")..Time.parse("2037-12-31 00:00:00 UTC")
 
@@ -100,7 +100,7 @@ module Salesforce
           end
         when :double
           begin
-            value.to_s.to_d
+            BigDecimal(value.to_s)
           rescue
             value if value.is_a?(Numeric)
           end

data/lib/salesforce/config.rb

@@ -6,11 +6,11 @@ module Salesforce
     include Blockenspiel::DSL
     include Blockenspiel::DSLSetupMethods
 
-    dsl_attr_accessor :session_id, :server_instance, :server_domain, :user_id, :soap_endpoint_url
+    dsl_attr_accessor :session_id, :server_instance, :user_id, :soap_endpoint_url
 
     [
       :username, :password, :api_version, :use_sandbox?, :use_full_length_ids?,
-      :login_url, :session_id, :server_instance, :server_domain, :soap_endpoint_url, :soap_enterprise_namespace,
+      :login_url, :session_id, :server_instance, :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}
@@ -88,15 +88,15 @@ module Salesforce
     end
 
     def server_url
-      "https://#{server_instance}.#{server_domain}/services/data/v#{api_version}"
+      "https://#{server_instance}.salesforce.com/services/data/v#{api_version}"
     end
 
     def server_host
-      "https://#{server_instance}.#{server_domain}"
+      "https://#{server_instance}.salesforce.com"
     end
 
     def async_url
-      "https://#{server_instance}.#{server_domain}/services/async/#{api_version}"
+      "https://#{server_instance}.salesforce.com/services/async/#{api_version}"
     end
 
     def login_url

data/lib/salesforce/connection.rb

@@ -11,13 +11,13 @@ module Salesforce
     include HttpMethods
     include Conversion
     include Async
-
+    
     def self.as_logged_in_user(&block)
-      count = 0
+      count = 0 
       begin
         Salesforce::Authentication.session_id
         block.call
-      rescue RestClient::Unauthorized, Savon::SOAP::Fault => e
+      rescue RestClient::Request::Unauthorized, Savon::SOAPFault => e
         if count < 1 && (e.message.downcase.include?("unauthorized") || e.message.downcase.include?("invalid_login"))
           count += 1
           Salesforce::Config.on_login_failure
@@ -27,7 +27,7 @@ module Salesforce
           raise e
         end
       end
-
+    
     end
   end
-end
+end

data/lib/salesforce/connection/soap_api.rb

@@ -31,19 +31,26 @@ module Salesforce
         protected
         
         def invoke_soap(method_name, options)
-          options[:namespace]    ||= Config.soap_enterprise_namespace
-          options[:endpoint_url] ||= Config.soap_endpoint_url
-          
-          result = soap_client(options).request :wsdl, method_name do |soap|
-            soap.body = options[:body]
+          client_options = {
+            namespace: options[:namespace] ||= Config.soap_enterprise_namespace,
+            endpoint: options[:endpoint_url] ||= Config.soap_endpoint_url
+          }
 
-            unless method_name.to_sym == :login
-              soap.namespaces["xmlns:ns1"] = Config.soap_enterprise_namespace
-              soap.header = { "ns1:SessionHeader" => { "ns1:sessionId" => Config.session_id }}
-            end
+          additional_call_options = {}
+          unless method_name.to_sym == :login
+            additional_call_options[:soap_header] = {
+              "ns1:SessionHeader" => { "ns1:sessionId" => Config.session_id }
+            }
+
+            client_options[:namespaces] = {
+              "xmlns:ns1" => Config.soap_enterprise_namespace,
+            }
           end
+
+          client = soap_client(client_options)
+          result = client.call(method_name.to_sym, { message: options[:body] }.merge(additional_call_options))
           
-          result.to_hash[:"#{method_name.to_s.underscore}_response"][:result].tap do |result|
+          result.body[:"#{method_name.to_s.underscore}_response"][:result].tap do |result|
             unless result[:success] || method_name.to_sym == :login
               raise_error(method_name, options, result[:errors])
             end
@@ -51,10 +58,7 @@ module Salesforce
         end
         
         def soap_client(options)
-          Savon::Client.new do
-            wsdl.namespace = options[:namespace]
-            wsdl.endpoint  = options[:endpoint_url]
-          end          
+          Savon.client(options.merge(log: false))
         end
         
         def raise_error(method_name, options, errors)
@@ -71,4 +75,4 @@ MSG
       
     end
   end
-end
+end

data/test/salesforce/authentication_test.rb

@@ -10,7 +10,7 @@ class Salesforce::AuthenticationTest < ActiveSupport::TestCase
     Salesforce::Config.instance.session_id "existingsessionid"
     assert_equal "existingsessionid", Salesforce::Authentication.session_id
   end
-
+  
   def test_session_id__doesnotexist
     Salesforce.configure do
       username "username"
@@ -19,20 +19,20 @@ class Salesforce::AuthenticationTest < ActiveSupport::TestCase
     Salesforce::Authentication.expects(:generate_new_session_id).returns("new_session_id")
     assert_equal "new_session_id", Salesforce::Authentication.session_id
   end
-
+  
   def test_session_id__credentials_missing
     Salesforce::Authentication.expects(:generate_new_session_id).never
     assert_raises Salesforce::InvalidCredentials do
       Salesforce::Authentication.session_id
     end
   end
-
+  
   def test_logout
     Salesforce::Config.instance.session_id = "session_id"
     Salesforce::Authentication.logout
-    assert_nil Salesforce::Config.session_id
+    assert_equal nil, Salesforce::Config.session_id
   end
-
+    
   def test_generate_new_session_id__calls_connection_login
     result = {
       :session_id => "session_id",
@@ -46,42 +46,7 @@ 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
-
-  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
+  
+end