composite_primary_keys 7.0.10 → 7.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: bc3c55fbf216f962790b277309e53b78e6359a09
-  data.tar.gz: 4c427b0fe5b5eb3d71f955dbc7f377ae04c3d1a8
+  metadata.gz: 4146bd7f227eed41c3dbfeb8cd6e397789839531
+  data.tar.gz: 523601026d76d779cc5b96e216fb04adb562c0a1
 SHA512:
-  metadata.gz: d29164453f49e2a09edcd699012ecc9264df1284875afaa3dba760a47ee9cdf4fa74c2d5792a2fec799006c03288df3f5aff48cd0d78d733275413ac0525598b
-  data.tar.gz: 91c39473f95f039f88a3094b75b884982263d2857fdf930c86a26a356972e43f0bf426b300cba6a7b67b26471b246b061eb70ba90f345924394ffac7cd98d163
+  metadata.gz: feb2446749e8f8872a7073a1ba9d6409071e963cf46ea84d7b3bf8abd922ec580320b99cb33459694d56d4d57d74568a9f13ddb9b2f6e2eda7eb7e9c12a6ef6c
+  data.tar.gz: b842f5f95e23cae95d0af45bb315355542f6601d9407f745db47ac7a15d8315ebcc5a52506e380395a69e45183183f5f8b6191014e5c980f5643b58ed99f2719

data/History.rdoc

@@ -1,3 +1,12 @@
+== 7.0.11 (2014-10-10)
+
+* ActiveRecord 4.1.6 support (Tom Hughes, Charlie Savage)
+* Verify MariaDB support and update docs (Isi Robayna)
+* Postgresql binary column support (Piotr Gębala)
+* Fix deleting of records from collection association (akeuk and Charlie Savage)
+* Fix invalid include (shiro16)
+* Improve tests (Yann Marquet)
+
 == 7.0.10 (2014-08-07)
 
 * Update attribute dirty methods to allow attribute *_was
@@ -69,6 +78,9 @@ The first one no longer works.  It was removed because it made the internal code
 and makes the intention of the code clearer (especially when finding multiple records).
 If this change causes too much pain then please submit a ticket on Github.
 
+== 6.0.7 (2014-10-06)
+
+* Support Rails 4.0.6 (Tom Hughes)
 
 == 6.0.6 (2014-05-26)
 

data/lib/composite_primary_keys.rb

@@ -26,13 +26,10 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '~>4.1.4'
+  gem 'activerecord', '~>4.1.6'
   require 'active_record'
 end
 
-# AM files we override
-require 'active_model/dirty'
-
 # AR files we override
 require 'active_record/counter_cache'
 require 'active_record/fixtures'
@@ -51,9 +48,7 @@ require 'active_record/associations/join_dependency/join_association'
 require 'active_record/associations/preloader/association'
 require 'active_record/associations/preloader/belongs_to'
 
-
-require 'active_model/dirty'
-
+require 'active_record/attribute_methods/primary_key'
 require 'active_record/attribute_methods/dirty'
 require 'active_record/attribute_methods/read'
 require 'active_record/attribute_methods/write'
@@ -70,7 +65,6 @@ require 'active_record/relation/query_methods'
 require 'active_record/validations/uniqueness'
 
 # CPK files
-require 'composite_primary_keys/active_model/dirty'
 require 'composite_primary_keys/persistence'
 require 'composite_primary_keys/base'
 require 'composite_primary_keys/core'
@@ -94,6 +88,7 @@ require 'composite_primary_keys/associations/preloader/belongs_to'
 
 require 'composite_primary_keys/dirty'
 
+require 'composite_primary_keys/attribute_methods/primary_key'
 require 'composite_primary_keys/attribute_methods/dirty'
 require 'composite_primary_keys/attribute_methods/read'
 require 'composite_primary_keys/attribute_methods/write'

data/lib/composite_primary_keys/associations/has_many_association.rb

@@ -11,7 +11,6 @@ module ActiveRecord
           else
             # CPK
             # scope = self.scope.where(reflection.klass.primary_key => records)
-            # scope = self.scope.where(reflection.klass.primary_key => records)
             table = Arel::Table.new(reflection.table_name)
             and_conditions = records.map do |record|
               eq_conditions = Array(reflection.association_primary_key).map do |name|
@@ -31,7 +30,13 @@ module ActiveRecord
           if method == :delete_all
             update_counter(-scope.delete_all)
           else
-            update_counter(-scope.update_all(reflection.foreign_key => nil))
+            # CPK
+            # update_counter(-scope.update_all(reflection.foreign_key => nil))
+            update_hash = Array(reflection.foreign_key).inject(Hash.new) do |hash, key|
+              hash[key] = nil
+              hash
+            end
+            update_counter(-scope.update_all(update_hash))
           end
         end
       end

data/lib/composite_primary_keys/attribute_methods/primary_key.rb

@@ -0,0 +1,21 @@
+module ActiveRecord
+  module AttributeMethods
+    module PrimaryKey
+      # Returns the primary key previous value.
+      def id_was
+        sync_with_transaction_state
+        # CPK
+        #attribute_was(self.class.primary_key)
+
+        if self.composite?
+          self.class.primary_keys.map do |key_attr|
+            attribute_changed?(key_attr) ? changed_attributes[key_attr] : self.ids_hash[key_attr]
+          end
+        else
+          attribute_was(self.class.primary_key)
+        end
+
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/attribute_methods/write.rb

@@ -2,6 +2,7 @@ module ActiveRecord
   module AttributeMethods
     module Write
       def write_attribute_with_type_cast(attr_name, value, type_cast_method)
+        # CPK
         if attr_name.kind_of?(Array)
           value = [nil]*attr_name.length if value.nil?
           unless value.length == attr_name.length

data/lib/composite_primary_keys/relation.rb

@@ -21,17 +21,21 @@ module ActiveRecord
         include CompositePrimaryKeys::ActiveRecord::QueryMethods
 
         def delete(id_or_array)
-          # Without CPK:
-          # where(primary_key => id_or_array).delete_all
+          # CPK
+          if self.composite?
+            id_or_array = if id_or_array.is_a?(CompositePrimaryKeys::CompositeKeys)
+                            [id_or_array]
+                          else
+                            Array(id_or_array)
+                          end
 
-          id_or_array = if id_or_array.kind_of?(CompositePrimaryKeys::CompositeKeys)
-            [id_or_array]
+            id_or_array.each do |id|
+              # Is the passed in id actually a record?
+              id = id.kind_of?(ActiveRecord::Base) ? id.id : id
+              where(cpk_id_predicate(table, self.primary_key, id)).delete_all
+            end
           else
-            Array(id_or_array)
-          end
-
-          id_or_array.each do |id|
-            where(cpk_id_predicate(table, self.primary_key, id)).delete_all
+            where(primary_key => id_or_array).delete_all
           end
         end
 

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION
     MAJOR = 7
     MINOR = 0
-    TINY  = 10
+    TINY  = 11
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/test_delete.rb

@@ -19,57 +19,57 @@ class TestDelete < ActiveSupport::TestCase
     self.class.classes = CLASSES
   end
   
-#  def test_destroy_one
-#    testing_with do
-#      assert @first.destroy
-#    end
-#  end
-#
-#  def test_destroy_one_alone_via_class
-#    testing_with do
-#      assert @klass.destroy(@first.id)
-#    end
-#  end
-#
-#  def test_delete_one_alone
-#    testing_with do
-#      assert @klass.delete(@first.id)
-#    end
-#  end
-#
-#  def test_delete_many
-#    testing_with do
-#      to_delete = @klass.find(:all)[0..1]
-#      assert_equal 2, to_delete.length
-#    end
-#  end
-#
-#  def test_delete_all
-#    testing_with do
-#      @klass.delete_all
-#    end
-#  end
-#
-#  def test_clear_association
-#    department = Department.find(1,1)
-#    assert_equal(2, department.employees.size, "Before clear employee count should be 2.")
-#
-#    department.employees.clear
-#    assert_equal(0, department.employees.size, "After clear employee count should be 0.")
-#
-#    department.reload
-#    assert_equal(0, department.employees.size, "After clear and a reload from DB employee count should be 0.")
-#  end
-#
-#  def test_delete_association
-#    department = Department.find(1,1)
-#    assert_equal 2, department.employees.size , "Before delete employee count should be 2."
-#    first_employee = department.employees[0]
-#    department.employees.delete(first_employee)
-#    assert_equal 1, department.employees.size, "After delete employee count should be 1."
-#    department.reload
-#    assert_equal 1, department.employees.size, "After delete and a reload from DB employee count should be 1."
-#  end
+  def test_destroy_one
+    testing_with do
+     assert @first.destroy
+    end
+  end
+
+  def test_destroy_one_alone_via_class
+    testing_with do
+      assert @klass.destroy(@first.id)
+    end
+  end
+
+  def test_delete_one_alone
+    testing_with do
+      assert @klass.delete(@first.id)
+    end
+  end
+
+  def test_delete_many
+    testing_with do
+      to_delete = @klass.limit(2)
+      assert_equal 2, to_delete.length
+    end
+  end
+
+  def test_delete_all
+    testing_with do
+      @klass.delete_all
+    end
+  end
+
+  def test_clear_association
+    department = Department.find([1,1])
+    assert_equal(2, department.employees.size, "Before clear employee count should be 2.")
+
+    department.employees.clear
+    assert_equal(0, department.employees.size, "After clear employee count should be 0.")
+
+    department.reload
+    assert_equal(0, department.employees.size, "After clear and a reload from DB employee count should be 0.")
+  end
+
+  def test_delete_association
+    department = Department.find([1,1])
+    assert_equal 2, department.employees.size , "Before delete employee count should be 2."
+    first_employee = department.employees[0]
+    department.employees.delete(first_employee)
+    assert_equal 1, department.employees.size, "After delete employee count should be 1."
+    department.reload
+    assert_equal 1, department.employees.size, "After delete and a reload from DB employee count should be 1."
+  end
 
   def test_destroy_has_one
     # In this case the association is a has_one with
@@ -88,7 +88,7 @@ class TestDelete < ActiveSupport::TestCase
       Employee.find(head_id)
     end
   end
-  
+
   def test_destroy_has_and_belongs_to_many_on_non_cpk
     steve = employees(:steve)
     records_before = ActiveRecord::Base.connection.execute("select * from employees_groups").count
@@ -102,47 +102,47 @@ class TestDelete < ActiveSupport::TestCase
     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
-#    product = Product.find(1)
-#    assert_equal(2, product.product_tariffs.length)
-#
-#    # Get product_tariff length
-#    product_tariff_size = ProductTariff.count
-#
-#    # Delete product - should delete 2 product tariffs
-#    product.destroy
-#
-#    # Verify product_tariff are deleted
-#    assert_equal(product_tariff_size - 2, ProductTariff.count)
-#  end
-#
-#  def test_delete_cpk_association
-#    product = Product.find(1)
-#    assert_equal(2, product.product_tariffs.length)
-#
-#    product_tariff = product.product_tariffs.first
-#    product.product_tariffs.delete(product_tariff)
-#
-#    product.reload
-#    assert_equal(1, product.product_tariffs.length)
-#  end
-#
-#  def test_delete_records_for_has_many_association_with_composite_primary_key
-#    reference_type  = ReferenceType.find(1)
-#    codes_to_delete = reference_type.reference_codes[0..1]
-#    assert_equal(3, reference_type.reference_codes.size, "Before deleting records reference_code count should be 3.")
-#
-#    reference_type.reference_codes.delete(codes_to_delete)
-#    reference_type.reload
-#    assert_equal(1, reference_type.reference_codes.size, "After deleting 2 records and a reload from DB reference_code count should be 1.")
-#  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
+    product = Product.find(1)
+    assert_equal(2, product.product_tariffs.length)
+
+    # Get product_tariff length
+    product_tariff_size = ProductTariff.count
+
+    # Delete product - should delete 2 product tariffs
+    product.destroy
+
+    # Verify product_tariff are deleted
+    assert_equal(product_tariff_size - 2, ProductTariff.count)
+  end
+
+  def test_delete_cpk_association
+    product = Product.find(1)
+    assert_equal(2, product.product_tariffs.length)
+
+    product_tariff = product.product_tariffs.first
+    product.product_tariffs.delete(product_tariff)
+
+    product.reload
+    assert_equal(1, product.product_tariffs.length)
+  end
+
+  def test_delete_records_for_has_many_association_with_composite_primary_key
+    reference_type  = ReferenceType.find(1)
+    codes_to_delete = reference_type.reference_codes[0..1]
+    assert_equal(3, reference_type.reference_codes.size, "Before deleting records reference_code count should be 3.")
+
+    reference_type.reference_codes.delete(codes_to_delete)
+    reference_type.reload
+    assert_equal(1, reference_type.reference_codes.size, "After deleting 2 records and a reload from DB reference_code count should be 1.")
+  end
 end

metadata

@@ -1,29 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: composite_primary_keys
 version: !ruby/object:Gem::Version
-  version: 7.0.10
+  version: 7.0.11
 platform: ruby
 authors:
 - Charlie Savage
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-08-07 00:00:00.000000000 Z
+date: 2014-10-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.4
+        version: 4.1.6
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.4
+        version: 4.1.6
 description: Composite key support for ActiveRecord
 email: 
 executables: []
@@ -37,7 +37,6 @@ files:
 - init.rb
 - install.rb
 - lib/composite_primary_keys.rb
-- lib/composite_primary_keys/active_model/dirty.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
@@ -50,6 +49,7 @@ files:
 - lib/composite_primary_keys/associations/preloader/belongs_to.rb
 - lib/composite_primary_keys/associations/preloader/has_and_belongs_to_many.rb
 - lib/composite_primary_keys/attribute_methods/dirty.rb
+- 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/base.rb

data/lib/composite_primary_keys/active_model/dirty.rb

@@ -1,14 +0,0 @@
-module ActiveModel
-  module Dirty
-    def attribute_was(attr)
-      # CPK
-      if self.composite? && attr == "id"
-        self.class.primary_keys.map do |key_attr|
-          attribute_changed?(key_attr) ? changed_attributes[key_attr] : self.ids_hash[key_attr]
-        end
-      else
-        attribute_changed?(attr) ? changed_attributes[attr] : __send__(attr)
-      end
-    end
-  end
-end