executrix 1.1.3 → 1.2.0

data/README.md

@@ -86,6 +86,16 @@ res = salesforce.query('Account', 'select id, name, createddate from Account lim
 puts res.result.records.inspect
 ~~~
 
+## File Upload
+
+For file uploads, just add a `File` object to the binary columns.
+~~~ ruby
+attachment = {'ParentId' => '00Kk0001908kqkDEAQ', 'Name' => 'attachment.pdf', 'Body' => File.new('tmp/attachment.pdf')}
+records_to_insert = []
+records_to_insert << attachment
+salesforce.insert('Attachment', records_to_insert)
+~~~
+
 ### Query status
 
 The above examples all return immediately after sending the data to the Bulk API. If you want to wait, until the batch finished, call the final_status method on the batch-reference.

data/executrix.gemspec

@@ -20,8 +20,9 @@ Gem::Specification.new do |gem|
   gem.require_paths = ["lib"]
 
   gem.add_dependency 'rake'
-  gem.add_dependency 'nori', '< 2.3'
+  gem.add_dependency 'nori', '< 2.4'
   gem.add_dependency 'nokogiri', '< 1.7'
-  gem.add_development_dependency 'rspec', '< 2.14'
-  gem.add_development_dependency 'webmock', '< 1.12'
+  gem.add_dependency 'rubyzip', '< 1.1'
+  gem.add_development_dependency 'rspec', '< 2.15'
+  gem.add_development_dependency 'webmock', '< 1.14'
 end

data/lib/executrix/connection.rb

@@ -24,12 +24,13 @@ module Executrix
       @session_id.split('!').first
     end
 
-    def create_job operation, sobject, external_field
+    def create_job operation, sobject, content_type, external_field
       Executrix::Http.create_job(
         @instance,
         @session_id,
         operation,
         sobject,
+        content_type,
         @api_version,
         external_field)[:id]
     end
@@ -82,6 +83,15 @@ module Executrix
       )
     end
 
+    def add_file_upload_batch job_id, filename
+      Executrix::Http.add_file_upload_batch(
+        @instance,
+        @session_id,
+        job_id,
+        filename,
+        @api_version)[:id]
+    end
+
     def add_batch job_id, records
       return -1 if records.nil? || records.empty?
 

data/lib/executrix/helper.rb

@@ -37,5 +37,33 @@ module Executrix
       before_sf = server_url[/^https?:\/\/(.+)\.salesforce\.com/, 1]
       before_sf.gsub(/-api$/,'')
     end
+
+    def attachment_keys records
+      records.map do |record|
+        record.select do |key, value|
+          value.class == File
+        end.keys
+      end.flatten.uniq
+    end
+
+    def transform_values! records, keys
+      keys.each do |key|
+        records.each do |record|
+          file_handle = record[key]
+          if file_handle
+            file_path = File.absolute_path(file_handle)
+            record
+              .merge!({
+                key => Executrix::Helper.absolute_to_relative_path(file_path,'#')
+              })
+            yield file_path if block_given?
+          end
+        end
+      end
+    end
+
+    def absolute_to_relative_path input, replacement
+      input.gsub(/(^C:[\/\\])|(^\/)/,replacement)
+    end
   end
 end

data/lib/executrix/http.rb

@@ -41,6 +41,20 @@ module Executrix
       process_csv_response(process_http_request(r))
     end
 
+    def add_file_upload_batch instance, session_id, job_id, filename, api_version
+      data = File.read(filename)
+      headers = {
+        'Content-Type' => 'zip/csv',
+        'X-SFDC-Session' => session_id}
+      r = Http::Request.new(
+        :post,
+        Http::Request.generic_host(instance),
+        "/services/async/#{api_version}/job/#{job_id}/batch",
+        data,
+        headers)
+      process_xml_response(nori.parse(process_http_request(r)))
+    end
+
     def process_http_request(r)
       http = Net::HTTP.new(r.host, 443)
       http.use_ssl = true
@@ -120,7 +134,7 @@ module Executrix
           headers)
       end
 
-      def self.create_job instance, session_id, operation, sobject, api_version, external_field = nil
+      def self.create_job instance, session_id, operation, sobject, content_type, api_version, external_field = nil
         external_field_line = external_field ?
           "<externalIdFieldName>#{external_field}</externalIdFieldName>" : nil
         body = %Q{<?xml version="1.0" encoding="utf-8" ?>
@@ -128,7 +142,7 @@ module Executrix
             <operation>#{operation}</operation>
             <object>#{sobject}</object>
             #{external_field_line}
-            <contentType>CSV</contentType>
+            <contentType>#{content_type}</contentType>
           </jobInfo>
         }
         headers = {
@@ -209,7 +223,6 @@ module Executrix
           headers)
       end
 
-      private
       def self.generic_host prefix
         "#{prefix}.salesforce.com"
       end

data/lib/executrix/version.rb

@@ -1,3 +1,3 @@
 module Executrix
-  VERSION = '1.1.3'
+  VERSION = '1.2.0'
 end

data/lib/executrix.rb

@@ -3,6 +3,7 @@ require 'executrix/helper'
 require 'executrix/batch'
 require 'executrix/http'
 require 'executrix/connection'
+require 'zip'
 
 module Executrix
   class Api
@@ -40,6 +41,7 @@ module Executrix
       job_id = @connection.create_job(
         'query',
         sobject,
+        'CSV',
         nil)
       batch_id = @connection.add_query(job_id, query)
       @connection.close_job job_id
@@ -49,11 +51,44 @@ module Executrix
 
     private
     def start_job(operation, sobject, records, external_field=nil)
+      attachment_keys = Executrix::Helper.attachment_keys(records)
+
+      content_type = 'CSV'
+      zip_filename = nil
+      request_filename = nil
+      batch_id = -1
+      if not attachment_keys.empty?
+        tmp_filename = Dir::Tmpname.make_tmpname('bulk_upload', '.zip')
+        zip_filename = "#{Dir.tmpdir}/#{tmp_filename}"
+        Zip::File.open(zip_filename, Zip::File::CREATE) do |zipfile|
+          Executrix::Helper.transform_values!(records, attachment_keys) do |path|
+            zipfile.add(Executrix::Helper.absolute_to_relative_path(path, ''), path)
+          end
+          tmp_filename = Dir::Tmpname.make_tmpname('request', '.txt')
+          request_filename = "#{Dir.tmpdir}/#{tmp_filename}"
+          File.open(request_filename, 'w') do |file|
+            file.write(Executrix::Helper.records_to_csv(records))
+          end
+          zipfile.add('request.txt', request_filename)
+        end
+
+        content_type = 'ZIP_CSV'
+      end
+
       job_id = @connection.create_job(
         operation,
         sobject,
+        content_type,
         external_field)
-      batch_id = @connection.add_batch job_id, records
+      if zip_filename
+        batch_id = @connection.add_file_upload_batch job_id, zip_filename
+        [zip_filename, request_filename].each do |file|
+          File.delete(file) if file
+        end
+      else
+        batch_id = @connection.add_batch job_id, records
+      end
+
       @connection.close_job job_id
       Executrix::Batch.new @connection, job_id, batch_id
     end

data/spec/lib/executrix/batch_spec.rb

@@ -3,33 +3,33 @@ require 'spec_helper'
 
 describe Executrix::Batch do
   describe '#final_status' do
-    it 'should return the final status if it already exists' do
+    it 'returns the final status if it already exists' do
       b = described_class.new nil, nil, nil
       expected_status = {w: :tf}
-      b.should_not_receive(:status)
+      expect(b).not_to receive(:status)
       b.instance_variable_set '@final_status', expected_status
       expect(b.final_status).to eq(expected_status)
     end
 
-    it 'should return specific final status for -1 batch id' do
+    it 'returns specific final status for -1 batch id' do
       b = described_class.new nil, nil, -1
       expected_status = {
           state: 'Completed',
           state_message: 'Empty Request',
         }
-      b.should_not_receive(:status)
+      expect(b).not_to receive(:status)
       expect(b.final_status).to eq(expected_status)
     end
 
