composite_primary_keys 1.0.6 → 1.0.7

data/History.txt

@@ -1,3 +1,7 @@
+== 1.0.7 2008-08-12
+
+* fix for the last fix -- when has_many is composite and belongs_to is single
+
 == 1.0.6 2008-08-06
 
 * fix associations create
@@ -123,4 +127,4 @@
   * id sets: Foo.find(2,1), 
   * lists of id sets: Foo.find([2,1], [7,3], [8,12]), 
   * and even stringified versions of the above:
-  * Foo.find '2,1' or Foo.find '2,1;7,3'
+  * Foo.find '2,1' or Foo.find '2,1;7,3'

data/lib/composite_primary_keys/associations.rb

@@ -281,14 +281,15 @@ module ActiveRecord::Associations
       keys_ids = [keys, quoted_ids].transpose
       keys_ids.collect {|key, id| "(#{table_name}.#{key} = #{id})"}.join(' AND ')
     end 
-    
+
     def set_belongs_to_association_for(record)
       if @reflection.options[:as]
-        raise 'polymorphic joins are not supported by composite_primary_keys'
+        record["#{@reflection.options[:as]}_id"]   = @owner.id unless @owner.new_record?
+        record["#{@reflection.options[:as]}_type"] = @owner.class.base_class.name.to_s
       else
-        key_values = @reflection.primary_key_name.to_s.split(CompositePrimaryKeys::ID_SEP).zip(@owner.id)
+        key_values = @reflection.primary_key_name.to_s.split(CompositePrimaryKeys::ID_SEP).zip([@owner.id].flatten)
         key_values.each{|kv| record[kv.first] = kv.last} unless @owner.new_record?
-      end
+      end    
     end    
   end
 

data/lib/composite_primary_keys/version.rb

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

data/test/test_create.rb

@@ -58,4 +58,11 @@ class TestCreate < Test::Unit::TestCase
     assert_equal(suburb.city_id, street.city_id)
     assert_equal(suburb.suburb_id, street.suburb_id)
   end
-end
+  
+  def test_create_on_association_when_belongs_to_is_single_key
+    rt = ReferenceType.find(:first)
+    rt.reference_codes.create(:reference_type_id => 1234, :reference_code => 4321, :code_label => 'foo', :abbreviation => 'bar')
+    rc = ReferenceCode.find_by_reference_code(4321)
+    assert_equal(rc.reference_type_id, rt.reference_type_id)
+  end
+end

data/website/index.html

@@ -33,7 +33,7 @@
     <h1>Composite Primary Keys</h1>
     <div id="version" class="clickable" onclick='document.location = "http://rubyforge.org/projects/compositekeys"; return false'>
       Get Version
-      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">1.0.5</a>
+      <a href="http://rubyforge.org/projects/compositekeys" class="numbers">1.0.6</a>
     </div>
     <h1>&#x2192; Ruby on Rails</h1>
 

data/website/version-raw.js

@@ -1,3 +1,3 @@
 // Announcement JS file
-var version = "1.0.5";
+var version = "1.0.6";
 MagicAnnouncement.show('compositekeys', version);

data/website/version.js

@@ -1,4 +1,4 @@
 // Version JS file
-var version = "1.0.5";
+var version = "1.0.6";
 
 document.write(" - " + version);

metadata

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