composite_primary_keys 6.0.7 → 6.0.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: add6bac7bcaa5ca9b40c11e99df452b921b962ae
-  data.tar.gz: d1dd46cc248802f32c061f349c7d8f2158268cf9
+  metadata.gz: e0407c008d66e10820394e98a97bb7a507d0226a
+  data.tar.gz: 25d4c43eb87731e104c3ec486e94a20b9568f0bf
 SHA512:
-  metadata.gz: 1dbf3af753f80209f70ccc15b2dfbc08a8bca681489a114bebf5c4d442f87c6b7dd06c4245ea83da7d02b904f1bc853634a8030deef31b0a95bd823a4f5a8efa
-  data.tar.gz: b293046f7cc2c73ca0edb6d462588988101c83f9fb34c6841281da4f614990952d4fefbdacd651f39540c3c425526253dc7821a208b7c7bf9a98797412e3dd1e
+  metadata.gz: 007219da8c4b82d562742f361516772b7f74d4f97e6d065ef01b526dbb9b6047e18b2445dcf3054070d7ff129da0d7a29f5ff78fc55ef49f22503080fa894a42
+  data.tar.gz: b712e6fb1b0d39c530b6c54c9e6dddd81bcf6552989f95b12160612379aaa27ee671ae6d1fc85a40d698c933ff2fc65eba2777b1e060ac94380f3c7ce6a603cb

data/History.rdoc

@@ -1,3 +1,9 @@
+== 6.0.08 (2015-01-24)
+
+* Fix habtm association #delete_records (Uros Jurglic)
+* Support optimistic locking (Toshio Maki)
+* Remove singleton classes on CPK relations (Nicolás Hock Isaza)
+
 == 6.0.7 (2014-10-06)
 
 * Support Rails 4.0.6 (Tom Hughes)

data/lib/composite_primary_keys.rb

@@ -52,8 +52,10 @@ require 'active_record/associations/preloader/has_and_belongs_to_many'
 require 'active_model/dirty'
 
 require 'active_record/attribute_methods/dirty'
+require 'active_record/attribute_methods/primary_key'
 require 'active_record/attribute_methods/read'
 require 'active_record/attribute_methods/write'
+require 'active_record/locking/optimistic'
 require 'active_record/nested_attributes'
 
 require 'active_record/connection_adapters/abstract_adapter'
@@ -68,6 +70,7 @@ require 'active_record/validations/uniqueness'
 
 # CPK files
 require 'composite_primary_keys/persistence'
+require 'composite_primary_keys/locking/optimistic'
 require 'composite_primary_keys/active_record_overides'
 require 'composite_primary_keys/base'
 require 'composite_primary_keys/core'
@@ -92,6 +95,7 @@ require 'composite_primary_keys/associations/preloader/has_and_belongs_to_many'
 require 'composite_primary_keys/dirty'
 
 require 'composite_primary_keys/attribute_methods/dirty'
+require 'composite_primary_keys/attribute_methods/primary_key'
 require 'composite_primary_keys/attribute_methods/read'
 require 'composite_primary_keys/attribute_methods/write'
 require 'composite_primary_keys/nested_attributes'
@@ -105,3 +109,5 @@ require 'composite_primary_keys/relation/finder_methods'
 require 'composite_primary_keys/relation/query_methods'
 
 require 'composite_primary_keys/validations/uniqueness'
+
+require 'composite_primary_keys/composite_relation'

data/lib/composite_primary_keys/associations/has_and_belongs_to_many_association.rb

@@ -49,7 +49,8 @@ module ActiveRecord
 
           predicate1 = cpk_id_predicate(relation, Array(reflection.foreign_key), Array(owner.id))
           predicate2 = cpk_in_predicate(relation, Array(reflection.association_foreign_key), records.map { |x| x.id }) unless records == :all
-          stmt = relation.where(predicate1.and(predicate2)).compile_delete
+          conds = predicate2.nil?? predicate1 : predicate1.and(predicate2)
+          stmt = relation.where(conds).compile_delete
 
           owner.class.connection.delete stmt.to_sql
         end

data/lib/composite_primary_keys/attribute_methods/primary_key.rb

@@ -0,0 +1,17 @@
+module ActiveRecord
+  module AttributeMethods
+    module PrimaryKey
+      def id_was
+        sync_with_transaction_state
+
+        if self.composite?
+          self.class.primary_keys.map do |key_attr|
+            attribute_changed?(key_attr) ? changed_attributes[key_attr] : self.ids_hash[key_attr]
+          end
+        else
+          attribute_was(self.class.primary_key)
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/base.rb

@@ -4,6 +4,7 @@ module ActiveRecord
 
   class Base
     include CompositePrimaryKeys::ActiveRecord::Persistence
+    include CompositePrimaryKeys::ActiveRecord::Locking::Optimistic
     
     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/composite_relation.rb

@@ -0,0 +1,44 @@
+module CompositePrimaryKeys
+  module CompositeRelation
+    include CompositePrimaryKeys::ActiveRecord::Batches
+    include CompositePrimaryKeys::ActiveRecord::Calculations
+    include CompositePrimaryKeys::ActiveRecord::FinderMethods
+    include CompositePrimaryKeys::ActiveRecord::QueryMethods
+
+    def delete(id_or_array)
+      # Without CPK:
+      # where(primary_key => id_or_array).delete_all
+
+      id_or_array = if id_or_array.kind_of?(CompositePrimaryKeys::CompositeKeys)
+        [id_or_array]
+      else
+        Array(id_or_array)
+      end
+
+      id_or_array.each do |id|
+        where(cpk_id_predicate(table, self.primary_key, id)).delete_all
+      end
+    end
+
+    def destroy(id_or_array)
+      # Without CPK:
+      #if id.is_a?(Array)
+      #  id.map { |one_id| destroy(one_id) }
+      #else
+      #  find(id).destroy
+      #end
+
+      id_or_array = if id_or_array.kind_of?(CompositePrimaryKeys::CompositeKeys)
+        [id_or_array]
+      else
+        Array(id_or_array)
+      end
+
+      id_or_array.each do |id|
+        where(cpk_id_predicate(table, self.primary_key, id)).each do |record|
+          record.destroy
+        end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/locking/optimistic.rb

@@ -0,0 +1,51 @@
+module CompositePrimaryKeys
+  module ActiveRecord
+    module Locking
+      module Optimistic
+        private
+          def _update_record(attribute_names = @attributes.keys) #:nodoc:
+            return super unless locking_enabled?
+            return 0 if attribute_names.empty?
+
+            lock_col = self.class.locking_column
+            previous_lock_value = send(lock_col).to_i
+            increment_lock
+
+            attribute_names += [lock_col]
+            attribute_names.uniq!
+
+            begin
+              relation = self.class.unscoped
+
+              if self.composite?
+                stmt = relation.where(
+                  relation.cpk_id_predicate(relation.table, self.class.primary_key, id_was).and(
+                    relation.table[lock_col].eq(self.class.quote_value(previous_lock_value, column_for_attribute(lock_col)))
+                  )
+                ).arel.compile_update(arel_attributes_with_values_for_update(attribute_names))
+              else
+                stmt = relation.where(
+                  relation.table[self.class.primary_key].eq(id).and(
+                    relation.table[lock_col].eq(self.class.quote_value(previous_lock_value, column_for_attribute(lock_col)))
+                  )
+                ).arel.compile_update(arel_attributes_with_values_for_update(attribute_names))
+              end
+
+              affected_rows = self.class.connection.update stmt
+
+              unless affected_rows == 1
+                raise ::ActiveRecord::StaleObjectError.new(self, "update")
+              end
+
+              affected_rows
+
+            # If something went wrong, revert the version.
+            rescue Exception
+              send(lock_col + '=', previous_lock_value)
+              raise
+            end
+          end
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/relation.rb

@@ -1,71 +1,25 @@
 module ActiveRecord
   class Relation
     def add_cpk_support
-      class << self
-        include CompositePrimaryKeys::ActiveRecord::Batches
-        include CompositePrimaryKeys::ActiveRecord::Calculations
-        include CompositePrimaryKeys::ActiveRecord::FinderMethods
-        include CompositePrimaryKeys::ActiveRecord::QueryMethods
-        
-        
-        def delete(id_or_array)
-          # Without CPK:
-          # where(primary_key => id_or_array).delete_all
-
-          id_or_array = if id_or_array.kind_of?(CompositePrimaryKeys::CompositeKeys)
-            [id_or_array]
-          else
-            Array(id_or_array)
-          end
-
-          id_or_array.each do |id|
-            where(cpk_id_predicate(table, self.primary_key, id)).delete_all
-          end
-        end
-
-        def destroy(id_or_array)
-          # Without CPK:
-          #if id.is_a?(Array)
-          #  id.map { |one_id| destroy(one_id) }
-          #else
-          #  find(id).destroy
-          #end
-
-          id_or_array = if id_or_array.kind_of?(CompositePrimaryKeys::CompositeKeys)
-            [id_or_array]
-          else
-            Array(id_or_array)
-          end
-
-          id_or_array.each do |id|
-            where(cpk_id_predicate(table, self.primary_key, id)).each do |record|
-              record.destroy
-            end
-          end
-        end
-      end
+      extend CompositePrimaryKeys::CompositeRelation
     end
 
-    def add_cpk_where_values_hash
-      class << self
-        def where_values_hash(relation_table_name = table_name)
-          # CPK adds this so that it finds the Equality nodes beneath the And node:
-          nodes_from_and = with_default_scope.where_values.grep(Arel::Nodes::And).map {|and_node| and_node.children.grep(Arel::Nodes::Equality) }.flatten
+    alias :where_values_hash_without_cpk :where_values_hash
+    def where_values_hash(relation_table_name = table_name)
+      # CPK adds this so that it finds the Equality nodes beneath the And node:
+      nodes_from_and = with_default_scope.where_values.grep(Arel::Nodes::And).map {|and_node| and_node.children.grep(Arel::Nodes::Equality) }.flatten
 
-          equalities = (nodes_from_and + with_default_scope.where_values.grep(Arel::Nodes::Equality)).find_all { |node|
-            node.left.relation.name == relation_table_name
-          }
+      equalities = (nodes_from_and + with_default_scope.where_values.grep(Arel::Nodes::Equality)).find_all { |node|
+        node.left.relation.name == relation_table_name
+      }
 
-          Hash[equalities.map { |where| [where.left.name, where.right] }]
-        end
-      end
+      Hash[equalities.map { |where| [where.left.name, where.right] }]
     end
 
     alias :initialize_without_cpk :initialize
     def initialize(klass, table, values = {})
       initialize_without_cpk(klass, table, values)
       add_cpk_support if klass && klass.composite?
-      add_cpk_where_values_hash
     end
 
     alias :initialize_copy_without_cpk :initialize_copy

data/lib/composite_primary_keys/version.rb

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

data/test/abstract_unit.rb

@@ -6,6 +6,7 @@ require 'composite_primary_keys'
 
 require 'active_support/test_case'
 require 'minitest/autorun'
+require 'mocha/mini_test'
 
 # Now load the connection spec
 require File.join(PROJECT_ROOT, "test", "connections", "connection_spec")
@@ -27,13 +28,13 @@ I18n.config.enforce_available_locales = true
 
 class ActiveSupport::TestCase
   include ActiveRecord::TestFixtures
-  
+
   self.fixture_path = File.dirname(__FILE__) + "/fixtures/"
   self.use_instantiated_fixtures = false
   self.use_transactional_fixtures = true
 
   def assert_date_from_db(expected, actual, message = nil)
-    # SQL Server doesn't have a separate column type just for dates, 
+    # SQL Server doesn't have a separate column type just for dates,
     # so the time is in the string and incorrectly formatted
     if current_adapter?(:SQLServerAdapter)
       assert_equal expected.strftime("%Y/%m/%d 00:00:00"), actual.strftime("%Y/%m/%d 00:00:00")
@@ -60,11 +61,11 @@ class ActiveSupport::TestCase
   def assert_no_queries(&block)
     assert_queries(0, &block)
   end
-  
+
   cattr_accessor :classes
 
   protected
-  
+
   def testing_with(&block)
     classes.keys.each do |key_test|
       @key_test = key_test
@@ -75,15 +76,15 @@ class ActiveSupport::TestCase
       yield
     end
   end
-  
+
   def first_id
     ids = (1..@primary_keys.length).map {|num| 1}
     composite? ? ids.to_composite_ids : ids.first
   end
-  
+
   def composite?
     @key_test != :single
-  end  
+  end
 
   # Oracle metadata is in all caps.
   def with_quoted_identifiers(s)

data/test/fixtures/db_definitions/db2-create-tables.sql

@@ -1,8 +1,8 @@
 CREATE TABLE reference_types (
-  reference_type_id integer NOT NULL generated by default as identity (start with 100, increment by 1, no cache),  
-  type_label varchar(50) default NULL,  
-  abbreviation varchar(50) default NULL, 
-  description varchar(50) default NULL, 
+  reference_type_id integer NOT NULL generated by default as identity (start with 100, increment by 1, no cache),
+  type_label varchar(50) default NULL,
+  abbreviation varchar(50) default NULL,
+  description varchar(50) default NULL,
   PRIMARY KEY (reference_type_id)
 );
 
@@ -74,7 +74,7 @@ CREATE TABLE groups (
   id integer NOT NULL ,
   name varchar(50) NOT NULL,
   PRIMARY KEY  (id)
-);               
+);
 
 CREATE TABLE memberships (
   user_id integer NOT NULL,
@@ -91,17 +91,18 @@ CREATE TABLE membership_statuses (
 );
 
 create table restaurants (
-	franchise_id integer not null,
-	store_id integer not null,
-	name varchar(100),
-	primary key (franchise_id, store_id)
+  franchise_id integer not null,
+  store_id integer not null,
+  name varchar(100),
+  lock_version integer default 0,
+  primary key (franchise_id, store_id)
 );
 
 create table restaurants_suburbs (
-	franchise_id integer not null,
-	store_id integer not null,
-	city_id integer not null,
-	suburb_id integer not null
+  franchise_id integer not null,
+  store_id integer not null,
+  city_id integer not null,
+  suburb_id integer not null
 );
 
 create table products_restaurants (
@@ -109,3 +110,9 @@ create table products_restaurants (
   franchise_id integer not null,
   store_id integer not null
 );
+
+create table model_with_callbacks (
+  reference_type_id integer,
+  reference_code integer NOT NULL,
+  PRIMARY KEY (reference_type_id,reference_code)
+);

data/test/fixtures/db_definitions/db2-drop-tables.sql

@@ -1,17 +1,18 @@
-drop table MEMBERSHIPS;                                                                                                                    
-drop table REFERENCE_CODES;                                                                                                                 
-drop table TARIFFS;                                                                                                                         
-drop table ARTICLES;                                                                                                                        
-drop table GROUPS;                                                                                                                          
-drop table MEMBERSHIP_STATUSES;                                                                                                             
-drop table READINGS;                                                                                                                        
-drop table REFERENCE_TYPES;                                                                                                                 
-drop table STREETS;                                                                                                                         
-drop table PRODUCTS;                                                                                                                        
-drop table USERS;                                                                                                                           
-drop table SUBURBS;                                                                                                                         
-drop table PRODUCT_TARIFFS; 
+drop table MEMBERSHIPS;
+drop table REFERENCE_CODES;
+drop table TARIFFS;
+drop table ARTICLES;
+drop table GROUPS;
+drop table MEMBERSHIP_STATUSES;
+drop table READINGS;
+drop table REFERENCE_TYPES;
+drop table STREETS;
+drop table PRODUCTS;
+drop table USERS;
+drop table SUBURBS;
+drop table PRODUCT_TARIFFS;
 drop table KITCHEN_SINK;
 drop table RESTAURANTS;
 drop table RESTAURANTS_SUBURBS;
 drop table PRODUCTS_RESTAURANTS;
+drop table MODEL_WITH_CALLBACKS;

data/test/fixtures/db_definitions/mysql.sql

@@ -123,6 +123,7 @@ create table restaurants (
     franchise_id int not null,
     store_id int not null,
     name varchar(100),
+    lock_version int default 0,
     primary key (franchise_id, store_id)
 );
 
@@ -190,3 +191,9 @@ create table employees_groups (
   employee_id int not null,
   group_id int not null
 );
+
+create table model_with_callbacks (
+    reference_type_id int not null,
+    reference_code int not null,
+    primary key (reference_type_id, reference_code)
+);

data/test/fixtures/db_definitions/oracle.drop.sql

@@ -40,3 +40,4 @@ drop sequence students_seq;
 drop table seats;
 drop table capitols;
 drop table products_restaurants;
+drop table model_with_callbacks;

data/test/fixtures/db_definitions/oracle.sql

@@ -131,6 +131,7 @@ create table restaurants (
     franchise_id number(11) not null,
     store_id     number(11) not null,
     name         varchar(100),
+    lock_version number(11) default 0,
     constraint restaurants_pk primary key (franchise_id, store_id)
 );
 
@@ -205,3 +206,8 @@ create table employees_groups (
   group_id int not null
 );
 
+create table model_with_callbacks(
+    reference_type_id number(11),
+    reference_code    number(11),
+    constraint model_with_callbacks_pk primary key (reference_type_id, reference_code)
+);

data/test/fixtures/db_definitions/postgresql.sql

@@ -125,6 +125,7 @@ create table restaurants (
     franchise_id int not null,
     store_id     int not null,
     name         varchar(100),
+    lock_version int default 0,
     primary key (franchise_id, store_id)
 );
 
@@ -192,3 +193,9 @@ create table employees_groups (
   employee_id int not null,
   group_id int not null
 );
+
+create table model_with_callbacks(
+    reference_type_id int,
+    reference_code    int         not null,
+    primary key (reference_type_id, reference_code)
+);

data/test/fixtures/db_definitions/sqlite.sql

@@ -83,7 +83,7 @@ create table membership_statuses (
     id integer not null primary key autoincrement,
     user_id int not null,
     group_id int not null,
-	status varchar(50) not null
+    status varchar(50) not null
 );
 
 create table departments (
@@ -111,48 +111,49 @@ create table hacks (
 );
 
 create table restaurants (
-	franchise_id integer not null,
-	store_id integer not null,
-	name varchar(100),
-	primary key (franchise_id, store_id)
+    franchise_id integer not null,
+    store_id integer not null,
+    name varchar(100),
+    lock_version integer default 0,
+    primary key (franchise_id, store_id)
 );
 
 create table restaurants_suburbs (
-	franchise_id integer not null,
-	store_id integer not null,
-	city_id integer not null,
-	suburb_id integer not null
+    franchise_id integer not null,
+    store_id integer not null,
+    city_id integer not null,
+    suburb_id integer not null
 );
 
 create table dorms (
-	id integer not null primary key autoincrement
+    id integer not null primary key autoincrement
 );
 
 create table rooms (
-	dorm_id integer not null,
-	room_id integer not null,
-	primary key (dorm_id, room_id)
+    dorm_id integer not null,
+    room_id integer not null,
+    primary key (dorm_id, room_id)
 );
 
 create table room_attributes (
-	id integer not null primary key autoincrement,
-	name varchar(50)
+    id integer not null primary key autoincrement,
+    name varchar(50)
 );
 
 create table room_attribute_assignments (
-	dorm_id integer not null,
-	room_id integer not null,
-	room_attribute_id integer not null
+    dorm_id integer not null,
+    room_id integer not null,
+    room_attribute_id integer not null
 );
 
 create table students (
-	id integer not null primary key autoincrement
+    id integer not null primary key autoincrement
 );
 
 create table room_assignments (
-	student_id integer not null,
-	dorm_id integer not null,
-	room_id integer not null	
+    student_id integer not null,
+    dorm_id integer not null,
+    room_id integer not null
 );
 
 create table seats (
@@ -170,8 +171,8 @@ create table capitols (
 
 create table products_restaurants (
   product_id integer not null,
-	franchise_id integer not null,
-	store_id integer not null
+  franchise_id integer not null,
+  store_id integer not null
 );
 
 create table employees_groups (
@@ -179,3 +180,8 @@ create table employees_groups (
   group_id integer not null
 );
 
+create table model_with_callbacks(
+    reference_type_id int(11),
+    reference_code int(11) not null,
+    primary key (reference_type_id, reference_code)
+);

data/test/fixtures/db_definitions/sqlserver.drop.sql

@@ -83,4 +83,7 @@ DROP TABLE capitols;
 go
 
 DROP TABLE products_restaurants;
-go
+go
+
+DROP TABLE model_with_callbacks;
+go

data/test/fixtures/db_definitions/sqlserver.sql

@@ -28,7 +28,7 @@ CREATE TABLE tariffs (
     [tariff_id]  [int],
     [start_date] [date],
     [amount]     [int] NULL
-    CONSTRAINT [tariffs_pk] PRIMARY KEY 
+    CONSTRAINT [tariffs_pk] PRIMARY KEY
         ( [tariff_id], [start_date] )
 );
 go
@@ -88,7 +88,7 @@ go
 CREATE TABLE memberships (
     user_id  [int] NOT NULL,
     group_id [int] NOT NULL
-    CONSTRAINT [memberships_pk] PRIMARY KEY 
+    CONSTRAINT [memberships_pk] PRIMARY KEY
         ( [user_id], [group_id] )
 );
 go
@@ -133,8 +133,9 @@ go
 CREATE TABLE restaurants (
     franchise_id [int] NOT NULL,
     store_id     [int] NOT NULL,
-    name         [varchar](100)
-    CONSTRAINT [restaurants_pk] PRIMARY KEY CLUSTERED 
+    name         [varchar](100),
+    lock_version [int] DEFAULT 0
+    CONSTRAINT [restaurants_pk] PRIMARY KEY CLUSTERED
         ( [franchise_id], [store_id] )
 );
 go
@@ -155,7 +156,7 @@ go
 CREATE TABLE rooms (
     dorm_id [int] NOT NULL,
     room_id [int] NOT NULL,
-    CONSTRAINT [rooms_pk] PRIMARY KEY CLUSTERED 
+    CONSTRAINT [rooms_pk] PRIMARY KEY CLUSTERED
         ( [dorm_id], [room_id] )
 );
 go
@@ -197,7 +198,7 @@ go
 CREATE TABLE capitols (
     country varchar(450) NOT NULL,
     city varchar(450) NOT NULL
-    CONSTRAINT [capitols_pk] PRIMARY KEY 
+    CONSTRAINT [capitols_pk] PRIMARY KEY
         ( [country], [city] )
 );
 go
@@ -207,4 +208,12 @@ CREATE TABLE products_restaurants (
     franchise_id [int] NOT NULL,
     store_id     [int] NOT NULL
 );
-go
+go
+
+CREATE TABLE model_with_callbacks (
+    reference_type_id [int],
+    reference_code    [int],
+    CONSTRAINT [model_with_callbacks_pk] PRIMARY KEY
+        ( [reference_type_id], [reference_code] )
+);
+go

data/test/fixtures/dorm.rb

@@ -1,3 +1,3 @@
 class Dorm < ActiveRecord::Base
-  has_many :rooms, :include => :room_attributes, :primary_key => [:id]
-end
+  has_many :rooms, -> { includes(:room_attributes) }, :primary_key => [:id]
+end

data/test/fixtures/model_with_callback.rb

@@ -0,0 +1,39 @@
+class ModelWithCallback < ActiveRecord::Base
+  after_save  :after_save_method
+  before_save :before_save_method
+  around_save :around_save_method
+
+  after_create  :after_create_method
+  before_create :before_create_method
+  around_create :around_create_method
+
+  after_update  :after_update_method
+  before_update :before_update_method
+  around_update :around_update_method
+
+  after_destroy  :after_destroy_method
+  before_destroy :before_destroy_method
+  around_destroy :around_destroy_method
+
+  private
+
+  # Save callbacks
+  def after_save_method  ; end
+  def before_save_method ; end
+  def around_save_method ; yield ; end
+
+  # Create callbacks
+  def after_create_method  ; end
+  def before_create_method ; end
+  def around_create_method ; yield ;end
+
+  # Update callbacks
+  def after_update_method  ; end
+  def before_update_method ; end
+  def around_update_method ; yield ; end
+
+  # Destroy callbacks
+  def after_destroy_method  ; end
+  def before_destroy_method ; end
+  def around_destroy_method ; yield ; end
+end

data/test/fixtures/model_with_callbacks.yml

@@ -0,0 +1,3 @@
+random:
+  reference_type_id: 1
+  reference_code: 1

data/test/fixtures/suburb.rb

@@ -1,6 +1,6 @@
 class Suburb < ActiveRecord::Base
   self.primary_keys = :city_id, :suburb_id
   has_many :streets,  :foreign_key => [:city_id, :suburb_id]
-  has_many :first_streets,  :foreign_key => [:city_id, :suburb_id], 
-          :class_name => 'Street', :conditions => "streets.name = 'First Street'"
-end
+  has_many :first_streets, -> { where "streets.name = 'First Street'" },
+           :foreign_key => [:city_id, :suburb_id], :class_name => 'Street'
+end

data/test/test_callbacks.rb

@@ -0,0 +1,36 @@
+require File.expand_path('../abstract_unit', __FILE__)
+
+def has_callbacks(obj, action, options = {})
+  obj.expects(:"before_#{action}_method")
+  obj.expects(:"after_#{action}_method")
+  obj.expects(:"around_#{action}_method")
+end
+
+class TestCallbacks < ActiveSupport::TestCase
+  fixtures :model_with_callbacks
+
+  def test_save_callbacks
+    obj = ModelWithCallback.first
+    has_callbacks(obj, :save)
+    obj.save
+  end
+
+  def test_create_callbacks
+    obj = ModelWithCallback.new
+    has_callbacks(obj, :create)
+    obj.save!
+  end
+
+  def test_update_callbacks
+    obj = ModelWithCallback.first
+    has_callbacks(obj, :update)
+    obj.reference_code = 4
+    obj.save!
+  end
+
+  def test_destroy_callbacks
+    obj = ModelWithCallback.first
+    has_callbacks(obj, :destroy)
+    obj.destroy
+  end
+end

data/test/test_delete.rb

@@ -90,11 +90,13 @@ class TestDelete < ActiveSupport::TestCase
   end
   
   def test_destroy_has_and_belongs_to_many_on_non_cpk
-    steve = employees(:steve)
     records_before = ActiveRecord::Base.connection.execute("select * from employees_groups").count
-    steve.destroy
+    employee = Employee.create
+    employee.groups << Group.create(name: 'test')
+    employees_groups_count = employee.groups.count
+    employee.destroy!
     records_after = ActiveRecord::Base.connection.execute("select * from employees_groups").count
-    assert_equal records_after, records_before - steve.groups.count
+    assert_equal records_before, records_after
   end
 
   def test_delete_not_destroy_on_cpk

data/test/test_dumpable.rb

@@ -0,0 +1,15 @@
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestDumpable < ActiveSupport::TestCase
+  fixtures :articles, :readings, :users
+
+  def test_marshal_with_simple_preload
+    articles = Article.preload(:readings).where(id: 1).to_a
+    assert_equal(Marshal.load(Marshal.dump(articles)), articles)
+  end
+
+  def test_marshal_with_comples_preload
+    articles = Article.preload({ readings: :user }).where(id: 1).to_a
+    assert_equal(Marshal.load(Marshal.dump(articles)), articles)
+  end
+end

data/test/test_equal.rb

@@ -4,7 +4,7 @@ class TestEqual < ActiveSupport::TestCase
   fixtures :capitols
 
   def test_new
-    assert_not_equal(Capitol.new, Capitol.new)
+    assert_not_equal(Capitol.new.object_id, Capitol.new.object_id)
   end
 
   def test_same_new

data/test/test_optimistic.rb

@@ -0,0 +1,18 @@
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestOptimisitic < ActiveSupport::TestCase
+  fixtures :restaurants
+
+  def test_update_with_stale_error
+    restaurant_1 = Restaurant.find([1, 1])
+    restaurant_1['name'] = "McDonalds renamed"
+
+    restaurant_2 = Restaurant.find([1, 1])
+    restaurant_2['name'] = "McDonalds renamed 2"
+
+    assert(restaurant_1.save)
+    assert_raise ActiveRecord::StaleObjectError do
+      restaurant_2.save
+    end
+  end
+end

data/test/test_suite.rb

@@ -13,6 +13,7 @@
   test_habtm
   test_ids
   test_miscellaneous
+  test_optimistic
   test_pagination
   test_polymorphic
   test_predicates

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 6.0.7
+  version: 6.0.8
 platform: ruby
 authors:
 - Dr Nic Williams
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-06 00:00:00.000000000 Z
+date: 2015-01-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -25,6 +25,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 4.0.6
+- !ruby/object:Gem::Dependency
+  name: mocha
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.1.0
 description: Composite key support for ActiveRecord
 email: 
 executables: []
@@ -50,17 +64,20 @@ files:
 - lib/composite_primary_keys/associations/preloader/belongs_to.rb
 - lib/composite_primary_keys/associations/preloader/has_and_belongs_to_many.rb
 - lib/composite_primary_keys/attribute_methods/dirty.rb
+- lib/composite_primary_keys/attribute_methods/primary_key.rb
 - lib/composite_primary_keys/attribute_methods/read.rb
 - lib/composite_primary_keys/attribute_methods/write.rb
 - lib/composite_primary_keys/base.rb
 - lib/composite_primary_keys/composite_arrays.rb
 - lib/composite_primary_keys/composite_predicates.rb
+- lib/composite_primary_keys/composite_relation.rb
 - lib/composite_primary_keys/connection_adapters/abstract/connection_specification_changes.rb
 - lib/composite_primary_keys/connection_adapters/abstract_adapter.rb
 - lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb
 - lib/composite_primary_keys/core.rb
 - lib/composite_primary_keys/dirty.rb
 - lib/composite_primary_keys/fixtures.rb
+- lib/composite_primary_keys/locking/optimistic.rb
 - lib/composite_primary_keys/nested_attributes.rb
 - lib/composite_primary_keys/persistence.rb
 - lib/composite_primary_keys/relation.rb
@@ -123,6 +140,8 @@ files:
 - test/fixtures/membership_status.rb
 - test/fixtures/membership_statuses.yml
 - test/fixtures/memberships.yml
+- test/fixtures/model_with_callback.rb
+- test/fixtures/model_with_callbacks.yml
 - test/fixtures/product.rb
 - test/fixtures/product_tariff.rb
 - test/fixtures/product_tariffs.yml
@@ -166,10 +185,12 @@ files:
 - test/test_attribute_methods.rb
 - test/test_attributes.rb
 - test/test_calculations.rb
+- test/test_callbacks.rb
 - test/test_composite_arrays.rb
 - test/test_counter_cache.rb
 - test/test_create.rb
 - test/test_delete.rb
+- test/test_dumpable.rb
 - test/test_dup.rb
 - test/test_equal.rb
 - test/test_exists.rb
@@ -178,6 +199,7 @@ files:
 - test/test_ids.rb
 - test/test_miscellaneous.rb
 - test/test_nested_attributes.rb
+- test/test_optimistic.rb
 - test/test_pagination.rb
 - test/test_polymorphic.rb
 - test/test_predicates.rb
@@ -207,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: compositekeys
-rubygems_version: 2.4.1
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord
@@ -221,10 +243,12 @@ test_files:
 - test/test_attributes.rb
 - test/test_attribute_methods.rb
 - test/test_calculations.rb
+- test/test_callbacks.rb
 - test/test_composite_arrays.rb
 - test/test_counter_cache.rb
 - test/test_create.rb
 - test/test_delete.rb
+- test/test_dumpable.rb
 - test/test_dup.rb
 - test/test_equal.rb
 - test/test_exists.rb
@@ -233,6 +257,7 @@ test_files:
 - test/test_ids.rb
 - test/test_miscellaneous.rb
 - test/test_nested_attributes.rb
+- test/test_optimistic.rb
 - test/test_pagination.rb
 - test/test_polymorphic.rb
 - test/test_predicates.rb