Merge pull request collectiveidea#302 from marutosi/master-merge-2-1-…

…stable

merge 2-1-stable to master

lib/awesome_nested_set/model/transactable.rb

@@ -3,16 +3,23 @@ module Acts #:nodoc:
  module NestedSet #:nodoc:
  module Model
  module Transactable
+ class OpenTransactionsIsNotZero < ActiveRecord::StatementInvalid
+ end
+
+ class DeadlockDetected < ActiveRecord::StatementInvalid
+ end
 
  protected
  def in_tenacious_transaction(&block)
  retry_count = 0
  begin
  transaction(&block)
+ rescue CollectiveIdea::Acts::NestedSet::Move::ImpossibleMove
+ raise
  rescue ActiveRecord::StatementInvalid => error
- raise unless self.class.connection.open_transactions.zero?
+ raise OpenTransactionsIsNotZero.new(error.message) unless connection.open_transactions.zero?
  raise unless error.message =~ /[Dd]eadlock|Lock wait timeout exceeded/
- raise unless retry_count < 10
+ raise DeadlockDetected.new(error.message) unless retry_count < 10
  retry_count += 1
  logger.info "Deadlock detected on retry #{retry_count}, restarting transaction"
  sleep(rand(retry_count)*0.1) # Aloha protocol

lib/awesome_nested_set/move.rb

@@ -110,9 +110,12 @@ def get_boundaries
  [bound, other_bound]
  end
 
+ class ImpossibleMove < ActiveRecord::StatementInvalid
+ end
+
  def prevent_impossible_move
  if !root && !instance.move_possible?(target)
- raise ActiveRecord::ActiveRecordError, "Impossible move, target node cannot be inside moved tree."
+ raise ImpossibleMove, "Impossible move, target node cannot be inside moved tree."
  end
  end