activesalesforce 0.1.7 → 0.1.8

data/lib/rforce.rb

@@ -163,6 +163,7 @@ module RForce
       @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 to see SOAP wiredumps.
       @server.set_debug_output $stderr if show_debug

data/lib/salesforce_connection_adapter.rb

@@ -73,28 +73,50 @@ module ActiveRecord
         
         @fault = fault
         
-        puts "\nSalesforceError:\n   message='#{message}'\n   fault='#{fault}'\n\n"
+        #puts "\nSalesforceError:\n   message='#{message}'\n   fault='#{fault}'\n\n"
         logger.debug("\nSalesforceError:\n   message='#{message}'\n   fault='#{fault}'\n\n")
       end
     end
     
+
     class SalesforceAdapter < AbstractAdapter
+    
+      class EntityDefinition
+        attr_reader :name, :columns, :column_name_to_column, :relationships
+        
+        def custom?
+          @custom
+        end
+        
+        def api_name
+          @custom ? name + "__c" : name
+        end
+        
+        def initialize(name, columns, relationships, custom)
+          @name = name
+          @columns = columns
+          @relationships = relationships
+          @custom = custom
+          
+          @column_name_to_column = {}          
+          @columns.each { |column| @column_name_to_column[column.name] = column }
+        end
+      end
+      
       COLUMN_NAME_REGEX = /@C_(\w+)/
       COLUMN_VALUE_REGEX = /@V_'(([^']|\\')*)'/
       
       include StringHelper
       
       attr_accessor :batch_size
+      attr_reader :entity_def_map
       
       def initialize(connection, logger, connection_options, config)
         super(connection, logger)
         
         @connection_options, @config = connection_options, config
         
-        @columns_map = {}
-        @columns_name_map = {}
-        
-        @relationships_map = {}
+        @entity_def_map = {}
       end
       
       
@@ -142,11 +164,18 @@ module ActiveRecord
       # DATABASE STATEMENTS ======================================
       
       def select_all(sql, name = nil) #:nodoc:
-        table_name = table_name_from_sql(sql)
+        log(sql, name)
+        
+        raw_table_name = sql.match(/FROM (\w+) /)[1]
+        table_name = raw_table_name.singularize
         entity_name = entity_name_from_table(table_name)
+        entity_def = get_entity_def(entity_name)
+
         column_names = api_column_names(table_name)
         
-        soql = sql.sub(/SELECT \* FROM \w+ /, "SELECT #{column_names.join(', ')} FROM #{table_name} ")
+        soql = sql.sub(/SELECT \* FROM /, "SELECT #{column_names.join(', ')} FROM ")
+        
+        soql.sub!(/ FROM \w+ /, " FROM #{entity_def.api_name} ")
         
         # Look for a LIMIT clause
         soql.sub!(/LIMIT 1/, "")
@@ -161,6 +190,9 @@ module ActiveRecord
           soql = $~.pre_match + column.api_name + $~.post_match
         end
         
+        # Update table name references
+        soql.sub!(/#{raw_table_name}\./, "#{entity_def.api_name}.")
+        
         # Remove column value prefix
         soql.gsub!(/@V_/, "")
         
@@ -182,14 +214,15 @@ module ActiveRecord
           
           record.each do |name, value| 
             name = column_nameize(name.to_s)
-            
-            # Replace nil element with nil
-            value = nil if value.respond_to?(:xmlattr_nil) and value.xmlattr_nil
-            
-            # Ids are returned in an array with 2 duplicate entries...
-            value = value[0] if name == "id"
-            
-            row[name] = value
+            if name != "type"
+              # Replace nil element with nil
+              value = nil if value.respond_to?(:xmlattr_nil) and value.xmlattr_nil
+              
+              # Ids are returned in an array with 2 duplicate entries...
+              value = value[0] if name == "id"
+              
+              row[name] = value
+            end
           end  
           
           result << row        
@@ -203,11 +236,13 @@ module ActiveRecord
         self.batch_size = 1
         
         # Check for SELECT COUNT(*) FROM query
-        matchCount = sql.match(/SELECT COUNT\(\*\) FROM (\w+)/)       
+        matchCount = sql.match(/SELECT COUNT\(\*\) FROM /)       
         if matchCount
-          sql = "SELECT id FROM #{matchCount[1].singularize} #{matchCount.post_match}"
+          sql = "SELECT id FROM #{matchCount.post_match}"
         end
         
+        log(sql, name)
+        
         result = select_all(sql, name)
         
         if matchCount
@@ -289,7 +324,7 @@ module ActiveRecord
         responseName = (method.to_s + "Response").to_sym
         finalResponse = response[responseName]
         
-        raise SalesforceError.new(@logger, response[:fault][:faultstring], response.fault) unless finalResponse
+        raise SalesforceError.new(@logger, response[:Fault][:faultstring], response.fault) unless finalResponse
         
         result = finalResponse[:result]
       end       
@@ -306,20 +341,22 @@ module ActiveRecord
       end
       
       
-      def columns(table_name, name = nil)
-        entity_name = entity_name_from_table(table_name)
-        
-        cached_columns = @columns_map[entity_name]
-        return cached_columns if cached_columns
+      def get_entity_def(entity_name)
+        cached_entity_def = @entity_def_map[entity_name]
+        return cached_entity_def if cached_entity_def
         
         cached_columns = []
-        @columns_map[entity_name] = cached_columns
-        
         cached_relationships = []
-        @relationships_map[entity_name] = cached_relationships
-        
-        metadata = get_result(@connection.describeSObject(:sObjectType => entity_name), :describeSObject)
         
+        begin
+          metadata = get_result(@connection.describeSObject(:sObjectType => entity_name), :describeSObject)
+          custom = false
+        rescue SalesforceError => e
+          # Fallback and see if we can find a custom object with this name
+          metadata = get_result(@connection.describeSObject(:sObjectType => entity_name + "__c"), :describeSObject)
+          custom = true
+        end
+
         metadata.fields.each do |field| 
           column = SalesforceColumn.new(field) 
           cached_columns << column
@@ -340,24 +377,27 @@ module ActiveRecord
             end
           end
         end
+
+        entity_def = EntityDefinition.new(entity_name, cached_columns, cached_relationships, custom)
+        @entity_def_map[entity_name] = entity_def
         
-        configure_active_record entity_name
-        
-        cached_columns
+        configure_active_record entity_def
+                
+        entity_def
       end
       
       
-      def configure_active_record(entity_name)
+      def configure_active_record(entity_def)
+        entity_name = entity_def.name
         klass = entity_name.constantize
-        klass.table_name = entity_name
-        klass.pluralize_table_names = false
+        
         klass.set_inheritance_column nil
         klass.lock_optimistically = false
         klass.record_timestamps = false
         klass.default_timezone = :utc 
         
         # Create relationships for any reference field
-        @relationships_map[entity_name].each do |relationship|
+        entity_def.relationships.each do |relationship|
           referenceName = relationship.name
           unless self.respond_to? referenceName.to_sym or relationship.reference_to == "Profile"
             reference_to = relationship.reference_to
@@ -387,32 +427,15 @@ module ActiveRecord
       end
       
       
-      def relationships(table_name)
+      def columns(table_name, name = nil)
         entity_name = entity_name_from_table(table_name)
-        
-        cached_relationships = @relationships_map[entity_name]
-        
-        unless cached_relationships
-          # This will load column and relationship metadata        
-          columns(table_name)
-        end
-        
-        @relationships_map[entity_name]
+        get_entity_def(entity_name).columns
       end
-      
+            
       
       def columns_map(table_name, name = nil)
         entity_name = entity_name_from_table(table_name)
-        
-        columns_map = @columns_name_map[entity_name]
-        unless columns_map 
-          columns_map = {}
-          @columns_name_map[entity_name] = columns_map
-          
-          columns(entity_name).each { |column| columns_map[column.name] = column }
-        end
-        
-        columns_map
+        get_entity_def(entity_name).column_name_to_column
       end
       
       
@@ -422,7 +445,9 @@ module ActiveRecord
       
       
       def create_sobject(entity_name, id, fields)
-        sobj = [ 'type { :xmlns => "urn:sobject.partner.soap.sforce.com" }', entity_name ]
+        entity_def = get_entity_def(entity_name)
+        
+        sobj = [ 'type { :xmlns => "urn:sobject.partner.soap.sforce.com" }', entity_def.api_name ]
         sobj << 'Id { :xmlns => "urn:sobject.partner.soap.sforce.com" }' << id if id    
         
         # now add any changed fields
@@ -435,11 +460,6 @@ module ActiveRecord
       end
       
       
-      def table_name_from_sql(sql)
-        sql.match(/FROM (\w+) /)[1].singularize
-      end
-      
-      
       def column_names(table_name)
         columns(table_name).map { |column| column.name }
       end

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: activesalesforce
 version: !ruby/object:Gem::Version 
-  version: 0.1.7
-date: 2006-02-03 00:00:00 -05:00
+  version: 0.1.8
+date: 2006-02-04 00:00:00 -05:00
 summary: ActiveSalesforce is an extension to the Rails Framework that allows for the dynamic creation and management of ActiveRecord objects through the use of Salesforce meta-data and uses a Salesforce.com organization as the backing store.
 require_paths: 
 - lib