johnsbrn-classy-inheritance 0.6.5 → 0.6.6

data/History.txt

@@ -1,3 +1,5 @@
+== 0.6.6 2009-02-01
+  * More comprehensive fix for has_one bug
 == 0.6.5 2009-02-01
   * Add fix for has_one primary key bug - http://rails.lighthouseapp.com/projects/8994/tickets/1756-has_one-with-foreign_key-primary_key-bug
 == 0.6.4 2009-02-01

data/lib/classy-inheritance.rb

@@ -1,3 +1,40 @@
+module ActiveRecord
+  module Associations
+    class HasOneAssociation
+      
+      def set_belongs_to_association_for(record)
+        if @reflection.options[:as]
+          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?
+        end
+      end
+      
+      private 
+      def new_record(replace_existing)
+        # Make sure we load the target first, if we plan on replacing the existing
+        # instance. Otherwise, if the target has not previously been loaded
+        # elsewhere, the instance we create will get orphaned.
+        load_target if replace_existing
+        record = @reflection.klass.send(:with_scope, :create => construct_scope[:create]) do
+          yield @reflection
+        end
+
+        if replace_existing
+          replace(record, true) 
+        else
+          puts "test"
+          record[@reflection.primary_key_name] = @reflection.options.has_key?(:primary_key) ? @owner.send(@reflection.options[:primary_key]) : @owner.id unless @owner.new_record?
+          self.target = record
+        end
+
+        record
+      end
+    end
+  end
+end
+
 module Stonean
   module ClassyInheritance
     VERSION = '0.6.5'
@@ -5,7 +42,7 @@ module Stonean
     def self.version
       VERSION
     end
-
+    
     module ClassMethods
       
       # fix active record has_one primary key bug - http://rails.lighthouseapp.com/projects/8994/tickets/1756-has_one-with-foreign_key-primary_key-bug
@@ -21,8 +58,9 @@ module Stonean
           method_name = "has_one_after_save_for_#{reflection.name}".to_sym
           define_method(method_name) do
             association = instance_variable_get(ivar) if instance_variable_defined?(ivar)
-            if !association.nil? && (new_record? || association.new_record? || association[reflection.primary_key_name] != id)
-              primary_key = reflection.options[:primary_key] || :id
+            
+            primary_key = reflection.options[:primary_key] || :id
+            if !association.nil? && (new_record? || association.new_record? || association[reflection.primary_key_name] != send(primary_key))
               association[reflection.primary_key_name] = send(primary_key)
               association.save(true)
             end
@@ -230,9 +268,9 @@ if Object.const_defined?("ActiveRecord") && ActiveRecord.const_defined?("Base")
       end
     end
   end
-                                    
-
+  
   ActiveRecord::Base.class_eval do
     extend Stonean::ClassyInheritance::ClassMethods
   end
+  
 end

data/test/test_has_dependency.rb

@@ -0,0 +1,79 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+Account.has_dependency :account_login, :attrs => [:login, :password], :foreign_key => :account_email, :primary_key => :email
+
+class TestHasDependency < Test::Unit::TestCase
+
+  def setup
+    @account = Account.new
+  end
+  
+  def test_active_record_should_respond_to_depends_on
+    assert ActiveRecord::Base.respond_to?(:has_dependency)
+  end
+  
+  def test_account_should_respond_to_find_with_account_login
+    assert Account.respond_to?(:find_with_account_login)
+  end
+  
+  def test_account_should_respond_to_login
+    assert @account.respond_to?(:login)
+  end
+  
+  def test_account_should_respond_to_login=
+    assert @account.respond_to?(:login=)
+  end
+  
+  def test_account_should_respond_to_password
+    assert @account.respond_to?(:password)
+  end
+  
+  def test_account_should_respond_to_password=
+    assert @account.respond_to?(:password=)
+  end
+  
+  def test_account_should_create_account_login_record
+    @account.login = 'joe'
+    @account.password = 'password'
+    @account.first_name = 'joe'
+    @account.last_name = 'bloggs'
+    @account.email = 'joe@bloggs.co.uk'
+  
+    @account.save
+  
+    @account_login = AccountLogin.find(:first, :conditions => {:account_email => @account.email})
+  
+    assert_equal @account_login, @account.account_login
+  
+    assert_equal @account_login.login, @account.login
+    assert_equal @account_login.password, @account.password
+  end
+  
+  def test_account_should_be_invalid_without_account_login_attributes
+    @account.first_name = 'joe'
+    @account.last_name = 'bloggs'
+    @account.email = 'joe@bloggs.co.uk'
+    assert !@account.valid?
+  end
+  
+  def test_account_should_be_valid_with_account_login_attributes
+    @account.login = 'joe'
+    @account.password = 'password'
+    @account.first_name = 'joe'
+    @account.last_name = 'bloggs'
+    @account.email = 'joe@bloggs.co.uk'
+    
+    assert @account.valid?
+  end
+
+  def test_account_should_have_nice_error_message
+    @account = Account.new(:login => "joe")
+    @account.valid?
+
+    assert @account.errors.full_messages.include?("Last name can't be blank")
+    assert @account.errors.full_messages.include?("Email can't be blank")
+    assert @account.errors.full_messages.include?("First name can't be blank")
+    assert @account.errors.full_messages.include?("Password can't be blank")
+  end
+  
+end

metadata

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