salesforce_bulk2 0.5.0 → 0.5.1

data/lib/salesforce_bulk/batch.rb

@@ -1,6 +1,6 @@
 module SalesforceBulk
   class Batch
-    attr_accessor :connection
+    attr_accessor :session_id
 
     attr_reader :apex_processing_time
     attr_reader :api_active_processing_time
@@ -14,18 +14,29 @@ module SalesforceBulk
     attr_reader :total_processing_time
     attr_reader :data
 
-    @@max_records = 10000
+    @@batch_size = 10000
 
-    def self.max_records
-      @@max_records
+    def self.batch_size
+      @@batch_size
     end
-    
-    #This is not the way this is going to run
-    def initialize(data, job_id, client = nil)
-      update(data)
-      @client = client
+
+    def self.new_from_xml xml_data, session_id = nil
+      batch = Batch.new
+      batch.update(data)
+      batch.session_id = session_id
+      batch
+    end
+
+    def self.find job_id, batch_id, session_id
+      batch = Batch.new
+      batch.id = batch_id
+      batch.job_id = job_id
+      batch.session_id = session_id
+      batch.refresh
+      batch
     end
 
+
     def update(data)
       @data = data
 
@@ -41,6 +52,10 @@ module SalesforceBulk
       @apex_processing_time = data['apex_processing_time'].to_i
     end
 
+    def job
+      @job ||= Job.find(@job_id, @session_id) if @session_id
+    end
+
     ### State Information ###
     def in_progress?
       state? 'InProgress'
@@ -79,7 +94,7 @@ module SalesforceBulk
     end
 
     def refresh
-      xml_data = http_get_xml("job/#{jobId}/batch/#{batchId}")
+      xml_data = @connection.http_get_xml("job/#{jobId}/batch/#{batchId}")
       update(xml_data)
     end
   end

data/lib/salesforce_bulk/client.rb

@@ -16,12 +16,12 @@ module SalesforceBulk
       @connection.disconnect
     end
 
-    def connect
-      @connection.connect
+    def connect options = {}
+      @connection.connect(options)
     end
 
-    def create_job operation, sobject, options = {}
-      Job.new add_job(operation, sobject, options), self
+    def new_job operation, sobject, options = {}
+      Job.new(add_job(operation, sobject, options), self)
     end
 
     def add_job operation, sobject, options={}
@@ -39,7 +39,7 @@ module SalesforceBulk
       xml  = '<?xml version="1.0" encoding="utf-8"?>'
       xml += '<jobInfo xmlns="http://www.force.com/2009/06/asyncapi/dataload">'
       xml += "  <operation>#{operation}</operation>"
-      xml += "  <object>#{sobject}</object>"
+      xml += "  <object>#{sobject}</object>" if sobject
       xml += "  <externalIdFieldName>#{options[:external_id_field_name]}</externalIdFieldName>" if options[:external_id_field_name]
       xml += "  <concurrencyMode>#{options[:concurrency_mode]}</concurrencyMode>" if options[:concurrency_mode]
       xml += "  <contentType>CSV</contentType>"
@@ -66,11 +66,11 @@ module SalesforceBulk
       @connection.http_post_xml("job/#{job_id}", xml)
     end
 
-    def get_job job_id
+    def get_job_info job_id
       @connection.http_get_xml("job/#{job_id}")
     end
 
-    def get_batch job_id, batch_id
+    def get_batch_info job_id, batch_id
       @connection.http_get_xml("job/#{jobId}/batch/#{batchId}")
     end
 
@@ -190,9 +190,9 @@ module SalesforceBulk
     end
     
     def perform_operation(operation, sobject, data, external_id = nil, batch_size = nil)
-      job = create_job(operation, sobject, :external_id_field_name => external_id)
+      job = new_job(operation, sobject, :external_id_field_name => external_id)
       
-      data.each_slice(batch_size || Batch.max_records) do |records|
+      data.each_slice(batch_size || Batch.batch_size) do |records|
         job.add_batch(records)
       end
 

data/lib/salesforce_bulk/connection.rb

@@ -44,7 +44,13 @@ module SalesforceBulk
       @debugging = options[:debugging] || @@debugging
     end
 
-    def connect
+    def connect options = {}
+      raise Error.new("Already connected") if connected?
+
+      @username = options[:username] || @username
+      @password = options[:password] || @password
+      @version  = options[:version] || @version
+
       xml  = '<?xml version="1.0" encoding="utf-8"?>'
       xml += '<env:Envelope xmlns:xsd="http://www.w3.org/2001/XMLSchema"'
       xml += ' xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"'

data/lib/salesforce_bulk/job.rb

@@ -7,10 +7,11 @@ module SalesforceBulk
     attr_reader :data
 
     @@fields = [:id, :operation, :object, :createdById, :state, :createdDate, 
-      :systemModstamp, :externalIdFieldName, :concurrencyMode, :contentType, :numberBatchesQueued, 
-      :numberBatchesInProgress, :numberBatchesCompleted, :numberBatchesFailed, :totalBatches, 
-      :retries, :numberRecordsProcessed, :numberRecordsFailed, :totalProcessingTime, 
-      :apiActiveProcessingTime, :apexProcessingTime, :apiVersion]
+      :systemModstamp, :externalIdFieldName, :concurrencyMode, :contentType, 
+      :numberBatchesQueued, :numberBatchesInProgress, :numberBatchesCompleted, 
+      :numberBatchesFailed, :totalBatches, :retries, :numberRecordsProcessed, 
+      :numberRecordsFailed, :totalProcessingTime, :apiActiveProcessingTime, 
+      :apexProcessingTime, :apiVersion]
     
     @@valid_operations = [:delete, :insert, :update, :upsert, :query]
     @@valid_concurrency_modes = ['Parallel', 'Serial']
@@ -28,9 +29,10 @@ module SalesforceBulk
       @@valid_concurrency_modes.include?(concurrency_mode)
     end
 
-    def initialize xml_data, client
-      update(xml_data)
-      @client = client
+    def new_from_xml xml_data, client = nil
+      job = Job.new
+      job.update(xml_data)
+      job.client = client
     end
 
     def update xml_data
@@ -45,7 +47,7 @@ module SalesforceBulk
         instance_variable_set(field, xml_data[field])
       end
 
-      #Special cases/formats
+      #Special cases and data formats
       @created_date = DateTime.parse(xml_data['createdDate'])
       @system_modstamp = DateTime.parse(xml_data['systemModstamp'])
 
@@ -76,26 +78,26 @@ module SalesforceBulk
     end
 
     def close
-      update(@client.close(@id))
+      update(@client.close_job(@id))
     end
 
     def abort
-      update(@client.abort(@id))
+      update(@client.abort_job(@id))
     end
 
     def refresh
-      update(@client.get_job(@id))
-    end
-
-    #Statuses
-    def batches_finished?
-      @number_batches_queued == 0 and
-      @number_batches_in_progress == 0
+      update(@client.get_job_info(@id))
     end
 
     def get_results
       batch_list.map(&:result).flatten
     end
+
+    #Statuses
+    def batches_finished?
+      (@number_batches_queued == 0) and
+      (@number_batches_in_progress == 0)
+    end
     
     def finished?
       failed?  or 

data/lib/salesforce_bulk/version.rb

@@ -1,3 +1,3 @@
 module SalesforceBulk
-  VERSION = "0.5.0"
+  VERSION = "0.5.1"
 end

data/lib/salesforce_bulk.rb

@@ -14,4 +14,7 @@ require 'salesforce_bulk/job'
 require 'salesforce_bulk/batch'
 require 'salesforce_bulk/batch_result'
 require 'salesforce_bulk/batch_result_collection'
-require 'salesforce_bulk/query_result_collection'
+require 'salesforce_bulk/query_result_collection'
+
+module SalesforceBulk
+end

data/{salesforce_bulk.gemspec → salesforce_bulk2.gemspec}

@@ -6,8 +6,8 @@ Gem::Specification.new do |s|
   s.name        = "salesforce_bulk2"
   s.version     = SalesforceBulk::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.authors     = ["Adam Kerr", "Jorge Valdivia","Javier Julio"]
-  s.email       = ["ajrkerr@gmail.com", "jorge@valdivia.me","jjfutbol@gmail.com"]
+  s.authors     = ["Adam Kerr", "Jorge Valdivia", "Javier Julio"]
+  s.email       = ["ajrkerr@gmail.com", "jorge@valdivia.me", "jjfutbol@gmail.com"]
   s.homepage    = "https://github.com/ajrkerr/salesforce_bulk"
   s.summary     = %q{Ruby support for the Salesforce Bulk API}
   s.description = %q{This gem is a simple interface to the Salesforce Bulk API providing support for insert, update, upsert, delete, and query.}
@@ -17,7 +17,7 @@ Gem::Specification.new do |s|
   s.executables   = `git ls-files -- bin/*`.split("\n").map{ |f| File.basename(f) }
   s.require_paths = ["lib"]
 
-  s.add_dependency "active_support"
+  s.add_dependency "activesupport"
   s.add_dependency "xml-simple"
 
   s.add_development_dependency "mocha"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_bulk2
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.5.1
   prerelease: 
 platform: ruby
 authors:
@@ -11,10 +11,10 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-31 00:00:00.000000000 Z
+date: 2012-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: active_support
+  name: activesupport
   requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
@@ -134,7 +134,7 @@ files:
 - lib/salesforce_bulk/query_result_collection.rb
 - lib/salesforce_bulk/salesforce_error.rb
 - lib/salesforce_bulk/version.rb
-- salesforce_bulk.gemspec
+- salesforce_bulk2.gemspec
 - test/fixtures/batch_create_request.csv
 - test/fixtures/batch_create_response.xml
 - test/fixtures/batch_info_list_response.xml