composite_primary_keys 10.0.3 → 10.0.4

data/test/test_counter_cache.rb

@@ -1,31 +1,31 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestCalculations < ActiveSupport::TestCase
-  fixtures :tariffs
-
-  def test_update_counter
-    tariff = tariffs(:flat)
-    assert_equal(50, tariff.amount)
-    Tariff.update_counters(tariff.id, :amount => 1)
-    tariff.reload
-    assert_equal(51, tariff.amount)
-  end
-
-  def test_increment_counter
-    tariff = tariffs(:flat)
-    assert_equal(50, tariff.amount)
-    Tariff.increment_counter(:amount, tariff.id)
-
-    tariff.reload
-    assert_equal(51, tariff.amount)
-  end
-
-  def test_decrement_counter
-    tariff = tariffs(:flat)
-    assert_equal(50, tariff.amount)
-    Tariff.decrement_counter(:amount, tariff.id)
-
-    tariff.reload
-    assert_equal(49, tariff.amount)
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestCalculations < ActiveSupport::TestCase
+  fixtures :tariffs
+
+  def test_update_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.update_counters(tariff.id, :amount => 1)
+    tariff.reload
+    assert_equal(51, tariff.amount)
+  end
+
+  def test_increment_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.increment_counter(:amount, tariff.id)
+
+    tariff.reload
+    assert_equal(51, tariff.amount)
+  end
+
+  def test_decrement_counter
+    tariff = tariffs(:flat)
+    assert_equal(50, tariff.amount)
+    Tariff.decrement_counter(:amount, tariff.id)
+
+    tariff.reload
+    assert_equal(49, tariff.amount)
+  end
 end

data/test/test_dup.rb

@@ -1,38 +1,38 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestClone < 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],
-    },
-  }
-  
-  def setup
-    self.class.classes = CLASSES
-  end
-  
-  def test_dup
-    testing_with do
-      clone = @first.dup
-      
-      remove_keys = Array(@klass.primary_key).map(&:to_s)
-      remove_keys << Array(@klass.primary_key) # Rails 4 adds the PK to the attributes, so we want to remove it as well
-      assert_equal(@first.attributes.except(*remove_keys), clone.attributes.except(*remove_keys))
-
-      if composite?
-        @klass.primary_key.each do |key|
-          assert_nil(clone[key], "Primary key '#{key}' should be nil")
-        end
-      else
-        assert_nil(clone[@klass.primary_key], "Sole primary key should be nil")
-      end
-    end
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestClone < 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],
+    },
+  }
+  
+  def setup
+    self.class.classes = CLASSES
+  end
+  
+  def test_dup
+    testing_with do
+      clone = @first.dup
+      
+      remove_keys = Array(@klass.primary_key).map(&:to_s)
+      remove_keys << Array(@klass.primary_key) # Rails 4 adds the PK to the attributes, so we want to remove it as well
+      assert_equal(@first.attributes.except(*remove_keys), clone.attributes.except(*remove_keys))
+
+      if composite?
+        @klass.primary_key.each do |key|
+          assert_nil(clone[key], "Primary key '#{key}' should be nil")
+        end
+      else
+        assert_nil(clone[@klass.primary_key], "Sole primary key should be nil")
+      end
+    end
+  end
 end

data/test/test_exists.rb