-    it 'should query the status correctly' do
+    it 'queries the status correctly' do
       b = described_class.new nil, nil, nil
-      b.should_receive(:status).once.and_return({w: :tf})
+      expect(b).to receive(:status).once.and_return({w: :tf})
       # TODO lookup the actual result
-      b.should_receive(:results).once.and_return({g: :tfo})
+      expect(b).to receive(:results).once.and_return({g: :tfo})
       expect(b.final_status).to eq({w: :tf, results: {g: :tfo}})
     end
 
-    it 'should yield status correctly' do
+    it 'yields status correctly' do
       expected_running_state = {
           state: 'InProgress'
         }
@@ -37,18 +37,18 @@ describe Executrix::Batch do
           state: 'Completed'
         }
       b = described_class.new nil, nil, nil
-      b.should_receive(:status).once.and_return(expected_running_state)
-      b.should_receive(:status).once.and_return(expected_running_state)
-      b.should_receive(:status).once.and_return(expected_final_state)
-      b.should_receive(:results).once.and_return({g: :tfo})
+      expect(b).to receive(:status).once.and_return(expected_running_state)
+      expect(b).to receive(:status).once.and_return(expected_running_state)
+      expect(b).to receive(:status).once.and_return(expected_final_state)
+      expect(b).to receive(:results).once.and_return({g: :tfo})
       expect{|blk| b.final_status(0, &blk)}
         .to yield_successive_args(expected_running_state, expected_final_state)
     end
 
-    it 'should raise exception when batch fails' do
+    it 'raises exception when batch fails' do
       b = described_class.new nil, nil, nil
       expected_error_message = 'Generic Error Message'
-      b.should_receive(:status).once.and_return(
+      expect(b).to receive(:status).once.and_return(
         {
           state: 'Failed',
           state_message: expected_error_message})

data/spec/lib/executrix/connection_spec.rb

@@ -6,16 +6,16 @@ describe Executrix::Connection do
 
   {
     login: 0,
-    create_job: 3,
+    create_job: 4,
     close_job: 1,
     query_batch: 2,
     query_batch_result_id: 2,
     query_batch_result_data: 3,
   }.each do |method_name, num_of_params|
     describe "##{method_name}" do
-      it 'should delegate correctly to Http class' do
-        Executrix::Http
-          .should_receive(method_name)
+      it 'delegates correctly to Http class' do
+        expect(Executrix::Http)
+          .to receive(method_name)
           .and_return({})
         subject.send(method_name, *Array.new(num_of_params))
       end
@@ -23,22 +23,22 @@ describe Executrix::Connection do
   end
 
   describe '#add_query' do
-    it 'should delegate correctly to Http class' do
-      Executrix::Http.should_receive(:add_batch)
+    it 'delegates correctly to Http class' do
+      expect(Executrix::Http).to receive(:add_batch)
           .and_return({})
       subject.add_query(nil, nil)
     end
   end
 
   describe '#org_id' do
-    it 'should raise exception when not logged in' do
+    it 'raises exception when not logged in' do
       expect {subject.org_id}.to raise_error(RuntimeError)
     end
 
-    it 'should return correct OrgId after login' do
+    it 'returns correct OrgId after login' do
       org_id = '00D50000000IehZ'
-      Executrix::Http
-      .should_receive(:login)
+      expect(Executrix::Http)
+      .to receive(:login)
       .and_return({session_id: "#{org_id}!AQcAQH0dMHZfz972Szmpkb58urFRkgeBGsxL_QJWwYMfAbUeeG7c1E6LYUfiDUkWe6H34r1AAwOR8B8fLEz6n04NPGRrq0FM"})
       expect(subject.login.org_id).to eq(org_id)
     end
@@ -46,20 +46,20 @@ describe Executrix::Connection do
 
 
   describe '#add_batch' do
-    it 'should delegate correctly to underlying classes' do
-      Executrix::Http.should_receive(:add_batch)
+    it 'delegates correctly to underlying classes' do
+      expect(Executrix::Http).to receive(:add_batch)
           .and_return({})
-      Executrix::Helper.should_receive(:records_to_csv)
+      expect(Executrix::Helper).to receive(:records_to_csv)
         .and_return('My,Awesome,CSV')
-      subject.add_batch(nil, 'non emtpy records')
+      subject.add_batch(nil, [{'non_emtpy' => 'records'}])
     end
 
-    it 'should return -1 for nil input' do
+    it 'returns -1 for nil input' do
       return_code = subject.add_batch(nil, nil)
       expect(return_code).to eq(-1)
     end
 
-    it 'should return -1 for empty input' do
+    it 'returns -1 for empty input' do
       return_code = subject.add_batch(nil, [])
       expect(return_code).to eq(-1)
     end

data/spec/lib/executrix/helper_spec.rb

@@ -3,7 +3,7 @@ require 'spec_helper'
 
 describe Executrix::Helper do
   describe '.records_to_csv' do
-    it 'should return valid csv for single record' do
+    it 'returns valid csv for single record' do
       input = [
         {'Title' => 'Awesome Title', 'Name' => 'A name'},
       ]
@@ -13,7 +13,7 @@ describe Executrix::Helper do
       expect(described_class.records_to_csv(input)).to eq(expected_csv)
     end
 
-    it 'should return valid csv for basic records' do
+    it 'returns valid csv for basic records' do
       input = [
         {'Title' => 'Awesome Title', 'Name' => 'A name'},
         {'Title' => 'A second Title', 'Name' => 'A second name'},
@@ -25,7 +25,7 @@ describe Executrix::Helper do
       expect(described_class.records_to_csv(input)).to eq(expected_csv)
     end
 
-    it 'should return valid csv when first row misses a key' do
+    it 'returns valid csv when first row misses a key' do
       input = [
         {'Title' => 'Awesome Title', 'Name' => 'A name'},
         {'Title' => 'A second Title', 'Name' => 'A second name', 'Something' => 'Else'},
@@ -37,7 +37,7 @@ describe Executrix::Helper do
       expect(described_class.records_to_csv(input)).to eq(expected_csv)
     end
 
-    it 'should correctly convert Array to Multi-Picklist' do
+    it 'correctly converts Array to Multi-Picklist' do
       input = [
         {'Title' => 'Awesome Title', 'Picklist' => ['Several', 'Values']},
         {'Title' => 'A second Title', 'Picklist' => ['SingleValue']},
@@ -49,7 +49,7 @@ describe Executrix::Helper do
       expect(described_class.records_to_csv(input)).to eq(expected_csv)
     end
 
-    it 'should return valid csv when order of keys varies' do
+    it 'returns valid csv when order of keys varies' do
       input = [
         {'Title' => 'Awesome Title', 'Name' => 'A name'},
         {'Name' => 'A second name', 'Title' => 'A second Title'},
@@ -75,19 +75,146 @@ describe Executrix::Helper do
       'https://supercustomname.my.salesforce.com/services/Soap/u/28.0/00EH0000001jNQu'
     }
 
-    it 'should return correct instance for regular salesforce server url' do
+    it 'returns correct instance for regular salesforce server url' do
       expect(described_class.fetch_instance_from_server_url(basic_server_url))
         .to eq('eu1')
     end
 
-    it 'should return correct instance for api salesforce server url' do
+    it 'returns correct instance for api salesforce server url' do
       expect(described_class.fetch_instance_from_server_url(basic_api_server_url))
         .to eq('cs7')
     end
 
-    it 'should return correct instance for named salesforce server url' do
+    it 'returns correct instance for named salesforce server url' do
       expect(described_class.fetch_instance_from_server_url(named_server_url))
         .to eq('supercustomname.my')
     end
   end
+
+  describe '.attachment_keys' do
+    let(:records_with_attachment) do
+      prefix = Dir.tmpdir
+      FileUtils.touch("#{prefix}/attachment.pdf")
+      [
+        {
+          'normal_key' => 'normal_value1',
+          'attachment_key' => nil,
+        },
+        {
+          'normal_key' => 'normal_value2',
+          'attachment_key' => File.new("#{prefix}/attachment.pdf"),
+        }
+      ]
+    end
+
+    let(:records_with_multiple_attachment) do
+      prefix = Dir.tmpdir
+      FileUtils.touch("#{prefix}/attachment1.pdf")
+      FileUtils.touch("#{prefix}/attachment2.pdf")
+      FileUtils.touch("#{prefix}/attachment3.pdf")
+      [
+        {
+          'normal_key' => 'normal_value1',
+          'attachment_key' => File.new("#{prefix}/attachment1.pdf"),
+          'another_attachment_key' => File.new("#{prefix}/attachment2.pdf"),
+        },
+        {
+          'normal_key' => 'normal_value2',
+          'attachment_key' => File.new("#{prefix}/attachment3.pdf"),
+        }
+      ]
+    end
+
+    let(:records_without_attachment) do
+      [
+        {
+          'normal_key' => 'normal_value1',
+          'another_normal_key' => 'another_normal_value1',
+        },
+        {
+          'normal_key' => 'normal_value2',
+          'another_normal_key' => 'another_normal_value2',
+        }
+      ]
+    end
+
+    it 'returns correct keys for single attachment key' do
+      expect(described_class.attachment_keys(records_with_attachment))
+        .to eq(['attachment_key'])
+    end
+
+    it 'returns correct keys for multiple attachment keys' do
+      expect(described_class.attachment_keys(records_with_multiple_attachment))
+        .to eq(['attachment_key', 'another_attachment_key'])
+    end
+
+    it 'returns false for no attachment' do
+      expect(described_class.attachment_keys(records_without_attachment))
+        .to eq([])
+    end
+  end
+
+  describe '.transform_values!' do
+    let(:records_with_attachment) do
+      prefix = Dir.tmpdir
+      FileUtils.touch("#{prefix}/attachment.pdf")
+      [
+        {
+          'normal_key' => 'normal_value1',
+          'attachment_key' => nil,
+        },
+        {
+          'normal_key' => 'normal_value2',
+          'attachment_key' => File.new("#{prefix}/attachment.pdf"),
+        }
+      ]
+    end
+
+    it 'transforms values correctly' do
+      expect(File).to receive(:absolute_path).and_return('/an/absolute/path')
+      expected_output = [
+        {
+          'normal_key' => 'normal_value1',
+          'attachment_key' => nil,
+        },
+        {
+          'normal_key' => 'normal_value2',
+          'attachment_key' => '#an/absolute/path',
+        }
+      ]
+
+      input = records_with_attachment
+      described_class.transform_values!(input,['attachment_key'])
+      expect(input).to eq(expected_output)
+    end
+
+    it 'yields absolute path' do
+      expect(File).to receive(:absolute_path).and_return('/an/absolute/path')
+      input = records_with_attachment
+      expect do |blk|
+        described_class.transform_values!(input,['attachment_key'], &blk)
+      end.to yield_with_args('/an/absolute/path')
+    end
+  end
+
+  describe '.absolute_to_relative_path' do
+    let(:unix_path) { '/a/unix/path' }
+    let(:windows_path_backslash) { 'C:\a\backslash\path' }
+    let(:windows_path_forwardslash) { 'C:/a/forwardslash/path' }
+
+    it 'strips unix path correctly' do
+      expect(described_class.absolute_to_relative_path(unix_path,'')).
+        to eq('a/unix/path')
+    end
+
+    it 'strips windows path with backslash correctly' do
+      expect(described_class.absolute_to_relative_path(windows_path_backslash,'')).
+        to eq('a\backslash\path')
+    end
+
+    it 'strips windows path with forwardslash correctly' do
+      expect(described_class.absolute_to_relative_path(windows_path_forwardslash,'')).
+        to eq('a/forwardslash/path')
+    end
+  end
 end

data/spec/lib/executrix/http_spec.rb

@@ -16,7 +16,7 @@ describe Executrix::Http do
       Executrix::Http::Request.new(:get, 'test.host', '/', '', [])
     end
   
-    it 'should return a response object' do
+    it 'returns a response object' do
        expected_body = 'correct result'
         stub_request(:post, 'https://test.host')
           .with(
@@ -140,16 +140,16 @@ describe Executrix::Http do
         </soapenv:Envelope>}
     end
 
-    it 'should raise an error for faulty login' do
-      Executrix::Http.should_receive(:process_http_request)
+    it 'raises an error for faulty login' do
+      expect(Executrix::Http).to receive(:process_http_request)
         .and_return(login_error)
       expect{ Executrix::Http.login('a','b','c', 'd') }
         .to raise_error(RuntimeError, login_error_message)
     end
 
-    it 'should return hash for correct login' do
+    it 'returns hash for correct login' do
       [login_success, login_success_new].each do |login_response|
-        Executrix::Http.should_receive(:process_http_request)
+        expect(Executrix::Http).to receive(:process_http_request)
           .and_return(login_response)
         result = Executrix::Http.login('a','b','c', 'd')
         expect(result).to be_a(Hash)
@@ -189,10 +189,10 @@ describe Executrix::Http do
           </jobInfo>}
     end
 
-    it 'should return hash for creating job' do
-      Executrix::Http.should_receive(:process_http_request)
+    it 'returns hash for creating job' do
+      expect(Executrix::Http).to receive(:process_http_request)
         .and_return(create_job_success)
-      result = Executrix::Http.create_job('a','b','c','d', 'e')
+      result = Executrix::Http.create_job('a','b','c','d', 'e', 'f')
       expect(result).to be_a(Hash)
       expect(result).to have_key(:id)
       expect(result).to have_key(:operation)
@@ -218,8 +218,8 @@ describe Executrix::Http do
       }
     end
 
-    it 'should return hash for adding batch' do
-      Executrix::Http.should_receive(:process_http_request)
+    it 'returns hash for adding batch' do
+      expect(Executrix::Http).to receive(:process_http_request)
         .and_return(add_batch_success)
       result = Executrix::Http.add_batch(:post,'a','b','c','d')
       expect(result).to be_a(Hash)
@@ -258,8 +258,8 @@ describe Executrix::Http do
           </jobInfo>}
     end
 
-    it 'should return hash for closing job' do
-      Executrix::Http.should_receive(:process_http_request)
+    it 'returns hash for closing job' do
+      expect(Executrix::Http).to receive(:process_http_request)
         .and_return(close_job_success)
       result = Executrix::Http.close_job('a','b','c','d')
       expect(result).to be_a(Hash)
@@ -280,8 +280,8 @@ describe Executrix::Http do
         </error>}
     end
 
-    it 'should raise an exception on faulty authorization' do
-      Executrix::Http.should_receive(:process_http_request)
+    it 'raises an exception on faulty authorization' do
+      expect(Executrix::Http).to receive(:process_http_request)
         .and_return(invalid_session_id)
       expect{Executrix::Http.query_batch('a','b','c','d','e')}
         .to raise_error(RuntimeError, 'InvalidSessionId: Invalid session id')
@@ -295,8 +295,8 @@ describe Executrix::Http do
         </result-list>}
     end
 
-    it 'should return hash including the result id' do
-      Executrix::Http.should_receive(:process_http_request)
+    it 'returns hash including the result id' do
+      expect(Executrix::Http).to receive(:process_http_request)
         .and_return(batch_result_success)
       result = Executrix::Http.query_batch_result_id('a','b','c','d','e')
       expect(result).to be_a(Hash)
@@ -317,8 +317,8 @@ describe Executrix::Http do
         "003K001200KO82cIAD","King of the  Hill"}
     end
 
-    it 'should return array of arrays for data' do
-      Executrix::Http.should_receive(:process_http_request)
+    it 'returns array of arrays for data' do
+      expect(Executrix::Http).to receive(:process_http_request)
         .and_return(batch_result_data_success)
       result = Executrix::Http.query_batch_result_data('a','b','c','d','e','f')
       expect(result).to eq([
@@ -326,8 +326,8 @@ describe Executrix::Http do
         {'Id' => '003M001200KO82cIAD', 'my_external_id__c' => 'K-015699'}])
     end
 
