composite_primary_keys 1.0.5 → 1.0.6

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.6 2008-08-06
+
+* fix associations create
+
 == 1.0.5 2008-07-25
 
 * fix for calculations with a group by clause [thx Sirius Black]

data/lib/composite_primary_keys/associations.rb

@@ -280,7 +280,16 @@ module ActiveRecord::Associations
       quoted_ids = quoted_ids.split(CompositePrimaryKeys::ID_SEP) if quoted_ids.is_a?(String)
       keys_ids = [keys, quoted_ids].transpose
       keys_ids.collect {|key, id| "(#{table_name}.#{key} = #{id})"}.join(' AND ')
-    end  
+    end 
+    
+    def set_belongs_to_association_for(record)
+      if @reflection.options[:as]
+        raise 'polymorphic joins are not supported by composite_primary_keys'
+      else
+        key_values = @reflection.primary_key_name.to_s.split(CompositePrimaryKeys::ID_SEP).zip(@owner.id)
+        key_values.each{|kv| record[kv.first] = kv.last} unless @owner.new_record?
+      end
+    end    
   end
 
   class HasAndBelongsToManyAssociation < AssociationCollection #:nodoc:

data/lib/composite_primary_keys/version.rb

@@ -2,7 +2,7 @@ module CompositePrimaryKeys
   module VERSION #:nodoc:
     MAJOR = 1
     MINOR = 0
-    TINY  = 5
+    TINY  = 6
     STRING = [MAJOR, MINOR, TINY].join('.')
   end
 end

data/test/test_associations.rb

@@ -1,4 +1,5 @@
 require 'abstract_unit'
+require 'fixtures/article'
 require 'fixtures/product'
 require 'fixtures/tariff'
 require 'fixtures/product_tariff'
@@ -12,10 +13,11 @@ require 'fixtures/room_attribute_assignment'
 require 'fixtures/student'
 require 'fixtures/room_assignment'
 require 'fixtures/user'
+require 'fixtures/reading'
 
 class TestAssociations < Test::Unit::TestCase
-  fixtures :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants, :restaurants_suburbs,
-           :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments, :users
+  fixtures :articles, :products, :tariffs, :product_tariffs, :suburbs, :streets, :restaurants, :restaurants_suburbs,
+           :dorms, :rooms, :room_attributes, :room_attribute_assignments, :students, :room_assignments, :users, :readings
   
   def test_quoted_table_columns
     assert_equal "product_tariffs.product_id,product_tariffs.tariff_id,product_tariffs.tariff_start_date", 

data/test/test_create.rb

@@ -1,9 +1,11 @@
 require 'abstract_unit'
 require 'fixtures/reference_type'
 require 'fixtures/reference_code'
+require 'fixtures/street'
+require 'fixtures/suburb'
 
 class TestCreate < Test::Unit::TestCase
-  fixtures :reference_types, :reference_codes
+  fixtures :reference_types, :reference_codes, :streets, :suburbs
   
   CLASSES = {
     :single => {
@@ -48,4 +50,12 @@ class TestCreate < Test::Unit::TestCase
       assert_equal composite?, !@successful, "Create should have failed for composites; #{@obj.inspect}"
     end
   end
+  
+  def test_create_on_association
+    suburb = Suburb.find(:first)
+    suburb.streets.create(:city_id => suburb.city_id, :suburb_id => suburb.suburb_id, :name => "my street")
+    street = Street.find_by_name('my street')
+    assert_equal(suburb.city_id, street.city_id)
+    assert_equal(suburb.suburb_id, street.suburb_id)
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: composite_primary_keys
 version: !ruby/object:Gem::Version 
-  version: 1.0.5
+  version: 1.0.6
 platform: ruby
 authors: 
 - Dr Nic Williams
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-07-25 00:00:00 -05:00
+date: 2008-08-06 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency