batch_insert 0.2 → 0.3

data/Rakefile

@@ -1,46 +1,43 @@
 require 'rake'
-require 'spec/rake/spectask'
+require 'rake/testtask'
+require 'rdoc/task'
+require 'rspec/core/rake_task'
 
-require 'rubygems'
-require 'rake/gempackagetask'
+desc 'Default: run unit tests.'
+task :default => :test
 
-PKG_FILES = FileList[
-  '[a-zA-Z]*',
-  'generators/**/*',
-  'lib/**/*',
-  'rails/**/*',
-  'spec/**/*'
-]
-
-spec = Gem::Specification.new do |s|
-  s.name = 'batch_insert'
-  s.version = '0.2'
-  s.author = 'Shaun Mangelsdorf'
-  s.email = 's.mangelsdorf@gmail.com'
-  s.homepage = 'http://smangelsdorf.github.com'
-  s.platform = Gem::Platform::RUBY
-  s.summary = 'Extends ActiveRecord to provide batch insertion capabilities'
-  s.files = PKG_FILES.to_a
-  s.require_path = 'lib'
-  s.has_rdoc = false
-  s.extra_rdoc_files = ['README.md']
-  s.rubyforge_project = 'batch_insert'
-  s.description = <<EOF
-Adds batch insertion capabilities to ActiveRecord model classes.
-EOF
+desc 'Generate documentation for the batch_insert plugin.'
+RDoc::Task.new(:rdoc) do |rdoc|
+  rdoc.rdoc_dir = 'rdoc'
+  rdoc.title    = 'BatchInsert'
+  rdoc.options << '--line-numbers' << '--inline-source'
+  rdoc.rdoc_files.include('README')
+  rdoc.rdoc_files.include('lib/**/*.rb')
 end
 
-desc 'Default: run specs.'
-task :default => :spec
-
-desc 'Run the specs'
-Spec::Rake::SpecTask.new(:spec) do |t|
-  t.spec_opts = ['--colour --format progress --loadby mtime --reverse']
-  t.spec_files = FileList['spec/**/*_spec.rb']
+RSpec::Core::RakeTask.new do |t|
+  t.rspec_opts = ["-c", "-f progress", "-r ./spec/spec_helper.rb"]
+  t.pattern = 'spec/*_spec.rb'
 end
 
-desc 'Turn this plugin into a gem.'
-Rake::GemPackageTask.new(spec) do |pkg|
-  pkg.gem_spec = spec
+begin
+  require 'jeweler'
+  Jeweler::Tasks.new do |gem|
+    gem.name = 'batch_insert'
+    gem.summary = 'Extends ActiveRecord to provide batch insertion capabilities'
+    gem.description = 'Adds batch insertion capabilities to ActiveRecord model classes.'
+    gem.files = Dir[
+      '[a-zA-Z]*',
+      'generators/**/*',
+      'lib/**/*',
+      'rails/**/*',
+      'spec/**/*'
+    ]
+    gem.extra_rdoc_files = ['README.md']
+    gem.authors = ['Shaun Mangelsdorf']
+    gem.homepage = 'http://smangelsdorf.github.com'
+    gem.version = '0.3'
+  end
+rescue LoadError
+  puts "Jeweler could not be sourced"
 end
-

data/init.rb

@@ -1,3 +1 @@
-# Released under the MIT license. See the LICENSE file for details
-
-require File.join(File.dirname(__FILE__), 'rails', 'init')
+# Include hook code here

data/lib/batch_insert.rb

@@ -1,18 +1,12 @@
 # Released under the MIT license. See the MIT-LICENSE file for details
-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 BatchInsert
+  module ActiveRecordExtension
     module ClassMethods
       def batch_insert(opts={})
-        self.batched_inserts = returning(batched_inserts) do
+        self.batched_inserts = batched_inserts.tap do
           self.batched_inserts = []
 
-          self.batched_insert_opts = returning(batched_insert_opts) do
+          self.batched_insert_opts = batched_insert_opts.tap do
             self.batched_insert_opts = opts
             yield
           end
@@ -42,8 +36,8 @@ module ActiveRecord
       end
 
       def insert(opts={})
-        returning new(opts) do |obj|
-          raise RecordInvalid.new(obj) unless obj.valid?
+        new(opts).tap do |obj|
+          raise ActiveRecord::RecordInvalid.new(obj) unless obj.valid?
           self.batched_inserts << obj.attributes
 
           limit = batched_insert_opts[:batch_size].to_i
@@ -52,4 +46,14 @@ module ActiveRecord
       end
     end
   end
+
+  class Railtie < Rails::Railtie
+    initializer 'batch_insert.install_active_record_mixins' do
+      ActiveRecord::Base.instance_eval do
+        send :extend, ::BatchInsert::ActiveRecordExtension::ClassMethods
+        class_inheritable_accessor :batched_inserts
+        class_inheritable_accessor :batched_insert_opts
+      end
+    end
+  end
 end

metadata

@@ -1,11 +1,12 @@
 --- !ruby/object:Gem::Specification 
 name: batch_insert
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 13
+  prerelease: 
   segments: 
   - 0
-  - 2
-  version: "0.2"
+  - 3
+  version: "0.3"
 platform: ruby
 authors: 
 - Shaun Mangelsdorf
@@ -13,14 +14,11 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-11-18 00:00:00 +10:00
-default_executable: 
+date: 2011-08-16 00:00:00 Z
 dependencies: []
 
-description: |
-  Adds batch insertion capabilities to ActiveRecord model classes.
-
-email: s.mangelsdorf@gmail.com
+description: Adds batch insertion capabilities to ActiveRecord model classes.
+email: 
 executables: []
 
 extensions: []
@@ -28,15 +26,13 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 files: 
-- uninstall.rb
-- init.rb
 - MIT-LICENSE
-- Rakefile
 - README.md
+- Rakefile
+- init.rb
 - install.rb
 - lib/batch_insert.rb
-- rails/init.rb
-has_rdoc: true
+- uninstall.rb
 homepage: http://smangelsdorf.github.com
 licenses: []
 
@@ -46,23 +42,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
-rubyforge_project: batch_insert
-rubygems_version: 1.3.6
+rubyforge_project: 
+rubygems_version: 1.8.5
 signing_key: 
 specification_version: 3
 summary: Extends ActiveRecord to provide batch insertion capabilities

data/rails/init.rb

@@ -1,3 +0,0 @@
-require 'batch_insert'
-
-ActiveRecord::Base.send :include, ActiveRecord::BatchInsert