-    it 'should return correct array with spaces' do
-      Executrix::Http.should_receive(:process_http_request)
+    it 'returns correct array with spaces' do
+      expect(Executrix::Http).to receive(:process_http_request)
         .and_return(batch_result_data_with_spaces_success)
       result = Executrix::Http.query_batch_result_data('a','b','c','d','e','f')
       expect(result).to eq([

data/spec/lib/executrix_spec.rb

@@ -11,53 +11,96 @@ describe Executrix::Api do
   end
 
   {
-    upsert: 3,
-    update: 2,
-    insert: 2,
-    delete: 2,
-  }.each do |method_name, num_of_params|
+    upsert: [nil,[{'no' => 'value'}], 'upsert_id'],
+    update: [nil,[{'no' => 'value'}]],
+    insert: [nil,[{'no' => 'value'}]],
+    delete: [nil,[{'no' => 'value'}]],
+  }.each do |method_name, values|
     describe "##{method_name}" do
-      it 'should delegate to #start_job' do
-        Executrix::Connection
-          .should_receive(:connect)
+      it 'delegates to #start_job' do
+        expect(Executrix::Connection)
+          .to receive(:connect)
           .and_return(empty_connection)
         s = described_class.new(nil, nil)
-        s.should_receive(:start_job)
-          .with(method_name.to_s, *Array.new(num_of_params))
-        s.send(method_name, *Array.new(num_of_params))
+        expect(s).to receive(:start_job)
+          .with(method_name.to_s, *values)
+        s.send(method_name, *values)
       end
 
-      it 'should trigger correct workflow' do
-        Executrix::Connection
-          .should_receive(:connect)
+      it 'triggers correct workflow' do
+        expect(Executrix::Connection)
+          .to receive(:connect)
           .and_return(empty_connection)
         s = described_class.new(nil, nil)
-        empty_connection.should_receive(:create_job).ordered
-        empty_connection.should_receive(:add_batch).ordered
-        empty_connection.should_receive(:close_job).ordered
-        res = s.send(method_name, *Array.new(num_of_params))
+        expect(empty_connection).to receive(:create_job).ordered
+        expect(empty_connection).to receive(:add_batch).ordered
+        expect(empty_connection).to receive(:close_job).ordered
+        res = s.send(method_name, *values)
         expect(res).to be_a(Executrix::Batch)
       end
     end
   end
 
   describe '#query' do
-    it 'should trigger correct workflow' do
-      Executrix::Connection
-          .should_receive(:connect)
+    it 'triggers correct workflow' do
+        expect(Executrix::Connection)
+          .to receive(:connect)
           .and_return(empty_connection)
-      Executrix::Batch
-        .should_receive(:new)
+        expect(Executrix::Batch)
+          .to receive(:new)
         .and_return(empty_batch)
 
       s = described_class.new(nil, nil)
       sobject_input = 'sobject_stub'
       query_input = 'query_stub'
-      empty_connection.should_receive(:create_job).ordered
-      empty_connection.should_receive(:add_query).ordered
-      empty_connection.should_receive(:close_job).ordered
-      empty_batch.should_receive(:final_status).ordered
+      expect(empty_connection).to receive(:create_job).ordered
+      expect(empty_connection).to receive(:add_query).ordered
+      expect(empty_connection).to receive(:close_job).ordered
+      expect(empty_batch).to receive(:final_status).ordered
       s.query(sobject_input, query_input)
     end
   end
+
+  context 'file upload' do
+    describe '#insert' do
+      prefix = Dir.tmpdir
+      FileUtils.touch("#{prefix}/attachment.pdf")
+      attachment_data = {
+        'ParentId' => '00Kk0001908kqkDEAQ',
+        'Name' => 'attachment.pdf',
+        'Body' => File.new("#{prefix}/attachment.pdf")
+      }
+
+      {
+        upsert: [nil,[attachment_data.dup], 'upsert_id'],
+        update: [nil,[attachment_data.dup]],
+        insert: [nil,[attachment_data.dup]],
+        delete: [nil,[attachment_data.dup]],
+      }.each do |method_name, values|
+        describe "##{method_name}" do
+          it 'delegates to #start_job' do
+            expect(Executrix::Connection)
+              .to receive(:connect)
+              .and_return(empty_connection)
+            s = described_class.new(nil, nil)
+            expect(s).to receive(:start_job)
+              .with(method_name.to_s, *values)
+            s.send(method_name, *values)
+          end
+
+          it 'triggers correct workflow' do
+            expect(Executrix::Connection)
+              .to receive(:connect)
+              .and_return(empty_connection)
+            s = described_class.new(nil, nil)
+            expect(empty_connection).to receive(:create_job).ordered
+            expect(empty_connection).to receive(:add_file_upload_batch).ordered
+            expect(empty_connection).to receive(:close_job).ordered
+            res = s.send(method_name, *values)
+            expect(res).to be_a(Executrix::Batch)
+          end
+        end
+      end
+    end
+  end
 end

metadata

@@ -1,99 +1,114 @@
 --- !ruby/object:Gem::Specification
 name: executrix
 version: !ruby/object:Gem::Version
-  version: 1.1.3
-  prerelease: 
+  version: 1.2.0
+  prerelease:
 platform: ruby
 authors:
 - Jorge Valdivia
 - Leif Gensert
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ! '>='
+    - - '>='
       - !ruby/object:Gem::Version
         version: '0'
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: nori
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - <
       - !ruby/object:Gem::Version
-        version: '2.3'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
+        version: '2.4'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - <
       - !ruby/object:Gem::Version
-        version: '2.3'
+        version: '2.4'
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: !ruby/object:Gem::Requirement
-    none: false
+  version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - <
       - !ruby/object:Gem::Version
         version: '1.7'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - <
       - !ruby/object:Gem::Version
         version: '1.7'
+    none: false
+  prerelease: false
+  type: :runtime
 - !ruby/object:Gem::Dependency
-  name: rspec
-  requirement: !ruby/object:Gem::Requirement
+  name: rubyzip
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.1'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - <
       - !ruby/object:Gem::Version
-        version: '2.14'
-  type: :development
+        version: '1.1'
+    none: false
   prerelease: false
+  type: :runtime
+- !ruby/object:Gem::Dependency
+  name: rspec
   version_requirements: !ruby/object:Gem::Requirement
-    none: false
     requirements:
     - - <
       - !ruby/object:Gem::Version
-        version: '2.14'
-- !ruby/object:Gem::Dependency
-  name: webmock
-  requirement: !ruby/object:Gem::Requirement
+        version: '2.15'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - <
       - !ruby/object:Gem::Version
-        version: '1.12'
-  type: :development
+        version: '2.15'
+    none: false
   prerelease: false
+  type: :development
+- !ruby/object:Gem::Dependency
+  name: webmock
   version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - <
+      - !ruby/object:Gem::Version
+        version: '1.14'
     none: false
+  requirement: !ruby/object:Gem::Requirement
     requirements:
     - - <
       - !ruby/object:Gem::Version
-        version: '1.12'
-description: This gem provides a super simple interface for the Salesforce Bulk API.
-  It provides support for insert, update, upsert, delete, and query.
+        version: '1.14'
+    none: false
+  prerelease: false
+  type: :development
+description: This gem provides a super simple interface for the Salesforce Bulk API. It provides support for insert, update, upsert, delete, and query.
 email:
 - jorge@valdivia.me
 - leif@propertybase.com
@@ -125,32 +140,32 @@ files:
 - spec/spec_helper.rb
 homepage: https://github.com/propertybase/executrix
 licenses: []
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
-  none: false
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -2027489645870901694
-required_rubygems_version: !ruby/object:Gem::Requirement
+      version: '0'
+      hash: 2
   none: false
+required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ! '>='
+  - - '>='
     - !ruby/object:Gem::Version
-      version: '0'
       segments:
       - 0
-      hash: -2027489645870901694
+      version: '0'
+      hash: 2
+  none: false
 requirements: []
 rubyforge_project: executrix
-rubygems_version: 1.8.23
-signing_key: 
+rubygems_version: 1.8.24
+signing_key:
 specification_version: 3
 summary: Ruby support for the Salesforce Bulk API
 test_files: