activesalesforce 0.2.3 → 0.2.4

data/lib/asf_adapter.rb

@@ -100,7 +100,7 @@ module ActiveRecord
     class SalesforceAdapter < AbstractAdapter
       
       class EntityDefinition
-        attr_reader :name, :columns, :column_name_to_column, :relationships
+        attr_reader :name, :columns, :column_name_to_column, :api_name_to_column, :relationships
         
         def custom?
           @custom
@@ -118,11 +118,12 @@ module ActiveRecord
           
           @column_name_to_column = {}          
           @columns.each { |column| @column_name_to_column[column.name] = column }
+          
+          @api_name_to_column = {}
+          @columns.each { |column| @api_name_to_column[column.api_name] = column }
         end
       end
       
-      COLUMN_VALUE_REGEX = /@V_'(([^']|\\')*)'/m
-      
       include StringHelper
       
       attr_accessor :batch_size
@@ -234,12 +235,12 @@ module ActiveRecord
           row = {}
           
           record.each do |name, value| 
-            name = column_nameize(name.to_s)
-            if name != "type"
+            if name != :type
               # Ids may be returned in an array with 2 duplicate entries...
-              value = value[0] if name == "id" && value.is_a?(Array)
-              
-              row[name] = value
+              value = value[0] if name == :Id && value.is_a?(Array)
+
+              attribute_name = entity_def.api_name_to_column[name.to_s].name
+              row[attribute_name] = value
             end
           end  
           
@@ -388,7 +389,7 @@ module ActiveRecord
           column = SalesforceColumn.new(field) 
           cached_columns << column
           
-          cached_relationships << SalesforceRelationship.new(field) if field[:type] =~ /reference/i
+          cached_relationships << SalesforceRelationship.new(field, column) if field[:type] =~ /reference/i
         end
         
         if metadata.childRelationships

data/lib/relationship_definition.rb

@@ -41,7 +41,7 @@ module ActiveRecord
     
       attr_reader :name, :api_name, :custom, :foreign_key, :label, :reference_to, :one_to_many
       
-      def initialize(source)
+      def initialize(source, column = nil)
         if source[:childSObject]
           relationship = source
           
@@ -63,8 +63,8 @@ module ActiveRecord
           @readonly = (field[:updateable] != "true" or field[:createable] != "true")          
           @reference_to = field[:referenceTo]
           @one_to_many = false
-          #@foreign_key = column_nameize(field[:name])
-          @foreign_key = field[:name]
+          
+          @foreign_key = column.name
         end
 
         @name = column_nameize(@api_name)

metadata

@@ -3,9 +3,9 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: activesalesforce
 version: !ruby/object:Gem::Version 
-  version: 0.2.3
-date: 2006-02-15 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.
+  version: 0.2.4
+date: 2006-02-16 00:00:00 -05: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
 email: dchasman@salesforce.com