activesalesforce 0.3.0 → 0.3.1

data/lib/activesalesforce.rb

@@ -1,24 +1,18 @@
 =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.
+  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
 
 require 'asf_adapter'

data/lib/asf_adapter.rb

@@ -1,24 +1,18 @@
 =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.
+  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
 
 require 'rubygems'
@@ -189,12 +183,31 @@ module ActiveRecord
       end
       
       
+      # TRANSACTIOn SUPPORT (Boxcarring really because the salesforce.com api does not support transactions)
+      
+      # Begins the transaction (and turns off auto-committing).
+      def begin_db_transaction()    
+        log('Opening boxcar', 'begin_db_transaction()')
+      end
+
+      # Commits the transaction (and turns on auto-committing).
+      def commit_db_transaction()   
+        log('Committing boxcar', 'commit_db_transaction()')
+      end
+
+      # Rolls back the transaction (and turns on auto-committing). Must be
+      # done if the transaction block raises an exception or returns false.
+      def rollback_db_transaction() 
+        log('Rolling back boxcar', 'rollback_db_transaction()')
+      end
+      
+      
       # DATABASE STATEMENTS ======================================
       
       def select_all(sql, name = nil) #:nodoc:
         log(sql, name) {
           # Check for SELECT COUNT(*) FROM query
-          selectCountMatch = sql.match(/SELECT COUNT\(\*\) FROM/i)       
+          selectCountMatch = sql.match(/SELECT\s+COUNT\(\*\)\s+FROM/i)       
           if selectCountMatch
             soql = "SELECT id FROM#{selectCountMatch.post_match}"
           end
@@ -209,21 +222,24 @@ 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}")
+          soql.sub!(/\s+FROM\s+\w+/i, " FROM #{entity_def.api_name}")
           
           # Look for a LIMIT clause
-          soql.sub!(/LIMIT 1/i, "")
+          soql.sub!(/LIMIT\s+1/i, "")
           
           # Look for an OFFSET clause
-          soql.sub!(/\d+ OFFSET \d+/i, "")
+          soql.sub!(/\d+\s+OFFSET\s+\d+/i, "")
           
           # Fixup column references to use api names
           columns = columns_map(table_name)
-          while soql =~ /\w+\.(\w+)/i
-            column_name = $~[1]
+          soql.gsub!(/((?:\w+\.)?\w+)(?=\s*(?:=|!=|<|>|<=|>=)\s*(?:'[^']*'|NULL|TRUE|FALSE))/mi) do |column_name| 
+            # strip away any table alias
+            column_name.sub!(/\w+\./, '')
             
             column = columns[column_name]
-            soql = $~.pre_match + column.api_name + $~.post_match
+            raise SalesforceError.new(@logger, "Column not found for #{column_name}!") unless column
+            
+            column.api_name
           end
           
           # Update table name references
@@ -283,12 +299,12 @@ module ActiveRecord
       def insert(sql, name = nil, pk = nil, id_value = nil, sequence_name = nil)
         log(sql, name) {
           # Convert sql to sobject
-          table_name = sql.match(/INSERT INTO (\w+) /i)[1].singularize
+          table_name = sql.match(/INSERT\s+INTO\s+(\w+)\s+/i)[1].singularize
           entity_name = entity_name_from_table(table_name)
           columns = columns_map(table_name)
           
           # Extract array of column names
-          names = sql.match(/\((.+)\) VALUES/i)[1].scan(/\w+/i)
+          names = sql.match(/\((.+)\)\s+VALUES/i)[1].scan(/\w+/i)
           
           # Extract arrays of values
           values = sql.match(/VALUES\s*\((.+)\)/i)[1]
@@ -308,7 +324,7 @@ module ActiveRecord
       def update(sql, name = nil) #:nodoc:
         log(sql, name) {
           # Convert sql to sobject
-          table_name = sql.match(/UPDATE (\w+) /i)[1].singularize
+          table_name = sql.match(/UPDATE\s+(\w+)\s+/i)[1].singularize
           entity_name = entity_name_from_table(table_name)
           columns = columns_map(table_name)
           
@@ -499,7 +515,7 @@ module ActiveRecord
               klass.belongs_to referenceName.to_sym, :class_name => reference_to, :foreign_key => foreign_key, :dependent => false
             end
             
-            @logger.debug("   Created one-to-#{one_to_many ? 'many' : 'one' } relationship '#{referenceName}' from #{entity_name} to #{relationship.reference_to} using #{foreign_key}")
+            #@logger.debug("   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

@@ -1,24 +1,18 @@
 =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.
+  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
 
 require 'rubygems'

data/lib/mock_binding.rb

@@ -1,24 +1,18 @@
 =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.
+  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
 
 require 'yaml'

data/lib/relationship_definition.rb

@@ -1,24 +1,18 @@
 =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.
+  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
 
 require 'rubygems'

data/lib/rforce.rb

@@ -1,12 +1,3 @@
-require 'net/https'
-require 'uri'
-require 'zlib'
-require 'stringio'
-require 'rexml/document'
-require 'rexml/xpath'
-require 'rubygems'
-require_gem 'builder'
-
 =begin
   RForce v0.1
   Copyright (c) 2005 Ian Dees
@@ -55,6 +46,18 @@ require_gem 'builder'
 #
 #    binding.create 'sObject {"xsi:type" => "Opportunity"}' => opportunity
 #
+
+
+require 'net/https'
+require 'uri'
+require 'zlib'
+require 'stringio'
+require 'rexml/document'
+require 'rexml/xpath'
+require 'rubygems'
+require_gem 'builder'
+
+
 module RForce
 
   #Allows indexing hashes like method calls: hash.key

data/test/unit/basic_test.rb

@@ -1,3 +1,20 @@
+=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
+
 require 'rubygems'
 
 #require_gem 'activesalesforce', '>= 0.2.6'
@@ -25,7 +42,7 @@ module Asf
       def initialize(test_method_name)
         super(test_method_name)
         
-        #force_recording :test_master_detail
+        #force_recording :test_batch_insert
       end
       
       def setup
@@ -106,6 +123,29 @@ module Asf
         
         department.destroy
       end
+      
+      def test_batch_insert
+        c1 = Contact.new(:first_name => 'FN1', :last_name => 'LN1')
+        c2 = Contact.new(:first_name => 'FN2', :last_name => 'LN2')
+
+        Contact.transaction(c1, c2) do
+          c1.save
+          c2.save
+        end
+
+        c1.first_name << '_2'        
+        c2.first_name << '_2'        
+
+        Contact.transaction(c1, c2) do
+          c1.save
+          c2.save
+        end
+        
+        Contact.transaction(c1, c2) do
+          c2.destroy
+          c1.destroy
+        end
+      end
                   
     end