activerecord-import 0.28.0 → 0.28.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0b3c71766c00d489ea17001a179599e9bfe643cc
-  data.tar.gz: cce704816a91718a1e81fee5c1e799447655bf3a
+  metadata.gz: dbd7badbb2e98c6725ddaf5edbb713c4f79bfc01
+  data.tar.gz: 0912df3959070820db94063d0172a43f4b027a9f
 SHA512:
-  metadata.gz: 9880191ac0df7086dc8b5be319262655cd43d365ae9df6cde654bc8374d57d75a2aafe3018d5f63e1af1fbd64f9041bb15fb5a967d5ece0e0d5702dd739c0123
-  data.tar.gz: 989fde16bae64ff5789e481053e6a596b6f172b0d9085846d7bb91c108fb1ebb01c8d8ea20c70794476b3b7ddbb4d15efe985f54780642fddcc98991061406cb
+  metadata.gz: 22fb70781c58df1795c41e5b8e954b8a89e6c85be0dbf33f2c2fb9265847778f99f414cbd7fe9ea945d6aa43f89d7557ea41541f938fa357a7bbcb2c0e6114df
+  data.tar.gz: b480446464f626518ac128b2e79d4e4dbb2b50e8e52d6781812a0ee1594e5328430214ad03be9590c09dcfd07661ae54130b53ccde1b9b7d2131d2f40c80a633

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Changes in 0.28.1
+
+### Fixes
+
+* Fix issue where ActiveRecord presence validations were being mutated.
+  Limited custom presence validation to bulk imports.
+
 ## Changes in 0.28.0
 
 ### New Features

data/lib/activerecord-import/import.rb

@@ -24,42 +24,57 @@ module ActiveRecord::Import #:nodoc:
   end
 
   class Validator
-    def initialize(options = {})
+    def initialize(klass, options = {})
       @options = options
+      init_validations(klass)
+    end
+
+    def init_validations(klass)
+      @validate_callbacks = klass._validate_callbacks.dup
+
+      klass._validate_callbacks.each_with_index do |callback, i|
+        filter = callback.raw_filter
+
+        if filter.class.name =~ /Validations::PresenceValidator/
+          callback = callback.dup
+          filter = filter.dup
+          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
+        elsif !@options[:validate_uniqueness] && filter.is_a?(ActiveRecord::Validations::UniquenessValidator)
+          @validate_callbacks.delete(callback)
+        end
+      end
     end
 
     def valid_model?(model)
       validation_context = @options[:validate_with_context]
       validation_context ||= (model.new_record? ? :create : :update)
-
       current_context = model.send(:validation_context)
+
       begin
         model.send(:validation_context=, validation_context)
         model.errors.clear
 
-        validate_callbacks = model._validate_callbacks.dup
-
-        model._validate_callbacks.each do |callback|
-          filter = callback.raw_filter
-
-          if filter.class.name =~ /Validations::PresenceValidator/
-            associations = model.class.reflect_on_all_associations(:belongs_to)
-            attrs = filter.instance_variable_get(:@attributes)
-            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)
-          elsif !@options[:validate_uniqueness] && filter.is_a?(ActiveRecord::Validations::UniquenessValidator)
-            validate_callbacks.delete(callback)
-          end
-        end
-
         model.run_callbacks(:validation) do
           if defined?(ActiveSupport::Callbacks::Filters::Environment) # ActiveRecord >= 4.1
-            runner = validate_callbacks.compile
+            runner = @validate_callbacks.compile
             env = ActiveSupport::Callbacks::Filters::Environment.new(model, false, nil)
             if runner.respond_to?(:call) # ActiveRecord < 5.1
               runner.call(env)
@@ -78,10 +93,10 @@ module ActiveRecord::Import #:nodoc:
               runner.invoke_before(env)
               runner.invoke_after(env)
             end
-          elsif validate_callbacks.method(:compile).arity == 0 # ActiveRecord = 4.0
-            model.instance_eval validate_callbacks.compile
+          elsif @validate_callbacks.method(:compile).arity == 0 # ActiveRecord = 4.0
+            model.instance_eval @validate_callbacks.compile
           else # ActiveRecord 3.x
-            model.instance_eval validate_callbacks.compile(nil, model)
+            model.instance_eval @validate_callbacks.compile(nil, model)
           end
         end
 
@@ -529,7 +544,7 @@ class ActiveRecord::Base
       options[:locking_column] = locking_column if attribute_names.include?(locking_column)
 
       is_validating = options[:validate_with_context].present? ? true : options[:validate]
-      validator = ActiveRecord::Import::Validator.new(options)
+      validator = ActiveRecord::Import::Validator.new(self, options)
 
       # assume array of model objects
       if args.last.is_a?( Array ) && args.last.first.is_a?(ActiveRecord::Base)

data/lib/activerecord-import/version.rb

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

data/test/import_test.rb

@@ -316,6 +316,13 @@ describe "#import" do
           UserToken.import [:user_name, :token], [%w("Bob", "12345abcdef67890")]
         end
       end
+
+      it "should not mutate the defined validations" do
+        UserToken.import [:user_name, :token], [%w("Bob", "12345abcdef67890")]
+        ut = UserToken.new
+        ut.valid?
+        assert_includes ut.errors.messages, :user
+      end
     end
   end
 

metadata

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