rails_admin_import 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8729f794b1c8ace3c08caeed84399b2ff8a997aeb7d623b05f132de9ac12ce94
-  data.tar.gz: bdb84ea9e8ad25667a74846581d0e34ac5570d76141e446c4d2e9a3752fe3e91
+  metadata.gz: b6c5950fbf60618a001ef18c46c8331faf75113cfdf3342b17268b00dd5be46d
+  data.tar.gz: 37b6f77d11d21c8c6f38dd45a3826beb2386e1f4616c929d5d7d289bf3ee77f3
 SHA512:
-  metadata.gz: 3470647f410a12da9f6b8d5711ba1b2b49d24b9c3a3995dcb96fd8db306fe50a339a4480d46192b786e1053205285382eeac69850cab7bb6fb5f78631253931a
-  data.tar.gz: 9e6fba88b0fb93af73c05dd301db9a64ae0874c2d711817279454d3d104d9f3994c4cab12e02767d223defda77945f5e2c147adf78a1e5eb9daa787d1d1bfcd4
+  metadata.gz: b763676e2157bf7c352633aee545766fe38e9cb97ac75d8bd2edfca5dced0a839f0ede5a6100569f9757a4dc8e5601a93daf89028b61da94b7e56034d79494a9
+  data.tar.gz: f934b8e2f28165b793fdf6f78e5d6b591dbaeef7a8eab8fce94b4f0574a5137025fa3834c9a7131c5f9dbe4bc8cca52ffd85fa726bfa4b783c241407a9c8a03e

data/lib/rails_admin_import/importer.rb

@@ -190,11 +190,6 @@ module RailsAdminImport
     end
 
     def find_or_create_object(record, update)
-      field_names = import_model.model_fields.map(&:name)
-      new_attrs = record.select do |field_name, value|
-        field_names.include?(field_name) && !value.blank?
-      end
-
       model = import_model.model
       object = if update.present?
                  query = update.each_with_object({}) do
@@ -205,10 +200,18 @@ module RailsAdminImport
 
       if object.nil?
         object = model.new
-        perform_model_callback(object, :before_import_attributes, new_attrs)
+      end
+
+      perform_model_callback(object, :before_import_attributes, record)
+
+      field_names = import_model.model_fields.map(&:name)
+      new_attrs = record.select do |field_name, value|
+        field_names.include?(field_name) && !value.blank?
+      end
+
+      if object.new_record?
         object.attributes = new_attrs
       else
-        perform_model_callback(object, :before_import_attributes, new_attrs)
         object.attributes = new_attrs.except(update.map(&:to_sym))
       end
       object

data/lib/rails_admin_import/version.rb

@@ -1,3 +1,3 @@
 module RailsAdminImport
-  VERSION = "3.0.1"
+  VERSION = "3.0.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails_admin_import
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Steph Skardal
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-04-10 00:00:00.000000000 Z
+date: 2022-04-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails