composite_primary_keys 12.0.2 → 12.0.10

data/test/test_nested_attributes.rb

@@ -1,124 +1,67 @@
-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
-
-  fixtures :topics, :topic_sources
-
-  def test_nested_attributes_create_with_string_in_primary_key
-    platform = 'instagram'
-
-    topic = topics(:music)
-    topic.update :topic_sources_attributes => [{
-      :platform => platform,
-      :keywords => 'funk'
-    }]
-    assert_not_nil TopicSource.find_by_platform(platform)
-  end
-
-  def test_nested_attributes_update_with_string_in_primary_key
-    platform = 'instagram'
-
-    topic = topics(:music)
-    topic.update :topic_sources_attributes => [{
-      :platform => platform,
-      :keywords => 'funk'
-    }]
-    assert_not_nil TopicSource.find_by_platform(platform)
-
-    topic_source = TopicSource.find_by_platform(platform)
-    cpk = CompositePrimaryKeys::CompositeKeys[topic.id, platform]
-    topic.update :topic_sources_attributes => [{
-      :id => cpk,
-      :keywords => 'jazz'
-    }]
-
-    topic_source = TopicSource.find_by_platform(platform)
-    assert_kind_of(TopicSource, topic_source)
-    assert_equal(topic_source.keywords, 'jazz')
-  end
-
-  def test_nested_attributes_update_with_string_in_primary_key_2
-    topic = topics(:music)
-    topic_source = topic_sources(:music_source)
-
-    topic.update(:topic_sources_attributes => [{:id => topic_source.id,
-                                                           :keywords => 'classical, jazz'}])
-
-    topic_source.reload
-    assert_equal(topic_source.keywords, 'classical, jazz')
-  end
-
-  def test_nested_attributes_update_with_string_in_primary_key_3
-    topic = topics(:music)
-    topic_source = topic_sources(:music_source)
-
-    topic.update(:topic_sources_attributes => [{:id => topic_source.id.to_s,
-                                                           :keywords => 'classical, jazz'}])
-
-    topic_source.reload
-    assert_equal(topic_source.keywords, 'classical, jazz')
-  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
+end

data/test/test_polymorphic.rb

@@ -1,27 +1,43 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestPolymorphic < ActiveSupport::TestCase
-  fixtures :users, :employees, :comments, :hacks, :articles, :readings
+  fixtures :articles, :departments, :employees, :users, :comments
 
-  def test_polymorphic_has_many
-    comments = Hack.find(7).comments
-    assert_equal 7, comments[0].person_id
+  def test_has_many
+    user = users(:santiago)
+    comments = user.comments
+    assert_equal(user.id, comments[0].person_id)
   end
 
-  def test_polymorphic_has_one
-    first_comment = Hack.find(7).first_comment
-    assert_equal 7, first_comment.person_id
+  def test_has_one
+    user = users(:santiago)
+    first_comment = user.first_comment
+    assert_equal(user.id, first_comment.person_id)
   end
 
   def test_has_many_through
-    assert_equal(2, Article.count, 'Baseline sanity check')
-    user = users(:santiago)
-    article_names = user.articles.collect { |a| a.name }.sort
-    assert_equal ['Article One', 'Article Two'], article_names
+    department = departments(:accounting)
+    comment = comments(:employee_comment)
+
+    assert_equal(1, department.comments.size)
+    assert_equal(comment, department.comments[0])
   end
 
-  def test_polymorphic_has_many_through
+  def test_has_many_through_2
+    article = articles(:second)
+
     user = users(:santiago)
-    assert_equal(['andrew'], user.hacks.collect { |a| a.name }.sort)
+    assert_equal(user, article.user_commentators[0])
+
+    user = users(:drnic)
+    assert_equal(user, article.user_commentators[1])
+  end
+
+  def test_clear_has_many_through
+    article = articles(:second)
+
+    assert_equal(2, article.comments.size)
+    article.user_commentators = []
+    assert_equal(0, article.comments.size)
   end
 end

data/test/test_preload.rb

@@ -1,7 +1,7 @@
 require File.expand_path('../abstract_unit', __FILE__)
 
 class TestPreload < ActiveSupport::TestCase
-  fixtures :comments, :users, :employees, :groups, :hacks, :readings
+  fixtures :articles, :comments, :users, :employees, :groups, :readings
 
   class UserForPreload < User
     has_many :comments_with_include_condition, -> { where('person_type = ?', 'User')},
@@ -31,10 +31,11 @@ class TestPreload < ActiveSupport::TestCase
 
   def test_preload_for_conditioned_has_many_association
     # has one comment
+    article = articles(:first)
     user1 = users(:santiago)
     user2 = UserForPreload.create(name: 'TestPreload')
-    Comment.create(person: user2, person_type: 'User')
-    Comment.create(person: user2, person_type: 'User')
+    Comment.create(article: article, person: user2, person_type: 'User')
+    Comment.create(article: article, person: user2, person_type: 'User')
 
     users = UserForPreload.where(id: [user1.id, user2.id]).all
     assert_equal(1, users.first.comments_with_include_condition.size)

data/test/test_serialize.rb

@@ -5,11 +5,11 @@ class TestSerialization < ActiveSupport::TestCase
 
   def test_json
     department = Department.first
-    assert_equal('{"department_id":1,"location_id":1}', department.to_json)
+    assert_equal('{"id":1,"location_id":1}', department.to_json)
   end
 
   def test_serializable_hash
     department = Department.first
-    assert_equal({"department_id" => 1,"location_id" => 1}, department.serializable_hash)
+    assert_equal({"id" => 1,"location_id" => 1}, department.serializable_hash)
   end
 end

data/test/test_update.rb

@@ -1,79 +1,97 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestUpdate < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes
-
-  CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => :reference_type_id,
-      :update => { :description => 'RT Desc' },
-    },
-    :dual   => {
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-      :update => { :description => 'RT Desc' },
-    },
-  }
-
-  def setup
-    self.class.classes = CLASSES
-  end
-
-  def test_setup
-    testing_with do
-      assert_not_nil @klass_info[:update]
-    end
-  end
-
-  def test_update_attributes
-    testing_with do
-      assert(@first.update(@klass_info[:update]))
-      assert(@first.reload)
-      @klass_info[:update].each_pair do |attr_name, new_value|
-        assert_equal(new_value, @first[attr_name])
-      end
-    end
-  end
-
-  def test_update_primary_key
-    obj = ReferenceCode.find([1,1])
-    obj.reference_type_id = 2
-    obj.reference_code = 3
-    assert_equal({"reference_type_id" => 2, "reference_code" => 3}, obj.ids_hash)
-    assert(obj.save)
-    assert(obj.reload)
-    assert_equal(2, obj.reference_type_id)
-    assert_equal(3, obj.reference_code)
-    assert_equal({"reference_type_id" => 2, "reference_code" => 3}, obj.ids_hash)
-    assert_equal([2, 3], obj.id)
-  end
-
-  def test_update_attribute
-    obj = ReferenceType.find(1)
-    obj[:abbreviation] = 'a'
-    obj['abbreviation'] = 'b'
-    assert(obj.save)
-    assert(obj.reload)
-    assert_equal('b', obj.abbreviation)
-  end
-
-  def test_update_all
-    ReferenceCode.update_all(description: 'random value')
-
-    ReferenceCode.all.each do |reference_code|
-      assert_equal('random value', reference_code.description)
-    end
-  end
-
-  def test_update_all_join
-    ReferenceCode.joins(:reference_type).
-                  where('reference_types.reference_type_id = ?', 2).
-                  update_all(:description => 'random value')
-
-    query = ReferenceCode.where('reference_type_id = ?', 2).
-                          where(:description => 'random value')
-
-    assert_equal(2, query.count)
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestUpdate < ActiveSupport::TestCase
+  fixtures :departments, :reference_types, :reference_codes, :rooms, :room_assignments
+
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => :reference_type_id,
+      :update => { :description => 'RT Desc' },
+    },
+    :dual   => {
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+      :update => { :description => 'RT Desc' },
+    },
+  }
+
+  def setup
+    self.class.classes = CLASSES
+  end
+
+  def test_setup
+    testing_with do
+      assert_not_nil @klass_info[:update]
+    end
+  end
+
+  def test_update_attributes
+    testing_with do
+      assert(@first.update(@klass_info[:update]))
+      assert(@first.reload)
+      @klass_info[:update].each_pair do |attr_name, new_value|
+        assert_equal(new_value, @first[attr_name])
+      end
+    end
+  end
+
+  def test_update_attributes_with_id_field
+    department = departments(:accounting)
+    department.update_attribute(:location_id, 3)
+    department.reload
+    assert_equal(3, department.location_id)
+  end
+
+  def test_update_primary_key
+    obj = ReferenceCode.find([1,1])
+    obj.reference_type_id = 2
+    obj.reference_code = 3
+    assert_equal({"reference_type_id" => 2, "reference_code" => 3}, obj.ids_hash)
+    assert(obj.save)
+    assert(obj.reload)
+    assert_equal(2, obj.reference_type_id)
+    assert_equal(3, obj.reference_code)
+    assert_equal({"reference_type_id" => 2, "reference_code" => 3}, obj.ids_hash)
+    assert_equal([2, 3], obj.id)
+  end
+
+  def test_update_attribute
+    obj = ReferenceType.find(1)
+    obj[:abbreviation] = 'a'
+    obj['abbreviation'] = 'b'
+    assert(obj.save)
+    assert(obj.reload)
+    assert_equal('b', obj.abbreviation)
+  end
+
+  def test_update_all
+    ReferenceCode.update_all(description: 'random value')
+
+    ReferenceCode.all.each do |reference_code|
+      assert_equal('random value', reference_code.description)
+    end
+  end
+
+  def test_update_all_join
+    ReferenceCode.joins(:reference_type).
+                  where('reference_types.reference_type_id = ?', 2).
+                  update_all(:description => 'random value')
+
+    query = ReferenceCode.where('reference_type_id = ?', 2).
+                          where(:description => 'random value')
+
+    assert_equal(2, query.count)
+  end
+
+  def test_update_with_uniqueness
+    assignment = room_assignments(:jacksons_room)
+    room_1 = rooms(:branner_room_1)
+    room_2 = rooms(:branner_room_3)
+
+    assert_equal(room_1, assignment.room)
+    assignment.room = room_2
+    assignment.save!
+    assert_equal(room_2, assignment.room)
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 12.0.2
+  version: 12.0.10
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-05-19 00:00:00.000000000 Z
+date: 2021-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -48,6 +48,7 @@ files:
 - README.rdoc
 - Rakefile
 - lib/composite_primary_keys.rb
+- lib/composite_primary_keys/active_model/attribute_assignment.rb
 - lib/composite_primary_keys/arel/sqlserver.rb
 - lib/composite_primary_keys/arel/to_sql.rb
 - lib/composite_primary_keys/associations/association.rb
@@ -126,14 +127,10 @@ files:
 - test/fixtures/employees.yml
 - test/fixtures/group.rb
 - test/fixtures/groups.yml
-- test/fixtures/hack.rb
-- test/fixtures/hacks.yml
 - test/fixtures/membership.rb
 - test/fixtures/membership_status.rb
 - test/fixtures/membership_statuses.yml
 - test/fixtures/memberships.yml
-- test/fixtures/pk_called_id.rb
-- test/fixtures/pk_called_ids.yml
 - test/fixtures/product.rb
 - test/fixtures/product_tariff.rb
 - test/fixtures/product_tariffs.yml
@@ -141,8 +138,6 @@ files:
 - test/fixtures/reading.rb
 - test/fixtures/readings.yml
 - test/fixtures/reference_code.rb
-- test/fixtures/reference_code_using_composite_key_alias.rb
-- test/fixtures/reference_code_using_simple_key_alias.rb
 - test/fixtures/reference_codes.yml
 - test/fixtures/reference_type.rb
 - test/fixtures/reference_types.yml
@@ -158,8 +153,6 @@ files:
 - test/fixtures/room_attribute_assignments.yml
 - test/fixtures/room_attributes.yml
 - test/fixtures/rooms.yml
-- test/fixtures/seat.rb
-- test/fixtures/seats.yml
 - test/fixtures/street.rb
 - test/fixtures/streets.yml
 - test/fixtures/student.rb
@@ -168,15 +161,12 @@ files:
 - test/fixtures/suburbs.yml
 - test/fixtures/tariff.rb
 - test/fixtures/tariffs.yml
-- test/fixtures/topic.rb
-- test/fixtures/topic_source.rb
 - test/fixtures/topic_sources.yml
 - test/fixtures/topics.yml
 - test/fixtures/user.rb
 - test/fixtures/users.yml
 - test/plugins/pagination.rb
 - test/plugins/pagination_helper.rb
-- test/test_aliases.rb
 - test/test_associations.rb
 - test/test_attribute_methods.rb
 - test/test_attributes.rb
@@ -188,7 +178,6 @@ files:
 - test/test_delete.rb
 - test/test_dumpable.rb
 - test/test_dup.rb
-- test/test_enum.rb
 - test/test_equal.rb
 - test/test_exists.rb
 - test/test_find.rb
@@ -203,7 +192,6 @@ files:
 - test/test_preload.rb
 - test/test_santiago.rb
 - test/test_serialize.rb
-- test/test_suite.rb
 - test/test_touch.rb
 - test/test_tutorial_example.rb
 - test/test_update.rb
@@ -227,14 +215,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord
 test_files:
 - test/abstract_unit.rb
 - test/README_tests.rdoc
-- test/test_aliases.rb
 - test/test_associations.rb
 - test/test_attributes.rb
 - test/test_attribute_methods.rb
@@ -246,7 +233,6 @@ test_files:
 - test/test_delete.rb
 - test/test_dumpable.rb
 - test/test_dup.rb
-- test/test_enum.rb
 - test/test_equal.rb
 - test/test_exists.rb
 - test/test_find.rb
@@ -261,7 +247,6 @@ test_files:
 - test/test_preload.rb
 - test/test_santiago.rb
 - test/test_serialize.rb
-- test/test_suite.rb
 - test/test_touch.rb
 - test/test_tutorial_example.rb
 - test/test_update.rb

data/test/fixtures/hack.rb

@@ -1,5 +0,0 @@
-class Hack < ActiveRecord::Base
-  has_many :comments, :as => :person
-  
-  has_one :first_comment, :as => :person, :class_name => "Comment"
-end

data/test/fixtures/hacks.yml

@@ -1,3 +0,0 @@
-andrew:
-  id: 7
-  name: andrew

data/test/fixtures/pk_called_id.rb

@@ -1,5 +0,0 @@
-class PkCalledId < ActiveRecord::Base
-  self.primary_keys = :id, :reference_code
-
-  validates_presence_of :reference_code, :code_label, :abbreviation
-end

data/test/fixtures/pk_called_ids.yml

@@ -1,11 +0,0 @@
-name_prefix_mr:
-  id: 1
-  reference_code: 1
-  code_label: MR
-  abbreviation: Mr
-
-name_prefix_mrs:
-  id: 2
-  reference_code: 1
-  code_label: MRS
-  abbreviation: Mrs

data/test/fixtures/reference_code_using_composite_key_alias.rb

@@ -1,8 +0,0 @@
-class ReferenceCodeUsingCompositeKeyAlias < ActiveRecord::Base
-  self.table_name = 'reference_codes'
-  self.primary_key = [:reference_type_id, :reference_code]
-  
-  belongs_to :reference_type, :foreign_key => "reference_type_id"
-  
-  validates_presence_of :reference_code, :code_label, :abbreviation
-end

data/test/fixtures/reference_code_using_simple_key_alias.rb

@@ -1,8 +0,0 @@
-class ReferenceCodeUsingSimpleKeyAlias < ActiveRecord::Base
-  self.table_name = 'reference_codes'
-  self.primary_key = :code_label
-  
-  belongs_to :reference_type, :foreign_key => "reference_type_id"
-  
-  validates_presence_of :reference_code, :code_label, :abbreviation
-end

data/test/fixtures/seat.rb

@@ -1,5 +0,0 @@
-class Seat < ActiveRecord::Base
-  self.primary_keys = [:flight_number, :seat]
-
-  validates_uniqueness_of :customer
-end

data/test/fixtures/seats.yml

@@ -1,9 +0,0 @@
-seat1:
-  flight_number: 1
-  seat: 1
-  customer: 1
-
-seat2:
-  flight_number: 1
-  seat: 2
-  customer: 2

data/test/fixtures/topic.rb

@@ -1,6 +0,0 @@
-class Topic < ActiveRecord::Base
-	has_many :topic_sources, dependent: :destroy
-	accepts_nested_attributes_for :topic_sources
-
-	validates :name, :feed_size, presence: true
-end

data/test/fixtures/topic_source.rb

@@ -1,7 +0,0 @@
-class TopicSource < ActiveRecord::Base
-	self.primary_keys = :topic_id, :platform
-
-	belongs_to :topic, inverse_of: :topic_sources
-
-	validates :platform, presence: true
-end