composite_primary_keys 7.0.5 → 7.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b80c3c585051897678d097a60e5e2d2e0aaf9ec3
-  data.tar.gz: c6b042d7c81d77f5e8e1712c9808574288ac672c
+  metadata.gz: 6ac56003035ab69fb85bb4d3ec40644e5d3d80eb
+  data.tar.gz: 5fa4ebe741e44a8334b63a52ee050acdfa42140f
 SHA512:
-  metadata.gz: 1ccdf4ac7aed2c8c3856ecbcf238662f9c8e04e2a34e156542645be631e61d7d2b3299d106ee6d5c4afb911fea69bb5e7e551422e573dfcca59664854a3014a4
-  data.tar.gz: 61238d4592fd9ba1b9f984c233399f6ccbbc4d2b6c6abd12ebedb174cc3094557043e5034941e3b3da192560bc17cb34857e70e959026a88a786f5208cf6755e
+  metadata.gz: 56e41e34385f9ae35be4a3c4fdeb8d5db149fdb6139122e67f169420637365c7c38d1e33e8e177eca175653fa0aa18fcd2d4e746126dafc66b6d20518b8c17d7
+  data.tar.gz: b84fc59f176103f616bd31fc202a6e12e2c611cf75957ee6e4304da3850103b55da205d04b89f809d2652f8ad8c851186d41369c742a58f8a8b0319c98187be7

data/History.rdoc

@@ -1,3 +1,7 @@
+== 7.0.6 (2014-07-22)
+
+* Change the way we override ActiveRecord::Persistence to call sequence of included modules (such as callbacks)
+
 == 7.0.5 (2014-07-21)
 
 * Remove overriden Postgresql adapter code (Charlie Savage)

data/lib/composite_primary_keys/base.rb

@@ -3,8 +3,6 @@ module ActiveRecord
   end
 
   class Base
-    include CompositePrimaryKeys::ActiveRecord::Persistence
-    
     INVALID_FOR_COMPOSITE_KEYS = 'Not appropriate for composite primary keys'
     NOT_IMPLEMENTED_YET        = 'Not implemented for composite primary keys yet'
 

data/lib/composite_primary_keys/persistence.rb

@@ -1,20 +1,8 @@
-module CompositePrimaryKeys
-  module ActiveRecord
-    module Persistence
-      def relation_for_destroy
-        # CPK
-        #pk         = self.class.primary_key
-        #column     = self.class.columns_hash[pk]
-        #substitute = self.class.connection.substitute_at(column, 0)
-        #relation = self.class.unscoped.where(
-        #  self.class.arel_table[pk].eq(substitute))
-        #relation.bind_values = [[column, id]]
-
-        # run AR's original relation_for_destroy when primary key is not composite
-        if Array(self.class.primary_key).size <= 1
-          return super
-        end
-
+module ActiveRecord
+  module Persistence
+    def relation_for_destroy
+      # CPK
+      if self.composite?
         relation = self.class.unscoped
 
         Array(self.class.primary_key).each_with_index do |key, index|
@@ -24,40 +12,50 @@ module CompositePrimaryKeys
           relation.bind_values += [[column, self[key]]]
         end
 
+        relation
+      else
+        pk         = self.class.primary_key
+        column     = self.class.columns_hash[pk]
+        substitute = self.class.connection.substitute_at(column, 0)
+
+        relation = self.class.unscoped.where(
+          self.class.arel_table[pk].eq(substitute))
+
+        relation.bind_values = [[column, id]]
         relation
       end
+    end
 
-      def touch(name = nil)
-        raise ActiveRecordError, "cannot touch on a new record object" unless persisted?
+    def touch(name = nil)
+      raise ActiveRecordError, "cannot touch on a new record object" unless persisted?
 
-        attributes = timestamp_attributes_for_update_in_model
-        attributes << name if name
+      attributes = timestamp_attributes_for_update_in_model
+      attributes << name if name
 
-        unless attributes.empty?
-          current_time = current_time_from_proper_timezone
-          changes = {}
+      unless attributes.empty?
+        current_time = current_time_from_proper_timezone
+        changes = {}
 
-          attributes.each do |column|
-            column = column.to_s
-            changes[column] = write_attribute(column, current_time)
-          end
+        attributes.each do |column|
+          column = column.to_s
+          changes[column] = write_attribute(column, current_time)
+        end
 
-          changes[self.class.locking_column] = increment_lock if locking_enabled?
+        changes[self.class.locking_column] = increment_lock if locking_enabled?
 
-          changed_attributes.except!(*changes.keys)
+        changed_attributes.except!(*changes.keys)
 
-          relation    = self.class.send(:relation)
-          arel_table  = self.class.arel_table
-          primary_key = self.class.primary_key
+        relation    = self.class.send(:relation)
+        arel_table  = self.class.arel_table
+        primary_key = self.class.primary_key
 
-          # CPK
-          #self.class.unscoped.where(primary_key => self[primary_key]).update_all(changes) == 1
-          primary_key_predicate = relation.cpk_id_predicate(arel_table, Array(primary_key), Array(id))
-          self.class.unscoped.where(primary_key_predicate).update_all(changes) == 1
-        else
-          true
-        end
+        # CPK
+        #self.class.unscoped.where(primary_key => self[primary_key]).update_all(changes) == 1
+        primary_key_predicate = relation.cpk_id_predicate(arel_table, Array(primary_key), Array(id))
+        self.class.unscoped.where(primary_key_predicate).update_all(changes) == 1
+      else
+        true
       end
     end
   end
-end
+end

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION
     MAJOR = 7
     MINOR = 0
-    TINY  = 5
+    TINY  = 6
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 7.0.5
+  version: 7.0.6
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-07-21 00:00:00.000000000 Z
+date: 2014-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord