portable_model 1.2.2 → 1.3.0

data/lib/portable_model.rb

@@ -10,12 +10,18 @@ module PortableModel
     base.extend(ClassMethods)
   end
 
-  # Introduce a virtual attribute that is used to indicate whether the record
-  # is currently being imported. It can be read to skip callbacks and
-  # validations that shouldn't be run when a record is being imported.
+  # This virtual attribute is now deprecated in favor of #currently_importing?
   #
   attr_accessor :importing_record
 
+  # Check whether the record is currently being imported. Callers can use this
+  # for determining when to skip callbacks and validations that shouldn't be
+  # run when a record is being imported.
+  #
+  def currently_importing?
+    !!Thread.current[:imported_records]
+  end
+
   # Export the record to a hash.
   #
   def export_to_hash
@@ -111,7 +117,9 @@ module PortableModel
           # use the result of that previous import.
           record = imported_records[record_hash.object_id]
 
-          unless record
+          if record
+            update_record_associations(record, record_hash, options)
+          else
             transaction do
               # First split out the attributes that correspond to portable
               # associations.
@@ -276,6 +284,23 @@ module PortableModel
       end
     end
 
+    # Update a record's foreign key associations with the respective keys from record_hash.
+    #
+    def update_record_associations(record, record_hash, options)
+      # Determine the foreign keys that the record owns
+      association_foreign_key_list = record.class.reflect_on_all_associations(:belongs_to).map(&:association_foreign_key)
+
+      # Update the foreign keys to any associations that haven't been set yet.
+      association_foreign_keys = record_hash.reject do |key, value|
+        !association_foreign_key_list.include?(key) || value.nil? || !record[key].nil?
+      end
+
+      unless association_foreign_keys.empty?
+        record.attributes = association_foreign_keys
+        record.save(!options.fetch(:skip_validations, false))
+      end
+    end
+
   end
 
 end

data/lib/portable_model/version.rb

@@ -1,3 +1,3 @@
 module PortableModel
-  VERSION = "1.2.2"
+  VERSION = "1.3.0"
 end

metadata

@@ -5,9 +5,9 @@ version: !ruby/object:Gem::Version
   prerelease: 
   segments: 
   - 1
-  - 2
-  - 2
-  version: 1.2.2
+  - 3
+  - 0
+  version: 1.3.0
 platform: ruby
 authors: 
 - Clyde Law
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2016-04-07 00:00:00 Z
+date: 2016-11-09 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord