johnsbrn-classy-inheritance 0.6.8 → 0.6.8.1

data/History.txt

@@ -1,3 +1,5 @@
+== 0.6.8.1 2009-03-19
+  * Update for Rails 2.3 - johnsbrn
 == 0.6.8 2009-02-03
   * Make has_one fix consistent with edge Rails - johnsbrn
 == 0.6.7 2009-02-01

data/lib/classy-inheritance.rb

@@ -1,7 +1,9 @@
+require 'active_record/version'
 module ActiveRecord
   module Associations
     class HasOneAssociation
       
+      # this is fixed in 2.3, but it doesn't hurt to leave it here
       def set_belongs_to_association_for(record)
         if @reflection.options[:as]
           record["#{@reflection.options[:as]}_id"]   = @owner.id unless @owner.new_record?
@@ -15,6 +17,7 @@ module ActiveRecord
       end
       
       private 
+      #this is still not fixed in 2.3
       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
@@ -38,11 +41,31 @@ module ActiveRecord
       end
     end
   end
+  
+  if ActiveRecord::VERSION::MAJOR == 2 && ActiveRecord::VERSION::MINOR == 3
+
+    module AutosaveAssociation
+    
+      # fix active record has_one primary key bug rails 2.3 - http://rails.lighthouseapp.com/projects/8994/tickets/1756-has_one-with-foreign_key-primary_key-bug
+      def save_has_one_association(reflection)
+        if (association = association_instance_get(reflection.name)) && !association.target.nil?
+          primary_key = reflection.options[:primary_key] || :id  
+          if reflection.options[:autosave] && association.marked_for_destruction?
+            association.destroy
+          elsif new_record? || association.new_record? || association[reflection.primary_key_name] != send(primary_key) || reflection.options[:autosave]
+            association[reflection.primary_key_name] = send(primary_key)
+            association.save(false)
+          end
+        end
+      end
+    end
+
+  end
 end
 
 module Stonean
   module ClassyInheritance
-    VERSION = '0.6.8'
+    VERSION = '0.6.8.1'
 
     def self.version
       VERSION
@@ -50,35 +73,40 @@ module Stonean
     
     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
-      def has_one(association_id, options = {})
-        if options[:through]
-          reflection = create_has_one_through_reflection(association_id, options)
-          association_accessor_methods(reflection, ActiveRecord::Associations::HasOneThroughAssociation)
-        else
-          reflection = create_has_one_reflection(association_id, options)
+      
+      # fix active record has_one primary key bug rails 2.2.2 - http://rails.lighthouseapp.com/projects/8994/tickets/1756-has_one-with-foreign_key-primary_key-bug
+      if ActiveRecord::VERSION::MAJOR == 2 && ActiveRecord::VERSION::MINOR == 2
+
+        def has_one(association_id, options = {})
+          if options[:through]
+            reflection = create_has_one_through_reflection(association_id, options)
+            association_accessor_methods(reflection, ActiveRecord::Associations::HasOneThroughAssociation)
+          else
+            reflection = create_has_one_reflection(association_id, options)
 
-          ivar = "@#{reflection.name}"
+            ivar = "@#{reflection.name}"
 
-          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)
+            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)
             
-            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)
+              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
             end
-          end
-          after_save method_name
+            after_save method_name
 
-          add_single_associated_validation_callbacks(reflection.name) if options[:validate] == true
-          association_accessor_methods(reflection, ActiveRecord::Associations::HasOneAssociation)
-          association_constructor_method(:build,  reflection, ActiveRecord::Associations::HasOneAssociation)
-          association_constructor_method(:create, reflection, ActiveRecord::Associations::HasOneAssociation)
+            add_single_associated_validation_callbacks(reflection.name) if options[:validate] == true
+            association_accessor_methods(reflection, ActiveRecord::Associations::HasOneAssociation)
+            association_constructor_method(:build,  reflection, ActiveRecord::Associations::HasOneAssociation)
+            association_constructor_method(:create, reflection, ActiveRecord::Associations::HasOneAssociation)
 
-          configure_dependency_for_has_one(reflection)
+            configure_dependency_for_has_one(reflection)
+          end
         end
+        
       end
       
       def depends_on(model_sym, options = {}) 

data/test/test_classy-inheritance.rb

@@ -1,10 +1,9 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
-User.depends_on :profile, :attrs => [:first_name, :last_name, :email]
-
 class TestClassyInheritance < Test::Unit::TestCase
 
   def setup
+    User.depends_on :profile, :attrs => [:first_name, :last_name, :email]
     @user = User.new
   end
   

data/test/test_has_dependency.rb

@@ -1,11 +1,12 @@
 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.has_dependency :account_login, :attrs => [:login, :password], :foreign_key => :account_email, :primary_key => :email
+    Database.has_dependency :database_login, :attrs => [:login]
     @account = Account.new
+    @database = Database.new
   end
   
   def test_active_record_should_respond_to_depends_on
@@ -32,6 +33,17 @@ class TestHasDependency < Test::Unit::TestCase
     assert @account.respond_to?(:password=)
   end
   
+  def test_profile_should_create_author_record
+    @database.name = 'page'
+    @database.login = 'joe'
+  
+    @database.save!
+  
+    @database_login = DatabaseLogin.find(:first, :conditions => {:database_id => @database.id})
+  
+    assert_equal 'joe', @database_login.login
+  end
+  
   def test_account_should_create_account_login_record
     @account.login = 'joe'
     @account.password = 'password'

data/test/test_helper.rb

@@ -1,6 +1,8 @@
 require 'rubygems'
 require 'activerecord'
 
+ActiveRecord.load_all!
+
 require 'test/unit'
 require File.dirname(__FILE__) + '/../lib/classy-inheritance'
 
@@ -56,6 +58,17 @@ class SetupTestTables < ActiveRecord::Migration
       t.timestamps
     end
 
+    create_table :databases, :force => true do |t|
+      t.string :name
+      t.timestamps
+    end
+    
+    create_table :database_logins, :force => true do |t|
+      t.string :login
+      t.integer :database_id
+      t.timestamps
+    end
+    
     create_table :addresses, :force => true do |t|
       t.string :line_one
       t.string :line_two
@@ -118,6 +131,14 @@ class Profile < ActiveRecord::Base
   validates_presence_of :first_name, :last_name, :email
 end
 
+class Database < ActiveRecord::Base
+  validates_presence_of :name
+end
+
+class DatabaseLogin < ActiveRecord::Base
+  validates_presence_of :login
+end
+
 class Account < ActiveRecord::Base
   validates_presence_of :first_name, :last_name, :email
 end

data/test/test_with_optional_dependency.rb

@@ -1,16 +1,17 @@
 require File.dirname(__FILE__) + '/test_helper.rb'
 
 class TestWithOptionalDependency < Test::Unit::TestCase
-  # Turn off the validates_presence_of call
-  Author.depends_on :profile, :validates_presence_if => false, 
-    :attrs => [:first_name, :last_name, :email]
-  
-  # Turn off the validates_presence_of and the validates_associated calls
-  Artist.depends_on :profile, :validates_presence_if => false, 
-    :validates_associated_if => false,
-    :attrs => [:first_name, :last_name, :email]
 
   def setup
+    # Turn off the validates_presence_of call
+    Author.depends_on :profile, :validates_presence_if => false, 
+      :attrs => [:first_name, :last_name, :email]
+
+    # Turn off the validates_presence_of and the validates_associated calls
+    Artist.depends_on :profile, :validates_presence_if => false, 
+      :validates_associated_if => false,
+      :attrs => [:first_name, :last_name, :email]
+    
     @author = Author.new
     @artist = Artist.new
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: johnsbrn-classy-inheritance
 version: !ruby/object:Gem::Version 
-  version: 0.6.8
+  version: 0.6.8.1
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,11 +9,12 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-01 00:00:00 -08:00
+date: 2009-03-19 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: bones
+  type: :development
   version_requirement: 
   version_requirements: !ruby/object:Gem::Requirement 
     requirements: