activesalesforce 0.4.8 → 0.4.9

data/lib/asf_adapter.rb

@@ -352,9 +352,8 @@ module ActiveRecord
           
           # Extract arrays of values
           values = sql.match(/VALUES\s*\((.+)\)/i)[1]
-          values = values.scan(/(((NULL))|((TRUE))|((FALSE))|'(([^']|'')*)'),*/mi)
-          
-          values.map! { |v| v[7] }
+          values = values.scan(/(NULL|TRUE|FALSE|'(?:(?:[^']|'')*)'),*/mi).flatten
+          values.map! { |v| v.first == "'" ? v.slice(1, v.length - 2) : v == "NULL" ? nil : v }
           
           fields = get_fields(columns, names, values, :createable)
           
@@ -376,11 +375,10 @@ module ActiveRecord
           columns = entity_def.column_name_to_column
           
           match = sql.match(/SET\s+(.+)\s+WHERE/mi)[1]
-          names = match.scan(/(\w+)\s*=\s*('|NULL|TRUE|FALSE)/i)
-          names.map! { |v| v[0] }
+          names = match.scan(/(\w+)\s*=\s*(?:'|NULL|TRUE|FALSE)/i).flatten
           
-          values = match.scan(/=\s*(((NULL))|((TRUE))|((FALSE))|'(([^']|'')*)'),*/mi)
-          values.map! { |v| v[7] }
+          values = match.scan(/=\s*(NULL|TRUE|FALSE|'(?:(?:[^']|'')*)'),*/mi).flatten
+          values.map! { |v| v.first == "'" ? v.slice(1, v.length - 2) : v == "NULL" ? nil : v }
           
           fields = get_fields(columns, names, values, :updateable)
           

data/lib/rforce.rb

@@ -59,7 +59,7 @@ require_gem 'builder'
 
 
 module RForce
-  
+
   #Allows indexing hashes like method calls: hash.key
   #to supplement the traditional way of indexing: hash[key]
   module FlashHash
@@ -67,50 +67,50 @@ module RForce
       self[method]
     end
   end
-  
+
   #Turns an XML response from the server into a Ruby
   #object whose methods correspond to nested XML elements.
   class SoapResponse
     include FlashHash
-    
+
     #Parses an XML string into structured data.
     def initialize(content)
       document = REXML::Document.new content
       node = REXML::XPath.first document, '//soapenv:Body'
       @parsed = SoapResponse.parse node
     end
-    
+
     #Allows this object to act like a hash (and therefore
     #as a FlashHash via the include above).
     def [](symbol)
       @parsed[symbol]
     end
-    
+
     #Digests an XML DOM node into nested Ruby types.
     def SoapResponse.parse(node)
       #Convert text nodes into simple strings.
       return node.text unless node.has_elements?
-      
+
       #Convert nodes with children into FlashHashes.
       elements = {}
       class << elements
         include FlashHash
       end
-      
+
       #Add all the element's children to the hash.
       node.each_element do |e|
         name = e.name.to_sym
-        
+
         case elements[name]
           #The most common case: unique child element tags.
         when NilClass: elements[name] = parse(e)
-          
+
           #Non-unique child elements become arrays:
-          
+
           #We've already created the array: just
           #add the element.
         when Array: elements[name] << parse(e)
-          
+
           #We haven't created the array yet: do so,
           #then put the existing element in, followed
           #by the new one.
@@ -119,17 +119,17 @@ module RForce
           elements[name] << parse(e)
         end
       end
-      
+
       return elements
     end
   end
-  
-  
+
+
   #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
-    
+
     #Fill in the guts of this typical SOAP envelope
     #with the session ID and the body of the SOAP request.
     Envelope = <<-HERE
@@ -153,58 +153,58 @@ module RForce
   </soap:Body>
 </soap:Envelope>
     HERE
-    
+
     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>'
-    
+
     #Connect to the server securely.
     def initialize(url, sid)
       init_server(url)
-      
+
       @session_id = sid
       @batch_size = DEFAULT_BATCH_SIZE
     end
-    
-    
+
+
     def show_debug
       $DEBUG or ENV['SHOWSOAP']
     end
-    
-    
+
+
     def init_server(url)
       @url = URI.parse(url)
       @server = Net::HTTP.new(@url.host, @url.port)
       @server.use_ssl = @url.scheme == 'https'
       @server.verify_mode = OpenSSL::SSL::VERIFY_NONE
-      
+
       # run ruby with -d or env variable SHOWSOAP=true to see SOAP wiredumps.
       @server.set_debug_output $stderr if show_debug
     end
-    
-    
+
+
     #Log in to the server and remember the session ID
     #returned to us by SalesForce.
     def login(user, password)
       @user = user
       @password = password
-      
+
       response = call_remote(:login, [:username, user, :password, password])
-      
+
       unless response.loginResponse
         pp response
-        raise "Incorrect user name / password [#{response.fault}]" 
+        raise "Incorrect user name / password [#{response.fault}]"
       end
-      
+
       result = response[:loginResponse][:result]
       @session_id = result[:sessionId]
-      
+
       init_server(result[:serverUrl])
-      
+
       response
     end
-    
-    
+
+
     #Call a method on the remote server.  Arguments can be
     #a hash or (if order is important) an array of alternating
     #keys and values.
@@ -213,7 +213,7 @@ module RForce
       expanded = ''
       @builder = Builder::XmlMarkup.new(:target => expanded)
       expand({method => args}, 'urn:partner.soap.sforce.com')
-      
+
       extra_headers = ""
       extra_headers << (AssignmentRuleHeaderUsingRuleId % assignment_rule_id) if assignment_rule_id
       extra_headers << AssignmentRuleHeaderUsingDefaultRule if use_default_rule
@@ -222,54 +222,54 @@ module RForce
       #Fill in the blanks of the SOAP envelope with our
       #session ID and the expanded XML of our request.
       request = (Envelope % [@session_id, @batch_size, extra_headers, expanded])
-      
+
       # reset the batch size for the next request
       @batch_size = DEFAULT_BATCH_SIZE
-      
+
       # gzip request
       request = encode(request)
-      
+
       headers = {
         'Connection' => 'Keep-Alive',
         'Content-Type' => 'text/xml',
         'SOAPAction' => '""',
         'User-Agent' => 'ActiveSalesforce'
       }
-      
+
       unless show_debug
         headers['Accept-Encoding'] = 'gzip'
         headers['Content-Encoding'] = 'gzip'
       end
-      
+
       #Send the request to the server and read the response.
       response = @server.post2(@url.path, request.lstrip, headers)
-      
+
       # decode if we have encoding
       content = decode(response)
-      
+
       # Check to see if INVALID_SESSION_ID was raised and try to relogin in
-      if method != :login and @session_id and response =~ /<faultcode>sf\:INVALID_SESSION_ID<\/faultcode>/
+      if method != :login and @session_id and content =~ /sf:INVALID_SESSION_ID/
         puts "\n\nSession timeout error - auto relogin activated"
-        
+
         login(@user, @password)
-        
+
         #Send the request to the server and read the response.
-        response = @server.post2(@url.path, request, headers)
-        
+        response = @server.post2(@url.path, request.lstrip, headers)
+
         content = decode(response)
       end
-      
+
       SoapResponse.new(content)
     end
-    
-    
+
+
     # decode gzip
     def decode(response)
       encoding = response['Content-Encoding']
-      
+
       # return body if no encoding
       if !encoding then return response.body end
-      
+
       # decode gzip
       case encoding.strip
       when 'gzip':
@@ -284,12 +284,12 @@ module RForce
         response.body
       end
     end
-    
-    
+
+
     # encode gzip
     def encode(request)
       return request if show_debug
-      
+
       begin
         ostream = StringIO.new
         gzw = Zlib::GzipWriter.new(ostream)
@@ -299,28 +299,28 @@ module RForce
         gzw.close
       end
     end
-    
-    
+
+
     #Turns method calls on this object into remote SOAP calls.
     def method_missing(method, *args)
       unless args.size == 1 && [Hash, Array].include?(args[0].class)
         raise 'Expected 1 Hash or Array argument'
       end
-      
+
       call_remote method, args[0]
     end
-    
-    
+
+
     #Expand Ruby data structures into XML.
     def expand(args, xmlns = nil)
       #Nest arrays: [:a, 1, :b, 2] => [[:a, 1], [:b, 2]]
       if (args.class == Array)
         args.each_index{|i| args[i, 2] = [args[i, 2]]}
       end
-      
+
       args.each do |key, value|
         attributes = xmlns ? {:xmlns => xmlns} : {}
-        
+
         #If the XML tag requires attributes,
         #the tag name will contain a space
         #followed by a string representation
@@ -330,16 +330,16 @@ module RForce
         #becomes <sObject xsi:type="Opportunity>...</sObject>
         if key.is_a? String
           key, modifier = key.split(' ', 2)
-          
+
           attributes.merge!(eval(modifier)) if modifier
         end
-        
+
         #Create an XML element and fill it with this
         #value's sub-items.
         case value
         when Hash, Array
           @builder.tag!(key, attributes) do expand value; end
-          
+
         when String
           @builder.tag!(key, attributes) { @builder.text! value }
         end

data/test/unit/recorded_test_case.rb

@@ -67,7 +67,7 @@ module Asf
         action[:recording] = true if @recording
 
         ActiveRecord::Base.logger = LOGGER
-        ActiveRecord::Base.clear_connection_cache!
+        ActiveRecord::Base.clear_active_connections!
         ActiveRecord::Base.reset_column_information_and_inheritable_attributes_for_all_subclasses
         ActiveRecord::Base.establish_connection(action)
         

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: activesalesforce
 version: !ruby/object:Gem::Version 
-  version: 0.4.8
-date: 2006-03-21 00:00:00 -05:00
+  version: 0.4.9
+date: 2006-04-05 00:00:00 -04:00
 summary: ActiveSalesforce (ASF) is a Rails connection adapter that provides direct access to Salesforce.com hosted data and metadata via the ActiveRecord model layer. Objects, fields, and relationships are all auto surfaced as active record attributes and rels.
 require_paths: 
 - lib
@@ -103,5 +103,5 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 0.1.1
+        version: 0.1.2
     version: