activesalesforce 0.1.2 → 0.1.3

data/lib/rforce.rb

@@ -155,13 +155,17 @@ module RForce
       @batch_size = DEFAULT_BATCH_SIZE
     end
 
+    def show_debug
+      $DEBUG or ENV['SHOWSOAP']
+    end
+    
     def init_server(url)
       @url = URI.parse(url)
       @server = Net::HTTP.new(@url.host, @url.port)
       @server.use_ssl = @url.scheme == 'https'
 
       # run ruby with -d to see SOAP wiredumps.
-      @server.set_debug_output $stderr if $DEBUG
+      @server.set_debug_output $stderr if show_debug
     end
 
     #Log in to the server and remember the session ID
@@ -208,7 +212,7 @@ module RForce
         'User-Agent' => 'ActiveSalesforce RForce'
       }
       
-      unless $DEBUG
+      unless show_debug
         headers['Accept-Encoding'] = 'gzip'
         headers['Content-Encoding'] = 'gzip'
       end
@@ -258,7 +262,7 @@ module RForce
 
     # encode gzip
     def encode(request)
-      return request if $DEBUG
+      return request if show_debug
       
       begin
         ostream = StringIO.new

data/lib/salesforce_connection_adapter.rb

@@ -29,6 +29,13 @@ require 'thread'
 require File.dirname(__FILE__) + '/salesforce_login'
 require File.dirname(__FILE__) + '/column_definition'
 
+class ResultArray < Array
+  attr_reader :actual_size
+  
+  def initialize(actual_size)
+    @actual_size = actual_size
+  end
+end
 
 module ActiveRecord    
   class Base   
@@ -140,11 +147,14 @@ module ActiveRecord
         entity_name = entity_name_from_table(table_name)
         column_names = api_column_names(table_name)
         
-        soql = sql.sub(/SELECT \* FROM/, "SELECT #{column_names.join(', ')} FROM")
+        soql = sql.sub(/SELECT \* FROM \w+ /, "SELECT #{column_names.join(', ')} FROM #{table_name} ")
         
         # Look for a LIMIT clause
         soql.sub!(/LIMIT 1/, "")
         
+        # Look for an OFFSET clause
+        soql.sub!(/\d+ OFFSET \d+/, "")
+        
         # Fixup column references to use api names
         columns = columns_map(table_name)
         while soql =~ /@@(\w+)/
@@ -157,9 +167,10 @@ module ActiveRecord
         @connection.batch_size = @batch_size if @batch_size
         @batch_size = nil
         
-        records = get_result(@connection.query(:queryString => soql), :query).records
+        queryResult = get_result(@connection.query(:queryString => soql), :query)
+        records = queryResult.records
         
-        result = []        
+        result = ResultArray.new(queryResult[:size].to_i)
         return result unless records
         
         records = [ records ] unless records.is_a?(Array)
@@ -186,16 +197,28 @@ module ActiveRecord
       end
       
       def select_one(sql, name = nil) #:nodoc:
-        @connection.batch_size = 1
+        self.batch_size = 1
+        
+        # Check for SELECT COUNT(*) FROM query
+        matchCount = sql.match(/SELECT COUNT\(\*\) FROM (\w+)/)       
+        if matchCount
+          sql = "SELECT id FROM #{matchCount[1].singularize} #{matchCount.post_match}"
+        end
+        
         result = select_all(sql, name)
-        result.nil? ? nil : result.first
+        
+        if matchCount
+          { :count => result.actual_size }
+        else
+          result.nil? ? nil : result.first
+        end
       end
       
       def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
         tokens = sql.scan(/[0-9A-Za-z._]+/)
         
         # Convert sql to sobject
-        table_name = tokens[2]
+        table_name = tokens[2].singularize
         entity_name = entity_name_from_table(table_name)
         columns = columns_map(table_name)
         
@@ -219,7 +242,7 @@ module ActiveRecord
       
       def update(sql, name = nil) #:nodoc:
         # Convert sql to sobject
-        table_name = sql.match(/UPDATE (\w+) /)[1]
+        table_name = sql.match(/UPDATE (\w+) /)[1].singularize
         entity_name = entity_name_from_table(table_name)
         columns = columns_map(table_name)
         
@@ -243,10 +266,10 @@ module ActiveRecord
       def delete(sql, name = nil) 
         # Extract the ids from the IN () clause
         match = sql.match(/IN \(([^\)]*)\)/)
-
+        
         # If the IN clause was not found fall back to WHERE id = 'blah'
         ids = match ? match[1].scan(/\w+/) : [ sql.match(/WHERE id = '([^\']*)'/)[1] ]
-
+        
         ids_element = []        
         ids.each { |id| ids_element << :ids << id }
         
@@ -295,7 +318,7 @@ module ActiveRecord
         
         if metadata.childRelationships
           metadata.childRelationships.each do |relationship|
-          
+            
             if relationship[:childSObject].casecmp(entity_name) == 0
               r = SalesforceRelationship.new(relationship)
               cached_relationships << r
@@ -310,25 +333,34 @@ module ActiveRecord
       
       def configure_active_record(entity_name)
         klass = entity_name.constantize
-        
         klass.table_name = entity_name
         klass.pluralize_table_names = false
         klass.set_inheritance_column nil
         klass.lock_optimistically = false
         klass.record_timestamps = false
-        klass.default_timezone = :utc
+        klass.default_timezone = :utc 
         
         # Create relationships for any reference field
         @relationships_map[entity_name].each do |relationship|
           referenceName = relationship.name
           unless self.respond_to? referenceName.to_sym or relationship.reference_to == "Profile"
+            reference_to = relationship.reference_to
+            
+            begin
+              reference_to.constantize
+            rescue NameError => e
+              # Automatically create a least a stub for the referenced entity
+              referenced_klass = klass.class_eval("::#{reference_to} = Class.new(ActiveRecord::Base)")
+              puts "Created ActiveRecord stub for the referenced entity '#{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 => relationship.reference_to, :foreign_key => foreign_key, :dependent => false
+              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 => relationship.reference_to, :foreign_key => foreign_key, :dependent => false
+              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}"
@@ -384,7 +416,7 @@ module ActiveRecord
       end
       
       def table_name_from_sql(sql)
-        sql.match(/FROM (\w+) /)[1]
+        sql.match(/FROM (\w+) /)[1].singularize
       end
       
       def column_names(table_name)

metadata

@@ -3,7 +3,7 @@ rubygems_version: 0.8.11
 specification_version: 1
 name: activesalesforce
 version: !ruby/object:Gem::Version 
-  version: 0.1.2
+  version: 0.1.3
 date: 2006-02-02 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: