Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use << to concat strings instead of += #81

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 28 additions & 28 deletions lib/salesforce_bulk_api/job.rb
Original file line number Diff line number Diff line change
Expand Up @@ -22,14 +22,14 @@ def create_job(batch_size, send_nulls, no_null_list)
@no_null_list = no_null_list

xml = "#{@XML_HEADER}<jobInfo xmlns=\"http://www.force.com/2009/06/asyncapi/dataload\">"
xml += "<operation>#{@operation}</operation>"
xml += "<object>#{@sobject}</object>"
xml << "<operation>#{@operation}</operation>"
xml << "<object>#{@sobject}</object>"
# This only happens on upsert
if !@external_field.nil?
xml += "<externalIdFieldName>#{@external_field}</externalIdFieldName>"
xml << "<externalIdFieldName>#{@external_field}</externalIdFieldName>"
end
xml += "<contentType>XML</contentType>"
xml += "</jobInfo>"
xml << "<contentType>XML</contentType>"
xml << "</jobInfo>"

path = "job"
headers = Hash['Content-Type' => 'application/xml; charset=utf-8']
Expand All @@ -45,8 +45,8 @@ def create_job(batch_size, send_nulls, no_null_list)

def close_job()
xml = "#{@XML_HEADER}<jobInfo xmlns=\"http://www.force.com/2009/06/asyncapi/dataload\">"
xml += "<state>Closed</state>"
xml += "</jobInfo>"
xml << "<state>Closed</state>"
xml << "</jobInfo>"

path = "job/#{@job_id}"
headers = Hash['Content-Type' => 'application/xml; charset=utf-8']
Expand Down Expand Up @@ -85,9 +85,9 @@ def add_batches
def add_batch(keys, batch)
xml = "#{@XML_HEADER}<sObjects xmlns=\"http://www.force.com/2009/06/asyncapi/dataload\" xmlns:xsi=\"http://www.w3.org/2001/XMLSchema-instance\">"
batch.each do |r|
xml += create_sobject(keys, r)
xml << create_sobject(keys, r)
end
xml += '</sObjects>'
xml << '</sObjects>'
path = "job/#{@job_id}/batch/"
headers = Hash["Content-Type" => "application/xml; charset=UTF-8"]
response = @connection.post_xml(nil, path, xml, headers)
Expand All @@ -99,17 +99,17 @@ def build_sobject(data)
xml = '<sObject>'
data.keys.each do |k|
if k.is_a?(Hash)
xml += build_sobject(k)
xml << build_sobject(k)
elsif k.to_s.include? '.'
relations = k.to_s.split('.')
parent = relations[0]
child = relations[1..-1].join('.')
xml += "<#{parent}>#{build_sobject({ child => data[k] })}</#{parent}>"
xml << "<#{parent}>#{build_sobject({ child => data[k] })}</#{parent}>"
elsif data[k] != :type
xml += "<#{k}>#{data[k]}</#{k}>"
xml << "<#{k}>#{data[k]}</#{k}>"
end
end
xml += '</sObject>'
xml << '</sObject>'
end

def build_relationship_sobject(key, value)
Expand All @@ -118,10 +118,10 @@ def build_relationship_sobject(key, value)
parent = relations[0]
child = relations[1..-1].join('.')
xml = "<#{parent}>"
xml += "<sObject>"
xml += build_relationship_sobject(child, value)
xml += "</sObject>"
xml += "</#{parent}>"
xml << "<sObject>"
xml << build_relationship_sobject(child, value)
xml << "</sObject>"
xml << "</#{parent}>"
else
xml = "<#{key}>#{value}</#{key}>"
end
Expand All @@ -131,26 +131,26 @@ def create_sobject(keys, r)
sobject_xml = '<sObject>'
keys.each do |k|
if r[k].is_a?(Hash)
sobject_xml += "<#{k}>"
sobject_xml += build_sobject(r[k])
sobject_xml += "</#{k}>"
sobject_xml << "<#{k}>"
sobject_xml << build_sobject(r[k])
sobject_xml << "</#{k}>"
elsif k.to_s.include? '.'
sobject_xml += build_relationship_sobject(k, r[k])
sobject_xml << build_relationship_sobject(k, r[k])
elsif !r[k].to_s.empty?
sobject_xml += "<#{k}>"
sobject_xml << "<#{k}>"
if r[k].respond_to?(:encode)
sobject_xml += r[k].encode(:xml => :text)
sobject_xml << r[k].encode(:xml => :text)
elsif r[k].respond_to?(:iso8601) # timestamps
sobject_xml += r[k].iso8601.to_s
sobject_xml << r[k].iso8601.to_s
else
sobject_xml += r[k].to_s
sobject_xml << r[k].to_s
end
sobject_xml += "</#{k}>"
sobject_xml << "</#{k}>"
elsif @send_nulls && !@no_null_list.include?(k) && r.key?(k)
sobject_xml += "<#{k} xsi:nil=\"true\"/>"
sobject_xml << "<#{k} xsi:nil=\"true\"/>"
end
end
sobject_xml += '</sObject>'
sobject_xml << '</sObject>'
sobject_xml
end

Expand Down