johnsbrn-classy-inheritance 0.6.7 → 0.6.8

data/History.txt

@@ -1,3 +1,5 @@
+== 0.6.8 2009-02-03
+  * Make has_one fix consistent with edge Rails - johnsbrn
 == 0.6.7 2009-02-01
   * Forgot to remove some debugging code -johnsbrn
 == 0.6.6 2009-02-01

data/lib/classy-inheritance.rb

@@ -7,7 +7,10 @@ module ActiveRecord
           record["#{@reflection.options[:as]}_id"]   = @owner.id unless @owner.new_record?
           record["#{@reflection.options[:as]}_type"] = @owner.class.base_class.name.to_s
         else
-          record[@reflection.primary_key_name] = @reflection.options.has_key?(:primary_key) ? @owner.send(@reflection.options[:primary_key]) : @owner.id unless @owner.new_record?
+          unless @owner.new_record?
+            primary_key = @reflection.options[:primary_key] || :id
+            record[@reflection.primary_key_name] = @owner.send(primary_key)
+          end
         end
       end
       
@@ -24,7 +27,10 @@ module ActiveRecord
         if replace_existing
           replace(record, true) 
         else
-          record[@reflection.primary_key_name] = @reflection.options.has_key?(:primary_key) ? @owner.send(@reflection.options[:primary_key]) : @owner.id unless @owner.new_record?
+          unless @owner.new_record?
+            primary_key = @reflection.options[:primary_key] || :id
+            record[@reflection.primary_key_name] = @owner.send(primary_key)
+          end
           self.target = record
         end
 
@@ -36,7 +42,7 @@ end
 
 module Stonean
   module ClassyInheritance
-    VERSION = '0.6.5'
+    VERSION = '0.6.8'
 
     def self.version
       VERSION

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: johnsbrn-classy-inheritance
 version: !ruby/object:Gem::Version 
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors: 
 - Andrew Stone