active_force 0.19.0 → 0.20.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 38ef881c292f8ecb12be07a0471f759a06b9155af5e3a49c26dbb69e024db87f
-  data.tar.gz: 6a209feb04dc0c6a192c084a95c2e55c64696bbb54636496fc98dc8c56c7b653
+  metadata.gz: 1647fdc453090811c384514ae857c83b686dc966e2af5e47af3a6dc67e42059d
+  data.tar.gz: 515a98a5715c24359739d76730758b728a9cbf1b8c0cbf2b3c1bb5a355a21c9e
 SHA512:
-  metadata.gz: 814f0f4844f94acea113a4eabf1e3afd366b2b00255fe5bcca5ccfccb0f5d862651548302373d078a7c070422d6db6c8cf971f33112c360f0d43f133d500c98a
-  data.tar.gz: 48f595e34749ec49adeaeb8320c407911f8841d83fcd433cdd5e7e9bc5b6b8f37d01a0f30f6a96610d91949ab8e30e2cb4b0c3f9aa18692447fc31ed6d4b75fb
+  metadata.gz: 48115b7a0df0201a24f477ba2f658e692824337a78c0d288afd3c056b42fccaaf065e1e3ab296fa16bda1f2f2eaf82ff1322adcea6d9d6a9f82c2318cea15d98
+  data.tar.gz: a7b6dacca6775374b089cc9022462c470d8103d63792c7e7668ccd3e082446b0429a2d54d0e3392694c0e25ea25139916d11bc9f0080659faea6e7eaa0e41541

data/.gitignore

@@ -15,3 +15,4 @@ spec/reports
 test/tmp
 test/version_tmp
 tmp
+.idea

data/CHANGELOG.md

@@ -2,6 +2,11 @@
 
 ## Not released
 
+## 0.20.0
+
+- Change `.first` to not query the API if records have already been retrieved (https://github.com/Beyond-Finance/active_force/pull/73)
+- Bugfix: Transform NULL values for SF Bulk API, which expects "#N/A" (https://github.com/Beyond-Finance/active_force/pull/74)
+
 ## 0.19.0
 
 - Bulk API methods. (https://github.com/Beyond-Finance/active_force/pull/65)

data/lib/active_force/bulk/records.rb

@@ -3,6 +3,8 @@ require 'csv'
 module ActiveForce
   module Bulk
     class Records
+      NULL_VALUE = '#N/A'.freeze
+
       attr_reader :headers, :data
       def initialize(headers:, data:)
         @headers = headers
@@ -16,10 +18,25 @@ module ActiveForce
       end
 
       def self.parse_from_attributes(records)
+        # Sorting ensures that the headers line up with the values for the CSV
         headers = records.first.keys.sort.map(&:to_s)
-        data = records.map { |r| r.sort.pluck(-1) }
+        data = records.map do |r|
+           r.transform_values { |v| transform_value_for_sf(v) }.sort.pluck(-1)
+        end
         new(headers: headers, data: data)
       end
+
+      # SF expects a special value for setting a column to be NULL.
+      def self.transform_value_for_sf(value)
+        case value
+        when NilClass
+          NULL_VALUE
+        when Time
+          value.iso8601
+        else
+          value.to_s
+        end
+      end
     end
   end
 end

data/lib/active_force/query.rb

@@ -78,7 +78,15 @@ module ActiveForce
     end
 
     def first
-      limit 1
+      if @records
+        clone_and_set_instance_variables(
+          size: 1,
+          records: [@records.first],
+          decorated_records: [@decorated_records&.first]
+        )
+      else
+        limit(1)
+      end
     end
 
     def last(limit = 1)
@@ -126,9 +134,9 @@ module ActiveForce
 
       def clone_and_set_instance_variables instance_variable_hash={}
         clone = self.clone
-        clone.instance_variable_set(:@decorated_records, nil)
-        clone.instance_variable_set(:@records, nil)
-        instance_variable_hash.each { |k,v| clone.instance_variable_set("@#{k.to_s}", v) }
+        { decorated_records: nil, records: nil }
+          .merge(instance_variable_hash)
+          .each { |k,v| clone.instance_variable_set("@#{k.to_s}", v) }
         clone
       end
   end

data/lib/active_force/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveForce
-  VERSION = '0.19.0'
+  VERSION = '0.20.0'
 end

data/spec/active_force/bulk/record_spec.rb

@@ -9,11 +9,13 @@ describe ActiveForce::Bulk::Records do
       %w[value3 value4],
     ]
   end
+
   describe '#to_csv' do
     it 'returns CSV with headers' do
       expect(subject.to_csv).to eq "header1,header2\nvalue1,value2\nvalue3,value4\n"
     end
   end
+
   describe '::parse_from_attributes' do
     subject { described_class.parse_from_attributes(attributes) }
     let(:attributes) do
@@ -28,5 +30,25 @@ describe ActiveForce::Bulk::Records do
       expect(records.headers).to eq headers
       expect(records.data).to eq data
     end
+
+    context 'when there are NULL values' do
+      let(:attributes) do
+        [
+          { header1: nil, header2: 'value2'},
+          { header1: 'value3', header2: nil},
+        ]
+      end
+      let(:data) do
+        [
+          %w[#N/A value2],
+          %w[value3 #N/A],
+        ]
+      end
+
+      it 'substitutes the expected SF value for NULL' do
+        records = subject
+        expect(records.data).to eq data
+      end
+    end
   end
 end

data/spec/active_force/query_spec.rb

@@ -165,6 +165,22 @@ describe ActiveForce::Query do
       expect(query.to_s).to eq "SELECT Id, name, etc FROM table_name"
       expect(new_query.to_s).to eq 'SELECT Id, name, etc FROM table_name LIMIT 1'
     end
+
+    it "does not query if records have already been fetched" do
+      query = ActiveForce::Query.new 'table_name'
+      query.instance_variable_set(:@records, %w[foo bar])
+      query.instance_variable_set(:@decorated_records, %w[foo bar])
+      expect(query).not_to receive(:limit)
+      expect(query).to receive(:clone_and_set_instance_variables).with(size: 1, records: ['foo'], decorated_records: ['foo'])
+      query.first
+    end
+
+    it 'queries the api if it has not been queried yet' do
+      query = ActiveForce::Query.new 'table_name'
+      query.instance_variable_set(:@records, nil)
+      expect(query).to receive(:limit)
+      query.first
+    end
   end
 
   describe '.last' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_force
 version: !ruby/object:Gem::Version
-  version: 0.19.0
+  version: 0.20.0
 platform: ruby
 authors:
 - Eloy Espinaco
@@ -11,7 +11,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-15 00:00:00.000000000 Z
+date: 2023-11-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel