activesalesforce 0.2.6 → 0.2.7

data/lib/asf_adapter.rb

@@ -44,18 +44,25 @@ module ActiveRecord
     
     # Establishes a connection to the database that's used by all Active Record objects.
     def self.activesalesforce_connection(config) # :nodoc:
-      puts "Using ActiveSalesforce connection!"
+      puts "\nUsing ActiveSalesforce connection\n"
       
       url = config[:url]
       sid = config[:sid]
+      binding = config[:binding] if config[:binding]
       
+      if binding
+        puts "   via provided binding #{binding}\n" 
+        #pp binding
+      end
+        
       if sid
-        connection = @@cache["sid=#{sid}"]
-        unless connection
+        binding = @@cache["sid=#{sid}"] unless binding
+        
+        unless binding
           puts "Establishing new connection for [sid='#{sid}']"
           
-          connection = RForce::Binding.new(url, sid)
-          @@cache["sid=#{sid}"] = connection
+          binding = RForce::Binding.new(url, sid)
+          @@cache["sid=#{sid}"] = binding
           
           puts "Created new connection for [sid='#{sid}']"
         end
@@ -71,19 +78,20 @@ module ActiveRecord
         username = config[:username]
         password = config[:password]
         
-        connection = @@cache["#{url}.#{username}.#{password}"]
-        unless connection
+        binding = @@cache["#{url}.#{username}.#{password}"] unless binding
+        
+        unless binding
           puts "Establishing new connection for ['#{url}', '#{username}']"
           
-          connection = RForce::Binding.new(url)
-          connection.login(username, password).result
+          binding = RForce::Binding.new(url, sid)
+          binding.login(username, password).result
           
-          @@cache["#{url}.#{username}.#{password}"] = connection
+          @@cache["#{url}.#{username}.#{password}"] = binding
           
           puts "Created new connection for ['#{url}', '#{username}']"
         end
         
-        ConnectionAdapters::SalesforceAdapter.new(connection, logger, [url, username, password], config)
+        ConnectionAdapters::SalesforceAdapter.new(binding, logger, [url, username, password, sid], config)
       end
     end
   end
@@ -98,7 +106,7 @@ module ActiveRecord
         
         @fault = fault
 
-        logger.debug("\nSalesforceError:\n   message='#{message}'\n   fault='#{fault}'\n\n")
+        logger.debug("\nSalesforceError:\n   message='#{message}'\n   fault='#{fault}'\n\n") if logger
       end
     end
     
@@ -290,8 +298,8 @@ module ActiveRecord
         values = values.scan(/(((NULL))|((TRUE))|((FALSE))|'(([^']|'')*)'),*/mi)
 
         values.map! { |v| v[7] }
-
-        fields = get_fields(columns, names, values)
+        
+        fields = get_fields(columns, names, values, :createable)
         
         sobject = create_sobject(entity_name, nil, fields)
           
@@ -314,7 +322,7 @@ module ActiveRecord
         values = match.scan(/=\s*(((NULL))|((TRUE))|((FALSE))|'(([^']|'')*)'),*/mi)
         values.map! { |v| v[7] }
 
-        fields = get_fields(columns, names, values)
+        fields = get_fields(columns, names, values, :updateable)
         
         id = sql.match(/WHERE\s+id\s*=\s*'(\w+)'/i)[1]
         
@@ -341,13 +349,11 @@ module ActiveRecord
         ids_element = []        
         ids.each { |id| ids_element << :ids << id }
         
-        pp ids_element
-        
         check_result(get_result(@connection.delete(ids_element), :delete))
       end
       
       
-      def get_fields(columns, names, values) 
+      def get_fields(columns, names, values, access_check) 
         fields = {}
         names.each_with_index do | name, n | 
           value = values[n]
@@ -359,7 +365,8 @@ module ActiveRecord
             
             value.gsub!(/''/, "'") if value.is_a? String
           
-            fields[column.api_name] = value unless column.readonly or value.empty?
+            include_field = ((not value.empty?) and column.send(access_check))            
+            fields[column.api_name] = value if include_field
           end
         end
 
@@ -404,15 +411,18 @@ module ActiveRecord
           custom = true
         end
         
-        metadata.fields.each do |field| 
+        metadata[:fields].each do |field| 
           column = SalesforceColumn.new(field) 
           cached_columns << column
           
           cached_relationships << SalesforceRelationship.new(field, column) if field[:type] =~ /reference/i
         end
         