@@ -1,40 +1,40 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestExists < ActiveSupport::TestCase
-  fixtures :articles, :departments, :capitols
-  
-  def test_id
-    assert(Article.exists?(1))
-    assert(!Article.exists?(-1))
-  end
-
-  def test_array
-    assert(Article.exists?(['name = ?', 'Article One']))
-    assert(!Article.exists?(['name = ?', 'Article -1']))
-  end
-
-  def test_hash
-    assert(Article.exists?('name' => 'Article One'))
-    assert(!Article.exists?('name' => 'Article -1'))
-  end
-
-  def test_cpk_id
-    assert(Department.exists?(CompositePrimaryKeys::CompositeKeys.new([1,1])))
-    assert(!Department.exists?(CompositePrimaryKeys::CompositeKeys.new([1,-1])))
-  end
-
-  def test_cpk_array_id
-    assert(Department.exists?([1,1]))
-    assert(!Department.exists?([1,-1]))
-  end
-
-  def test_cpk_array_condition
-    assert(Department.exists?(['department_id = ? and location_id = ?', 1, 1]))
-    assert(!Department.exists?(['department_id = ? and location_id = ?', 1, -1]))
-  end
-
-  def test_cpk_array_string_id
-    assert(Capitol.exists?(['The Netherlands', 'Amsterdam']))
-    assert(!Capitol.exists?(['The Netherlands', 'Paris']))
-  end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestExists < ActiveSupport::TestCase
+  fixtures :articles, :departments, :capitols
+  
+  def test_id
+    assert(Article.exists?(1))
+    assert(!Article.exists?(-1))
+  end
+
+  def test_array
+    assert(Article.exists?(['name = ?', 'Article One']))
+    assert(!Article.exists?(['name = ?', 'Article -1']))
+  end
+
+  def test_hash
+    assert(Article.exists?('name' => 'Article One'))
+    assert(!Article.exists?('name' => 'Article -1'))
+  end
+
+  def test_cpk_id
+    assert(Department.exists?(CompositePrimaryKeys::CompositeKeys.new([1,1])))
+    assert(!Department.exists?(CompositePrimaryKeys::CompositeKeys.new([1,-1])))
+  end
+
+  def test_cpk_array_id
+    assert(Department.exists?([1,1]))
+    assert(!Department.exists?([1,-1]))
+  end
+
+  def test_cpk_array_condition
+    assert(Department.exists?(['department_id = ? and location_id = ?', 1, 1]))
+    assert(!Department.exists?(['department_id = ? and location_id = ?', 1, -1]))
+  end
+
+  def test_cpk_array_string_id
+    assert(Capitol.exists?(['The Netherlands', 'Amsterdam']))
+    assert(!Capitol.exists?(['The Netherlands', 'Paris']))
+  end
 end

data/test/test_miscellaneous.rb

@@ -1,32 +1,32 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestMiscellaneous < ActiveSupport::TestCase
-  fixtures :reference_types, :reference_codes, :products
-  
-  CLASSES = {
-    :single => {
-      :class => ReferenceType,
-      :primary_keys => :reference_type_id,
-    },
-    :dual   => { 
-      :class => ReferenceCode,
-      :primary_keys => [:reference_type_id, :reference_code],
-    },
-  }
-  
-  def setup
-    self.class.classes = CLASSES
-  end
-
-  def test_composite_class
-    testing_with do
-      assert_equal composite?, @klass.composite?
-    end
-  end
-
-  def test_composite_instance
-    testing_with do
-      assert_equal composite?, @first.composite?
-    end
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestMiscellaneous < ActiveSupport::TestCase
+  fixtures :reference_types, :reference_codes, :products
+  
+  CLASSES = {
+    :single => {
+      :class => ReferenceType,
+      :primary_keys => :reference_type_id,
+    },
+    :dual   => { 
+      :class => ReferenceCode,
+      :primary_keys => [:reference_type_id, :reference_code],
+    },
+  }
+  
+  def setup
+    self.class.classes = CLASSES
+  end
+
+  def test_composite_class
+    testing_with do
+      assert_equal composite?, @klass.composite?
+    end
+  end
+
+  def test_composite_instance
+    testing_with do
+      assert_equal composite?, @first.composite?
+    end
+  end
+end

data/test/test_pagination.rb

@@ -1,36 +1,36 @@
-#require File.expand_path('../abstract_unit', __FILE__)
-#require 'plugins/pagination'
-#
-#class TestPagination < ActiveSupport::TestCase
-#  fixtures :reference_types, :reference_codes
-#
-#  include ActionController::Pagination
-#  DEFAULT_PAGE_SIZE = 2
-#
-#  attr_accessor :params
-#
-#  CLASSES = {
-#    :single => {
-#      :class => ReferenceType,
-#      :primary_keys => :reference_type_id,
-#      :table => :reference_types,
-#    },
-#    :dual   => {
-#      :class => ReferenceCode,
-#      :primary_keys => [:reference_type_id, :reference_code],
-#      :table => :reference_codes,
-#    },
-#  }
-#
-#  def setup
-#    self.class.classes = CLASSES
-#    @params = {}
-#  end
-#
-#  def test_paginate_all
-#    testing_with do
-#      @object_pages, @objects = paginate @klass_info[:table], :per_page => DEFAULT_PAGE_SIZE
-#      assert_equal 2, @objects.length, "Each page should have #{DEFAULT_PAGE_SIZE} items"
-#    end
-#  end
+#require File.expand_path('../abstract_unit', __FILE__)
+#require 'plugins/pagination'
+#
+#class TestPagination < ActiveSupport::TestCase
+#  fixtures :reference_types, :reference_codes
+#
+#  include ActionController::Pagination
+#  DEFAULT_PAGE_SIZE = 2
+#
+#  attr_accessor :params
+#
+#  CLASSES = {
+#    :single => {
+#      :class => ReferenceType,
+#      :primary_keys => :reference_type_id,
+#      :table => :reference_types,
+#    },
+#    :dual   => {
+#      :class => ReferenceCode,
+#      :primary_keys => [:reference_type_id, :reference_code],
+#      :table => :reference_codes,
+#    },
+#  }
+#
+#  def setup
+#    self.class.classes = CLASSES
+#    @params = {}
+#  end
+#
+#  def test_paginate_all
+#    testing_with do
+#      @object_pages, @objects = paginate @klass_info[:table], :per_page => DEFAULT_PAGE_SIZE
+#      assert_equal 2, @objects.length, "Each page should have #{DEFAULT_PAGE_SIZE} items"
+#    end
+#  end
 #end

data/test/test_preload.rb

@@ -91,4 +91,11 @@ class TestPreload < ActiveSupport::TestCase
     assert_equal(1, employees.first.groups_2.size)
     assert_equal(2, employees.second.groups_2.size)
   end
+
+  def test_preload_settings_inversion
+    users = User.preload(:readings).all
+    reading = users.first.readings.first
+
+    assert_equal(true, reading.association(:user).loaded?)
+  end
 end

data/test/test_validations.rb

@@ -1,13 +1,13 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestValidations < ActiveSupport::TestCase
-  fixtures :students, :dorms, :rooms, :room_assignments
-
-  def test_uniqueness_validation_persisted
-    room_assignment = RoomAssignment.find([1, 1, 1])
-    assert(room_assignment.valid?)
-
-    room_assignment = RoomAssignment.new(:student_id => 1, :dorm_id => 1, :room_id => 2)
-    assert(!room_assignment.valid?)
-  end
-end
+require File.expand_path('../abstract_unit', __FILE__)
+
+class TestValidations < ActiveSupport::TestCase
+  fixtures :students, :dorms, :rooms, :room_assignments
+
+  def test_uniqueness_validation_persisted
+    room_assignment = RoomAssignment.find([1, 1, 1])
+    assert(room_assignment.valid?)
+
+    room_assignment = RoomAssignment.new(:student_id => 1, :dorm_id => 1, :room_id => 2)
+    assert(!room_assignment.valid?)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 10.0.3
+  version: 10.0.4
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-02-25 00:00:00.000000000 Z
+date: 2018-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -19,7 +19,7 @@ dependencies:
         version: 5.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.5
+        version: 5.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: 5.1.0
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.5
+        version: 5.1.6
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -112,7 +112,6 @@ files:
 - lib/composite_primary_keys/attribute_methods/primary_key.rb
 - lib/composite_primary_keys/attribute_methods/read.rb
 - lib/composite_primary_keys/attribute_methods/write.rb
-- lib/composite_primary_keys/attribute_set/builder.rb
 - lib/composite_primary_keys/autosave_association.rb
 - lib/composite_primary_keys/base.rb
 - lib/composite_primary_keys/composite_arrays.rb
@@ -279,7 +278,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.3
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord