HornsAndHooves-moribus 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 663f93b966818f12016683fe8860a7a3d386e32f
-  data.tar.gz: accabca452e497ee454302d2a4b28652e2b6dcb5
+  metadata.gz: 3f9194654bbeebef4db4c98f24246c8c444a307a
+  data.tar.gz: b21548da9a34e71cf86d81fc4f3223bccac26f8c
 SHA512:
-  metadata.gz: 867a00838e44330f51ab4e8aa74834d1f64e66437313010d8f96ba208ea90ca0bf3a8afb768c4c7ebaf05fd5c9d75b323fa9c04ebe5e47d710485e467c1cf721
-  data.tar.gz: eec8c434ba13395c60a7f904ee166590706d212412aaa566eff4c18ba40e1bce6e3103b2547cfa287c27f0e85488d9cedce5e8e09f49dc9f2734136c8e071363
+  metadata.gz: 3e010e70ad8cf22b9a909563faed39839e59dd6efb30bde31366502f31c75484ce1b7722e52945a8bb91aba842efd320ec59b28f68f3233d6a630b292cd8eb39
+  data.tar.gz: 0f3133f27b5a5896525ba3d2a7a8fcca56a25b65497fc949bdfb9579fc8248b74fd871f87c4c0f501a41f595916ebc95c1f3e2cb5b073a89110dc83241ac852a

data/lib/moribus/tracked_behavior.rb

@@ -59,7 +59,7 @@ module Moribus
       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 @@ module Moribus
       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 @@ module Moribus
       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

data/lib/moribus/version.rb

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

data/spec/moribus_spec.rb

@@ -299,7 +299,8 @@ describe Moribus do
         @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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: HornsAndHooves-moribus
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.3
 platform: ruby
 authors:
 - HornsAndHooves
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-30 00:00:00.000000000 Z
+date: 2017-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -207,7 +207,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.4.8
+rubygems_version: 2.6.8
 signing_key: 
 specification_version: 4
 summary: Introduces Aggregated and Tracked behavior to ActiveRecord::Base models