batch_insert 0.1.1 → 0.2

data/README.md

@@ -7,6 +7,12 @@ The API is very similar to the standard `new` and `create` functions provided
 by ActiveRecord, but will not return a saved object to the caller.
 
 
+License
+=======
+
+This plugin is released under the MIT license, and was contributed to the Rails community by the good people at [Software Projects](http://www.sp.com.au)
+
+
 Example
 =======
 
@@ -45,4 +51,11 @@ Example
 		ModelClass.insert(conflict)
 	end		# Exception!
 
-Copyright (c) 2010 Shaun Mangelsdorf, released under the MIT license
+**Custom batch size is supported (the default is unlimited)**
+
+    ModelClass.batch_insert :batch_size => 10 do
+		# This loop will cause 3 INSERT statements
+		37.times do |i|
+			ModelClass.insert :name => "object #{i}", :description => "The #{i.ordinalize} object"
+		end
+	end     # And the last 7 objects will be inserted here.

data/Rakefile

@@ -14,7 +14,7 @@ PKG_FILES = FileList[
 
 spec = Gem::Specification.new do |s|
   s.name = 'batch_insert'
-  s.version = '0.1.1'
+  s.version = '0.2'
   s.author = 'Shaun Mangelsdorf'
   s.email = 's.mangelsdorf@gmail.com'
   s.homepage = 'http://smangelsdorf.github.com'

data/lib/batch_insert.rb

@@ -3,24 +3,21 @@ module ActiveRecord
   module BatchInsert
     def self.included(base)
       base.class_inheritable_accessor :batched_inserts
+      base.class_inheritable_accessor :batched_insert_opts
       base.extend ClassMethods
     end
 
     module ClassMethods
-      def batch_insert
+      def batch_insert(opts={})
         self.batched_inserts = returning(batched_inserts) do
           self.batched_inserts = []
-          yield
-
-          unless self.batched_inserts.empty?
-            column_names = columns.map(&:name).sort - [primary_key]
-            connection.execute %Q{
-              INSERT INTO #{connection.quote_table_name(table_name)}
-              (#{column_names.map{|n| connection.quote_column_name(n)}.join(',')})
-              VALUES
-              #{batch_insert_values_string(column_names)}
-            }.gsub(/\s+/,' ').squeeze(' ').strip
+
+          self.batched_insert_opts = returning(batched_insert_opts) do
+            self.batched_insert_opts = opts
+            yield
           end
+
+          flush_batch_insert_queue
         end
       end
 
@@ -30,10 +27,27 @@ module ActiveRecord
         end.join ','
       end
 
+      def flush_batch_insert_queue
+        unless self.batched_inserts.empty?
+          column_names = columns.map(&:name).sort - [primary_key]
+          connection.execute %Q{
+            INSERT INTO #{connection.quote_table_name(table_name)}
+            (#{column_names.map{|n| connection.quote_column_name(n)}.join(',')})
+            VALUES
+            #{batch_insert_values_string(column_names)}
+          }.gsub(/\s+/,' ').squeeze(' ').strip
+
+          batched_inserts.clear
+        end
+      end
+
       def insert(opts={})
         returning new(opts) do |obj|
           raise RecordInvalid.new(obj) unless obj.valid?
           self.batched_inserts << obj.attributes
+
+          limit = batched_insert_opts[:batch_size].to_i
+          flush_batch_insert_queue if limit > 0 and self.batched_inserts.length >= limit
         end
       end
     end

metadata

@@ -4,9 +4,8 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 1
-  - 1
-  version: 0.1.1
+  - 2
+  version: "0.2"
 platform: ruby
 authors: 
 - Shaun Mangelsdorf
@@ -14,7 +13,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-11 00:00:00 +10:00
+date: 2010-11-18 00:00:00 +10:00
 default_executable: 
 dependencies: []
 
@@ -36,7 +35,6 @@ files:
 - README.md
 - install.rb
 - lib/batch_insert.rb
-- lib/tasks/batch_insert.rake
 - rails/init.rb
 has_rdoc: true
 homepage: http://smangelsdorf.github.com

data/lib/tasks/batch_insert.rake

@@ -1,4 +0,0 @@
-# desc "Explaining what the task does"
-# task :batch_insert do
-#   # Task goes here
-# end