active_record_bulk_insert 1.2.0 → 1.3.0

checksums.yaml

@@ -1,15 +1,15 @@
 ---
 !binary "U0hBMQ==":
   metadata.gz: !binary |-
-    MjEyNGY3MzlkZTc3ZDkyOTRkYjdkMGFiZjUwYzVjNTFmN2M0NDVmYQ==
+    YTY2YmY2OTZkYWEzODRlOWFmZGFlZDkxZjZmYWFmNDk1Yjk3YTZiZg==
   data.tar.gz: !binary |-
-    NGFmMWVkN2U1ZWFmNTZmMDJiOTgxYzRjM2M4OWI1M2RkOThiYTNhMQ==
+    NzJjZDAyYmYwYTNlMmUyYTAzMTkwYjRjNWU2ZThkMmE3ZGE2NjBhZQ==
 SHA512:
   metadata.gz: !binary |-
-    YWQ5MDA0ZmY0ZjllNDc0ZGI4ZjY5OTFjYmYxNjFhNzdhZWRiZGExYTEzMTdm
-    Mzk4Zjc3MzBjZDhjZWY5ZDZjMjlmMWVlYzUzOWY3ZTFhN2FmZTg2ZjgzMDFk
-    ODU0YTNiZWM1MGQ3ZTFkZTZlNzdlOGZjN2JkZDIwMmVkNTU2OGM=
+    ZTQ5ZDdkNzI5ZTJiMmJjNWMzZDMzMDU5YjY5MGJlM2Q3MDBlOGRlMzcwYjE3
+    YWM5NzBiY2Y0ZDA0NWNmNDE5MWFkZTc5Y2RlNjhhOTA2MWUxYTliY2U4YmQw
+    YTI0ZTQxNTlkNGMxYmE2NzI2NTQ1YTUzMWNkMTdkYjkwYTM3NWI=
   data.tar.gz: !binary |-
-    MmU5MmRjMWUzMDQ0MzRmMmE3ZjJjNGJmZjQ0OTI4NDRmOTUyMGY2ODg2MDA4
-    NWNlMThjZGUwNzVlMGI2Y2ZiNmFiZGFmNTZjNTM2NjVkOTc0N2RhMDY4NmFl
-    YWJiOTU2MDg4ZDBmMDIwMDZhMTliNjQwNTgzN2EyYWQ0NDJkY2U=
+    ZTJhZDQ3M2U0ZWNhNmYwZmQyNWQzNmE0Y2Q1MzJjNTA5MDY4NTRmNjJmMTAw
+    YzM3NWEzNDY5NjQ1NDQ4NmFmMjAwNDMwYjllYmQ4NTA5ZTMwMzFjMzg5NTY0
+    YjU4MGI4NGQyYzExMGJjNDQ4OTgxODQzNWZmMTVmMDdmNzAxZmI=

data/README.md

@@ -1,4 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/active_record_bulk_insert.svg)](http://badge.fury.io/rb/active_record_bulk_insert)
+[![Gem](https://img.shields.io/gem/dt/active_record_bulk_insert.svg)](https://rubygems.org/gems/active_record_bulk_insert)
 [![Build Status](https://api.travis-ci.org/bjhaid/active_record_bulk_insert.png)](https://travis-ci.org/bjhaid/active_record_bulk_insert)
 
 # BULK INSERT
@@ -50,6 +51,17 @@ User.bulk_insert(users, :validate => true)
 ```
 *The return value is a list of invalid records*
 
+### Validate with a custom validator
+
+```ruby
+users = [{:username => "foo", :firstname => "Foo", :lastname => "Bar", :age => 31},
+         {:username => "j.doe", :firstname => "John", :lastname => "Doe", :age => 57},
+         {:firstname => "John", :lastname => "Doe", :age => 57}]
+User.bulk_insert(users, :validate_with => Proc.new { |user| !user[:username].blank? })
+# => [{:firstname => "John", :lastname => "Doe", :age => 57}]
+```
+*The return value is a list of invalid records*
+
 ### Provide your own primary keys
 
 ```ruby

data/lib/active_record_bulk_insert.rb

@@ -18,8 +18,9 @@ ActiveRecord::Base.class_eval do
     attributes = _resolve_record(attrs.first, options).keys.join(", ")
 
     invalid = []
-    if options.fetch(:validate, false)
-      attrs, invalid = attrs.partition { |record| _validate(record) }
+    if options.fetch(:validate, false) || options.fetch(:validate_with, false)
+      _validator = options.fetch(:validate_with, self.method(:_validate))
+      attrs, invalid = attrs.partition { |record| _validator.call(record) }
     end
 
     values_sql = attrs.map do |record|

data/spec/sample_record_spec.rb

@@ -89,6 +89,25 @@ describe SampleRecord do
         invalid_records = SampleRecord.bulk_insert(records, :validate => true, :disable_timestamps => true)
         invalid_records.should == [{:age => 30, :name => ""}]
       end
+
+      it "validates with a custom validator if ':validate_with' is specified" do
+        records = [{:age => 30, :name => "Bar"}, {:age => 29, :name => "Foo"}]
+        validator = Proc.new { |record| record[:name] != "Foo" }
+
+        invalid_records = SampleRecord.bulk_insert(records, :validate_with => validator)
+
+        invalid_records.should == [{:age => 29, :name => "Foo"}]
+      end
+
+      it "validates with the custom validator when both ':validate' and ':validate_with' are specified" do
+        SampleRecord.send(:validates, :name, :presence => true)
+        records = [{:age => 30, :name => ""}, {:age => 29, :name => "Foo"}]
+        validator = Proc.new { |record| record[:name] != "Foo" }
+
+        invalid_records = SampleRecord.bulk_insert(records, :validate => true, :validate_with => validator)
+
+        invalid_records.should == [{:age => 29, :name => "Foo"}]
+      end
     end
 
     context "timestamps" do

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_bulk_insert
 version: !ruby/object:Gem::Version
-  version: 1.2.0
+  version: 1.3.0
 platform: ruby
 authors:
 - Abejide Ayodele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-12-21 00:00:00.000000000 Z
+date: 2017-02-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord