active-record-transactioner 0.0.6 → 0.0.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: d0d85c7182312c5329e6c8731c57aa2d737f9952
-  data.tar.gz: 42316fbb652cfef2b9b35b0c572244dde822b404
+  metadata.gz: 47b2ab9839e7398fbbfa1684d0e205596df258ab
+  data.tar.gz: e0197e8fbd713edd92990767c92711b8fe286c8b
 SHA512:
-  metadata.gz: 90e200215749d32941aace7319d6c05d0cd305bf237afa40740d441078542fc83a6e647385449e2e4b9908f389471c59b27c90e4034b0d9612157816452b81ce
-  data.tar.gz: 2ee07d9fa63ebb9bb7ec9f4d620eef2ea98166fe25464497c42ecfebb533cdbb3e392fcd0bcdd4eeb4eb586452bf707797f86b4ad5b9059392ec9943d832da21
+  metadata.gz: 25fd2e63c7d0e7ba9bcb8d674a8cf236e657a18243e172d07b4fa327b92196da22f5773cbb2dbf4a64da6157f4419432b32764812acc91f7019b32af87e438dd
+  data.tar.gz: 65fdf15c694d40a88c2aee97dbaeb638516b1b19a6491b7e7b70f158ef9a383e08f32a892e0c1501dc085f761ee9e05b2b3724545b4c8a27222e7931bd75816a

data/Gemfile

@@ -7,14 +7,20 @@ source "http://rubygems.org"
 # Include everything needed to run rake, tests, features, etc.
 group :development do
   gem "rails", "~> 4.0.10"
-  gem "rspec-rails", "~> 3.1.0"
+  gem "rspec-rails", "~> 3.4.0"
   gem "rdoc", "~> 3.12"
   gem "bundler", ">= 1.0.0"
   gem "jeweler", ">= 1.8.4"
   gem "builder"
   gem "activerecord"
-  gem "mysql2"
+  gem "sqlite3", "1.3.11"
+  gem "mysql2", "0.3.20"
   gem "pry"
+  gem "best_practice_project", github: "kaspernj/best_practice_project" # path: "/home/kaspernj/Dev/Ruby/best_practice_project"
+  gem "rubocop", "0.35.1"
+  gem "database_cleaner"
 end
 
-gem "codeclimate-test-reporter", group: :test, require: nil
+group :test do
+  gem "codeclimate-test-reporter", require: nil
+end

data/Gemfile.lock

@@ -1,3 +1,10 @@
+GIT
+  remote: git://github.com/kaspernj/best_practice_project.git
+  revision: a733a53ffa7fcf2af0b49c30fa7d949579319782
+  specs:
+    best_practice_project (0.0.5)
+      psych (~> 2.0.0)
+
 GEM
   remote: http://rubygems.org/
   specs:
@@ -27,10 +34,14 @@ GEM
       tzinfo (~> 0.3.37)
     addressable (2.3.6)
     arel (4.0.2)
+    ast (2.1.0)
+    astrolabe (1.3.1)
+      parser (~> 2.2)
     builder (3.1.4)
     codeclimate-test-reporter (0.4.2)
       simplecov (>= 0.7.1, < 1.0.0)
     coderay (1.1.0)
+    database_cleaner (1.4.1)
     descendants_tracker (0.0.4)
       thread_safe (~> 0.3, >= 0.3.1)
     diff-lcs (1.2.5)
@@ -72,7 +83,7 @@ GEM
     multi_json (1.10.0)
     multi_xml (0.5.5)
     multipart-post (2.0.0)
-    mysql2 (0.3.16)
+    mysql2 (0.3.20)
     nokogiri (1.6.2.1)
       mini_portile (= 0.6.0)
     oauth2 (0.9.3)
@@ -81,10 +92,14 @@ GEM
       multi_json (~> 1.3)
       multi_xml (~> 0.5)
       rack (~> 1.2)
+    parser (2.2.3.0)
+      ast (>= 1.1, < 3.0)
+    powerpack (0.1.1)
     pry (0.10.1)
       coderay (~> 1.1.0)
       method_source (~> 0.8.1)
       slop (~> 3.4)
+    psych (2.0.15)
     rack (1.5.2)
     rack-test (0.6.2)
       rack (>= 1.0)
@@ -101,25 +116,35 @@ GEM
       activesupport (= 4.0.12)
       rake (>= 0.8.7)
       thor (>= 0.18.1, < 2.0)
+    rainbow (2.0.0)
     rake (10.3.2)
     rdoc (3.12.2)
       json (~> 1.4)
-    rspec-core (3.1.7)
-      rspec-support (~> 3.1.0)
-    rspec-expectations (3.1.2)
+    rspec-core (3.4.1)
+      rspec-support (~> 3.4.0)
+    rspec-expectations (3.4.0)
       diff-lcs (>= 1.2.0, < 2.0)
-      rspec-support (~> 3.1.0)
-    rspec-mocks (3.1.3)
-      rspec-support (~> 3.1.0)
-    rspec-rails (3.1.0)
-      actionpack (>= 3.0)
-      activesupport (>= 3.0)
-      railties (>= 3.0)
-      rspec-core (~> 3.1.0)
-      rspec-expectations (~> 3.1.0)
-      rspec-mocks (~> 3.1.0)
-      rspec-support (~> 3.1.0)
-    rspec-support (3.1.2)
+      rspec-support (~> 3.4.0)
+    rspec-mocks (3.4.0)
+      diff-lcs (>= 1.2.0, < 2.0)
+      rspec-support (~> 3.4.0)
+    rspec-rails (3.4.0)
+      actionpack (>= 3.0, < 4.3)
+      activesupport (>= 3.0, < 4.3)
+      railties (>= 3.0, < 4.3)
+      rspec-core (~> 3.4.0)
+      rspec-expectations (~> 3.4.0)
+      rspec-mocks (~> 3.4.0)
+      rspec-support (~> 3.4.0)
+    rspec-support (3.4.1)
+    rubocop (0.35.1)
+      astrolabe (~> 1.3)
+      parser (>= 2.2.3.0, < 3.0)
+      powerpack (~> 0.1)
+      rainbow (>= 1.99.1, < 3.0)
+      ruby-progressbar (~> 1.7)
+      tins (<= 1.6.0)
+    ruby-progressbar (1.7.5)
     simplecov (0.9.1)
       docile (~> 1.1.0)
       multi_json (~> 1.0)
@@ -135,9 +160,11 @@ GEM
       actionpack (>= 3.0)
       activesupport (>= 3.0)
       sprockets (>= 2.8, < 4.0)
+    sqlite3 (1.3.11)
     thor (0.19.1)
     thread_safe (0.3.4)
     tilt (1.4.1)
+    tins (1.6.0)
     tzinfo (0.3.42)
 
 PLATFORMS
@@ -145,12 +172,19 @@ PLATFORMS
 
 DEPENDENCIES
   activerecord
+  best_practice_project!
   builder
   bundler (>= 1.0.0)
   codeclimate-test-reporter
+  database_cleaner
   jeweler (>= 1.8.4)
-  mysql2
+  mysql2 (= 0.3.20)
   pry
   rails (~> 4.0.10)
   rdoc (~> 3.12)
-  rspec-rails (~> 3.1.0)
+  rspec-rails (~> 3.4.0)
+  rubocop (= 0.35.1)
+  sqlite3 (= 1.3.11)
+
+BUNDLED WITH
+   1.10.6

data/README.md

@@ -28,8 +28,6 @@ end
 You can also do it a bit more complicated with some custom options.
 ```ruby
 ActiveRecordTransactioner.new(
-  call_args: ["Hello world!"],
-  call_method: :save!,
   transaction_method: :transaction,
   transaction_size: 1000,
   threadded: false
@@ -41,6 +39,24 @@ ActiveRecordTransactioner.new(
 end
 ```
 
+### Update columns
+```ruby
+ActiveRecordTransactioner.new do |trans|
+  models.each do |model|
+    trans.update_columns(model, some_column: "new_value")
+  end
+end
+```
+
+### Inserts in a single SQL statement (bulk inserts)
+```ruby
+ActiveRecordTransactioner.new do |trans|
+  1000.times do |count|
+    trans.bulk_create!(User.new(email: "test#{count}@example.com"))
+  end
+end
+```
+
 ### Destroy
 ```ruby
 ActiveRecordTransactioner.new do |trans|
@@ -52,9 +68,9 @@ end
 
 ### Threadded
 
-The "threadded" and "max_running_threads" options will start new threads to actually do the saving of the models, while continuing to queue up new models for saving in the primary thread. This way the database can utilize multiple cores, and if you use a threadded VM like JRuby or Rubinius, you will utilize even more cores.
+The "threadded" and "max_running_threads" options will start new threads to do the saving of the models, while continuing to queue up new models in the primary thread. This way the database can utilize multiple cores, and if you use a threadded VM like JRuby or Rubinius, you will utilize even more.
 
-This can help greatly speed up the processing.
+This can help greatly speed up the processing of records.
 
 Be aware that the saving of only one type of model, will be limited to only one thread, so it will make sense to try and queue up as many type of models as possible. Like users, orders and so on.
 
@@ -71,7 +87,7 @@ end
 ```
 
 ## Contributing to active-record-transactioner
- 
+
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet.
 * Check out the issue tracker to make sure someone already hasn't requested it and/or contributed it.
 * Fork the project.

data/Rakefile

@@ -1,7 +1,7 @@
 # encoding: utf-8
 
-require 'rubygems'
-require 'bundler'
+require "rubygems"
+require "bundler"
 begin
   Bundler.setup(:default, :development)
 rescue Bundler::BundlerError => e
@@ -9,41 +9,44 @@ rescue Bundler::BundlerError => e
   $stderr.puts "Run `bundle install` to install missing gems"
   exit e.status_code
 end
-require 'rake'
+require "rake"
 
-require 'jeweler'
+require "jeweler"
 Jeweler::Tasks.new do |gem|
   # gem is a Gem::Specification... see http://docs.rubygems.org/read/chapter/20 for more options
   gem.name = "active-record-transactioner"
   gem.homepage = "http://github.com/kaspernj/active-record-transactioner"
   gem.license = "MIT"
-  gem.summary = %Q{Queue up calls to specific models and execute them in transactions, after a certain number of models have been added.}
-  gem.description = %Q{Queue up calls to specific models and execute them in transactions, after a certain number of models have been added.}
+  gem.summary = "Queue up calls to specific models and execute them in transactions, after a certain number of models have been added."
+  gem.description = "Queue up calls to specific models and execute them in transactions, after a certain number of models have been added."
   gem.email = "kj@gfish.com"
   gem.authors = ["Kasper Johansen"]
   # dependencies defined in Gemfile
 end
 Jeweler::RubygemsDotOrgTasks.new
 
-require 'rspec/core'
-require 'rspec/core/rake_task'
+require "rspec/core"
+require "rspec/core/rake_task"
 RSpec::Core::RakeTask.new(:spec) do |spec|
-  spec.pattern = FileList['spec/**/*_spec.rb']
+  spec.pattern = FileList["spec/**/*_spec.rb"]
 end
 
 RSpec::Core::RakeTask.new(:rcov) do |spec|
-  spec.pattern = 'spec/**/*_spec.rb'
+  spec.pattern = "spec/**/*_spec.rb"
   spec.rcov = true
 end
 
-task :default => :spec
+task default: :spec
 
-require 'rdoc/task'
+require "rdoc/task"
 Rake::RDocTask.new do |rdoc|
-  version = File.exist?('VERSION') ? File.read('VERSION') : ""
+  version = File.exist?("VERSION") ? File.read("VERSION") : ""
 
-  rdoc.rdoc_dir = 'rdoc'
+  rdoc.rdoc_dir = "rdoc"
   rdoc.title = "active-record-transactioner #{version}"
-  rdoc.rdoc_files.include('README*')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  rdoc.rdoc_files.include("README*")
+  rdoc.rdoc_files.include("lib/**/*.rb")
 end
+
+require "best_practice_project"
+BestPracticeProject.load_tasks

data/VERSION

@@ -1 +1 @@
-0.0.6
+0.0.7

data/active-record-transactioner.gemspec

@@ -2,16 +2,16 @@
 # DO NOT EDIT THIS FILE DIRECTLY
 # Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
-# stub: active-record-transactioner 0.0.6 ruby lib
+# stub: active-record-transactioner 0.0.7 ruby lib
 
 Gem::Specification.new do |s|
   s.name = "active-record-transactioner"
-  s.version = "0.0.6"
+  s.version = "0.0.7"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.require_paths = ["lib"]
   s.authors = ["Kasper Johansen"]
-  s.date = "2014-12-05"
+  s.date = "2015-12-05"
   s.description = "Queue up calls to specific models and execute them in transactions, after a certain number of models have been added."
   s.email = "kj@gfish.com"
   s.extra_rdoc_files = [
@@ -28,6 +28,8 @@ Gem::Specification.new do |s|
     "Rakefile",
     "VERSION",
     "active-record-transactioner.gemspec",
+    "config/best_project_practice_rubocop.yml",
+    "config/best_project_practice_rubocop_todo.yml",
     "lib/active-record-transactioner.rb",
     "shippable.yml",
     "spec/active-record-transactioner_spec.rb",
@@ -81,7 +83,7 @@ Gem::Specification.new do |s|
   ]
   s.homepage = "http://github.com/kaspernj/active-record-transactioner"
   s.licenses = ["MIT"]
-  s.rubygems_version = "2.4.0"
+  s.rubygems_version = "2.2.2"
   s.summary = "Queue up calls to specific models and execute them in transactions, after a certain number of models have been added."
 
   if s.respond_to? :specification_version then
@@ -89,35 +91,47 @@ Gem::Specification.new do |s|
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<rails>, ["~> 4.0.10"])
-      s.add_development_dependency(%q<rspec-rails>, ["~> 3.1.0"])
+      s.add_development_dependency(%q<rspec-rails>, ["~> 3.4.0"])
       s.add_development_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_development_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_development_dependency(%q<jeweler>, [">= 1.8.4"])
       s.add_development_dependency(%q<builder>, [">= 0"])
       s.add_development_dependency(%q<activerecord>, [">= 0"])
-      s.add_development_dependency(%q<mysql2>, [">= 0"])
+      s.add_development_dependency(%q<sqlite3>, ["= 1.3.11"])
+      s.add_development_dependency(%q<mysql2>, ["= 0.3.20"])
       s.add_development_dependency(%q<pry>, [">= 0"])
+      s.add_development_dependency(%q<best_practice_project>, [">= 0"])
+      s.add_development_dependency(%q<rubocop>, ["= 0.35.1"])
+      s.add_development_dependency(%q<database_cleaner>, [">= 0"])
     else
       s.add_dependency(%q<rails>, ["~> 4.0.10"])
-      s.add_dependency(%q<rspec-rails>, ["~> 3.1.0"])
+      s.add_dependency(%q<rspec-rails>, ["~> 3.4.0"])
       s.add_dependency(%q<rdoc>, ["~> 3.12"])
       s.add_dependency(%q<bundler>, [">= 1.0.0"])
       s.add_dependency(%q<jeweler>, [">= 1.8.4"])
       s.add_dependency(%q<builder>, [">= 0"])
       s.add_dependency(%q<activerecord>, [">= 0"])
-      s.add_dependency(%q<mysql2>, [">= 0"])
+      s.add_dependency(%q<sqlite3>, ["= 1.3.11"])
+      s.add_dependency(%q<mysql2>, ["= 0.3.20"])
       s.add_dependency(%q<pry>, [">= 0"])
+      s.add_dependency(%q<best_practice_project>, [">= 0"])
+      s.add_dependency(%q<rubocop>, ["= 0.35.1"])
+      s.add_dependency(%q<database_cleaner>, [">= 0"])
     end
   else
     s.add_dependency(%q<rails>, ["~> 4.0.10"])
-    s.add_dependency(%q<rspec-rails>, ["~> 3.1.0"])
+    s.add_dependency(%q<rspec-rails>, ["~> 3.4.0"])
     s.add_dependency(%q<rdoc>, ["~> 3.12"])
     s.add_dependency(%q<bundler>, [">= 1.0.0"])
     s.add_dependency(%q<jeweler>, [">= 1.8.4"])
     s.add_dependency(%q<builder>, [">= 0"])
     s.add_dependency(%q<activerecord>, [">= 0"])
-    s.add_dependency(%q<mysql2>, [">= 0"])
+    s.add_dependency(%q<sqlite3>, ["= 1.3.11"])
+    s.add_dependency(%q<mysql2>, ["= 0.3.20"])
     s.add_dependency(%q<pry>, [">= 0"])
+    s.add_dependency(%q<best_practice_project>, [">= 0"])
+    s.add_dependency(%q<rubocop>, ["= 0.35.1"])
+    s.add_dependency(%q<database_cleaner>, [">= 0"])
   end
 end
 

data/config/best_project_practice_rubocop.yml

@@ -0,0 +1,7 @@
+---
+inherit_from: best_project_practice_rubocop_todo.yml
+
+AllCops:
+  Exclude:
+    - active-record-transactioner.gemspec
+    - spec/dummy/db/schema.rb

data/config/best_project_practice_rubocop_todo.yml

@@ -0,0 +1,21 @@
+
+
+
+
+
+
+# This configuration was generated by
+# `rubocop --auto-gen-config`
+# on 2015-12-05 17:13:03 +0100 using RuboCop version 0.35.1.
+# The point is for the user to remove these configuration records
+# one by one as the offenses are removed from the code base.
+# Note that changes in the inspected code, or installation of new
+# versions of RuboCop, may require this file to be generated again.
+
+# Offense count: 1
+Metrics/CyclomaticComplexity:
+  Max: 8
+
+# Offense count: 1
+Metrics/PerceivedComplexity:
+  Max: 9

data/lib/active-record-transactioner.rb

@@ -11,21 +11,23 @@ class ActiveRecordTransactioner
     debug: false
   }
 
+  EMPTY_ARGS = []
+
   ALLOWED_ARGS = DEFAULT_ARGS.keys
 
   def initialize(args = {})
-    args.each { |key, val| raise "Invalid key: '#{key}'." unless ALLOWED_ARGS.include?(key) }
+    args.each_key { |key| raise "Invalid key: '#{key}'." unless ALLOWED_ARGS.include?(key) }
 
     @args = DEFAULT_ARGS.merge(args)
     parse_and_set_args
 
-    if block_given?
-      begin
-        yield self
-      ensure
-        flush
-        join if threadded?
-      end
+    return unless block_given?
+
+    begin
+      yield self
+    ensure
+      flush
+      join if threadded?
     end
   end
 
@@ -35,6 +37,27 @@ class ActiveRecordTransactioner
     queue(model, type: :save!, validate: false)
   end
 
+  def bulk_create!(model)
+    attributes = model.attributes
+    attributes.delete("id")
+    attributes.delete("created_at")
+    attributes.delete("updated_at")
+
+    klass = model.class
+    @bulk_creates[klass] ||= []
+    @bulk_creates[klass] << attributes
+
+    @count += 1
+  end
+
+  def update_columns(model, updates)
+    queue(model, type: :update_columns, validate: false, method_args: [updates])
+  end
+
+  def update_column(model, column_name, new_value)
+    update_columns(model, column_name => new_value)
+  end
+
   def destroy!(model)
     queue(model, type: :destroy!)
   end
@@ -49,8 +72,15 @@ class ActiveRecordTransactioner
       validate = args.key?(:validate) ? args[:validate] : true
 
       @lock_models[klass] ||= Monitor.new
+
       @models[klass] ||= []
-      @models[klass] << {model: model, type: args[:type], validate: validate}
+      @models[klass] << {
+        model: model,
+        type: args.fetch(:type),
+        validate: validate,
+        method_args: args[:method_args] || EMPTY_ARGS
+      }
+
       @count += 1
     end
 
@@ -62,6 +92,14 @@ class ActiveRecordTransactioner
     wait_for_threads if threadded?
 
     @lock.synchronize do
+      @bulk_creates.each do |klass, attribute_array|
+        if threadded?
+          bulk_insert_attribute_array_threadded(klass, attribute_array)
+        else
+          bulk_insert_attribute_array(klass, attribute_array)
+        end
+      end
+
       @models.each do |klass, models|
         next if models.empty?
 
@@ -82,9 +120,7 @@ class ActiveRecordTransactioner
     threads_to_join = @lock_threads.synchronize { @threads.clone }
 
     debug "Threads to join: #{threads_to_join}" if @debug
-    threads_to_join.each do |thread|
-      thread.join
-    end
+    threads_to_join.each(&:join)
   end
 
   def threadded?
@@ -95,6 +131,7 @@ private
 
   def parse_and_set_args
     @models = {}
+    @bulk_creates = {}
     @threads = []
     @count = 0
     @lock = Monitor.new
@@ -110,16 +147,15 @@ private
   end
 
   def wait_for_threads
-    break_loop = false
-    while !break_loop
+    loop do
       debug "Running threads: #{@threads.length} / #{@max_running_threads}" if @debug
       if allowed_to_start_new_thread?
-        break_loop = true
+        break
       else
         debug "Waiting for threads #{@threads.length} / #{@max_running_threads}" if @debug
       end
 
-      sleep 0.2 unless break_loop
+      sleep 0.2
     end
 
     debug "Done waiting." if @debug
@@ -132,23 +168,30 @@ private
       debug "Opening new transaction by using '#{@args[:transaction_method]}'." if @debug
 
       klass.__send__(@args[:transaction_method]) do
-        debug "Going through models." if @debug
-        models.each do |work|
-          debug work if @debug
-
-          if work[:type] == :save!
-            validate = work.key?(:validate) ? work[:validate] : true
-            work[:model].save! validate: validate
-          elsif work[:type] == :destroy!
-            work[:model].destroy!
-          else
-            raise "Invalid type: '#{work[:type]}'."
-          end
-        end
+        work_models(models)
+      end
+    end
+  end
+
+  def work_models(models)
+    debug "Going through models." if @debug
+    models.each do |work|
+      debug work if @debug
+
+      work_type = work.fetch(:type)
+      model = work.fetch(:model)
 
-        debug "Done working with models." if @debug
+      if work_type == :save!
+        validate = work.key?(:validate) ? work[:validate] : true
+        model.save! validate: validate
+      elsif work_type == :update_columns || work_type == :destroy!
+        model.__send__(work_type, *work.fetch(:method_args))
+      else
+        raise "Invalid type: '#{work[:type]}'."
       end
     end
+
+    debug "Done working with models." if @debug
   end
 
   def work_threadded(klass, models)
@@ -159,7 +202,7 @@ private
             work_models_through_transaction(klass, models)
           end
         rescue => e
-          pute e.inspect
+          puts e.inspect
           puts e.backtrace
 
           raise e
@@ -182,4 +225,69 @@ private
   def allowed_to_start_new_thread?
     @lock_threads.synchronize { return @threads.length < @max_running_threads }
   end
+
+  def bulk_insert_attribute_array_threadded(klass, attribute_array)
+    @lock_threads.synchronize do
+      @threads << Thread.new do
+        begin
+          bulk_insert_attribute_array(klass, attribute_array)
+        rescue => e
+          puts e.inspect
+          puts e.backtrace
+
+          raise e
+        ensure
+          debug "Removing thread #{Thread.current.__id__}" if @debug
+          @lock_threads.synchronize { @threads.delete(Thread.current) }
+
+          debug "Threads count after remove: #{@threads.length}" if @debug
+        end
+      end
+    end
+  end
+
+  def bulk_insert_attribute_array(klass, attribute_array)
+    sql = "INSERT INTO `#{klass.table_name}` ("
+
+    first = true
+    attribute_array.first.each_key do |key|
+      if first
+        first = false
+      else
+        sql << ", "
+      end
+
+      sql << "`#{key}`"
+    end
+
+    sql << ") VALUES ("
+
+    first_insert = true
+    attribute_array.each do |attributes|
+      if first_insert
+        first_insert = false
+      else
+        sql << "), ("
+      end
+
+      first_value = true
+      attributes.each_value do |value|
+        if first_value
+          first_value = false
+        else
+          sql << ", "
+        end
+
+        sql << klass.connection.quote(value)
+      end
+    end
+
+    sql << ")"
+
+    klass.connection.execute(sql)
+
+    @lock.synchronize do
+      @count -= attribute_array.length
+    end
+  end
 end

data/shippable.yml

@@ -4,13 +4,13 @@ archive: true
 rvm:
   - 2.1.2
 before_script:
-  - cp spec/dummy/config/database.shippable.yml spec/dummy/config/database.yml
-  - mysql -e 'DROP DATABASE IF EXISTS transactioner;'
-  - mysql -e 'CREATE DATABASE transactioner;'
+  - mysql -e "CREATE DATABASE IF NOT EXISTS shippa;"
   - cd spec/dummy
-  - RAILS_ENV=test bundle exec rake db:migrate
+  - cp config/database.shippable.yml config/database.yml
+  - RAILS_ENV=test bundle exec rake db:schema:load
   - cd ../..
 script:
   - CODECLIMATE_REPO_TOKEN=b7d9c971bea2879b81bdf35f600b985bf3a016c6104169b2c29c213a5d2e7142 bundle exec rspec
+  - bundle exec rake best_practice_project:run
 notifications:
    email: false

data/spec/active-record-transactioner_spec.rb

@@ -16,25 +16,25 @@ describe "ActiveRecordTransactioner" do
 
     trans.join
 
-    model1.save_called.should eq true
-    model2.save_called.should eq true
-    model3.save_called.should eq false
+    expect(model1.save_called).to eq true
+    expect(model2.save_called).to eq true
+    expect(model3.save_called).to eq false
 
     called = false
-    ActiveRecordTransactioner.new do |trans|
+    ActiveRecordTransactioner.new do |transactioner|
       called = true
-      trans.class.should eql(ActiveRecordTransactioner)
+      expect(transactioner).to be_a ActiveRecordTransactioner
     end
 
-    called.should eq true
+    expect(called).to eq true
   end
 
-  it "should not fail under the Rails reverse bug" do
+  it "doesnt fail under the Rails reverse bug" do
     trans = ActiveRecordTransactioner.new(transaction_size: 1)
     model1 = ActiveRecordTransactionerTestClass.new
     trans.save!(model1)
     trans.join
 
-    ActiveRecordTransactionerTestClass::ARGS[:nilraise].should eq false
+    expect(ActiveRecordTransactionerTestClass::ARGS[:nilraise]).to eq false
   end
 end

data/spec/dummy/Rakefile

@@ -1,6 +1,6 @@
 # Add your own tasks in files placed in lib/tasks ending in .rake,
 # for example lib/tasks/capistrano.rake, and they will automatically be available to Rake.
 
-require File.expand_path('../config/application', __FILE__)
+require File.expand_path("../config/application", __FILE__)
 
 Dummy::Application.load_tasks

data/spec/dummy/bin/bundle

@@ -1,3 +1,3 @@
 #!/usr/bin/env ruby
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../Gemfile', __FILE__)
-load Gem.bin_path('bundler', 'bundle')
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile", __FILE__)
+load Gem.bin_path("bundler", "bundle")

data/spec/dummy/bin/rails

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-APP_PATH = File.expand_path('../../config/application',  __FILE__)
-require_relative '../config/boot'
-require 'rails/commands'
+APP_PATH = File.expand_path("../../config/application", __FILE__)
+require_relative "../config/boot"
+require "rails/commands"

data/spec/dummy/bin/rake

@@ -1,4 +1,4 @@
 #!/usr/bin/env ruby
-require_relative '../config/boot'
-require 'rake'
+require_relative "../config/boot"
+require "rake"
 Rake.application.run

data/spec/dummy/config.ru

@@ -1,4 +1,4 @@
 # This file is used by Rack-based servers to start the application.
 
-require ::File.expand_path('../config/environment',  __FILE__)
+require ::File.expand_path("../config/environment", __FILE__)
 run Rails.application

data/spec/dummy/config/application.rb

@@ -1,4 +1,4 @@
-require File.expand_path('../boot', __FILE__)
+require File.expand_path("../boot", __FILE__)
 
 # Pick the frameworks you want:
 require "active_record/railtie"
@@ -10,19 +10,18 @@ require "sprockets/railtie"
 Bundler.require(*Rails.groups)
 require "active-record-transactioner"
 
-module Dummy
-  class Application < Rails::Application
-    # Settings in config/environments/* take precedence over those specified here.
-    # Application configuration should go into files in config/initializers
-    # -- all .rb files in that directory are automatically loaded.
+module Dummy; end
 
-    # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
-    # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
-    # config.time_zone = 'Central Time (US & Canada)'
+class Dummy::Application < Rails::Application
+  # Settings in config/environments/* take precedence over those specified here.
+  # Application configuration should go into files in config/initializers
+  # -- all .rb files in that directory are automatically loaded.
 
-    # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
-    # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
-    # config.i18n.default_locale = :de
-  end
-end
+  # Set Time.zone default to the specified zone and make Active Record auto-convert to this zone.
+  # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
+  # config.time_zone = 'Central Time (US & Canada)'
 
+  # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
+  # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
+  # config.i18n.default_locale = :de
+end

data/spec/dummy/config/boot.rb

@@ -1,5 +1,5 @@
 # Set up gems listed in the Gemfile.
-ENV['BUNDLE_GEMFILE'] ||= File.expand_path('../../../../Gemfile', __FILE__)
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../../../Gemfile", __FILE__)
 
-require 'bundler/setup' if File.exist?(ENV['BUNDLE_GEMFILE'])
-$LOAD_PATH.unshift File.expand_path('../../../../lib', __FILE__)
+require "bundler/setup" if File.exist?(ENV["BUNDLE_GEMFILE"])
+$LOAD_PATH.unshift File.expand_path("../../../../lib", __FILE__)

data/spec/dummy/config/database.example.yml

@@ -1,7 +1,5 @@
 test:
-  adapter: mysql2
-  pool: 15
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
   timeout: 5000
-  username: username
-  password: password
-  database: transactioner-test

data/spec/dummy/config/database.shippable.yml

@@ -1,7 +1,5 @@
 test:
   adapter: mysql2
-  pool: 15
-  timeout: 5000
   encoding: utf8
-  database: transactioner
+  database: shippa
   username: shippa

data/spec/dummy/config/database.yml

@@ -1,7 +1,5 @@
 test:
-  adapter: mysql2
-  pool: 15
+  adapter: sqlite3
+  database: db/test.sqlite3
+  pool: 5
   timeout: 5000
-  username: transactioner
-  password: pRrdQjEhRfEu7Get
-  database: transactioner-test

data/spec/dummy/config/environment.rb

@@ -1,5 +1,5 @@
 # Load the Rails application.
-require File.expand_path('../application', __FILE__)
+require File.expand_path("../application", __FILE__)
 
 # Initialize the Rails application.
 Dummy::Application.initialize!

data/spec/dummy/config/environments/production.rb

@@ -33,7 +33,7 @@ Dummy::Application.configure do
   config.assets.digest = true
 
   # Version of your assets, change this if you want to expire all your assets.
-  config.assets.version = '1.0'
+  config.assets.version = "1.0"
 
   # Specifies the header that your server uses for sending files.
   # config.action_dispatch.x_sendfile_header = "X-Sendfile" # for apache

data/spec/dummy/config/initializers/secret_token.rb

@@ -9,4 +9,5 @@
 
 # Make sure your secret_key_base is kept private
 # if you're sharing your code publicly.
-Dummy::Application.config.secret_key_base = '6512c5484d76faa4df05f364d5681de25ee5e657672d98b0177cdb0a489862795e63d12244848be4d8b68f716f27b847654ac307c69f517f8fbc296796b06546'
+Dummy::Application.config.secret_key_base =
+  "6512c5484d76faa4df05f364d5681de25ee5e657672d98b0177cdb0a489862795e63d12244848be4d8b68f716f27b847654ac307c69f517f8fbc296796b06546"

data/spec/dummy/config/initializers/session_store.rb

@@ -1,3 +1,3 @@
 # Be sure to restart your server when you modify this file.
 
-Dummy::Application.config.session_store :cookie_store, key: '_dummy_session'
+Dummy::Application.config.session_store :cookie_store, key: "_dummy_session"

data/spec/spec_helper.rb

@@ -1,27 +1,38 @@
 require "codeclimate-test-reporter"
 CodeClimate::TestReporter.start
 
-$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
+$LOAD_PATH.unshift(File.join(File.dirname(__FILE__), "..", "lib"))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
-require 'active_record'
-require 'active-record-transactioner'
+require "active_record"
+require "active-record-transactioner"
+require "database_cleaner"
 
-ENV["RAILS_ENV"] ||= 'test'
+ENV["RAILS_ENV"] ||= "test"
 require_relative "dummy/config/environment"
-require 'rspec/rails'
+require "rspec/rails"
 
 # Requires supporting files with custom matchers and macros, etc,
 # in ./support/ and its subdirectories.
-Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each {|f| require f}
+Dir["#{File.dirname(__FILE__)}/support/**/*.rb"].each { |f| require f }
 
 ActiveRecord::Migration.check_pending! if defined?(ActiveRecord::Migration)
 
 RSpec.configure do |config|
   config.expect_with :rspec do |c|
-    c.syntax = [:should, :expect]
+    c.syntax = [:expect]
   end
 
   config.infer_base_class_for_anonymous_controllers = false
   config.infer_spec_type_from_file_location!
   config.use_transactional_fixtures = false
+
+  config.before(:suite) do
+    DatabaseCleaner.strategy = :truncation
+  end
+
+  config.around(:each) do |example|
+    DatabaseCleaner.cleaning do
+      example.run
+    end
+  end
 end

data/spec/support/basic_user_operations.rb

@@ -1,7 +1,5 @@
 shared_examples_for "basic user operations" do
   before do
-    ActiveRecord::Base.connection.execute("TRUNCATE TABLE users")
-
     transactioner do |trans|
       100.times do |count|
         user = User.new(username: "User #{count}", email: "user#{count}@example.com")
@@ -11,7 +9,7 @@ shared_examples_for "basic user operations" do
   end
 
   it "can create a lot of models" do
-    User.count.should eq 100
+    expect(User.count).to eq 100
   end
 
   it "can both insert and update a lot of records correct" do
@@ -19,17 +17,36 @@ shared_examples_for "basic user operations" do
       200.times do |count|
         user = User.find_or_initialize_by(email: "user#{count}@example.com")
         user.username = "User upsert #{count}"
+
         trans.save!(user)
       end
     end
 
     count = 0
     User.find_each do |user|
-      user.email.should eq "user#{count}@example.com"
+      expect(user.email).to eq "user#{count}@example.com"
+      count += 1
+    end
+
+    expect(User.count).to eq 200
+  end
+
+  it "#update_columns" do
+    transactioner do |trans|
+      count = 0
+      User.find_each do |user|
+        trans.update_columns(user, email: "test#{count}@example.com")
+        count += 1
+      end
+    end
+
+    count = 0
+    User.find_each do |user|
+      expect(user.email).to eq "test#{count}@example.com"
       count += 1
     end
 
-    User.count.should eq 200
+    expect(User.count).to eq 100
   end
 
   it "can delete a lot of records" do
@@ -39,6 +56,24 @@ shared_examples_for "basic user operations" do
       end
     end
 
-    User.count.should eq 50
+    expect(User.count).to eq 50
+  end
+
+  it "does bulk inserts" do
+    User.delete_all
+
+    transactioner do |trans|
+      300.times do |count|
+        trans.bulk_create!(User.new(email: "test#{count}@example.com"))
+      end
+    end
+
+    count = 0
+    User.order(:id).each do |user|
+      expect(user.email).to eq "test#{count}@example.com"
+      count += 1
+    end
+
+    expect(count).to eq 300
   end
 end

data/spec/test_classes/active-record-transactioner-test-class.rb

@@ -8,7 +8,7 @@ class ActiveRecordTransactionerTestClass
   end
 
   def self.transaction
-    Thread.current[:trans] = self.name
+    Thread.current[:trans] = name
 
     begin
       yield
@@ -17,7 +17,7 @@ class ActiveRecordTransactionerTestClass
     end
   end
 
-  def save!(args = {})
+  def save!(_args = {})
     raise "Failure - no transaction: #{Thread.current[:trans]}, #{self.class.name}" if Thread.current[:trans] != self.class.name
     @save_called = true
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active-record-transactioner
 version: !ruby/object:Gem::Version
-  version: 0.0.6
+  version: 0.0.7
 platform: ruby
 authors:
 - Kasper Johansen
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-12-05 00:00:00.000000000 Z
+date: 2015-12-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.4.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.4.0
 - !ruby/object:Gem::Dependency
   name: rdoc
   requirement: !ruby/object:Gem::Requirement
@@ -108,8 +108,36 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: sqlite3
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.11
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 1.3.11
 - !ruby/object:Gem::Dependency
   name: mysql2
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.20
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.3.20
+- !ruby/object:Gem::Dependency
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -123,7 +151,35 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: best_practice_project
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: rubocop
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.35.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - '='
+      - !ruby/object:Gem::Version
+        version: 0.35.1
+- !ruby/object:Gem::Dependency
+  name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -154,6 +210,8 @@ files:
 - Rakefile
 - VERSION
 - active-record-transactioner.gemspec
+- config/best_project_practice_rubocop.yml
+- config/best_project_practice_rubocop_todo.yml
 - lib/active-record-transactioner.rb
 - shippable.yml
 - spec/active-record-transactioner_spec.rb
@@ -224,7 +282,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.0
+rubygems_version: 2.2.2
 signing_key: 
 specification_version: 4
 summary: Queue up calls to specific models and execute them in transactions, after