active_record_bulk_insert 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 98abb1e9088469a72b2a1fdad538efbad45f0ff3
-  data.tar.gz: 6af5ead385884af2ba352c78066903402f7ace59
+  metadata.gz: c3d14d962a4b75438e6782bcfb7ae0d25c9f1bd5
+  data.tar.gz: f8878c7b4b47eb1f5daaff16135ceb03b491830b
 SHA512:
-  metadata.gz: b880829f30a4908a6f9409d74059ee0afaaea2fdde49dfd988df0fc84490a5a9b0d74828e6195717c868694f084462646531cb2ad76be91a4d35f553743a30e8
-  data.tar.gz: 792930311de34e535b98534c4b7158b5826028e431010c0c2728ffa0ad63da04bec8b1761e07ff87df8ae3d741e5071b789bf1463b43e322ad1bbd1027972088
+  metadata.gz: 5a0fdf6b3acad9e058d3bea8c2cc304edd6fab80d278a7ade049debd93cade9283138cd00a91cb05429c25de179cb4825c5e20915c14f2bab3796238fa732a84
+  data.tar.gz: 417f5e0f23e63e5d7ee3e51af9aaa25c942a95185b30ef57869e663a32a49b90deb270f2b2379e076511e80b3ac919cedde31219de610e3ed9b8df30cffdd8f3

data/README.md

@@ -6,6 +6,15 @@
 
 ### Quick Example
 
+For -v 1.0.0
+
+```ruby
+#Gemfile
+gem "active_record_bulk_insert", :require => 'base'
+```
+
+For subsequent versions
+
 ```ruby
 #Gemfile
 gem "active_record_bulk_insert"
@@ -50,6 +59,14 @@ User.bulk_insert(users, :use_provided_primary_key => true)
 ```
 *note this is only available from ActiveRecord 4.0 as id was protected from mass-assignment in ActiveRecord < 4.0*
 
+### Disable default timestamps
+
+*From version 1.0.2 updated_at and created_at are provided by default*
+
+```ruby
+User.bulk_insert(users, :disable_timestamps => true)
+```
+
 ### Bulk insert in batches
 
 ```ruby

data/lib/active_record_bulk_insert.rb

@@ -8,15 +8,17 @@ ActiveRecord::Base.class_eval do
   end
 
   def self.bulk_insert(attrs, options = {})
+    return [] if attrs.empty?
+
     use_provided_primary_key = options.fetch(:use_provided_primary_key, false)
-    attributes = _resolve_record(attrs.first, use_provided_primary_key).keys.join(", ")
+    attributes = _resolve_record(attrs.first, options).keys.join(", ")
 
     if options.fetch(:validate, false)
       attrs, invalid = attrs.partition { |record| _validate(record) }
     end
 
     values_sql = attrs.map do |record|
-      "(#{_resolve_record(record, use_provided_primary_key).values.map { |r| sanitize(r) }.join(', ')})"
+      "(#{_resolve_record(record, options).values.map { |r| sanitize(r) }.join(', ')})"
     end.join(",")
 
     sql = <<-SQL
@@ -29,16 +31,12 @@ ActiveRecord::Base.class_eval do
     invalid
   end
 
-  def self._resolve_record(record, use_provided_primary_key)
-    if record.is_a?(Hash) && use_provided_primary_key
-      record.except(primary_key).except(primary_key.to_sym)
-    elsif record.is_a?(Hash)
-      record
-    elsif record.is_a?(ActiveRecord::Base) && use_provided_primary_key
-      record.attributes
-    elsif record.is_a?(ActiveRecord::Base)
-      record.attributes.except(primary_key).except(primary_key.to_sym)
-    end
+  def self._resolve_record(record, options)
+    time = ActiveRecord::Base.default_timezone == :utc ? Time.now.utc : Time.now
+    _record = record.is_a?(ActiveRecord::Base) ? record.attributes : record
+    _record.merge!("created_at" => time, "updated_at" => time) unless options.fetch(:disable_timestamps, false)
+    _record = _record.except(primary_key).except(primary_key.to_sym) unless options.fetch(:use_provided_primary_key, false)
+    _record
   end
 
   def self._validate(record)

data/spec/sample_record_spec.rb

@@ -1,89 +1,115 @@
 require 'spec_helper'
 
 describe SampleRecord do
- describe "bulk_insert" do
-   it "inserts records into the DB" do
-     ActiveRecord::ConnectionAdapters::SQLite3Adapter.any_instance.should_receive(:execute).with do |params|
-       params.should include("INSERT INTO \"sample_records\"")
-       params.should include("Foo")
-       params.should include("30")
-     end.once
-     SampleRecord.bulk_insert([{:name => "Foo", :age => 30}])
-   end
-
-   it "inserts records into the DB and increases count of records" do
-     records = 5.times.map { |i| SampleRecord.new(:age => i + (30..50).to_a.sample, :name => "Foo#{i}").attributes }
-     expect {SampleRecord.bulk_insert(records)}.to change{SampleRecord.count}.by(records.size)
-   end
-
-   it "inserts multiple records into the DB in a single insert statement" do
-     records = 10.times.map { |i| {:age => 4, :name => "Foo#{i}"} }
-
-     ActiveRecord::ConnectionAdapters::SQLite3Adapter.any_instance.should_receive(:execute).with do |params|
-       matchdata = params.match(/insert into "sample_records"/i)
-       matchdata.to_a.count.should == 1
-       records.each do |record|
-         params.should include(record[:age].to_s)
-         params.should include(record[:name])
-       end
-     end.once
-
-     SampleRecord.bulk_insert(records)
-   end
-
-   it "relies on the DB to provide primary_key if :use_provided_primary_key is false or nil" do
-     records = 10.times.map { |i| SampleRecord.new(:id => 10000 + i, :age => 4, :name => "Foo#{i}") }
-
-     ActiveRecord::ConnectionAdapters::SQLite3Adapter.any_instance.should_receive(:execute).with do |params|
-       records.each do |record|
-         params.should_not include(record.id.to_s)
-       end
-     end
-
-     SampleRecord.bulk_insert(records)
-   end
-
-   it "uses provided primary_key if :use_provided_primary_key is true" do
-     records = 10.times.map { |i| SampleRecord.new(:id => 10000 + i, :age => 4, :name => "Foo#{i}") }
-
-     SampleRecord.bulk_insert(records, :use_provided_primary_key => true)
-     records.each do |record|
-       SampleRecord.exists?(:id => record.id).should be_true
-     end
-   end
-
-   it "support insertion of ActiveRecord objects" do
-     records = 10.times.map { |i| SampleRecord.new(:age => 4, :name => "Foo#{i}") }
-
-     ActiveRecord::ConnectionAdapters::SQLite3Adapter.any_instance.should_receive(:execute).with do |params|
-       matchdata = params.match(/insert into "sample_records"/i)
-       matchdata.to_a.count.should == 1
-       records.each do |record|
-         params.should include(record.age.to_s)
-         params.should include(record.name)
-       end
-     end.once
-
-     SampleRecord.bulk_insert(records)
-   end
-
-   context "validations" do
-     it "should not persist invalid records if ':validate => true' is specified" do
-       SampleRecord.send(:validates, :name, :presence => true)
-       expect {SampleRecord.bulk_insert([:age => 30], :validate => true)}.to_not change{SampleRecord.count}
-     end
-   end
- end
-
- describe "bulk_insert_in_batches" do
-   it "allows you to specify a batch_size" do
-     records = 10.times.map { |i| SampleRecord.new(:age => 4, :name => "Foo#{i}").attributes }
-
-     ActiveRecord::ConnectionAdapters::SQLite3Adapter.any_instance.should_receive(:execute).with do |params|
-       params.should include("INSERT INTO \"sample_records\"")
-     end.exactly(5).times
-
-     SampleRecord.bulk_insert_in_batches(records, :batch_size => 2)
-   end
- end
+  describe "bulk_insert" do
+    it "inserts records into the DB" do
+      ActiveRecord::ConnectionAdapters::SQLite3Adapter.any_instance.should_receive(:execute).with do |params|
+        params.should include("INSERT INTO \"sample_records\"")
+        params.should include("Foo")
+        params.should include("30")
+      end.once
+      SampleRecord.bulk_insert([{:name => "Foo", :age => 30}])
+    end
+
+    it "inserts records into the DB and increases count of records" do
+      records = 5.times.map { |i| SampleRecord.new(:age => i + (30..50).to_a.sample, :name => "Foo#{i}").attributes }
+      expect {SampleRecord.bulk_insert(records)}.to change{SampleRecord.count}.by(records.size)
+    end
+
+    it "inserts multiple records into the DB in a single insert statement" do
+      records = 10.times.map { |i| {:age => 4, :name => "Foo#{i}"} }
+
+      ActiveRecord::ConnectionAdapters::SQLite3Adapter.any_instance.should_receive(:execute).with do |params|
+        matchdata = params.match(/insert into "sample_records"/i)
+        matchdata.to_a.count.should == 1
+        records.each do |record|
+          params.should include(record[:age].to_s)
+          params.should include(record[:name])
+        end
+      end.once
+
+      SampleRecord.bulk_insert(records)
+    end
+
+    it "relies on the DB to provide primary_key if :use_provided_primary_key is false or nil" do
+      records = 10.times.map { |i| SampleRecord.new(:id => 10000 + i, :age => 4, :name => "Foo#{i}") }
+
+      ActiveRecord::ConnectionAdapters::SQLite3Adapter.any_instance.should_receive(:execute).with do |params|
+        records.each do |record|
+          params.should_not include(record.id.to_s)
+        end
+      end
+
+      SampleRecord.bulk_insert(records)
+    end
+
+    it "uses provided primary_key if :use_provided_primary_key is true" do
+      records = 10.times.map { |i| SampleRecord.new(:id => 10000 + i, :age => 4, :name => "Foo#{i}") }
+
+      SampleRecord.bulk_insert(records, :use_provided_primary_key => true)
+      records.each do |record|
+        SampleRecord.exists?(:id => record.id).should be_true
+      end
+    end
+
+    it "support insertion of ActiveRecord objects" do
+      records = 10.times.map { |i| SampleRecord.new(:age => 4, :name => "Foo#{i}") }
+
+      ActiveRecord::ConnectionAdapters::SQLite3Adapter.any_instance.should_receive(:execute).with do |params|
+        matchdata = params.match(/insert into "sample_records"/i)
+        matchdata.to_a.count.should == 1
+        records.each do |record|
+          params.should include(record.age.to_s)
+          params.should include(record.name)
+        end
+      end.once
+
+      SampleRecord.bulk_insert(records)
+    end
+
+    it "doesn't blow up on an empty array" do
+      expect do
+        SampleRecord.bulk_insert([])
+      end.to_not raise_error
+    end
+
+    context "validations" do
+      it "should not persist invalid records if ':validate => true' is specified" do
+        SampleRecord.send(:validates, :name, :presence => true)
+        expect {SampleRecord.bulk_insert([:age => 30], :validate => true)}.to_not change{SampleRecord.count}
+      end
+    end
+
+    context "timestamps" do
+      it "sets created_at and updated_at by default" do
+        records = 10.times.map { |i| SampleRecord.new(:id => 10000 + i, :age => 4, :name => "Foo#{i}") }
+        SampleRecord.bulk_insert(records)
+
+        SampleRecord.all.each do |record|
+          record.created_at.should_not be_nil
+        end
+      end
+
+      it "does not set created_at and updated_at if :disable_timestamps is true" do
+        records = 10.times.map { |i| SampleRecord.new(:id => 10000 + i, :age => 4, :name => "Foo#{i}") }
+        SampleRecord.bulk_insert(records, :disable_timestamps => true)
+
+        SampleRecord.all.each do |record|
+          record.created_at.should be_nil
+        end
+      end
+    end
+  end
+
+  describe "bulk_insert_in_batches" do
+    it "allows you to specify a batch_size" do
+      records = 10.times.map { |i| SampleRecord.new(:age => 4, :name => "Foo#{i}").attributes }
+
+      ActiveRecord::ConnectionAdapters::SQLite3Adapter.any_instance.should_receive(:execute).with do |params|
+        params.should include("INSERT INTO \"sample_records\"")
+      end.exactly(5).times
+
+      SampleRecord.bulk_insert_in_batches(records, :batch_size => 2)
+    end
+  end
 end

data/spec/support/migrations/1_sample_record_migration.rb

@@ -3,6 +3,7 @@ class SampleRecordMigration < ActiveRecord::Migration
     create_table :sample_records do |t|
       t.text "name"
       t.integer "age"
+      t.timestamps
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_bulk_insert
 version: !ruby/object:Gem::Version
-  version: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Abejide Ayodele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-05-30 00:00:00.000000000 Z
+date: 2014-07-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -104,7 +104,7 @@ signing_key:
 specification_version: 4
 summary: bulk insert records into the DB
 test_files:
+- spec/support/sample_record.rb
+- spec/support/migrations/1_sample_record_migration.rb
 - spec/sample_record_spec.rb
 - spec/spec_helper.rb
-- spec/support/migrations/1_sample_record_migration.rb
-- spec/support/sample_record.rb