executrix 1.2.2 → 1.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7b487dbd03be2bba6970d2b6fc7af64b598e0b04
-  data.tar.gz: b6a6808797fa0485fc062fc8a2daac55ef3cc081
+  metadata.gz: adbfe678d21169065c727f7b0f11e9871398a5f8
+  data.tar.gz: 4d5baaf178dc01c99abf9e653aeadba6633d9576
 SHA512:
-  metadata.gz: 99ca83a6dd6b0d8c0eec9b200d997aa44e75ae4893e6c6059b728f5b5fc537395820f727d5dd16960c326f8205ff2bb1894a1d7e930d681638f415c2c6330649
-  data.tar.gz: ac1a3ace185b9b92f15fad6afaf17a65674421e2420ad7c812029079c912ee8ab80625f4a32194b5fa512c3e1cf23d320bf64ec5989fc11aa509be1232c8f2a3
+  metadata.gz: 2cfc598c3a8448f4a3efd3bf378d50b8ea2aa98827dfb3ecce236d685d1ac6cd51cf2445e073ccd91fe8a7bfc49ceff5bb679d37237449ecbf6cb83688577705
+  data.tar.gz: 12ff55f6dad093df4ca29a8d5e835b1ce3e58c869b52490df0ceb80b805d91f1f95450a567266489281b60a4a7cf1debb8de23da1f205c2a3234d59166fe87a8

data/lib/executrix/batch.rb

@@ -1,5 +1,7 @@
 module Executrix
   class Batch
+    attr_reader :job_id
+
     def initialize connection, job_id, batch_id
       @connection = connection
       @job_id = job_id
@@ -39,6 +41,14 @@ module Executrix
       @connection.query_batch_result_data(@job_id, @batch_id, @result_id)
     end
 
+    def raw_request
+      @connection.raw_request
+    end
+
+    def raw_result
+      @connection.raw_result
+    end
+
     private
     def init_result_id
       result_raw = @connection.query_batch_result_id(@job_id, @batch_id)

data/lib/executrix/connection.rb

@@ -1,5 +1,8 @@
 module Executrix
   class Connection
+    attr_reader :raw_request
+    attr_reader :raw_result
+
     def initialize(username, password, api_version, sandbox)
       @username = username
       @password = password
@@ -73,7 +76,7 @@ module Executrix
     end
 
     def query_batch_result_data job_id, batch_id, result_id
-      Executrix::Http.query_batch_result_data(
+      @raw_result = Executrix::Http.query_batch_result_data(
         @instance,
         @session_id,
         job_id,
@@ -81,25 +84,28 @@ module Executrix
         result_id,
         @api_version,
       )
+      Executrix::Helper.parse_csv @raw_result
     end
 
     def add_file_upload_batch job_id, filename
+      @raw_request = File.read(filename)
       Executrix::Http.add_file_upload_batch(
         @instance,
         @session_id,
         job_id,
-        filename,
+        @raw_request,
         @api_version)[:id]
     end
 
     def add_batch job_id, records
       return -1 if records.nil? || records.empty?
+      @raw_request = Executrix::Helper.records_to_csv(records)
 
       Executrix::Http.add_batch(
         @instance,
         @session_id,
         job_id,
-        Executrix::Helper.records_to_csv(records),
+        @raw_request,
         @api_version)[:id]
     end
 

data/lib/executrix/helper.rb

@@ -65,5 +65,9 @@ module Executrix
     def absolute_to_relative_path input, replacement
       input.gsub(/(^C:[\/\\])|(^\/)/,replacement)
     end
+
+    def parse_csv csv_string
+      CSV.parse(csv_string, headers: true).map{|r| r.to_hash}
+    end
   end
 end

data/lib/executrix/http.rb

@@ -38,11 +38,10 @@ module Executrix
 
     def query_batch_result_data *args
       r = Http::Request.query_batch_result_data(*args)
-      process_csv_response(process_http_request(r))
+      normalize_csv(process_http_request(r))
     end
 
-    def add_file_upload_batch instance, session_id, job_id, filename, api_version
-      data = File.read(filename)
+    def add_file_upload_batch instance, session_id, job_id, data, api_version
       headers = {
         'Content-Type' => 'zip/csv',
         'X-SFDC-Session' => session_id}
@@ -82,8 +81,8 @@ module Executrix
       res.values.first
     end
 
-    def process_csv_response res
-      CSV.parse(res.gsub(/\n\s+/, "\n"), headers: true).map{|r| r.to_hash}
+    def normalize_csv res
+      res.gsub(/\n\s+/, "\n")
     end
 
     def process_soap_response res

data/lib/executrix/version.rb

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

data/spec/lib/executrix/batch_spec.rb

@@ -56,4 +56,18 @@ describe Executrix::Batch do
         .to raise_error(StandardError, expected_error_message)
     end
   end
+
+  [:request, :result].each do |action|
+    let(:connection) { double('Executrix::Connection') }
+    let(:request_result) { 'Generic Result/Request' }
+    describe "#raw_#{action}" do
+
+      it 'sends correct messages to connection' do
+        b = described_class.new nil, nil, nil
+        b.instance_variable_set '@connection', connection
+        expect(connection).to receive(:"raw_#{action}").and_return(request_result)
+        expect(b.send(:"raw_#{action}")).to eq(request_result)
+      end
+    end
+  end
 end

data/spec/lib/executrix/connection_spec.rb

@@ -14,6 +14,7 @@ describe Executrix::Connection do
   }.each do |method_name, num_of_params|
     describe "##{method_name}" do
       it 'delegates correctly to Http class' do
+        allow(Executrix::Helper).to receive(:parse_csv).and_return([])
         expect(Executrix::Http)
           .to receive(method_name)
           .and_return({})

data/spec/lib/executrix/helper_spec.rb

@@ -217,4 +217,21 @@ describe Executrix::Helper do
         to eq('a/forwardslash/path')
     end
   end
+
+  describe '.parse_csv' do
+    let(:csv_string) {
+       "Id,my_external_id__c\n" \
+       "003M000057GH39aIAD,K-00J799\n" \
+       "003M001200KO82cIAD,K-015699"
+    }
+    let(:expected_result) {
+      [
+        { 'Id' => '003M000057GH39aIAD', 'my_external_id__c' => 'K-00J799' },
+        { 'Id' => '003M001200KO82cIAD', 'my_external_id__c' => 'K-015699' },
+      ]
+    }
+    it 'correctly transforms csv string' do
+      expect(described_class.parse_csv(csv_string)).to eq(expected_result)
+    end
+  end
 end

data/spec/lib/executrix/http_spec.rb

@@ -317,22 +317,18 @@ describe Executrix::Http do
         "003K001200KO82cIAD","King of the  Hill"}
     end
 
-    it 'returns array of arrays for data' do
+    it 'returns a correctly formatted CSV string' 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([
-        {'Id' => '003M000057GH39aIAD', 'my_external_id__c' => 'K-00J799'},
-        {'Id' => '003M001200KO82cIAD', 'my_external_id__c' => 'K-015699'}])
+      expect(result).to eq(batch_result_data_success.gsub(/^\s+/, ''))
     end
 
-    it 'returns correct array with spaces' do
+    it 'returns a correctly formatted CSV string including 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([
-        {'Id' => '003K000057GH39aIAD', 'Name' => 'Master of Disaster'},
-        {'Id' => '003K001200KO82cIAD', 'Name' => 'King of the  Hill'}])
+      expect(result).to eq(batch_result_data_with_spaces_success.gsub(/^\s+/, ''))
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: executrix
 version: !ruby/object:Gem::Version
-  version: 1.2.2
+  version: 1.3.0
 platform: ruby
 authors:
 - Jorge Valdivia
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-02-05 00:00:00.000000000 Z
+date: 2014-02-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake