activesalesforce 0.2.1 → 0.2.2

data/lib/column_definition.rb

@@ -30,7 +30,6 @@ require 'pp'
 module ActiveRecord  
   module StringHelper
     def column_nameize(s)
-      #s ? s.first.downcase + s[1 .. s.length] : nil
       s.underscore
     end
   end

data/lib/rforce.rb

@@ -120,6 +120,7 @@ module RForce
       return elements
     end
   end
+  
 
   #Implements the connection to the SalesForce server.
   class Binding
@@ -147,17 +148,20 @@ module RForce
 </env:Envelope>
     HERE
 
+
     #Connect to the server securely.
-    def initialize(url)
+    def initialize(url, sid = nil)
       init_server(url)
 
-      @session_id = ''
+      @session_id = sid
       @batch_size = DEFAULT_BATCH_SIZE
     end
 
+
     def show_debug
       $DEBUG or ENV['SHOWSOAP']
     end
+
     
     def init_server(url)
       @url = URI.parse(url)
@@ -169,6 +173,7 @@ module RForce
       @server.set_debug_output $stderr if show_debug
     end
 
+
     #Log in to the server and remember the session ID
     #returned to us by SalesForce.
     def login(user, password)
@@ -186,6 +191,7 @@ module RForce
 
       response
     end
+    
 
     #Call a method on the remote server.  Arguments can be
     #a hash or (if order is important) an array of alternating
@@ -238,6 +244,7 @@ module RForce
 
       SoapResponse.new(content)
     end
+    
 
     # decode gzip
     def decode(response)
@@ -260,6 +267,7 @@ module RForce
         response.body
       end
     end
+    
 
     # encode gzip
     def encode(request)
@@ -275,6 +283,7 @@ module RForce
       end
     end
 
+
     #Turns method calls on this object into remote SOAP calls.
     def method_missing(method, *args)
       unless args.size == 1 && [Hash, Array].include?(args[0].class)
@@ -283,6 +292,7 @@ module RForce
 
       call_remote method, args[0]
     end
+    
 
     #Expand Ruby data structures into XML.
     def expand(args, xmlns = nil)

data/lib/salesforce_connection_adapter.rb

@@ -26,7 +26,7 @@ require_gem 'rails', ">= 1.0.0"
 
 require 'thread'
 
-require File.dirname(__FILE__) + '/salesforce_login'
+require File.dirname(__FILE__) + '/rforce'
 require File.dirname(__FILE__) + '/column_definition'
 
 class ResultArray < Array
@@ -46,20 +46,38 @@ module ActiveRecord
       puts "Using ActiveSalesforce connection!"
       
       url = config[:url]
-      username = config[:username]
-      password = config[:password]
+      sid = config[:sid]
       
-      connection = @@cache["#{url}.#{username}.#{password}"]
-      unless connection
-        puts "Establishing new connection for ['#{url}', '#{username}']"
-
-        connection = SalesforceLogin.new(url, username, password).proxy 
-        @@cache["#{url}.#{username}.#{password}"] = connection
+      if sid
+        connection = @@cache["sid=#{sid}"]
+        unless connection
+          puts "Establishing new connection for [sid='#{sid}']"
+          
+          connection = RForce::Binding.new(url, sid)
+          @@cache["sid=#{sid}"] = connection
+          
+          puts "Created new connection for [sid='#{sid}']"
+        end
+        
+        ConnectionAdapters::SalesforceAdapter.new(connection, logger, [url, sid], config)
+      else
+        username = config[:username]
+        password = config[:password]
+        
+        connection = @@cache["#{url}.#{username}.#{password}"]
+        unless connection
+          puts "Establishing new connection for ['#{url}', '#{username}']"
+          
+          connection = RForce::Binding.new(url)
+          connection.login(username, password).result
+          
+          @@cache["#{url}.#{username}.#{password}"] = connection
+          
+          puts "Created new connection for ['#{url}', '#{username}']"
+        end
         
-        puts "Created new connection for ['#{url}', '#{username}']"
+        ConnectionAdapters::SalesforceAdapter.new(connection, logger, [url, username, password], config)
       end
-      
-      ConnectionAdapters::SalesforceAdapter.new(connection, logger, [url, username, password], config)
     end
   end
   
@@ -72,15 +90,14 @@ module ActiveRecord
         super message
         
         @fault = fault
-        
-        #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 SalesforceAdapter < AbstractAdapter
+      
       class EntityDefinition
         attr_reader :name, :columns, :column_name_to_column, :relationships
         
@@ -134,10 +151,10 @@ 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'"
-          else                       quoted_value = super(value, column)
+        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}"
@@ -176,7 +193,7 @@ module ActiveRecord
         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)
         
         # Always (unless COUNT*)'ing) select all columns (required for the AR attributes mechanism to work correctly
@@ -209,7 +226,7 @@ module ActiveRecord
         @batch_size = nil
         
         queryResult = get_result(@connection.query(:queryString => soql), :query)
-        records = queryResult.records
+        records = queryResult[:records]
         
         result = ResultArray.new(queryResult[:size].to_i)
         return result unless records
@@ -264,7 +281,7 @@ module ActiveRecord
         
         # Extract arrays of values
         values = extract_values(sql)
-
+        
         fields = {}
         names.each_with_index do | name, n | 
           value = values[n]
@@ -289,14 +306,14 @@ module ActiveRecord
         
         names = extract_columns(sql)
         values = extract_values(sql)
-
+        
         fields = {}
         names.each_with_index do | name, n | 
           column = columns[name]
           value = values[n]
           fields[column.api_name] = value if not column.readonly and value != "NULL"
         end
-
+        
         id = sql.match(/WHERE id = @V_'(\w+)'/i)[1]
         
         sobject = create_sobject(entity_name, id, fields)
@@ -332,7 +349,7 @@ module ActiveRecord
         result = [ result ] unless result.is_a?(Array)
         
         result.each do |r|
-            raise SalesforceError.new(@logger, r[:errors], r[:errors][:message]) unless r[:success] == "true"
+          raise SalesforceError.new(@logger, r[:errors], r[:errors][:message]) unless r[:success] == "true"
         end
         
         result
@@ -354,7 +371,7 @@ module ActiveRecord
           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
@@ -375,12 +392,12 @@ 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_def
-                
+        
         entity_def
       end
       
@@ -429,7 +446,7 @@ module ActiveRecord
         entity_name = entity_name_from_table(table_name)
         get_entity_def(entity_name).columns
       end
-            
+      
       
       def columns_map(table_name, name = nil)
         entity_name = entity_name_from_table(table_name)

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: activesalesforce
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 date: 2006-02-06 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: 
@@ -28,7 +28,6 @@ cert_chain:
 authors: 
 - Doug Chasman
 files: 
-- lib/salesforce_login.rb
 - lib/column_definition.rb
 - lib/activesalesforce.rb
 - lib/rforce.rb

data/lib/salesforce_login.rb

@@ -1,39 +0,0 @@
-#!/usr/bin/env ruby
-
-=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 File.dirname(__FILE__) + '/rforce.rb'
-
-
-class SalesforceLogin
-  attr_reader :proxy
-  
-  def initialize(url, username, password) 
-    puts "SalesforceLogin.initialize()"
-
-    @proxy = RForce::Binding.new(url)
-    
-    login_result = @proxy.login(username, password).result
-  end
-end