activesalesforce 0.3.6 → 0.3.7

data/lib/asf_active_record.rb

@@ -0,0 +1,39 @@
+=begin
+  ActiveSalesforce
+  Copyright 2006 Doug Chasman
+ 
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+ 
+     http://www.apache.org/licenses/LICENSE-2.0
+ 
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+=end
+
+module ActiveSalesforce
+  
+  module ActiveRecord
+    
+    module Mixin
+      def self.append_features(base) #:nodoc:
+        super
+        
+        base.class_eval do  
+          class << self
+            def set_table_name(value = nil, &block)
+              super(value, &block)
+              connection.set_class_for_entity(self, table_name.singularize)
+            end        
+          end
+        end
+      end
+    end
+  
+  end
+
+end

data/lib/asf_adapter.rb

@@ -26,6 +26,8 @@ require File.dirname(__FILE__) + '/column_definition'
 require File.dirname(__FILE__) + '/relationship_definition'
 require File.dirname(__FILE__) + '/boxcar_command'
 require File.dirname(__FILE__) + '/entity_definition'
+require File.dirname(__FILE__) + '/asf_active_record'
+
 
 class ResultArray < Array
   attr_reader :actual_size
@@ -35,6 +37,7 @@ class ResultArray < Array
   end
 end
 
+
 module ActiveRecord    
   class Base   
     @@cache = {}
@@ -93,7 +96,7 @@ module ActiveRecord
       end
     end
   end
-  
+
   
   module ConnectionAdapters
     class SalesforceError < RuntimeError
@@ -125,12 +128,21 @@ module ActiveRecord
         @entity_def_map = {}
         
         @command_boxcar = []
+        @class_to_entity_map = {}
+      end
+      
+      
+      def set_class_for_entity(klass, entity_name)
+        @logger.debug("Setting @class_to_entity_map['#{entity_name.upcase}'] = #{klass}")
+        @class_to_entity_map[entity_name.upcase] = klass
       end
       
+      
       def binding
         @connection
       end
       
+      
       def adapter_name #:nodoc:
         'ActiveSalesforce'
       end
@@ -459,7 +471,7 @@ module ActiveRecord
         
         if cached_entity_def
           # Check for the loss of asf AR setup 
-          entity_klass = entity_name.constantize          
+          entity_klass = class_from_entity_name(entity_name)
           
           configure_active_record cached_entity_def unless entity_klass.respond_to?(:asf_augmented?)
           
@@ -512,7 +524,7 @@ module ActiveRecord
       
       def configure_active_record(entity_def)
         entity_name = entity_def.name
-        klass = entity_name.constantize
+        klass = class_from_entity_name(entity_name)
         
         class << klass
           def asf_augmented?
@@ -544,7 +556,7 @@ module ActiveRecord
             reference_to = reference_to.chop.chop.chop.capitalize if reference_to.match(/__c$/)
             
             begin
-              referenced_klass = reference_to.constantize
+              referenced_klass = class_from_entity_name(reference_to)
             rescue NameError => e
               # Automatically create a least a stub for the referenced entity
               @logger.debug("   Creating ActiveRecord stub for the referenced entity '#{reference_to}'")
@@ -585,6 +597,16 @@ module ActiveRecord
       end
       
       
+      def class_from_entity_name(entity_name)
+          entity_klass = @class_to_entity_map[entity_name.upcase]
+          @logger.debug("Found matching class '#{entity_klass}' for entity '#{entity_name}'") if entity_klass
+          
+          entity_klass = entity_name.constantize unless entity_klass
+                    
+          entity_klass
+      end
+      
+      
       def create_sobject(entity_name, id, fields)
         entity_def = get_entity_def(entity_name)
         

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: activesalesforce
 version: !ruby/object:Gem::Version 
-  version: 0.3.6
+  version: 0.3.7
 date: 2006-02-27 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: 
@@ -37,6 +37,7 @@ files:
 - lib/asf_adapter.rb
 - lib/sid_authentication_filter.rb
 - lib/relationship_definition.rb
+- lib/asf_active_record.rb
 - test/unit
 - test/unit/recorded_test_case.rb
 - test/unit/basic_test.rb