salesforce_bulk2 0.5.2 → 0.5.3

data/lib/salesforce_bulk2/batch.rb

@@ -60,7 +60,7 @@ module SalesforceBulk2
 
       @data = data
       body = data
-      
+
       if data.is_a?(Array)
         raise ArgumentError, "Batch data set exceeds #{@@batch_size} record limit by #{data.length - @@batch_size}" if data.length > @@batch_size
         raise ArgumentError, "Batch data set is empty" if data.length < 1
@@ -87,7 +87,7 @@ module SalesforceBulk2
     
     def get_result
       response = @client.http_get("job/#{@job_id}/batch/#{@id}/result")
-      
+
       #Query Result
       if response.body =~ /<.*?>/m
         result = XmlSimple.xml_in(response.body)

data/lib/salesforce_bulk2/client.rb

@@ -185,22 +185,21 @@ module SalesforceBulk2
       @jobs.map(&:abort)
     end
 
-
     ## Operations
     def delete(sobject, data, batch_size = nil)
-      perform_operation(:delete, sobject, data, :batch_size => nil)
+      perform_operation(:delete, sobject, data, :batch_size => batch_size)
     end
     
     def insert(sobject, data, batch_size = nil)
-      perform_operation(:insert, sobject, data, :batch_size => nil)
+      perform_operation(:insert, sobject, data, :batch_size => batch_size)
     end
     
-    def query(sobject, data, batch_size = nil)
-      perform_operation(:query, sobject, data, :batch_size => nil)
+    def query(sobject, query, batch_size = nil)
+      perform_operation(:query, sobject, query, :batch_size => batch_size)
     end
     
     def update(sobject, data, batch_size = nil)
-      perform_operation(:update, sobject, data, :batch_size => nil)
+      perform_operation(:update, sobject, data, :batch_size => batch_size)
     end
     
     def upsert(sobject, data, external_id, batch_size = nil)
@@ -210,7 +209,12 @@ module SalesforceBulk2
     def perform_operation(operation, sobject, data, options = {})
       job = new_job(operation: operation, object: sobject, :external_id => options[:external_id])
 
-      job.add_data(data, options[:batch_size])
+      if data.is_a?(Array)
+        job.add_data(data, options[:batch_size])
+      else
+        job.new_batch(data)
+      end
+
       job.close
       
       until job.finished?

data/lib/salesforce_bulk2/job.rb

@@ -144,17 +144,13 @@ module SalesforceBulk2
 
     def get_results
       results = BatchResultCollection.new
-
       get_batches.each { |batch| results << batch.get_result }
-
       results.flatten
     end
 
     # def get_requests
     #   results = BatchResultCollection.new
-
     #   get_batches.each { |batch| results << batch.get_request }
-
     #   results.flatten
     # end
 

data/lib/salesforce_bulk2/version.rb

@@ -1,3 +1,3 @@
 module SalesforceBulk2
-  VERSION = "0.5.2"
+  VERSION = "0.5.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_bulk2
 version: !ruby/object:Gem::Version
-  version: 0.5.2
+  version: 0.5.3
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-08-10 00:00:00.000000000 Z
+date: 2012-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport