restforce-db 0.3.2 → 0.3.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c7271f667addef9ca339a2452d20d4c59889d216
-  data.tar.gz: 809ed0792d08ee7504f78e9bf3cc59d9c3ffb2f5
+  metadata.gz: dd0758b4ebbb0d3260025eab127182c669bbee09
+  data.tar.gz: 3d2218660c4c8eb834c866389848274f74a26911
 SHA512:
-  metadata.gz: f1932d26bd6c8cb70ab2db91927f244f9847fbe1a49bd58255616daf7ee822f1a4228b2a26d045aa81ecea8aae00af09fc6fb9653b728f164dfb509a7ef7ec19
-  data.tar.gz: 1609aebd03dfb25bcad99683ab9e390e9decb1125b615ff0414325c4cafbc4addabe846ffb85f9ee74930663fa4f7db86f4684fafa761c9dd354daf371b3e845
+  metadata.gz: c9316983f8e18d5cacf1cdcdc2c86a3be04a641661b7e14a0d9d2ecc6ef3b7e3c6750a4f1dc5f2b0f8bd706f8fe27795f6a8515f21dd0bd7184b8214c4482cd3
+  data.tar.gz: 943d6204c2a38790e9ec00ed309203cb6338007eb79a525b4f6aadde0650c514669d2f707fb9338063c6425cd3601dd4d738a6505d5012e7d315f29d4cd3ffd6

data/lib/restforce/db/record_types/active_record.rb

@@ -20,12 +20,19 @@ module Restforce
           attributes = @mapping.convert(@record_type, from_record.attributes)
 
           record = @record_type.new(attributes.merge(salesforce_id: from_record.id))
-          @mapping.associations.each do |association, lookup|
+          associations = @mapping.associations.map do |association, lookup|
             associated = record.association(association).build
             lookup_id = from_record.record.send(lookup)
             build_association associated, lookup_id
           end
-          record.save!
+
+          record.transaction do
+            record.save!
+
+            # We touch the synchronization timestamps here to ensure that they
+            # exceed the last updated timestamp.
+            associations.each { |association| association.touch(:synchronized_at) }
+          end
 
           Instances::ActiveRecord.new(@record_type, record, @mapping).after_sync
         end
@@ -85,11 +92,11 @@ module Restforce
         # Mapping's database record type. Right now, nested associations are
         # ignored.
         #
-        # associated - The associatd database record.
+        # associated - The associated database record.
         # lookup_id  - A Salesforce ID corresponding to the record type in the
         #              Mapping defined for the associated database model.
         #
-        # Returns a Boolean.
+        # Returns the associated ActiveRecord instance.
         def build_association(associated, lookup_id)
           return if lookup_id.nil?
 
@@ -98,12 +105,8 @@ module Restforce
           salesforce_instance = mapping.salesforce_record_type.find(lookup_id)
           attributes = mapping.convert(associated.class, salesforce_instance.attributes)
 
-          associated.assign_attributes(
-            attributes.merge(
-              salesforce_id: lookup_id,
-              synchronized_at: Time.now,
-            ),
-          )
+          associated.assign_attributes(attributes.merge(salesforce_id: lookup_id))
+          associated
         end
 
       end

data/lib/restforce/db/version.rb

@@ -3,7 +3,7 @@ module Restforce
   # :nodoc:
   module DB
 
-    VERSION = "0.3.2"
+    VERSION = "0.3.3"
 
   end
 

data/test/lib/restforce/db/record_types/active_record_test.rb

@@ -99,6 +99,7 @@ describe Restforce::DB::RecordTypes::ActiveRecord do
         expect(user.email).to_equal("somebody@example.com")
         expect(user.salesforce_id).to_equal(association_id)
         expect(user.synchronized_at).to_not_be_nil
+        expect(user.synchronized_at).to_be(:>=, user.updated_at)
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: restforce-db
 version: !ruby/object:Gem::Version
-  version: 0.3.2
+  version: 0.3.3
 platform: ruby
 authors:
 - Andrew Horner