composite_primary_keys 12.0.2 → 12.0.10

data/test/test_find.rb

@@ -1,145 +1,164 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-# Testing the find action on composite ActiveRecords with two primary keys
-class TestFind < ActiveSupport::TestCase
-  fixtures :capitols, :departments, :reference_types, :reference_codes,
-    :suburbs, :employees
-
-  def test_find_first
-    ref_code = ReferenceCode.order('reference_type_id, reference_code').first
-    assert_kind_of(ReferenceCode, ref_code)
-    assert_equal([1,1], ref_code.id)
-  end
-
-  def test_find_last
-    ref_code = ReferenceCode.order('reference_type_id, reference_code').last
-    assert_kind_of(ReferenceCode, ref_code)
-    assert_equal([2,2], ref_code.id)
-  end
-
-  def test_find_one
-    ref_code = ReferenceCode.find([1,3])
-    assert_not_nil(ref_code)
-    assert_equal([1,3], ref_code.id)
-  end
-
-  def test_find_some
-    ref_codes = ReferenceCode.find([1,3], [2,1])
-    assert_kind_of(Array, ref_codes)
-    assert_equal(2, ref_codes.length)
-
-    ref_code = ref_codes[0]
-    assert_equal([1,3], ref_code.id)
-
-    ref_code = ref_codes[1]
-    assert_equal([2,1], ref_code.id)
-  end
-
-  def test_find_with_strings_as_composite_keys
-    capitol = Capitol.find(['The Netherlands', 'Amsterdam'])
-    assert_kind_of(Capitol, capitol)
-    assert_equal(['The Netherlands', 'Amsterdam'], capitol.id)
-  end
-
-  def test_find_with_strings_with_comma_as_composite_keys
-    capitol = Capitol.create!(country: 'The USA', city: 'Washington, D.C.')
-    assert_equal ['The USA', 'Washington, D.C.'], capitol.id
-
-    assert_equal capitol, Capitol.find(['The USA', 'Washington, D.C.'])
-    assert_equal capitol, Capitol.find(capitol.to_param)
-  end
-
-  def test_find_each
-    room_assignments = []
-    RoomAssignment.find_each(:batch_size => 2) do |assignment|
-      room_assignments << assignment
-    end
-
-    assert_equal(RoomAssignment.count, room_assignments.uniq.length)
-  end
-
-  def test_find_each_with_scope
-    scoped_departments = Department.where("department_id <> 3")
-    scoped_departments.find_each(:batch_size => 2) do |department|
-      assert department.id != 3
-    end
-  end
-
-  def test_not_found
-    error = assert_raise(::ActiveRecord::RecordNotFound) do
-      ReferenceCode.find(['999', '999'])
-    end
-
-    expected = "Couldn't find all ReferenceCodes with 'reference_type_id,reference_code': (999, 999) (found 0 results, but was looking for 1)."
-    assert_equal(with_quoted_identifiers(expected), error.message)
-  end
-
-  def test_find_last_suburb
-    suburb = Suburb.last
-    assert_equal([2,1], suburb.id)
-  end
-
-  def test_find_last_suburb_with_order
-    # Rails actually changes city_id DESC to city_id ASC
-    suburb = Suburb.order('suburbs.city_id DESC').last
-    assert_equal([1,1], suburb.id)
-  end
-
-  def test_find_in_batches
-    Department.find_in_batches do |batch|
-      assert_equal(Department.count, batch.size)
-    end
-  end
-
-  def test_in_batches_of_1
-    num_found = 0
-    Department.in_batches(of: 1) do |batch|
-      batch.each do |dept|
-        num_found += 1
-      end
-    end
-    assert_equal(Department.count, num_found)
-  end
-
-  def test_find_by_one_association
-    department = departments(:engineering)
-    employees = Employee.where(:department => department)
-    assert_equal(2, employees.to_a.count)
-  end
-
-  def test_find_by_all_associations
-    departments = Department.all
-    employees = Employee.where(:department => departments)
-    assert_equal(5, employees.to_a.count)
-  end
-
-  def test_expand_all
-    departments = Department.all
-    employees = Employee.where(:department => departments)
-    assert_equal(5, employees.count)
-  end
-
-  def test_find_one_with_params_id
-    params_id = ReferenceCode.find([1,3]).to_param
-    assert_equal params_id, "1,3"
-
-    ref_code = ReferenceCode.find(params_id)
-    assert_not_nil(ref_code)
-    assert_equal([1,3], ref_code.id)
-  end
-
-  def test_find_some_with_array_of_params_id
-    params_ids = ReferenceCode.find([1,3], [2,1]).map(&:to_param)
-    assert_equal ["1,3", "2,1"], params_ids
-
-    ref_codes = ReferenceCode.find(params_ids)
-    assert_kind_of(Array, ref_codes)
-    assert_equal(2, ref_codes.length)
-
-    ref_code = ref_codes[0]
-    assert_equal([1,3], ref_code.id)
-
-    ref_code = ref_codes[1]
-    assert_equal([2,1], ref_code.id)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+# Testing the find action on composite ActiveRecords with two primary keys
+class TestFind < ActiveSupport::TestCase
+  fixtures :capitols, :departments, :reference_types, :reference_codes,
+    :suburbs, :employees
+
+  def test_find_first
+    ref_code = ReferenceCode.order('reference_type_id, reference_code').first
+    assert_kind_of(ReferenceCode, ref_code)
+    assert_equal([1,1], ref_code.id)
+  end
+
+  def test_find_last
+    ref_code = ReferenceCode.order('reference_type_id, reference_code').last
+    assert_kind_of(ReferenceCode, ref_code)
+    assert_equal([2,2], ref_code.id)
+  end
+
+  def test_find_one
+    ref_code = ReferenceCode.find([1,3])
+    assert_not_nil(ref_code)
+    assert_equal([1,3], ref_code.id)
+  end
+
+  def test_find_some
+    ref_codes = ReferenceCode.find([1,3], [2,1])
+    assert_kind_of(Array, ref_codes)
+    assert_equal(2, ref_codes.length)
+
+    ref_code = ref_codes[0]
+    assert_equal([1,3], ref_code.id)
+
+    ref_code = ref_codes[1]
+    assert_equal([2,1], ref_code.id)
+  end
+
+  def test_find_with_strings_as_composite_keys
+    capitol = Capitol.find(['The Netherlands', 'Amsterdam'])
+    assert_kind_of(Capitol, capitol)
+    assert_equal(['The Netherlands', 'Amsterdam'], capitol.id)
+  end
+
+  def test_find_with_strings_with_comma_as_composite_keys
+    capitol = Capitol.create!(country: 'The USA', city: 'Washington, D.C.')
+    assert_equal ['The USA', 'Washington, D.C.'], capitol.id
+
+    assert_equal capitol, Capitol.find(['The USA', 'Washington, D.C.'])
+    assert_equal capitol, Capitol.find(capitol.to_param)
+  end
+
+  def test_find_each
+    room_assignments = []
+    RoomAssignment.find_each(:batch_size => 2) do |assignment|
+      room_assignments << assignment
+    end
+
+    assert_equal(RoomAssignment.count, room_assignments.uniq.length)
+  end
+
+  def test_find_each_with_scope
+    scoped_departments = Department.where("id <> 3")
+    scoped_departments.find_each(:batch_size => 2) do |department|
+      assert department.id != 3
+    end
+  end
+
+  def test_not_found
+    error = assert_raise(::ActiveRecord::RecordNotFound) do
+      ReferenceCode.find(['999', '999'])
+    end
+
+    expected = "Couldn't find all ReferenceCodes with 'reference_type_id,reference_code': (999, 999) (found 0 results, but was looking for 1)."
+    assert_equal(with_quoted_identifiers(expected), error.message)
+  end
+
+  def test_find_with_invalid_ids
+    assert_raise(::ActiveRecord::RecordNotFound) do
+      Suburb.find([-1, -1])
+    end
+  end
+
+  def test_find_with_no_ids
+    assert_raise(::ActiveRecord::RecordNotFound) do
+      Suburb.find
+    end
+  end
+
+  def test_find_last_suburb
+    suburb = Suburb.last
+    assert_equal([2,2], suburb.id)
+  end
+
+  def test_find_last_suburb_with_order
+    # Rails actually changes city_id DESC to city_id ASC
+    suburb = Suburb.order('suburbs.city_id DESC').last
+    assert_equal([1,1], suburb.id)
+  end
+
+  def test_find_in_batches
+    Department.find_in_batches do |batch|
+      assert_equal(Department.count, batch.size)
+    end
+  end
+
+  def test_in_batches_enumerator
+    enumerator = Department.in_batches
+    enumerator.each do |batch|
+      assert_equal(Department.count, batch.size)
+    end
+  end
+
+  def test_in_batches_of_1
+    num_found = 0
+    Department.in_batches(of: 1) do |batch|
+      batch.each do |dept|
+        num_found += 1
+      end
+    end
+    assert_equal(Department.count, num_found)
+  end
+
+  def test_find_by_one_association
+    department = departments(:engineering)
+    employees = Employee.where(:department => department)
+    assert_equal(2, employees.to_a.count)
+  end
+
+  def test_find_by_all_associations
+    departments = Department.all
+    employees = Employee.where(:department => departments)
+    assert_equal(5, employees.to_a.count)
+  end
+
+  def test_expand_all
+    departments = Department.all
+    employees = Employee.where(:department => departments)
+    assert_equal(5, employees.count)
+  end
+
+  def test_find_one_with_params_id
+    params_id = ReferenceCode.find([1,3]).to_param
+    assert_equal params_id, "1,3"
+
+    ref_code = ReferenceCode.find(params_id)
+    assert_not_nil(ref_code)
+    assert_equal([1,3], ref_code.id)
+  end
+
+  def test_find_some_with_array_of_params_id
+    params_ids = ReferenceCode.find([1,3], [2,1]).map(&:to_param)
+    assert_equal ["1,3", "2,1"], params_ids
+
+    ref_codes = ReferenceCode.find(params_ids)
+    assert_kind_of(Array, ref_codes)
+    assert_equal(2, ref_codes.length)
+
+    ref_code = ref_codes[0]
+    assert_equal([1,3], ref_code.id)
+
+    ref_code = ref_codes[1]
+    assert_equal([2,1], ref_code.id)
+  end
+end

data/test/test_habtm.rb

@@ -133,9 +133,9 @@ class TestHabtm < ActiveSupport::TestCase
 
     # reload to force reload of associations
     product_one = Product.find(1)
-    assert_equal 2, product_one.restaurants.size
+    assert_equal(2, product_one.restaurants.size)
 
     product_three = Product.find(3)
-    assert_equal 0, product_three.restaurants.size
+    assert_equal(0, product_three.restaurants.size)
   end
 end

data/test/test_ids.rb

@@ -1,116 +1,112 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class ChildCpkTest < ReferenceCode
-end
-
-class TestIds < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes, :pk_called_ids
-  
-  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'],
-    },
-    :pk_called_id => {
-      :class => PkCalledId,
-      :primary_keys => ['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