activesalesforce 0.2.2 → 0.2.3

data/lib/activesalesforce.rb

@@ -21,7 +21,7 @@
   SOFTWARE.
 =end
 
-require 'salesforce_connection_adapter'
+require 'asf_adapter'
 
 module ActionView
   module Helpers

data/lib/{salesforce_connection_adapter.rb → asf_adapter.rb}

@@ -28,6 +28,7 @@ require 'thread'
 
 require File.dirname(__FILE__) + '/rforce'
 require File.dirname(__FILE__) + '/column_definition'
+require File.dirname(__FILE__) + '/relationship_definition'
 
 class ResultArray < Array
   attr_reader :actual_size
@@ -120,8 +121,7 @@ module ActiveRecord
         end
       end
       
-      COLUMN_NAME_REGEX = /@C_(\w+)/
-      COLUMN_VALUE_REGEX = /@V_'(([^']|\\')*)'/
+      COLUMN_VALUE_REGEX = /@V_'(([^']|\\')*)'/m
       
       include StringHelper
       
@@ -151,21 +151,16 @@ module ActiveRecord
       
       def quote(value, column = nil)
         case value
-        when NilClass              then quoted_value = "'NULL'"
-        when TrueClass             then quoted_value = "'TRUE'"
-        when FalseClass            then quoted_value = "'FALSE'"
+        when NilClass              then quoted_value = "NULL"
+        when TrueClass             then quoted_value = "TRUE"
+        when FalseClass            then quoted_value = "FALSE"
         else                       quoted_value = super(value, column)
         end      
         
-        "@V_#{quoted_value}"
+        quoted_value
       end
       
       
-      def quote_column_name(name) #:nodoc:
-        # Mark the column name to make it easier to find later
-        "@C_#{name}"
-      end
-      
       # CONNECTION MANAGEMENT ====================================
       
       def active?
@@ -198,7 +193,7 @@ module ActiveRecord
         
         # Always (unless COUNT*)'ing) select all columns (required for the AR attributes mechanism to work correctly
         soql = sql.sub(/SELECT .+ FROM/i, "SELECT #{column_names.join(', ')} FROM") unless selectCountMatch
-        
+
         soql.sub!(/ FROM \w+/i, " FROM #{entity_def.api_name}")
         
         # Look for a LIMIT clause
@@ -209,8 +204,10 @@ module ActiveRecord
         
         # Fixup column references to use api names
         columns = columns_map(table_name)
-        while soql =~ COLUMN_NAME_REGEX
-          column = columns[$~[1]]
+        while soql =~ /\w+\.(\w+)/i
+          column_name = $~[1]
+          
+          column = columns[column_name]
           soql = $~.pre_match + column.api_name + $~.post_match
         end
         
@@ -277,10 +274,12 @@ module ActiveRecord
         columns = columns_map(table_name)
         
         # Extract array of column names
-        names = extract_columns(sql)
+        names = sql.match(/\((.+)\) VALUES/i)[1].scan(/\w+/i)
         
         # Extract arrays of values
-        values = extract_values(sql)
+        values = sql.match(/VALUES\s*\((.+)\)/i)[1]
+        values = values.scan(/(((NULL))|'(([^']|\\')*)'),*/mi)
+        values.map! { |v| v[3] }
         
         fields = {}
         names.each_with_index do | name, n | 
@@ -291,7 +290,7 @@ module ActiveRecord
         end
         
         sobject = create_sobject(entity_name, nil, fields)
-        
+          
         check_result(get_result(@connection.create(:sObjects => sobject), :create))[0][:id]
       end      
       
@@ -304,8 +303,11 @@ module ActiveRecord
         entity_name = entity_name_from_table(table_name)
         columns = columns_map(table_name)
         
-        names = extract_columns(sql)
-        values = extract_values(sql)
+        match = sql.match(/SET\s+(.+)\s+WHERE/mi)[1]
+        names = match.scan(/(\w+)\s+=/).flatten
+        
+        values = match.scan(/=\s+(((NULL))|'(([^']|\\')*)'),*/mi)
+        values.map! { |v| v[3] }
         
         fields = {}
         names.each_with_index do | name, n | 
@@ -314,7 +316,7 @@ module ActiveRecord
           fields[column.api_name] = value if not column.readonly and value != "NULL"
         end
         
-        id = sql.match(/WHERE id = @V_'(\w+)'/i)[1]
+        id = sql.match(/WHERE id = '(\w+)'/i)[1]
         
         sobject = create_sobject(entity_name, id, fields)
         
@@ -325,12 +327,22 @@ module ActiveRecord
       def delete(sql, name = nil) 
         log(sql, name)
         
-        # Extract the ids
-        ids = extract_values(sql)
+        # Extract the id
+        match = sql.match(/WHERE\s+id\s*=\s*'(\w+)'/mi)
+        
+        if match 
+          ids = [ match[1] ]
+        else
+          # Check for the form id IN ('x', 'y')
+          match = sql.match(/WHERE\s+id\s+IN\s*\((.+)\)/mi)[1]
+          ids = match.scan(/\w+/)
+        end
         
         ids_element = []        
         ids.each { |id| ids_element << :ids << id }
         
+        pp ids_element
+        
         check_result(get_result(@connection.delete(ids_element), :delete))
       end
       
@@ -380,15 +392,10 @@ module ActiveRecord
         end
         
         if metadata.childRelationships
-          metadata.childRelationships.each do |relationship|
-            
-            # DCHASMAN TO Figure out the weird and wacky world of relationship metadata
-            if (relationship[:childSObject].casecmp(entity_name) == 0) # or (relationship[:cascadeDelete] == "true")
+          metadata.childRelationships.each do |relationship|  
+            if relationship[:cascadeDelete] == "true"
               r = SalesforceRelationship.new(relationship)
               cached_relationships << r
-            else 
-              #puts "   Skipping relationship"
-              #pp relationship
             end
           end
         end
@@ -414,7 +421,7 @@ module ActiveRecord
         # Create relationships for any reference field
         entity_def.relationships.each do |relationship|
           referenceName = relationship.name
-          unless self.respond_to? referenceName.to_sym or relationship.reference_to == "Profile"
+          unless self.respond_to? referenceName.to_sym or relationship.reference_to == "Profile" 
             reference_to = relationship.reference_to
             
             begin
@@ -422,6 +429,9 @@ module ActiveRecord
             rescue NameError => e
               # Automatically create a least a stub for the referenced entity
               referenced_klass = klass.class_eval("::#{reference_to} = Class.new(ActiveRecord::Base)")
+              referenced_klass.connection = klass.connection
+              #configure_active_record(get_entity_def(reference_to))
+              
               puts "Created ActiveRecord stub for the referenced entity '#{reference_to}'"
             end
             
@@ -484,16 +494,6 @@ module ActiveRecord
         columns(table_name).map { |column| column.api_name }
       end
       
-      
-      def extract_columns(sql)
-        sql.scan(COLUMN_NAME_REGEX).flatten
-      end
-      
-      
-      def extract_values(sql)
-        sql.scan(COLUMN_VALUE_REGEX).map { |v| v[0] }
-      end
-      
     end
     
   end

data/lib/column_definition.rb

@@ -38,10 +38,11 @@ module ActiveRecord
     class SalesforceColumn < Column
       include StringHelper
       
-      attr_reader :api_name, :label, :readonly, :reference_to
+      attr_reader :api_name, :custom, :label, :readonly, :reference_to
       
       def initialize(field)
         @api_name = field[:name]
+        @custom = field[:custom] == "true"
         @name = column_nameize(@api_name)
         @type = get_type(field[:type])
         @limit = field[:length]
@@ -56,6 +57,8 @@ module ActiveRecord
           @reference_to = field[:referenceTo]
           @one_to_many = false
           @cascade_delete = false
+          
+          @name.chop!.chop! << "id__c" if @custom
         end
       end
       
@@ -90,37 +93,5 @@ module ActiveRecord
 
     end
     
-    class SalesforceRelationship
-      include StringHelper
-    
-      attr_reader :name, :api_name, :foreign_key, :label, :reference_to, :one_to_many, :cascade_delete
-      
-      def initialize(source)
-        if source[:childSObject]
-          relationship = source
-          
-          @api_name = relationship[:relationshipName] ? relationship[:relationshipName] : relationship[:field].chop.chop
-          @one_to_many = relationship[:relationshipName] != nil
-          @cascade_delete = relationship[:cascadeDelete] == "true"
-          @reference_to = relationship[:childSObject]
-          @label = @name
-          @foreign_key = column_nameize(relationship[:field])
-        else
-          field = source
-          
-          @api_name = field[:name].chop.chop
-          @label = field[:label]
-          @readonly = (field[:updateable] != "true" or field[:createable] != "true")          
-          @reference_to = field[:referenceTo]
-          @one_to_many = false
-          @cascade_delete = false
-          @foreign_key = column_nameize(field[:name])
-        end
-
-        @name = column_nameize(@api_name)
-
-      end
-    end
-    
   end
 end    

data/lib/relationship_definition.rb

@@ -0,0 +1,76 @@
+=begin
+  ActiveSalesforce
+  Copyright (c) 2006 Doug Chasman
+
+  Permission is hereby granted, free of charge, to any person obtaining a copy
+  of this software and associated documentation files (the "Software"), to deal
+  in the Software without restriction, including without limitation the rights
+  to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+  copies of the Software, and to permit persons to whom the Software is
+  furnished to do so, subject to the following conditions:
+
+  The above copyright notice and this permission notice shall be included in
+  all copies or substantial portions of the Software.
+
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+  IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+  FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+  AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+  LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+  SOFTWARE.
+=end
+
+require 'rubygems'
+require_gem 'rails', ">= 1.0.0"
+
+require 'pp'
+
+
+module ActiveRecord  
+  module StringHelper
+    def column_nameize(s)
+      s.underscore
+    end
+  end
+  
+  module ConnectionAdapters
+ 
+     class SalesforceRelationship
+      include StringHelper
+    
+      attr_reader :name, :api_name, :custom, :foreign_key, :label, :reference_to, :one_to_many
+      
+      def initialize(source)
+        if source[:childSObject]
+          relationship = source
+          
+          @api_name = relationship[:relationshipName] ? relationship[:relationshipName] : relationship[:field].chop.chop
+          @one_to_many = relationship[:relationshipName] != nil
+          @reference_to = relationship[:childSObject]
+          @label = @name
+          @foreign_key = column_nameize(relationship[:field])
+          @custom = false
+        else
+          field = source
+          
+          @api_name = field[:name]
+          @custom = field[:custom] == "true"
+          
+          @api_name = @api_name.chop.chop unless @custom
+          
+          @label = field[:label]
+          @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]
+        end
+
+        @name = column_nameize(@api_name)
+
+      end
+    end
+    
+  end
+end    

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: activesalesforce
 version: !ruby/object:Gem::Version 
-  version: 0.2.2
-date: 2006-02-06 00:00:00 -05:00
+  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.
 require_paths: 
 - lib
@@ -31,7 +31,8 @@ files:
 - lib/column_definition.rb
 - lib/activesalesforce.rb
 - lib/rforce.rb
-- lib/salesforce_connection_adapter.rb
+- lib/asf_adapter.rb
+- lib/relationship_definition.rb
 - test/unit
 - test/unit/account_test.rb
 - README