composite_primary_keys 5.0.14 → 6.0.0

data/test/test_attributes.rb

@@ -36,6 +36,7 @@ class TestAttributes < ActiveSupport::TestCase
   def test_brackets_assignment
     testing_with do
       @first.attributes.each_pair do |attr_name, value|
+        next if attr_name == @first.class.primary_key
         @first[attr_name]= !value.nil? ? value * 2 : '1'
         assert_equal !value.nil? ? value * 2 : '1', @first[attr_name]
       end

data/test/test_calculations.rb

@@ -32,7 +32,7 @@ class TestCalculations < ActiveSupport::TestCase
   end
 
   def test_count_includes_dup_columns
-    count = Tariff.includes(:product_tariffs).where("product_tariffs.tariff_id = ?", 2).count
+    count = Tariff.includes(:product_tariffs).references(:product_tariffs).where("product_tariffs.tariff_id = ?", 2).count
     assert_equal(1, count)
   end
 end

data/test/test_delete.rb

@@ -97,6 +97,18 @@ class TestDelete < ActiveSupport::TestCase
     assert_equal records_after, records_before - steve.groups.count
   end
 
+  def test_delete_not_destroy_on_cpk
+    tariff = Tariff.where(tariff_id: 2).first
+    tariff.delete
+    assert !tariff.persisted?
+  end
+  
+  def test_delete_not_destroy_on_non_cpk
+    article = Article.first
+    article.delete
+    assert !article.persisted?
+  end
+
 #  def test_destroy_has_many_delete_all
 #    # In this case the association is a has_many composite key with
 #    # dependent set to :delete_all

data/test/test_dup.rb

@@ -22,8 +22,9 @@ class TestClone < ActiveSupport::TestCase
     testing_with do
       clone = @first.dup
       
-      remove_keys = Array(@klass.primary_key).map &:to_s
-      assert_equal(@first.attributes.except(*remove_keys), clone.attributes)
+      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|

data/test/test_suite.rb

@@ -1,5 +1,3 @@
-require 'test/unit'
-
 %w(
   test_associations
   test_attribute_methods

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 5.0.14
+  version: 6.0.0
 platform: ruby
 authors:
 - Dr Nic Williams
@@ -9,48 +9,42 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-03-16 00:00:00.000000000 Z
+date: 2013-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.9
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 3.2.9
-    - - "~>"
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.2.0
+        version: 4.0.0
 description: Composite key support for ActiveRecord
 email: 
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Rakefile
 - History.rdoc
 - README.rdoc
 - README_DB2.rdoc
-- Rakefile
 - init.rb
 - install.rb
-- lib/composite_primary_keys.rb
+- loader.rb
 - lib/composite_primary_keys/associations/association.rb
 - lib/composite_primary_keys/associations/association_scope.rb
 - lib/composite_primary_keys/associations/has_and_belongs_to_many_association.rb
 - lib/composite_primary_keys/associations/has_many_association.rb
-- lib/composite_primary_keys/associations/join_dependency.rb
 - lib/composite_primary_keys/associations/join_dependency/join_association.rb
 - lib/composite_primary_keys/associations/join_dependency/join_part.rb
+- lib/composite_primary_keys/associations/join_dependency.rb
 - lib/composite_primary_keys/associations/preloader/association.rb
 - lib/composite_primary_keys/associations/preloader/belongs_to.rb
 - lib/composite_primary_keys/associations/preloader/has_and_belongs_to_many.rb
@@ -63,20 +57,20 @@ files:
 - lib/composite_primary_keys/connection_adapters/abstract/connection_specification_changes.rb
 - lib/composite_primary_keys/connection_adapters/abstract_adapter.rb
 - lib/composite_primary_keys/connection_adapters/postgresql_adapter.rb
-- lib/composite_primary_keys/counter_cache.rb
+- lib/composite_primary_keys/core.rb
 - lib/composite_primary_keys/dirty.rb
 - lib/composite_primary_keys/fixtures.rb
 - lib/composite_primary_keys/nested_attributes.rb
 - lib/composite_primary_keys/persistence.rb
-- lib/composite_primary_keys/relation.rb
 - lib/composite_primary_keys/relation/batches.rb
 - lib/composite_primary_keys/relation/calculations.rb
 - lib/composite_primary_keys/relation/finder_methods.rb
 - lib/composite_primary_keys/relation/query_methods.rb
+- lib/composite_primary_keys/relation.rb
 - lib/composite_primary_keys/sanitization.rb
 - lib/composite_primary_keys/validations/uniqueness.rb
 - lib/composite_primary_keys/version.rb
-- loader.rb
+- lib/composite_primary_keys.rb
 - scripts/console.rb
 - scripts/txt2html
 - scripts/txt2js
@@ -86,7 +80,6 @@ files:
 - tasks/databases/sqlite3.rake
 - tasks/databases/sqlserver.rake
 - tasks/website.rake
-- test/README_tests.rdoc
 - test/abstract_unit.rb
 - test/connections/connection_spec.rb
 - test/connections/databases.example.yml
@@ -99,6 +92,7 @@ files:
 - test/connections/native_sqlite3/connection.rb
 - test/connections/native_sqlserver/connection.rb
 - test/db_test.rb
+- test/debug.log
 - test/fixtures/article.rb
 - test/fixtures/articles.yml
 - test/fixtures/capitol.rb
@@ -120,20 +114,18 @@ files:
 - test/fixtures/dorms.yml
 - test/fixtures/employee.rb
 - test/fixtures/employees.yml
-- test/fixtures/employees_group.rb
-- test/fixtures/employees_groups.yml
 - test/fixtures/group.rb
 - test/fixtures/groups.yml
 - test/fixtures/hack.rb
 - test/fixtures/hacks.yml
 - test/fixtures/membership.rb
+- test/fixtures/memberships.yml
 - test/fixtures/membership_status.rb
 - test/fixtures/membership_statuses.yml
-- test/fixtures/memberships.yml
 - test/fixtures/product.rb
+- test/fixtures/products.yml
 - test/fixtures/product_tariff.rb
 - test/fixtures/product_tariffs.yml
-- test/fixtures/products.yml
 - test/fixtures/reading.rb
 - test/fixtures/readings.yml
 - test/fixtures/reference_code.rb
@@ -144,13 +136,13 @@ files:
 - test/fixtures/restaurants.yml
 - test/fixtures/restaurants_suburbs.yml
 - test/fixtures/room.rb
+- test/fixtures/rooms.yml
 - test/fixtures/room_assignment.rb
 - test/fixtures/room_assignments.yml
 - test/fixtures/room_attribute.rb
+- test/fixtures/room_attributes.yml
 - test/fixtures/room_attribute_assignment.rb
 - 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
@@ -165,16 +157,16 @@ files:
 - test/fixtures/users.yml
 - test/plugins/pagination.rb
 - test/plugins/pagination_helper.rb
+- test/README_tests.rdoc
 - test/setup.rb
 - test/test_associations.rb
-- test/test_attribute_methods.rb
 - test/test_attributes.rb
+- test/test_attribute_methods.rb
 - test/test_calculations.rb
 - test/test_composite_arrays.rb
 - test/test_counter_cache.rb
 - test/test_create.rb
 - test/test_delete.rb
-- test/test_delete_without_pk.rb
 - test/test_dup.rb
 - test/test_equal.rb
 - test/test_exists.rb
@@ -201,23 +193,24 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
-      version: 1.8.7
+      version: 1.9.3
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: compositekeys
-rubygems_version: 2.2.2
+rubygems_version: 2.0.6
 signing_key: 
 specification_version: 4
 summary: Composite key support for ActiveRecord
 test_files:
 - test/abstract_unit.rb
 - test/db_test.rb
+- test/debug.log
 - test/README_tests.rdoc
 - test/setup.rb
 - test/test_associations.rb
@@ -228,7 +221,6 @@ test_files:
 - test/test_counter_cache.rb
 - test/test_create.rb
 - test/test_delete.rb
-- test/test_delete_without_pk.rb
 - test/test_dup.rb
 - test/test_equal.rb
 - test/test_exists.rb

data/lib/composite_primary_keys/counter_cache.rb

@@ -1,22 +0,0 @@
-module ActiveRecord
-  module CounterCache
-    def update_counters(id, counters)
-      updates = counters.map do |counter_name, value|
-        operator = value < 0 ? '-' : '+'
-        quoted_column = connection.quote_column_name(counter_name)
-        "#{quoted_column} = COALESCE(#{quoted_column}, 0) #{operator} #{value.abs}"
-      end
-
-      IdentityMap.remove_by_id(symbolized_base_class, id) if IdentityMap.enabled?
-
-      # CPK
-      # update_all(updates.join(', '), primary_key => id )
-      primary_key_predicate = relation.cpk_id_predicate(self.arel_table, Array(self.primary_key), Array(id))
-      update_all(updates.join(', '), primary_key_predicate)
-    end
-
-    def decrement_counter(counter_name, id)
-      update_counters(id, counter_name => -1)
-    end
-  end
-end

data/test/fixtures/employees_group.rb

@@ -1,2 +0,0 @@
-class EmployeesGroup < ActiveRecord::Base
-end

data/test/fixtures/employees_groups.yml

@@ -1,15 +0,0 @@
-assn1:
-  employee_id: 1
-  group_id: 1
-
-assn2:
-  employee_id: 1
-  group_id: 2
-  
-assn3:
-  employee_id: 2
-  group_id: 1
-  
-assn4:
-  employee_id: 2
-  group_id: 2

data/test/test_delete_without_pk.rb

@@ -1,20 +0,0 @@
-require File.expand_path('../abstract_unit', __FILE__)
-
-class TestDeleteWithoutPK < ActiveSupport::TestCase
-
-  # can't load fixtures because other test dependencies
-  setup do
-    EmployeesGroup.create(employee_id: 1, group_id: 1)
-    EmployeesGroup.create(employee_id: 1, group_id: 2)
-    EmployeesGroup.create(employee_id: 2, group_id: 1)
-    EmployeesGroup.create(employee_id: 2, group_id: 1)
-  end
-
-  def test_destroy_without_primary_key
-    employees_group = EmployeesGroup.first
-    assert_raise(ActiveRecord::CompositeKeyError) do
-      employees_group.destroy
-    end
-    assert_equal 4, EmployeesGroup.count
-  end
-end