salesforce_ar_sync 5.3.0 → 5.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 469e85715a39bc27f3ce3af76aa9178d9c1abf4c2ec7239efbf842dc6ad71d71
-  data.tar.gz: 7e9f9732581785b7242392aab88a0078d58d791d96836f3377745428cae0a91e
+  metadata.gz: 40fc50d80886fc52df3a5e7746cedd628bd6caa59208f98fd4d9da679ce4c02b
+  data.tar.gz: 5a281b4603cab7430a4e7c9b615c5797a9af146a4e3eaf0221136f2ca76d5041
 SHA512:
-  metadata.gz: eee86f8fe5a96e0f58349863cdad1ee9ac385175658c8e090c9acee8d005c5de2fb18d37b91929f4373cec34baf25ddd0306415d667e310fc98cab9538fd49d5
-  data.tar.gz: 97e2f7b8bd5eb49342b49d100b23de407feb95b8262ce8c8695488abf369d8150e70cd889acf62fda6c4e0792fcec68061cd48498b764999252ec3fbb34c77b0
+  metadata.gz: 8f811c64d88b6fdeba01af7d5bd97b48aed716de2d9014413ffef4a417eab3155db55655e101edd507adf80e5dc7f2e6066d2430bd57421ecc85102ec4f67ebf
+  data.tar.gz: 1d1d0b72a10dc10e2d47a151fb4dde0281db7ec340f0b910cc899613eb393247ec6ef68b7bcfbc79ecbcabdc70604ea58880382605ccc99fb2fa2583d325e884

data/lib/salesforce_ar_sync/salesforce_sync.rb

@@ -71,24 +71,49 @@ module SalesforceArSync
       def salesforce_update(attributes = {})
         raise ArgumentError, "#{salesforce_id_attribute_name} parameter required" if attributes[salesforce_id_attribute_name].blank?
 
+        attempt_salesforce_update(attributes)
+      end
+
+      private
+
+      def find_record(attributes)
         data_source = unscoped_updates ? unscoped : self
         object = data_source.find_by(salesforce_id: attributes[salesforce_id_attribute_name])
         object ||= data_source.find_by(activerecord_web_id_attribute_name => attributes[salesforce_web_id_attribute_name]) if salesforce_sync_web_id? && attributes[salesforce_web_id_attribute_name]
+        return object if object.present?
 
-        if !object && additional_lookup_fields
+        if additional_lookup_fields
           additional_lookup_fields.each do |attribute_name, salesforce_attribute_name|
             object = data_source.find_by(attribute_name => attributes[salesforce_attribute_name]) if attributes[salesforce_attribute_name]
+            break if object
           end
+          return object
         end
+      end
 
-        if object.nil?
-          object = new
+      def build_record(attributes)
+        new.tap do |object|
           salesforce_default_attributes_for_create.merge(salesforce_id: attributes[salesforce_id_attribute_name]).each_pair do |k, v|
             object.send("#{k}=", v)
           end
         end
+      end
+
+      def attempt_salesforce_update(attributes, retried: false)
+        object = find_record(attributes) || build_record(attributes)
+        return unless object
+
+        object.salesforce_process_update(attributes) if salesforce_stale?(object, attributes[:SystemModstamp])
+      rescue ActiveRecord::RecordNotUnique
+        raise if retried
+
+        attempt_salesforce_update(attributes, retried: true)
+      end
+
+      def salesforce_stale?(object, modstamp)
+        return false if modstamp.blank?
 
-        object.salesforce_process_update(attributes) if object && (object.salesforce_updated_at.nil? || (object.salesforce_updated_at && object.salesforce_updated_at < Time.parse(attributes[:SystemModstamp])))
+        object.salesforce_updated_at.nil? || object.salesforce_updated_at < Time.parse(modstamp)
       end
     end
 

data/lib/salesforce_ar_sync/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SalesforceArSync
-  VERSION = '5.3.0'
+  VERSION = '5.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: salesforce_ar_sync
 version: !ruby/object:Gem::Version
-  version: 5.3.0
+  version: 5.3.1
 platform: ruby
 authors:
 - Michael Halliday
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-09-23 00:00:00.000000000 Z
+date: 2026-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: actionpack-xml_parser