HornsAndHooves-moribus 0.2.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ff0aab79e8583ad02f5eeea9b364f1675d893399
-  data.tar.gz: 2c299a91b8eb26c99a91896b01100dcd04626409
+  metadata.gz: e5e4d15715c31a7fc3c7fbc7e5374f27271d735a
+  data.tar.gz: def9ae949ad1d956852b70e23f8652bd2d977f42
 SHA512:
-  metadata.gz: c66b62b01b54222d549dbd8e038d3b073cf850a9f394450dcde325bf32d644e796ce234720c53cbebd1c0f8cd156a5479571b5d59021798fc5b48f1a5ecdbbe8
-  data.tar.gz: 86c8695bd44971914bc00f5f60fd72a1a697a1625810cafd9575b2287ee3e2112b74b0c51e92411868609e5f3e3d48dba35e2bf81c032216efbf40fd9f1d2a16
+  metadata.gz: dc9fe7bfc87c9a2be5e04781d5345c87bb3b10ba6ed9925641cb60bc80e1e93eb07a1a737c9ffbf2e9e60872451753a27cd42e601245741f85b7b47f26a3c4bc
+  data.tar.gz: c26e4d4ab22786a432b6d6aec34d932b2466b921a0c860b5bf71cd67c9811872bc9c492950e65c0dd3f0aa0406be5d48aa3c681e80a8153928eb1fd2d9872f83

data/.simplecov

@@ -12,7 +12,7 @@ SimpleCov.start do
   # Fail the build when coverage is weak:
   at_exit do
     SimpleCov.result.format!
-    threshold, actual = 97.118, SimpleCov.result.covered_percent
+    threshold, actual = 97.15, SimpleCov.result.covered_percent
     if actual < threshold
       msg = "\nLow coverage: "
       msg << red("#{actual}%")

data/lib/moribus/alias_association.rb

@@ -28,7 +28,7 @@ module Moribus
             ActiveRecord::Reflection.add_reflection self, alias_name, reflection
           else
             # Rails 4.0.x behavior:
-            reflections[alias_name] = reflection
+            reflections[alias_name] = reflections[association_name]
           end
           alias_association_methods(alias_name, reflection)
           reflection

data/lib/moribus/tracked_behavior.rb

@@ -77,15 +77,22 @@ module Moribus
 
     # Generate SQL statement to be used to update 'is_current' state of record to false.
     def current_to_false_sql_statement
-      klass           = self.class
-      is_current_col  = klass.columns.detect{|c| c.name == "is_current" }
-      lock_col        = klass.locking_column
-      lock_value      = respond_to?(lock_col) && send(lock_col).to_i
-      quoted_lock_col = klass.connection.quote_column_name(lock_col)
+      klass              = self.class
+      is_current_col     = klass.columns.detect { |c| c.name == "is_current" }
+      lock_column_name   = klass.locking_column
+      lock_value         = respond_to?(lock_column_name) && send(lock_column_name).to_i
+      lock_column        = if lock_value
+                             klass.columns.detect { |c| c.name == lock_column_name }
+                           else
+                             nil
+                           end
+      id_column          = klass.columns.detect { |c| c.name == klass.primary_key }
+      quoted_lock_column = klass.connection.quote_column_name(lock_column_name)
+
       "UPDATE #{klass.quoted_table_name} SET \"is_current\" = #{klass.quote_value(false, is_current_col)} ".tap do |sql|
-        sql << ", #{quoted_lock_col} = #{klass.quote_value(lock_value + 1, lock_col)} " if lock_value
-        sql << "WHERE #{klass.quoted_primary_key} = #{klass.quote_value(@_before_to_new_record_values[:id], "id")} "
-        sql << "AND #{quoted_lock_col} = #{klass.quote_value(lock_value, lock_col)}" if lock_value
+        sql << ", #{quoted_lock_column} = #{klass.quote_value(lock_value + 1, lock_column)} " if lock_value
+        sql << "WHERE #{klass.quoted_primary_key} = #{klass.quote_value(@_before_to_new_record_values[:id], id_column)} "
+        sql << "AND #{quoted_lock_column} = #{klass.quote_value(lock_value, lock_column)}" if lock_value
       end
     end
     private :current_to_false_sql_statement

data/lib/moribus/version.rb

@@ -1,3 +1,3 @@
 module Moribus # :nodoc:
-  VERSION = "0.2.0" # :nodoc:
+  VERSION = "0.2.1" # :nodoc:
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: HornsAndHooves-moribus
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
 platform: ruby
 authors:
 - HornsAndHooves
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-20 00:00:00.000000000 Z
+date: 2015-01-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails