composite_primary_keys 4.0.0.beta1 → 4.0.0.beta2

data/History.txt

@@ -1,7 +1,17 @@
+== 4.0.0.beta2 Not released
+* ActiveRecord 3.1 RC4 compatibility.
+* Fix instantiation of CPK models with included associations
+
 == 4.0.0.beta1 2011-06-09
-* ActiveRecord 3.1 compatibility.  This required a significant rewrite due to
+* ActiveRecord 3.1 RC1 compatibility.  This required a significant rewrite due to
   all the changes in AR 3.1 versus 3.0.
 
+== 3.1.10 Not released
+* Bugfix for belongs_to with includes (John Ash)
+* Improved tests for calling clear on a habtm association, which involved (David Rueck)
+* Fixed bug that resulted in unrelated records being deleted when calling (David Rueck)
+
+
 == 3.1.9 2011-06-04
 * Improve HABTM association tests (David Rueck)
 * Remove deprecated Rake tasks (Charlie Savage)

data/lib/composite_primary_keys/associations/join_dependency.rb

@@ -0,0 +1,26 @@
+module ActiveRecord
+  module Associations
+    class JoinDependency
+      def instantiate(rows)
+        primary_key = join_base.aliased_primary_key
+        parents = {}
+
+        records = rows.map { |model|
+          # CPK
+          #primary_id = model[primary_key]
+          primary_id = if primary_key.kind_of?(Array)
+            primary_key.map {|key| model[key]}
+          else
+            model[primary_key]
+          end
+          parent = parents[primary_id] ||= join_base.instantiate(model)
+          construct(parent, @associations, join_associations, model)
+          parent
+        }.uniq
+
+        remove_duplicate_results!(active_record, records, @associations)
+        records
+      end
+    end
+  end
+end

data/lib/composite_primary_keys/version.rb

@@ -3,6 +3,6 @@ module CompositePrimaryKeys
     MAJOR = 4
     MINOR = 0
     TINY  = 0
-    STRING = [MAJOR, MINOR, TINY, 'beta1'].join('.')
+    STRING = [MAJOR, MINOR, TINY, 'beta2'].join('.')
   end
 end

data/lib/composite_primary_keys.rb

@@ -26,7 +26,7 @@ $:.unshift(File.dirname(__FILE__)) unless
 
 unless defined?(ActiveRecord)
   require 'rubygems'
-  gem 'activerecord', '=3.1.0.rc1'
+  gem 'activerecord', '=3.1.0.rc4'
   require 'active_record'
 end
 
@@ -39,6 +39,7 @@ require 'active_record/associations/association'
 require 'active_record/associations/association_scope'
 require 'active_record/associations/has_and_belongs_to_many_association'
 require 'active_record/associations/has_many_association'
+require 'active_record/associations/join_dependency'
 require 'active_record/associations/join_dependency/join_part'
 require 'active_record/associations/join_dependency/join_association'
 require 'active_record/associations/preloader/association'
@@ -72,6 +73,7 @@ require 'composite_primary_keys/associations/association'
 require 'composite_primary_keys/associations/association_scope'
 require 'composite_primary_keys/associations/has_and_belongs_to_many_association'
 require 'composite_primary_keys/associations/has_many_association'
+require 'composite_primary_keys/associations/join_dependency'
 require 'composite_primary_keys/associations/join_dependency/join_part'
 require 'composite_primary_keys/associations/join_dependency/join_association'
 require 'composite_primary_keys/associations/preloader/association'

data/test/fixtures/products.yml

@@ -4,4 +4,7 @@ first_product:
   
 second_product:
   id: 2
-  name: Product Two
+  name: Product Two
+third_product:
+  id: 3
+  name: Product Three

data/test/test_associations.rb

@@ -6,7 +6,7 @@ class TestAssociations < ActiveSupport::TestCase
            :departments, :memberships
   
   def test_count
-    assert_equal(2, Product.count(:include => :product_tariffs))
+    assert_equal(3, Product.count(:include => :product_tariffs))
     assert_equal(3, Tariff.count(:include => :product_tariffs))
 
     expected = {Date.today => 2,
@@ -45,12 +45,12 @@ class TestAssociations < ActiveSupport::TestCase
   def test_find_includes_products
     # Old style
     products = Product.find(:all, :include => :product_tariffs)
-    assert_equal(2, products.length)
+    assert_equal(3, products.length)
     assert_equal(3, products.inject(0) {|sum, product| sum + product.product_tariffs.length})
 
     # New style
     products = Product.includes(:product_tariffs)
-    assert_equal(2, products.length)
+    assert_equal(3, products.length)
     assert_equal(3, products.inject(0) {|sum, product| sum + product.product_tariffs.length})
   end
 
@@ -90,15 +90,20 @@ class TestAssociations < ActiveSupport::TestCase
 
   def test_has_many_through
     products = Product.find(:all, :include => :tariffs)
-    assert_equal(2, products.length)
+    assert_equal(3, products.length)
 
     tarrifs_length = products.inject(0) {|sum, product| sum + product.tariffs.length}
     assert_equal(3, tarrifs_length)
   end
 
+  def test_new_style_includes_with_conditions
+    product_tariff = ProductTariff.includes(:tariff).where('tariffs.amount < 5').first
+    assert_equal(0, product_tariff.tariff.amount)
+  end
+
   def test_find_product_includes
     products = Product.find(:all, :include => {:product_tariffs => :tariff})
-    assert_equal(2, products.length)
+    assert_equal(3, products.length)
 
     product_tariffs_length = products.inject(0) {|sum, product| sum + product.product_tariffs.length}
     assert_equal(3, product_tariffs_length)

data/test/test_habtm.rb

@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'ruby-debug'
 
 class TestHabtm < ActiveSupport::TestCase
 
@@ -26,6 +27,8 @@ class TestHabtm < ActiveSupport::TestCase
     subway.products << first_product << second_product
     assert_equal 2, subway.products.size
     subway.products.clear
+    # reload to force reload of associations
+    subway = restaurants(:subway_one)
     assert_equal 0, subway.products.size
   end
 
@@ -36,7 +39,36 @@ class TestHabtm < ActiveSupport::TestCase
     product.restaurants << subway_one << subway_two
     assert_equal 2, product.restaurants.size
     product.restaurants.clear
+    # reload to force reload of associations
+    product = products(:first_product)
     assert_equal 0, product.restaurants.size
   end
 
+  # tests case reported in issue #39 where a bug resulted in
+  # deletion of incorrect join table records because the owner's id
+  # was assumed to be an array and is not in this case
+  # and evaluates to a useable but incorrect value
+  def test_habtm_clear_cpk_association_side_only_deletes_only_correct_records
+    product_one = Product.find(1)
+    product_three = Product.find(3)
+    subway_one = restaurants(:subway_one)
+    subway_two = restaurants(:subway_two)
+    product_one.restaurants << subway_one << subway_two
+    product_three.restaurants << subway_one << subway_two
+    assert_equal 2, product_one.restaurants.size
+    assert_equal 2, product_three.restaurants.size
+
+    # if product_three's id is incorrectly assumed to be
+    # an array it will be evaluated as 3[0], which is 1, which would
+    # delete product_one's associations rather than product_three's
+    product_three.restaurants.clear
+    
+    # reload to force reload of associations
+    product_one = Product.find(1)
+    product_three = Product.find(3)
+    
+    assert_equal 0, product_three.restaurants.size
+    assert_equal 2, product_one.restaurants.size
+  end
+
 end

data/test/test_miscellaneous.rb

@@ -31,7 +31,7 @@ class TestMiscellaneous < ActiveSupport::TestCase
   end
   
   def test_count
-    assert_equal 2, Product.count
+    assert_equal 3, Product.count
   end
   
-end
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  hash: 62196257
+  hash: 62196263
   prerelease: 6
   segments: 
   - 4
   - 0
   - 0
   - beta
-  - 1
-  version: 4.0.0.beta1
+  - 2
+  version: 4.0.0.beta2
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -18,7 +18,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-06-09 00:00:00 Z
+date: 2011-06-21 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activerecord
@@ -28,14 +28,14 @@ dependencies:
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
-        hash: 15424103
+        hash: 15424109
         segments: 
         - 3
         - 1
         - 0
         - rc
-        - 1
-        version: 3.1.0.rc1
+        - 4
+        version: 3.1.0.rc4
   type: :runtime
   version_requirements: *id001
 description: Composite key support for ActiveRecord 3
@@ -61,6 +61,7 @@ files:
 - lib/composite_primary_keys/associations/has_many_association.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