executrix 1.3.0 → 1.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: adbfe678d21169065c727f7b0f11e9871398a5f8
-  data.tar.gz: 4d5baaf178dc01c99abf9e653aeadba6633d9576
+  metadata.gz: 6ced71acaf75a254a114481b24b1ba5048b3d05b
+  data.tar.gz: ececa6fd0c37254472fcaf50362682844c071bb6
 SHA512:
-  metadata.gz: 2cfc598c3a8448f4a3efd3bf378d50b8ea2aa98827dfb3ecce236d685d1ac6cd51cf2445e073ccd91fe8a7bfc49ceff5bb679d37237449ecbf6cb83688577705
-  data.tar.gz: 12ff55f6dad093df4ca29a8d5e835b1ce3e58c869b52490df0ceb80b805d91f1f95450a567266489281b60a4a7cf1debb8de23da1f205c2a3234d59166fe87a8
+  metadata.gz: b07d762601af1dd6b05f9b6a87feb45cf42deecb64305e00a1341fe9c8a9a2820b000828ec94fd373f59bfe1ed45cd32640798a377a481cf799b41f7af79e3f8
+  data.tar.gz: bdd203300c9bad368639cf7dd6b7ded16c84aabd89cb34f20e841f0b971c5970fe103b43ba1c6bac03eb6fe7a8715070d13385c508628aacfe889e5d4662d536

data/.ruby-version

@@ -1 +1 @@
-2.1.0
+2.1.3

data/.travis.yml

@@ -4,15 +4,15 @@ bundler_args: --without documentation production
 rvm:
   - 1.9.3
   - 2.0.0
-  - 2.1.0
+  - 2.1.3
   - jruby-19mode
   - rbx
   - ruby-head
   - jruby-head
 matrix:
   allow_failures:
-    - rvm:
-      - ruby-head
-      - jruby-head
+    - rvm: ruby-head
+    - rvm: jruby-head
+  fast_finish: true
 script:
-  - bundle exec rake spec
+  - bundle exec rake spec

data/executrix.gemspec

@@ -22,14 +22,14 @@ Gem::Specification.new do |gem|
 
   gem.add_dependency 'rake'
   gem.add_dependency 'json'
-  gem.add_dependency 'nori', '< 2.4'
+  gem.add_dependency 'nori', '< 2.5'
   gem.add_dependency 'nokogiri', '< 1.7'
   gem.add_dependency 'rubyzip', '>= 1.0' ,'< 1.2'
-  gem.add_development_dependency 'rspec', '< 2.15'
-  gem.add_development_dependency 'webmock', '< 1.18'
+  gem.add_development_dependency 'rspec', '< 3.2'
+  gem.add_development_dependency 'webmock', '< 1.20'
   if RUBY_ENGINE == 'rbx'
     gem.add_dependency 'rubysl', '< 2.1'
     gem.add_development_dependency 'racc', '< 1.5'
     gem.add_development_dependency 'rubinius-coverage', '< 2.1'
   end
-end
+end

data/lib/executrix/batch.rb

@@ -36,9 +36,12 @@ module Executrix
       @connection.query_batch @job_id, @batch_id
     end
 
+    # results returned from Salesforce can be a single page id, or an array of ids.
+    # if it's an array of ids, we will fetch the results from each, and concatenate them.
     def results
-      init_result_id
-      @connection.query_batch_result_data(@job_id, @batch_id, @result_id)
+      Array(query_result_id).map do |result_id|
+        @connection.query_batch_result_data(@job_id, @batch_id, result_id)
+      end.flatten
     end
 
     def raw_request
@@ -50,11 +53,9 @@ module Executrix
     end
 
     private
-    def init_result_id
+    def query_result_id
       result_raw = @connection.query_batch_result_id(@job_id, @batch_id)
-      if result_raw
-        @result_id = result_raw[:result]
-      end
+      result_raw[:result] if result_raw
     end
   end
-end
+end

data/lib/executrix/helper.rb

@@ -18,7 +18,11 @@ module Executrix
       records.each do |hash|
         row = CSV::Row.new([],[],false)
         to_store = hash.inject({}) do |h, (k, v)|
-          h[k] = v.class == Array ? v.join(';') : v
+          if v == nil || v == '' || v == []
+            h[k] = '#N/A'
+          else
+            h[k] = v.class == Array ? v.join(';') : v
+          end
           h
         end
         row << to_store

data/lib/executrix/version.rb

@@ -1,3 +1,3 @@
 module Executrix
-  VERSION = '1.3.0'
-end
+  VERSION = '1.4.0'
+end

data/spec/lib/executrix/batch_spec.rb

@@ -70,4 +70,59 @@ describe Executrix::Batch do
       end
     end
   end
-end
+
+  describe '#results' do
+    let(:job_id) { "12345" }
+    let(:batch_id) { "67890" }
+    let(:connection) { double("connection") }
+    subject {described_class.new connection, job_id, batch_id}
+
+    context 'with a single page of results' do
+      let(:result_id) {"M75200000001Vgt"}
+      let(:single_result) {{:Id=>"M75200000001Vgt", :name=>"Joe"}}
+
+      it 'returns the results' do
+        expect(connection).to receive(:query_batch_result_id).
+          with(job_id, batch_id).
+          and_return({:result => result_id})
+
+        expect(connection).to receive(:query_batch_result_data).
+          once.
+          with(job_id, batch_id, result_id).
+          and_return(single_result)
+
+        expect(subject.results).to eq([single_result])
+      end
+    end
+
+    context 'with an array of page of results' do
+      let(:result_ids) {["M75200000001Vgt", "M76500000001Vgt", "M73400000001Vgt"]}
+      let(:multiple_results) {[{:Id=>"AAA11123", :name=>"Joe"},
+        {:Id=>"AAA11124", :name=>"Sam"},
+        {:Id=>"AAA11125", :name=>"Mike"}]}
+
+      it 'returns concatenated results' do
+        expect(connection).to receive(:query_batch_result_id).
+          with(job_id, batch_id).
+          and_return({:result => result_ids})
+
+        expect(connection).to receive(:query_batch_result_data).
+          ordered.
+          with(job_id, batch_id, result_ids[0]).
+          and_return(multiple_results[0])
+
+        expect(connection).to receive(:query_batch_result_data).
+          ordered.
+          with(job_id, batch_id, result_ids[1]).
+          and_return(multiple_results[1])
+
+        expect(connection).to receive(:query_batch_result_data).
+          ordered.
+          with(job_id, batch_id, result_ids[2]).
+          and_return(multiple_results[2])
+
+        expect(subject.results).to eq(multiple_results)
+      end
+    end
+  end
+end

data/spec/lib/executrix/connection_spec.rb

@@ -65,4 +65,31 @@ describe Executrix::Connection do
       expect(return_code).to eq(-1)
     end
   end
-end
+
+  describe '#query_batch_result_id' do
+    let(:job_id) {"12345"}
+    let(:batch_id) {"67890"}
+
+    context 'with a single page of results' do
+      let(:single_result) {{:result=>"M75200000001Vgt", :@xmlns=>"http://www.force.com/2009/06/asyncapi/dataload"}}
+      it 'returns the result_id as a string' do
+        expect(Executrix::Http).to receive(:query_batch_result_id).
+          with(nil, nil, job_id, batch_id, nil).
+          and_return(single_result)
+
+        expect(subject.query_batch_result_id(job_id, batch_id)).to eq(single_result)
+      end
+    end
+
+    context 'with an array of page of results' do
+      let(:multiple_result) {{:result=>["752M00000001Vgt", "752M00000001Vgy"], :@xmlns=>"http://www.force.com/2009/06/asyncapi/dataload"}}
+      it 'returns the resu lt_id as a string' do
+        expect(Executrix::Http).to receive(:query_batch_result_id).
+          with(nil, nil, job_id, batch_id, nil).
+          and_return(multiple_result)
+
+        expect(subject.query_batch_result_id(job_id, batch_id)).to eq(multiple_result)
+      end
+    end
+  end
+end

data/spec/lib/executrix/helper_spec.rb

@@ -60,6 +60,18 @@ describe Executrix::Helper do
       "\"A second Title\",\"A second name\"\n"
       expect(described_class.records_to_csv(input)).to eq(expected_csv)
     end
+
+    it 'correctly converts empty arrays, nil values and blank strings to #N/A' do
+      input = [
+        {'Title' => nil, 'Picklist' => ['Several', 'Values']},
+        {'Title' => '', 'Picklist' => []},
+      ]
+
+      expected_csv = "\"Title\",\"Picklist\"\n" \
+        "\"#N/A\",\"Several;Values\"\n" \
+        "\"#N/A\",\"#N/A\"\n"
+      expect(described_class.records_to_csv(input)).to eq(expected_csv)
+    end
   end
 
   describe '.fetch_instance_from_server_url' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: executrix
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
 platform: ruby
 authors:
 - Jorge Valdivia
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-13 00:00:00.000000000 Z
+date: 2014-10-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -45,14 +45,14 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.5'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.4'
+        version: '2.5'
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
@@ -93,28 +93,28 @@ dependencies:
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '3.2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '2.15'
+        version: '3.2'
 - !ruby/object:Gem::Dependency
   name: webmock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.20'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "<"
       - !ruby/object:Gem::Version
-        version: '1.18'
+        version: '1.20'
 description: This gem provides a super simple interface for the Salesforce Bulk API.
   It provides support for insert, update, upsert, delete, and query.
 email:
@@ -166,7 +166,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: executrix
-rubygems_version: 2.2.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Ruby support for the Salesforce Bulk API