activerecord-import 0.18.0 → 0.18.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e1c586e3530cab4dd5f201737dd31c9634079ba1
-  data.tar.gz: 1eb5d9c977a304bbff53ce32ffd61a0620426cc0
+  metadata.gz: 49847bc4a5b9c30133bb9a3ea8223906bcb65927
+  data.tar.gz: a4eeffe1ba579ccfe60f0e4e2e8ba7f641594aff
 SHA512:
-  metadata.gz: cd502299bf521c3f9c6f98a2e4eb55ba8b88f0715401a7b959eedbfd26c0a455524642e3e76dbb429931fa006b519376a9be307daa12dd5b73e14f1c48ada29c
-  data.tar.gz: 6a980c019a2db629a2ba1772b6630119ac8a04da23dc06c091cdb378a75ceeaf37ad17e5104d7c51f2982cf0253ec6485a538327655aea2e0d29a480364549ce
+  metadata.gz: 4b862bf40ca9dc76c6980bca024e9001db7e5ec89cdcfb98860cf9710280a44db4587e51ef45d5212c0121bc2bd407e45d6bbf6e047bf2ac5f8256c6b7d29ea6
+  data.tar.gz: 4409b8fbf9ea44482496a22679029eaf80e5a411cda999624f4587436e68b26eb59be7e263d0f324c39c5156da97be6b49929efde6d6c7bcda7a9c153a17c49a

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Changes in 0.18.1
+
+### Fixes
+
+* Fix to enable validation callbacks (before_validation,
+  after_validation). Thanks to @sinsoku, @jkowens via \#406.
+
 ## Changes in 0.18.0
 
 ### New Features

data/lib/activerecord-import/import.rb

@@ -37,12 +37,20 @@ module ActiveRecord::Import #:nodoc:
       model.send(:validation_context=, validation_context)
       model.errors.clear
 
-      @validators.each do |v|
-        if validation_context == v.options.fetch(:on, validation_context)
-          v.validate(model) if validate?(v, model)
+      validation_proc = lambda do
+        @validators.each do |v|
+          if validation_context == v.options.fetch(:on, validation_context)
+            v.validate(model) if validate?(v, model)
+          end
         end
       end
 
+      if model.respond_to?(:run_validation_callbacks)
+        model.send(:_run_validation_callbacks, &validation_proc)
+      else
+        model.send(:run_callbacks, :validation, &validation_proc)
+      end
+
       model.send(:validation_context=, current_context)
       model.errors.empty?
     end

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.18.0".freeze
+    VERSION = "0.18.1".freeze
   end
 end

data/test/import_test.rb

@@ -224,6 +224,12 @@ describe "#import" do
         end
         assert_equal 0, Topic.where(title: invalid_values.map(&:first)).count
       end
+
+      it "should run callbacks" do
+        assert_no_difference "Topic.count" do
+          Topic.import columns, [["invalid", "Jerry Carter"]], validate: true
+        end
+      end
     end
   end
 

data/test/models/topic.rb

@@ -3,6 +3,8 @@ class Topic < ActiveRecord::Base
   validates :title, numericality: { only_integer: true }, on: :context_test
   validates :title, uniqueness: true
 
+  before_validation -> { errors.add(:title, :invalid) if title == 'invalid' }
+
   has_many :books, inverse_of: :topic
   belongs_to :parent, class_name: "Topic"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.18.0
+  version: 0.18.1
 platform: ruby
 authors:
 - Zach Dennis