Merge remote-tracking branch 'origin/report_lock_version_on_stale_obj…

…_error'

* origin/report_lock_version_on_stale_obj_error:
  Report lock version when raising a stale object error

lib/moribus/tracked_behavior.rb

@@ -59,7 +59,7 @@ def update_current
       affected_rows = self.class.connection.update statement
 
       unless affected_rows == 1
-        raise ActiveRecord::StaleObjectError.new(self, "update_current")
+        raise ActiveRecord::StaleObjectError.new(self, "update_current (version #{current_lock_value})")
       end
       true
     end
@@ -106,7 +106,7 @@ def current_to_false_sql_statement
       klass              = self.class
       is_current_col     = klass.columns.detect { |c| c.name == "is_current" }
       lock_column_name   = klass.locking_column
-      lock_value         = has_attribute?(lock_column_name) && read_attribute(lock_column_name).to_i
+      lock_value         = current_lock_value
       lock_column        = if lock_value
                              klass.columns.detect { |c| c.name == lock_column_name }
                            else
@@ -127,5 +127,12 @@ def current_to_false_sql_statement
       end
     end
     private :current_to_false_sql_statement
+
+    # Returns the current value of the locking column if such exists.
+    def current_lock_value
+      lock_column_name = self.class.locking_column
+      has_attribute?(lock_column_name) && read_attribute(lock_column_name).to_i
+    end
+    private :current_lock_value
   end
 end

lib/moribus/version.rb

@@ -1,3 +1,3 @@
 module Moribus # :nodoc:
-  VERSION = "0.4.2" # :nodoc:
+  VERSION = "0.4.3" # :nodoc:
 end

spec/moribus_spec.rb

@@ -299,7 +299,8 @@ class SpecCustomerEmail < MoribusSpecModel(:spec_customer_id => :integer,
         @info1.update_attributes(:spec_person_name_id => 3)
 
         expect{ @info2.update_attributes(:spec_person_name_id => 4) }.
-          to raise_error(ActiveRecord::StaleObjectError)
+          to raise_error(ActiveRecord::StaleObjectError,
+                         "Attempted to update_current (version #{@info2.lock_version}) a stale object: SpecCustomerInfo")
       end
 
       it "updates lock_version incrementally for each new record" do