activesalesforce 1.0.0 → 1.1.0

data/README

@@ -19,10 +19,12 @@
 4. edit database.yml
 
 		adapter: activesalesforce
-  		url: https://www.salesforce.com/services/Soap/u/7.0
+  		url: https://www.salesforce.com
   		username: <salesforce user name goes here>
   		password: <salesforce password goes here>
   		
+  		NOTE: If you want to access your Salesforce Sandbox account use https://test.salesforce.com as your url instead
+  		
 5. proceed using standard Rails development techniques!  	
 
 == Advanced Features

data/lib/asf_adapter.rb

@@ -50,11 +50,16 @@ module ActiveRecord
     def self.activesalesforce_connection(config) # :nodoc:
       debug("\nUsing ActiveSalesforce connection\n")
       
-      # Default to production system using 7.0 API
+      # Default to production system using 8.0 API
       url = config[:url]
-      url = "https://www.salesforce.com/services/Soap/u/7.0" unless url
+      url = "https://www.salesforce.com" unless url
+
+      uri = URI.parse(url)
+      uri.path = "/services/Soap/u/8.0"
+      url = uri.to_s      
       
       sid = config[:sid]
+      client_id = config[:client_id]
       username = config[:username].to_s
       password = config[:password].to_s
       
@@ -65,6 +70,7 @@ module ActiveRecord
       if recording_source
         recording_source = File.open(recording_source, recording ? "w" : "r")
         binding = ActiveSalesforce::RecordingBinding.new(url, nil, recording != nil, recording_source, logger)
+        binding.client_id = client_id if client_id
         binding.login(username, password) unless sid
       end
       
@@ -85,22 +91,22 @@ module ActiveRecord
         # Check to insure that the second to last path component is a 'u' for Partner API
         raise ActiveSalesforce::ASFError.new(logger, "Invalid salesforce server url '#{url}', must be a valid Parter API URL") unless url.match(/\/u\//mi)
         
-        binding = @@cache["#{url}.#{username}.#{password}"] unless binding
+        binding = @@cache["#{url}.#{username}.#{password}.#{client_id}"] unless binding
         
         unless binding
-          debug("Establishing new connection for ['#{url}', '#{username}'")
+          debug("Establishing new connection for ['#{url}', '#{username}, '#{client_id}'")
           
           seconds = Benchmark.realtime {
             binding = RForce::Binding.new(url, sid)
             binding.login(username, password)
             
-            @@cache["#{url}.#{username}.#{password}"] = binding
+            @@cache["#{url}.#{username}.#{password}.#{client_id}"] = binding
           }
           
-          debug("Created new connection for ['#{url}', '#{username}'] in #{seconds} seconds")
+          debug("Created new connection for ['#{url}', '#{username}', '#{client_id}'] in #{seconds} seconds")
         end
         
-        ConnectionAdapters::SalesforceAdapter.new(binding, logger, [url, username, password, sid], config)
+        ConnectionAdapters::SalesforceAdapter.new(binding, logger, [url, username, password, sid, client_id], config)
       end
     end
   end
@@ -221,7 +227,7 @@ module ActiveRecord
         result
       end
       
-      
+       
       # Commits the transaction (and turns on auto-committing).
       def commit_db_transaction()   
         log("Committing boxcar with #{@command_boxcar.length} commands", 'commit_db_transaction()')
@@ -272,7 +278,7 @@ module ActiveRecord
           selectCountMatch = sql.match(/SELECT\s+COUNT\(\*\)\s+FROM/mi) unless selectCountMatch 
           
           if selectCountMatch
-            soql = "SELECT id FROM#{selectCountMatch.post_match}"
+            soql = "SELECT COUNT() FROM#{selectCountMatch.post_match}"
           else 
             if sql.match(/SELECT\s+\*\s+FROM/mi)
               # Always convert SELECT * to select all columns (required for the AR attributes mechanism to work correctly)
@@ -283,6 +289,11 @@ module ActiveRecord
           end
           
           soql.sub!(/\s+FROM\s+\w+/mi, " FROM #{entity_def.api_name}")
+
+          if selectCountMatch
+            query_result = get_result(@connection.query(:queryString => soql), :query)
+            return [{ :count => query_result[:size] }]
+          end
           
           # Look for a LIMIT clause
           limit = extract_sql_modifier(soql, "LIMIT")
@@ -323,11 +334,7 @@ module ActiveRecord
             add_rows(entity_def, query_result, result, limit)
           end
           
-          if selectCountMatch
-            [{ :count => result.actual_size }]
-          else
-            result
-          end
+          result
         }
       end
       

data/lib/rforce.rb

@@ -128,7 +128,7 @@ module RForce
   #Implements the connection to the SalesForce server.
   class Binding
     DEFAULT_BATCH_SIZE = 10
-    attr_accessor :batch_size, :url, :assignment_rule_id, :use_default_rule, :update_mru
+    attr_accessor :batch_size, :url, :assignment_rule_id, :use_default_rule, :update_mru, :client_id
 
     #Fill in the guts of this typical SOAP envelope
     #with the session ID and the body of the SOAP request.
@@ -157,6 +157,7 @@ module RForce
     AssignmentRuleHeaderUsingRuleId = '<partner:AssignmentRuleHeader soap:mustUnderstand="1"><partner:assignmentRuleId>%s</partner:assignmentRuleId></partner:AssignmentRuleHeader>'
     AssignmentRuleHeaderUsingDefaultRule = '<partner:AssignmentRuleHeader soap:mustUnderstand="1"><partner:useDefaultRule>true</partner:useDefaultRule></partner:AssignmentRuleHeader>'
     MruHeader = '<partner:MruHeader soap:mustUnderstand="1"><partner:updateMru>true</partner:updateMru></partner:MruHeader>'
+    ClientIdHeader = '<partner:CallOptions soap:mustUnderstand="1"><partner:client>%s</partner:client></partner:CallOptions>'
 
     #Connect to the server securely.
     def initialize(url, sid)
@@ -190,11 +191,8 @@ module RForce
       @password = password
 
       response = call_remote(:login, [:username, user, :password, password])
-
-      unless response.loginResponse
-        pp response
-        raise "Incorrect user name / password [#{response.fault}]"
-      end
+      
+      raise "Incorrect user name / password [#{response.fault}]" unless response.loginResponse
 
       result = response[:loginResponse][:result]
       @session_id = result[:sessionId]
@@ -218,6 +216,7 @@ module RForce
       extra_headers << (AssignmentRuleHeaderUsingRuleId % assignment_rule_id) if assignment_rule_id
       extra_headers << AssignmentRuleHeaderUsingDefaultRule if use_default_rule
       extra_headers << MruHeader if update_mru
+      extra_headers << (ClientIdHeader % client_id) if client_id
 
       #Fill in the blanks of the SOAP envelope with our
       #session ID and the expanded XML of our request.
@@ -249,8 +248,6 @@ module RForce
 
       # Check to see if INVALID_SESSION_ID was raised and try to relogin in
       if method != :login and @session_id and content =~ /sf:INVALID_SESSION_ID/
-        puts "\n\nSession timeout error - auto relogin activated"
-
         login(@user, @password)
 
 		#  repackage and rencode request with the new session id

data/test/unit/basic_test.rb

@@ -18,7 +18,7 @@
 require 'rubygems'
 
 #require_gem 'activesalesforce', '>= 0.4.3'
-require File.dirname(__FILE__) + '/../../lib/activesalesforce'
+require File.dirname(__FILE__) + '/../../lib/asf_adapter'
 
 require File.dirname(__FILE__) + '/recorded_test_case'
 require 'pp'
@@ -45,7 +45,7 @@ module Asf
       def initialize(test_method_name)
         super(test_method_name)
         
-        #force_recording :test_master_detail
+        #force_recording :test_create_a_contact
       end
       
       def setup
@@ -132,6 +132,10 @@ module Asf
         contact.save
       end
       
+      def test_client_id
+        Contact.connection.binding.client_id = "testClient"
+        contact.save
+      end
       
  
       def test_add_notes_to_contact

data/test/unit/config.yml

@@ -1,8 +1,4 @@
-url: https://www.salesforce.com/services/Soap/u/7.0
-username: doug_chasman@yahoo.com	
-password: Maceymo@11
-
-#username: admin@summer05_pbrondum.com
-#password: Test2000
-
+url: https://test.salesforce.com
+username: dutch@activesalesforce.com
+password: maceymo
 recording: true