-        if metadata.childRelationships
-          metadata.childRelationships.each do |relationship|  
+        relationships = metadata[:childRelationships]
+        if relationships
+          relationships = [ relationships ] unless relationships.is_a? Array
+          
+          relationships.each do |relationship|  
             if relationship[:cascadeDelete] == "true"
               r = SalesforceRelationship.new(relationship)
               cached_relationships << r
@@ -443,28 +453,40 @@ module ActiveRecord
           referenceName = relationship.name
           unless self.respond_to? referenceName.to_sym or relationship.reference_to == "Profile" 
             reference_to = relationship.reference_to
+            one_to_many = relationship.one_to_many
+            foreign_key = relationship.foreign_key
+            
+            # DCHASMAN TODO Figure out how to handle polymorphic refs (e.g. Note.parent can refer to 
+            # Account, Contact, Opportunity, Contract, Asset, Product2, <CustomObject1> ... <CustomObject(n)>
+            if reference_to.is_a? Array
+              puts "   Skipping unsupported polymophic one-to-#{one_to_many ? 'many' : 'one' } relationship '#{referenceName}' from #{entity_name} to [#{relationship.reference_to.join(', ')}] using #{foreign_key}"
+              next 
+            end
+
+            # Handle references to custom objects
+            if reference_to.match(/__c$/)
+              reference_to.chop!.chop!.chop!
+              reference_to.capitalize!
+            end
             
             begin
-              reference_to.constantize
+              referenced_klass = reference_to.constantize
             rescue NameError => e
               # Automatically create a least a stub for the referenced entity
+              puts "   Creating ActiveRecord stub for the referenced entity '#{reference_to}'"
+                          
               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}'"
+              # configure_active_record(get_entity_def(reference_to))
             end
-            
-            one_to_many = relationship.one_to_many
-            foreign_key = relationship.foreign_key
-            
+
             if one_to_many
               klass.has_many referenceName.to_sym, :class_name => reference_to, :foreign_key => foreign_key, :dependent => false
             else
               klass.belongs_to referenceName.to_sym, :class_name => reference_to, :foreign_key => foreign_key, :dependent => false
             end
             
-            puts "Created one-to-#{one_to_many ? 'many' : 'one' } relationship '#{referenceName}' from #{entity_name} to #{relationship.reference_to} using #{foreign_key}"
+            puts "   Created one-to-#{one_to_many ? 'many' : 'one' } relationship '#{referenceName}' from #{entity_name} to #{relationship.reference_to} using #{foreign_key}"
             
           end
         end

data/lib/column_definition.rb

@@ -38,7 +38,7 @@ module ActiveRecord
     class SalesforceColumn < Column
       include StringHelper
       
-      attr_reader :api_name, :custom, :label, :readonly, :reference_to
+      attr_reader :api_name, :custom, :label, :createable, :updateable, :reference_to
       
       def initialize(field)
         @api_name = field[:name]
@@ -51,7 +51,8 @@ module ActiveRecord
         @text = [:string, :text].include? @type
         @number = [:float, :integer].include? @type
         
-        @readonly = (field[:updateable] != "true" or field[:createable] != "true")
+        @createable = field[:createable] == "true"
+        @updateable = field[:updateable] == "true"
         
         if field[:type] =~ /reference/i
           @reference_to = field[:referenceTo]

data/lib/mock_binding.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 'yaml'
+require File.dirname(__FILE__) + '/rforce'
+
+
+class MockBinding < RForce::Binding
+  attr_reader :recorded_responses
+  
+  #Connect to the server securely.
+  def initialize(url, sid, recording)
+    @recording = recording
+    @recorded_responses = {}
+    
+    super(url, sid) if @recording
+  end
+  
+  
+  def save(f)
+    YAML.dump(@recorded_responses, f)
+  end
+  
+  
+  def load(f)
+    @recorded_responses = YAML.load(f)
+  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.
+  def call_remote(method, args)
+    # Star-out any passwords
+    safe_args = args.inject([]) {|memo, v| memo << (memo.last == :password ? "*" * v.length : v) }
+    key = "#{method}(#{safe_args.join(':')})"
+    
+    if @recording
+      response = super(method, args)
+      @recorded_responses[key] = response
+    else
+      response = @recorded_responses[key]
+      
+      unless response
+        @recorded_responses.each do |request, reponse|
+          #pp request
+        end
+        
+        raise "Unable to find matching response for recorded request '#{key}'" 
+      end
+    end
+    
+    response
+  end
+  
+end

