composite_primary_keys 12.0.9 → 12.0.10

data/test/test_ids.rb

@@ -1,112 +1,112 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class ChildCpkTest < ReferenceCode
-end
-
-class TestIds < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes
-  
-  CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => [:reference_type_id],
-    },
-    :dual   => {
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-    },
-    :dual_strs   => {
-      :class => ReferenceCode,
-      :primary_keys => ['reference_type_id', 'reference_code'],
-    }
-  }
-
-  def setup
-    self.class.classes = CLASSES
-  end
-
-  def test_id
-    testing_with do
-      assert_equal @first.id, @first.ids if composite?
-      assert_kind_of(CompositePrimaryKeys::CompositeKeys, @first.id) if composite?
-    end
-  end
-
-  def test_to_param
-    testing_with do
-      assert_equal '1,1', @first.to_param if composite?
-    end
-
-    capitol = Capitol.create!(country: 'The USA', city: 'Washington, D.C.')
-    assert_equal 'The USA,Washington^2C D.C.', capitol.to_param
-  end
-
-  def test_ids_to_s
-    testing_with do
-      order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
-      to_test = @klass.order(order)[0..1].map(&:id)
-      assert_equal '(1,1),(1,2)', @klass.ids_to_s(to_test) if @key_test == :dual
-      assert_equal '1,1;1,2', @klass.ids_to_s(to_test, ',', ';', '', '') if @key_test == :dual
-    end
-  end
-
-  def test_set_ids_string
-    testing_with do
-      array = @primary_keys.collect {|key| 5}
-      expected = composite? ? array.to_composite_keys : array.first
-      @first.id = expected.to_s
-      assert_equal expected, @first.id
-    end
-  end
-
-  def test_set_ids_array
-    testing_with do
-      array = @primary_keys.collect {|key| 5}
-      expected = composite? ? array.to_composite_keys : array.first
-      @first.id = expected
-      assert_equal expected, @first.id
-    end
-  end
-
-  def test_set_ids_comp
-    testing_with do
-      array = @primary_keys.collect {|key| 5}
-      expected = composite? ? array.to_composite_keys : array.first
-      @first.id = expected
-      assert_equal expected, @first.id
-    end
-  end
-
-  def test_primary_keys
-    testing_with do
-      if composite?
-        assert_not_nil @klass.primary_keys
-        assert_equal @primary_keys.map {|key| key.to_s}, @klass.primary_keys
-        assert_equal @klass.primary_keys, @klass.primary_key
-        assert_kind_of(CompositePrimaryKeys::CompositeKeys, @klass.primary_keys)
-        assert_equal @primary_keys.map {|key| key.to_sym}.join(','), @klass.primary_key.to_s
-      else
-        assert_not_nil @klass.primary_key
-        assert_equal @primary_keys.first, @klass.primary_key.to_sym
-        assert_equal @primary_keys.first.to_s, @klass.primary_key.to_s
-      end
-    end
-  end
-
-  def test_inherited_primary_keys
-    assert_equal(["reference_type_id", "reference_code"], ChildCpkTest.primary_keys)
-  end
-
-  def test_inherited_ids
-    cpk_test = ChildCpkTest.new
-    assert_equal([nil, nil], cpk_test.id)
-  end
-
-  def test_assign_ids
-    ref_code = ReferenceCode.new
-    assert_equal([nil, nil], ref_code.id)
-
-    ref_code.id = [2,1]
-    assert_equal([2,1], ref_code.id)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class ChildCpkTest < ReferenceCode
+end
+
+class TestIds < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes
+  
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => [:reference_type_id],
+    },
+    :dual   => {
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+    },
+    :dual_strs   => {
+      :class => ReferenceCode,
+      :primary_keys => ['reference_type_id', 'reference_code'],
+    }
+  }
+
+  def setup
+    self.class.classes = CLASSES
+  end
+
+  def test_id
+    testing_with do
+      assert_equal @first.id, @first.ids if composite?
+      assert_kind_of(CompositePrimaryKeys::CompositeKeys, @first.id) if composite?
+    end
+  end
+
+  def test_to_param
+    testing_with do
+      assert_equal '1,1', @first.to_param if composite?
+    end
+
+    capitol = Capitol.create!(country: 'The USA', city: 'Washington, D.C.')
+    assert_equal 'The USA,Washington^2C D.C.', capitol.to_param
+  end
+
+  def test_ids_to_s
+    testing_with do
+      order = @klass.primary_key.is_a?(String) ? @klass.primary_key : @klass.primary_key.join(',')
+      to_test = @klass.order(order)[0..1].map(&:id)
+      assert_equal '(1,1),(1,2)', @klass.ids_to_s(to_test) if @key_test == :dual
+      assert_equal '1,1;1,2', @klass.ids_to_s(to_test, ',', ';', '', '') if @key_test == :dual
+    end
+  end
+
+  def test_set_ids_string
+    testing_with do
+      array = @primary_keys.collect {|key| 5}
+      expected = composite? ? array.to_composite_keys : array.first
+      @first.id = expected.to_s
+      assert_equal expected, @first.id
+    end
+  end
+
+  def test_set_ids_array
+    testing_with do
+      array = @primary_keys.collect {|key| 5}
+      expected = composite? ? array.to_composite_keys : array.first
+      @first.id = expected
+      assert_equal expected, @first.id
+    end
+  end
+
+  def test_set_ids_comp
+    testing_with do
+      array = @primary_keys.collect {|key| 5}
+      expected = composite? ? array.to_composite_keys : array.first
+      @first.id = expected
+      assert_equal expected, @first.id
+    end
+  end
+
+  def test_primary_keys
+    testing_with do
+      if composite?
+        assert_not_nil @klass.primary_keys
+        assert_equal @primary_keys.map {|key| key.to_s}, @klass.primary_keys
+        assert_equal @klass.primary_keys, @klass.primary_key
+        assert_kind_of(CompositePrimaryKeys::CompositeKeys, @klass.primary_keys)
+        assert_equal @primary_keys.map {|key| key.to_sym}.join(','), @klass.primary_key.to_s
+      else
+        assert_not_nil @klass.primary_key
+        assert_equal @primary_keys.first, @klass.primary_key.to_sym
+        assert_equal @primary_keys.first.to_s, @klass.primary_key.to_s
+      end
+    end
+  end
+
+  def test_inherited_primary_keys
+    assert_equal(["reference_type_id", "reference_code"], ChildCpkTest.primary_keys)
+  end
+
+  def test_inherited_ids
+    cpk_test = ChildCpkTest.new
+    assert_equal([nil, nil], cpk_test.id)
+  end
+
+  def test_assign_ids
+    ref_code = ReferenceCode.new
+    assert_equal([nil, nil], ref_code.id)
+
+    ref_code.id = [2,1]
+    assert_equal([2,1], ref_code.id)
+  end
+end

data/test/test_nested_attributes.rb

@@ -1,67 +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
-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_update.rb

@@ -1,97 +1,97 @@
-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
+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