composite_primary_keys 13.0.7 → 14.0.9

data/test/test_composite_arrays.rb

@@ -1,38 +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
-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_has_one_through.rb

@@ -0,0 +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

data/test/test_nested_attributes.rb

@@ -64,4 +64,27 @@ class TestNestedAttributes < ActiveSupport::TestCase
     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

data/test/test_polymorphic.rb

@@ -40,4 +40,10 @@ class TestPolymorphic < ActiveSupport::TestCase
     article.user_commentators = []
     assert_equal(0, article.comments.size)
   end
+
+  def test_polymorphic_has_many_with_polymorphic_name
+    comments = UserWithPolymorphicName.find(1).comments
+    assert_equal 1, comments[0].person_id
+    assert_equal "User1", comments[0].person_type
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 13.0.7
+  version: 14.0.9
 platform: ruby
 authors:
 - Charlie Savage
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-02-04 00:00:00.000000000 Z
+date: 2023-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.2
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 6.1.0
+        version: 7.0.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -59,7 +59,6 @@ files:
 - lib/composite_primary_keys/associations/has_many_through_association.rb
 - lib/composite_primary_keys/associations/join_association.rb
 - lib/composite_primary_keys/associations/preloader/association.rb
-- lib/composite_primary_keys/associations/through_association.rb
 - lib/composite_primary_keys/attribute_methods.rb
 - lib/composite_primary_keys/attribute_methods/primary_key.rb
 - lib/composite_primary_keys/attribute_methods/read.rb
@@ -99,6 +98,7 @@ files:
 - tasks/databases/postgresql.rake
 - tasks/databases/sqlite.rake
 - tasks/databases/sqlserver.rake
+- tasks/databases/trilogy.rake
 - tasks/website.rake
 - test/README_tests.rdoc
 - test/abstract_unit.rb
@@ -106,6 +106,7 @@ files:
 - test/connections/databases.ci.yml
 - test/connections/databases.example.yml
 - test/connections/databases.yml
+- test/fixtures/admin.rb
 - test/fixtures/article.rb
 - test/fixtures/articles.yml
 - test/fixtures/capitol.rb
@@ -132,6 +133,7 @@ files:
 - test/fixtures/membership_status.rb
 - test/fixtures/membership_statuses.yml
 - test/fixtures/memberships.yml
+- test/fixtures/moderator.rb
 - test/fixtures/product.rb
 - test/fixtures/product_tariff.rb
 - test/fixtures/product_tariffs.yml
@@ -154,6 +156,8 @@ files:
 - test/fixtures/room_attribute_assignments.yml
 - test/fixtures/room_attributes.yml
 - test/fixtures/rooms.yml
+- test/fixtures/staff_room.rb
+- test/fixtures/staff_room_key.rb
 - test/fixtures/street.rb
 - test/fixtures/streets.yml
 - test/fixtures/student.rb
@@ -165,6 +169,7 @@ files:
 - test/fixtures/topic_sources.yml
 - test/fixtures/topics.yml
 - test/fixtures/user.rb
+- test/fixtures/user_with_polymorphic_name.rb
 - test/fixtures/users.yml
 - test/plugins/pagination.rb
 - test/plugins/pagination_helper.rb
@@ -183,6 +188,7 @@ files:
 - test/test_exists.rb
 - test/test_find.rb
 - test/test_habtm.rb
+- test/test_has_one_through.rb
 - test/test_ids.rb
 - test/test_miscellaneous.rb
 - test/test_nested_attributes.rb
@@ -209,14 +215,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.6
+rubygems_version: 3.4.21
 signing_key:
 specification_version: 4
 summary: Composite key support for ActiveRecord
@@ -238,6 +244,7 @@ test_files:
 - test/test_exists.rb
 - test/test_find.rb
 - test/test_habtm.rb
+- test/test_has_one_through.rb
 - test/test_ids.rb
 - test/test_miscellaneous.rb
 - test/test_nested_attributes.rb

data/lib/composite_primary_keys/associations/through_association.rb

@@ -1,24 +0,0 @@
-module ActiveRecord
-  module Associations
-    module ThroughAssociation
-      alias :original_construct_join_attributes :construct_join_attributes
-
-      def construct_join_attributes(*records)
-        # CPK
-        if !self.source_reflection.polymorphic? && source_reflection.klass.composite?
-          ensure_mutable
-
-          ids = records.map do |record|
-            source_reflection.association_primary_key(reflection.klass).map do |key|
-              record.send(key)
-            end
-          end
-
-          cpk_in_predicate(through_association.scope.klass.arel_table, source_reflection.foreign_key, ids)
-        else
-          original_construct_join_attributes(*records)
-        end
-      end
-    end
-  end
-end