data/lib/relationship_definition.rb

@@ -45,12 +45,28 @@ module ActiveRecord
         if source[:childSObject]
           relationship = source
           
-          @api_name = relationship[:relationshipName] ? relationship[:relationshipName] : relationship[:field].chop.chop
-          @one_to_many = relationship[:relationshipName] != nil
+          if relationship[:relationshipName]
+            @api_name = relationship[:relationshipName]
+            @one_to_many = true
+            @label = @api_name
+            @name = column_nameize(@api_name)
+            @custom = false
+          else 
+            @api_name = relationship[:field]
+            @one_to_many = relationship[:cascadeDelete] == "true"
+            @label = relationship[:childSObject].pluralize
+            @custom = relationship[:childSObject].match(/__c$/)
+
+            name = relationship[:childSObject]
+            name.chop!.chop!.chop! if custom
+            
+            @name = column_nameize(name.pluralize)
+          end
+          
           @reference_to = relationship[:childSObject]
-          @label = @name
+          
           @foreign_key = column_nameize(relationship[:field])
-          @custom = false
+          @foreign_key.chop!.chop! << "id__c" if @foreign_key.match(/__c$/)
         else
           field = source
           
@@ -60,15 +76,12 @@ module ActiveRecord
           @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.name
+          @name = column_nameize(@api_name)
         end
-
-        @name = column_nameize(@api_name)
-
       end
     end
     

data/lib/rforce.rb

@@ -150,7 +150,7 @@ module RForce
 
 
     #Connect to the server securely.
-    def initialize(url, sid = nil)
+    def initialize(url, sid)
       init_server(url)
 
       @session_id = sid
@@ -184,10 +184,10 @@ module RForce
 
       raise "Incorrect user name / password [#{response.fault}]" unless response.loginResponse
 
-      result = response.loginResponse.result
-      @session_id = result.sessionId
+      result = response[:loginResponse][:result]
+      @session_id = result[:sessionId]
 
-      init_server(result.serverUrl)
+      init_server(result[:serverUrl])
 
       response
     end

data/test/unit/basic_test.rb

@@ -0,0 +1,99 @@
+require 'rubygems'
+
+#require_gem 'activesalesforce', '>= 0.2.6'
+require 'activesalesforce'
+
+require 'recorded_test_case'
+require 'pp'
+
+
+class Contact < ActiveRecord::Base
+end
+
+
+
+module Asf
+  module UnitTests
+    
+    class BasicTest < Test::Unit::TestCase
+      include RecordedTestCase
+      
+      attr_reader :contact
+      
+      def initialize(test_method_name)
+        super(test_method_name)
+        
+        #force_recording :test_get_created_by_from_contact
+      end
+      
+      def setup
+        puts "\nStarting test '#{self.class.name.gsub('::', '')}.#{method_name}'"
+
+        super
+          
+        @contact = Contact.new
+        contact.first_name = 'DutchTestFirstName'
+        contact.last_name = 'DutchTestLastName'
+        contact.home_phone = '555-555-1212'
+        contact.save   
+        
+        contact.reload
+      end
+      
+      def teardown
+        contact.destroy if contact
+
+        super
+      end
+      
+      def test_count_contacts
+        assert_equal 27, Contact.count
+      end
+      
+      def test_create_a_contact
+        contact.id
+      end
+
+      def test_save_a_contact
+        contact.id
+      end
+
+      def test_find_a_contact
+        c = Contact.find(contact.id)
+        assert_equal contact.id, c.id
+      end
+
+      def test_find_a_contact_by_id
+        c = Contact.find_by_id(contact.id)
+        assert_equal contact.id, c.id
+      end
+
+      def test_find_a_contact_by_first_name
+        c = Contact.find_by_first_name('DutchTestFirstName')
+        assert_equal contact.id, c.id
+      end
+      
+      def test_read_all_content_columns
+        Contact.content_columns.each { |column| contact.send(column.name) }
+      end
+            
+      def test_get_created_by_from_contact
+        user = contact.created_by
+        assert_equal contact.created_by_id, user.id
+      end
+ 
+      def test_add_notes_to_contact
+        n1 = Note.new(:title => "My Title", :body => "My Body")
+        n2 = Note.new(:title => "My Title 2", :body => "My Body 2")
+        
+        contact.notes << n1
+        contact.notes << n2
+        
+        n1.save
+        n2.save
+      end
+                  
+    end
+
+  end
+end