composite_primary_keys 14.0.8 → 14.0.10

data/test/test_composite_arrays.rb

@@ -1,44 +1,44 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class CompositeArraysTest < ActiveSupport::TestCase
-
-  def test_new_primary_keys
-    keys = CompositePrimaryKeys::CompositeKeys.new
-    assert_not_nil keys
-    assert_equal '', keys.to_s
-    assert_equal '', "#{keys}"
-  end
-
-  def test_initialize_primary_keys
-    keys = CompositePrimaryKeys::CompositeKeys.new([1,2,3])
-    assert_not_nil keys
-    assert_equal '1,2,3', keys.to_s
-    assert_equal '1,2,3', "#{keys}"
-  end
-
-  def test_to_composite_keys
-    keys = [1,2,3].to_composite_keys
-    assert_equal CompositePrimaryKeys::CompositeKeys, keys.class
-    assert_equal '1,2,3', keys.to_s
-  end
-
-  def test_parse
-    assert_equal ['1', '2'], CompositePrimaryKeys::CompositeKeys.parse('1,2')
-    assert_equal ['The USA', '^Washington, D.C.'],
-                 CompositePrimaryKeys::CompositeKeys.parse('The USA,^5EWashington^2C D.C.')
-    assert_equal ['The USA', '^Washington, D.C.'],
-                 CompositePrimaryKeys::CompositeKeys.parse(['The USA', '^Washington, D.C.'])
-  end
-
-  def test_to_s
-    assert_equal '1,2', CompositePrimaryKeys::CompositeKeys.new([1, 2]).to_s
-    assert_equal 'The USA,^5EWashington^2C D.C.',
-                 CompositePrimaryKeys::CompositeKeys.new(['The USA', '^Washington, D.C.']).to_s
-  end
-
-  def test_to_param
-    assert_equal '1,2', CompositePrimaryKeys::CompositeKeys.new([1, 2]).to_param
-    assert_equal 'The USA,^5EWashington^2C D.C.',
-                 CompositePrimaryKeys::CompositeKeys.new(['The USA', '^Washington, D.C.']).to_param
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class CompositeArraysTest < ActiveSupport::TestCase
+
+  def test_new_primary_keys
+    keys = CompositePrimaryKeys::CompositeKeys.new
+    assert_not_nil keys
+    assert_equal '', keys.to_s
+    assert_equal '', "#{keys}"
+  end
+
+  def test_initialize_primary_keys
+    keys = CompositePrimaryKeys::CompositeKeys.new([1,2,3])
+    assert_not_nil keys
+    assert_equal '1,2,3', keys.to_s
+    assert_equal '1,2,3', "#{keys}"
+  end
+
+  def test_to_composite_keys
+    keys = [1,2,3].to_composite_keys
+    assert_equal CompositePrimaryKeys::CompositeKeys, keys.class
+    assert_equal '1,2,3', keys.to_s
+  end
+
+  def test_parse
+    assert_equal ['1', '2'], CompositePrimaryKeys::CompositeKeys.parse('1,2')
+    assert_equal ['The USA', '^Washington, D.C.'],
+                 CompositePrimaryKeys::CompositeKeys.parse('The USA,^5EWashington^2C D.C.')
+    assert_equal ['The USA', '^Washington, D.C.'],
+                 CompositePrimaryKeys::CompositeKeys.parse(['The USA', '^Washington, D.C.'])
+  end
+
+  def test_to_s
+    assert_equal '1,2', CompositePrimaryKeys::CompositeKeys.new([1, 2]).to_s
+    assert_equal 'The USA,^5EWashington^2C D.C.',
+                 CompositePrimaryKeys::CompositeKeys.new(['The USA', '^Washington, D.C.']).to_s
+  end
+
+  def test_to_param
+    assert_equal '1,2', CompositePrimaryKeys::CompositeKeys.new([1, 2]).to_param
+    assert_equal 'The USA,^5EWashington^2C D.C.',
+                 CompositePrimaryKeys::CompositeKeys.new(['The USA', '^Washington, D.C.']).to_param
+  end
+end

data/test/test_equal.rb

@@ -1,26 +1,55 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestEqual < ActiveSupport::TestCase
-  fixtures :capitols
-
-  def test_new
-    assert_equal(Capitol.new, Capitol.new)
-  end
-
-  def test_same_new
-    it = Capitol.new
-    assert_equal(it, it)
-  end
-
-  def test_same
-    first = Capitol.find(['Canada', 'Ottawa'])
-    second = Capitol.find(['Canada', 'Ottawa'])
-    assert_equal(first, second)
-  end
-
-  def test_different
-    first = Capitol.find(['Mexico', 'Mexico City'])
-    second = Capitol.find(['Canada', 'Ottawa'])
-    assert_not_equal(first, second)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestEqual < ActiveSupport::TestCase
+  fixtures :restaurants, :products
+
+  ############################################################
+  ### Tests for Product model with single primary key (id) ###
+  ############################################################
+
+  def test_single_same
+    first = Product.find(1)
+    second = Product.find(1)
+    assert_equal(first, second)
+  end
+
+  def test_different
+    first = Product.find(1)
+    second = Product.find(2)
+    assert_not_equal(first, second)
+  end
+
+  def test_two_new_objects_are_not_equal
+    assert_not_equal(Product.new, Product.new)
+  end
+
+  def test_same_new_object_is_equal_to_itself
+    it = Product.new
+    assert_equal(it, it)
+  end
+
+  #####################################################################################
+  ### Tests for Restaurant model with composite primary key (franchise_id, store_id) ##
+  #####################################################################################
+
+  def test_composite_same
+    first = Restaurant.find([1, 1])
+    second = Restaurant.find([1, 1])
+    assert_equal(first, second)
+  end
+
+  def test_composite_different
+    first = Restaurant.find([1, 1])
+    second = Restaurant.find([2, 2])
+    assert_not_equal(first, second)
+  end
+
+  def test_composite_two_new_objects_are_not_equal
+    assert_not_equal(Restaurant.new, Restaurant.new)
+  end
+
+  def test_composite_same_new_object_is_equal_to_itself
+    it = Restaurant.new
+    assert_equal(it, it)
+  end
+end

data/test/test_has_one_through.rb

@@ -1,30 +1,30 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestHasOneThrough < ActiveSupport::TestCase
-  fixtures :users, :rooms
-
-  def test_no_cpk
-    # This test makes sure we don't break anything in standard rails by using CPK
-    user = User.find(1)
-    assert_nil user.moderator
-    assert_nil user.admin
-
-    admin = Admin.create!(user: user)
-    assert_equal admin, user.admin
-    assert_equal 1, user.moderator.id
-    assert_equal 1, admin.id
-  end
-
-  def test_has_one_through
-    room = Room.find([1,1])
-    assert_nil room.staff_room
-    assert_nil room.staff_room_key
-
-    key = StaffRoomKey.create!(room: room, key_no: '1234')
-    assert_equal key, room.staff_room_key
-    assert_equal 1, room.staff_room.dorm_id
-    assert_equal 1, room.staff_room.room_id
-    assert_equal 1, key.dorm_id
-    assert_equal 1, key.room_id
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestHasOneThrough < ActiveSupport::TestCase
+  fixtures :users, :rooms
+
+  def test_no_cpk
+    # This test makes sure we don't break anything in standard rails by using CPK
+    user = User.find(1)
+    assert_nil user.moderator
+    assert_nil user.admin
+
+    admin = Admin.create!(user: user)
+    assert_equal admin, user.admin
+    assert_equal 1, user.moderator.id
+    assert_equal 1, admin.id
+  end
+
+  def test_has_one_through
+    room = Room.find([1,1])
+    assert_nil room.staff_room
+    assert_nil room.staff_room_key
+
+    key = StaffRoomKey.create!(room: room, key_no: '1234')
+    assert_equal key, room.staff_room_key
+    assert_equal 1, room.staff_room.dorm_id
+    assert_equal 1, room.staff_room.room_id
+    assert_equal 1, key.dorm_id
+    assert_equal 1, key.room_id
+  end
+end

data/test/test_hash.rb

@@ -0,0 +1,73 @@
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestHash < ActiveSupport::TestCase
+  fixtures :restaurants, :products
+
+  ############################################################
+  ### Tests for Product model with single primary key (id) ###
+  ############################################################
+
+  def test_single_same_object_has_the_same_hash
+    first = Product.find(1)
+    second = Product.find(1)
+    assert_equal(first.hash, second.hash)
+  end
+
+  def test_single_different_objects_have_different_hashes
+    first = Product.find(1)
+    second = Product.find(2)
+    assert_not_equal(first.hash, second.hash)
+  end
+
+  def test_single_persisted_object_hash_is_based_on_primary_key
+    first = Product.find(1)
+    second = Product.find(1)
+
+    assert_equal(first.hash, second.hash)
+    first.name = 'new name'
+    assert_equal(first.hash, second.hash)
+  end
+
+  def test_single_two_new_objects_have_different_hashes
+    assert_not_equal(Product.new.hash, Product.new.hash)
+  end
+
+  def test_single_same_new_object_has_the_same_hash
+    it = Product.new
+    assert_equal(it.hash, it.hash)
+  end
+
+  #####################################################################################
+  ### Tests for Restaurant model with composite primary key (franchise_id, store_id) ##
+  #####################################################################################
+
+  def test_composite_same_object_has_the_same_hash
+    first = Restaurant.find([1, 1])
+    second = Restaurant.find([1, 1])
+    assert_equal(first.hash, second.hash)
+  end
+
+  def test_composite_different_objects_have_different_hashes
+    first = Restaurant.find([1, 1])
+    second = Restaurant.find([2, 2])
+    assert_not_equal(first.hash, second.hash)
+  end
+
+  def test_composite_persisted_object_hash_is_based_on_primary_key
+    first = Restaurant.find([1, 1])
+    second = Restaurant.find([1, 1])
+
+    assert_equal(first.hash, second.hash)
+    first.name = 'new name'
+    assert_equal(first.hash, second.hash)
+  end
+
+  def test_composite_two_new_objects_have_different_hashes
+    assert_not_equal(Restaurant.new.hash, Restaurant.new.hash)
+  end
+
+  def test_composite_same_new_object_has_the_same_hash
+    it = Restaurant.new
+    assert_equal(it.hash, it.hash)
+  end
+end

data/test/test_nested_attributes.rb

@@ -1,67 +1,90 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-# Testing the find action on composite ActiveRecords with two primary keys
-class TestNestedAttributes < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes
-
-  def test_nested_atttribute_create
-    code_id = 1001
-
-    reference_type = reference_types(:name_prefix)
-    reference_type.update :reference_codes_attributes => [{
-      :reference_code => code_id,
-      :code_label => 'XX',
-      :abbreviation => 'Xx'
-    }]
-    assert_not_nil ReferenceCode.find_by_reference_code(code_id)
-  end
-
-  def test_nested_atttribute_update
-    code_id = 1002
-
-    reference_type = reference_types(:name_prefix)
-    reference_type.update :reference_codes_attributes => [{
-      :reference_code => code_id,
-      :code_label => 'XX',
-      :abbreviation => 'Xx'
-    }]
-
-    reference_code = ReferenceCode.find_by_reference_code(code_id)
-    cpk = CompositePrimaryKeys::CompositeKeys[reference_type.reference_type_id, code_id]
-    reference_type.update :reference_codes_attributes => [{
-      :id => cpk,
-      :code_label => 'AAA',
-      :abbreviation => 'Aaa'
-    }]
-
-    reference_code = ReferenceCode.find_by_reference_code(code_id)
-    assert_kind_of(ReferenceCode, reference_code)
-    assert_equal(reference_code.code_label, 'AAA')
-  end
-
-  def test_nested_atttribute_update_2
-    reference_type = reference_types(:gender)
-    reference_code = reference_codes(:gender_male)
-
-    reference_type.update(:reference_codes_attributes => [{:id => reference_code.id,
-                                                                      :code_label => 'XX',
-                                                                      :abbreviation => 'Xx'}])
-
-    reference_code.reload
-    assert_equal(reference_code.code_label, 'XX')
-    assert_equal(reference_code.abbreviation, 'Xx')
-  end
-
-  def test_nested_atttribute_update_3
-    reference_type = reference_types(:gender)
-    reference_code = reference_codes(:gender_male)
-
-    reference_type.update(:reference_codes_attributes => [{:id => reference_code.id.to_s,
-                                                                      :code_label => 'XX',
-                                                                      :abbreviation => 'Xx'}])
-
-    reference_code.reload
-    assert_equal(reference_code.code_label, 'XX')
-    assert_equal(reference_code.abbreviation, 'Xx')
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+# Testing the find action on composite ActiveRecords with two primary keys
+class TestNestedAttributes < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes
+
+  def test_nested_atttribute_create
+    code_id = 1001
+
+    reference_type = reference_types(:name_prefix)
+    reference_type.update :reference_codes_attributes => [{
+      :reference_code => code_id,
+      :code_label => 'XX',
+      :abbreviation => 'Xx'
+    }]
+    assert_not_nil ReferenceCode.find_by_reference_code(code_id)
+  end
+
+  def test_nested_atttribute_update
+    code_id = 1002
+
+    reference_type = reference_types(:name_prefix)
+    reference_type.update :reference_codes_attributes => [{
+      :reference_code => code_id,
+      :code_label => 'XX',
+      :abbreviation => 'Xx'
+    }]
+
+    reference_code = ReferenceCode.find_by_reference_code(code_id)
+    cpk = CompositePrimaryKeys::CompositeKeys[reference_type.reference_type_id, code_id]
+    reference_type.update :reference_codes_attributes => [{
+      :id => cpk,
+      :code_label => 'AAA',
+      :abbreviation => 'Aaa'
+    }]
+
+    reference_code = ReferenceCode.find_by_reference_code(code_id)
+    assert_kind_of(ReferenceCode, reference_code)
+    assert_equal(reference_code.code_label, 'AAA')
+  end
+
+  def test_nested_atttribute_update_2
+    reference_type = reference_types(:gender)
+    reference_code = reference_codes(:gender_male)
+
+    reference_type.update(:reference_codes_attributes => [{:id => reference_code.id,
+                                                                      :code_label => 'XX',
+                                                                      :abbreviation => 'Xx'}])
+
+    reference_code.reload
+    assert_equal(reference_code.code_label, 'XX')
+    assert_equal(reference_code.abbreviation, 'Xx')
+  end
+
+  def test_nested_atttribute_update_3
+    reference_type = reference_types(:gender)
+    reference_code = reference_codes(:gender_male)
+
+    reference_type.update(:reference_codes_attributes => [{:id => reference_code.id.to_s,
+                                                                      :code_label => 'XX',
+                                                                      :abbreviation => 'Xx'}])
+
+    reference_code.reload
+    assert_equal(reference_code.code_label, 'XX')
+    assert_equal(reference_code.abbreviation, 'Xx')
+  end
+
+  def test_nested_atttribute_update_4
+    code_id = 1003
+
+    reference_type = reference_types(:name_prefix)
+    reference_type.update :reference_codes_attributes => [{
+      :reference_code => code_id,
+      :code_label => 'XX',
+      :abbreviation => 'Xx'
+    }]
+    assert_not_nil ReferenceCode.find_by_reference_code(code_id)
+    reference_code = ReferenceCode.find_by_reference_code(code_id)
+    # directly pass :id as a array 
+    reference_type.update :reference_codes_attributes => [{
+      :id => [reference_type.reference_type_id, code_id],
+      :code_label => 'AAA',
+      :abbreviation => 'Aaa'
+    }]
+    
+    reference_code = ReferenceCode.find_by_reference_code(code_id)
+    assert_kind_of(ReferenceCode, reference_code)
+    assert_equal(reference_code.code_label, 'AAA')
+  end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 14.0.8
+  version: 14.0.10
 platform: ruby
 authors:
 - Charlie Savage
-autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-11-24 00:00:00.000000000 Z
+date: 2024-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -39,7 +38,6 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 description: Composite key support for ActiveRecord
-email:
 executables: []
 extensions: []
 extra_rdoc_files: []
@@ -189,6 +187,7 @@ files:
 - test/test_find.rb
 - test/test_habtm.rb
 - test/test_has_one_through.rb
+- test/test_hash.rb
 - test/test_ids.rb
 - test/test_miscellaneous.rb
 - test/test_nested_attributes.rb
@@ -206,8 +205,8 @@ files:
 homepage: https://github.com/composite-primary-keys/composite_primary_keys
 licenses:
 - MIT
-metadata: {}
-post_install_message:
+metadata:
+  changelog_uri: https://github.com/composite-primary-keys/composite_primary_keys/blob/master/History.rdoc
 rdoc_options: []
 require_paths:
 - lib
@@ -222,8 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.21
-signing_key:
+rubygems_version: 3.6.1
 specification_version: 4
 summary: Composite key support for ActiveRecord
 test_files:
@@ -245,6 +243,7 @@ test_files:
 - test/test_find.rb
 - test/test_habtm.rb
 - test/test_has_one_through.rb
+- test/test_hash.rb
 - test/test_ids.rb
 - test/test_miscellaneous.rb
 - test/test_nested_attributes.rb