activerecord-import 0.28.1 → 0.28.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbd7badbb2e98c6725ddaf5edbb713c4f79bfc01
-  data.tar.gz: 0912df3959070820db94063d0172a43f4b027a9f
+  metadata.gz: 39f2e5b83b07075c09bba10e3c9a53953b484641
+  data.tar.gz: 28869f9586c6200e932a34dadbed9f4790ee820d
 SHA512:
-  metadata.gz: 22fb70781c58df1795c41e5b8e954b8a89e6c85be0dbf33f2c2fb9265847778f99f414cbd7fe9ea945d6aa43f89d7557ea41541f938fa357a7bbcb2c0e6114df
-  data.tar.gz: b480446464f626518ac128b2e79d4e4dbb2b50e8e52d6781812a0ee1594e5328430214ad03be9590c09dcfd07661ae54130b53ccde1b9b7d2131d2f40c80a633
+  metadata.gz: dad31c1f3f11c1b6ba63cf2c5e65d71713603cb7604cac06e35d2786f34394e88a2ad69bc76fcaf14d7cd90e84fa277e84427425aa27cd0bcb65c61024990e1a
+  data.tar.gz: e842906754fd995d1be896e7929213919426ccf9c107f06c996c0216b9331c3232ff85ceb622c9de4678de6ff639e22ee783c5482bb9fbdb8c5740df46d55304

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Changes in 0.28.2
+
+### Fixes
+
+* Fix issue where validations where not working in certain scenarios.
+  Thanks to @CASIXx1 via \#579.
+
 ## Changes in 0.28.1
 
 ### Fixes

data/lib/activerecord-import/import.rb

@@ -32,33 +32,39 @@ module ActiveRecord::Import #:nodoc:
     def init_validations(klass)
       @validate_callbacks = klass._validate_callbacks.dup
 
-      klass._validate_callbacks.each_with_index do |callback, i|
+      @validate_callbacks.each_with_index do |callback, i|
         filter = callback.raw_filter
+        next unless filter.class.name =~ /Validations::PresenceValidator/ ||
+                    (!@options[:validate_uniqueness] &&
+                     filter.is_a?(ActiveRecord::Validations::UniquenessValidator))
 
-        if filter.class.name =~ /Validations::PresenceValidator/
-          callback = callback.dup
-          filter = filter.dup
+        callback = callback.dup
+        filter = filter.dup
+        attrs = filter.instance_variable_get(:@attributes).dup
+
+        if filter.is_a?(ActiveRecord::Validations::UniquenessValidator)
+          attrs = []
+        else
           associations = klass.reflect_on_all_associations(:belongs_to)
-          attrs = filter.instance_variable_get(:@attributes).dup
           associations.each do |assoc|
             if (index = attrs.index(assoc.name))
               key = assoc.foreign_key.to_sym
               attrs[index] = key unless attrs.include?(key)
             end
           end
-          filter.instance_variable_set(:@attributes, attrs)
-          if @validate_callbacks.respond_to?(:chain, true)
-            @validate_callbacks.send(:chain).tap do |chain|
-              callback.instance_variable_set(:@filter, filter)
-              chain[i] = callback
-            end
-          else
-            callback.raw_filter = filter
-            callback.filter = callback.send(:_compile_filter, filter)
-            @validate_callbacks[i] = callback
+        end
+
+        filter.instance_variable_set(:@attributes, attrs)
+
+        if @validate_callbacks.respond_to?(:chain, true)
+          @validate_callbacks.send(:chain).tap do |chain|
+            callback.instance_variable_set(:@filter, filter)
+            chain[i] = callback
           end
-        elsif !@options[:validate_uniqueness] && filter.is_a?(ActiveRecord::Validations::UniquenessValidator)
-          @validate_callbacks.delete(callback)
+        else
+          callback.raw_filter = filter
+          callback.filter = callback.send(:_compile_filter, filter)
+          @validate_callbacks[i] = callback
         end
       end
     end

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.28.1".freeze
+    VERSION = "0.28.2".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 0.28.2
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-01-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord