classy-inheritance 0.6.4 → 0.7.0

data/History.txt

@@ -1,3 +1,22 @@
+== 0.7.0 2009-04-11
+  * merge all of johnsbrn changes
+== 0.6.8.2 2009-03-19
+  * have fixed problems with class_name ending with ss
+== 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
+  * Forgot to remove some debugging code -johnsbrn
+== 0.6.6 2009-02-01
+  * More comprehensive fix for has_one bug - johnsbrn
+== 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 - johnsbrn
+== 0.6.4 2009-02-01
+  * Updated deprecated default error messages - johnsbrn
+  * Added has_dependency for non-polymorphic has_one - johnsbrn
+== 0.6.3 2009-01-13
+  * Fixed validations for prefix and postfix - johnsbrn
 == 0.6.2 2008-09-25
   * Added back validates_associated override.
 == 0.6.1 2008-07-21

data/classy-inheritance.gemspec

@@ -0,0 +1,35 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{classy-inheritance}
+  s.version = "0.7.0"
+
+  s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
+  s.authors = ["Andrew Stone"]
+  s.date = %q{2009-03-19}
+  s.description = %q{Classy Inheritance adds a depends_on class method to your ActiveRecord model so that you can define requisite objects.  This functionality is provided using the existing ActiveRecord methods without monkey patching any core code. Essentially, it provides an easy interface to generate code that anyone could add to their model to receive the same result. Depending on the parameters to your depends_on call, it may add some of the following methods: validates_presence_of, validates_associated, has_one or belongs_to.}
+  s.email = %q{andy@stonean.com}
+  s.extra_rdoc_files = ["History.txt", "License.txt", "README.txt"]
+  s.files = ["History.txt", "License.txt", "Manifest.txt", "README.txt", "Rakefile", "lib/classy-inheritance.rb", "test/test_classy-inheritance.rb", "test/test_helper.rb", "test/test_polymorphic_associations.rb", "test/test_with_optional_dependency.rb", "test/test_with_prefix_postfix.rb", "test/test_with_standard_attributes.rb", "test/test_has_dependency.rb", "test/test_with_class_name_ending_with_ss.rb"]
+  s.has_rdoc = true
+  s.homepage = %q{http://stonean.com/wiki/classy-inheritance}
+  s.rdoc_options = ["--main", "README.txt"]
+  s.require_paths = ["lib"]
+  s.rubyforge_project = %q{classyinherit}
+  s.rubygems_version = %q{1.3.1}
+  s.summary = %q{Classy Inheritance adds a depends_on class method to your ActiveRecord model so that you can define requisite objects}
+  s.test_files = ["test/test_classy-inheritance.rb", "test/test_has_dependency.rb", "test/test_helper.rb", "test/test_polymorphic_associations.rb", "test/test_with_class_name_ending_with_ss.rb", "test/test_with_optional_dependency.rb", "test/test_with_prefix_postfix.rb", "test/test_with_standard_attributes.rb"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_development_dependency(%q<bones>, [">= 2.2.0"])
+    else
+      s.add_dependency(%q<bones>, [">= 2.2.0"])
+    end
+  else
+    s.add_dependency(%q<bones>, [">= 2.2.0"])
+  end
+end

data/lib/classy-inheritance.rb

@@ -1,13 +1,114 @@
+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?
+          record["#{@reflection.options[:as]}_type"] = @owner.class.base_class.name.to_s
+        else
+          unless @owner.new_record?
+            primary_key = @reflection.options[:primary_key] || :id
+            record[@reflection.primary_key_name] = @owner.send(primary_key)
+          end
+        end
+      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
+        # 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
+          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
+
+        record
+      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.4'
+    VERSION = '0.7.0'
 
     def self.version
       VERSION
     end
-
+    
     module ClassMethods
+      
+      
+      # 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}"
+
+            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)
+              end
+            end
+            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)
+
+            configure_dependency_for_has_one(reflection)
+          end
+        end
+        
+      end
+      
       def depends_on(model_sym, options = {}) 
         define_relationship(model_sym,options)
 
@@ -41,7 +142,10 @@ module Stonean
         options[:attrs].each{|attr| define_accessors(model_sym, attr, options)}
       end
 
-
+      def has_dependency(model_sym, options = {})
+        depends_on(model_sym, options.update(:has_dependency => true))
+      end
+      
       def can_be(model_sym, options = {})
         unless options[:as]
           raise ArgumentError, ":as attribute required when calling can_be"
@@ -63,7 +167,7 @@ module Stonean
       private
 
       def classy_options
-        [:as, :attrs, :prefix, :postfix, :validates_presence_if, :validates_associated_if]
+        [:as, :attrs, :has_dependency, :prefix, :postfix, :validates_presence_if, :validates_associated_if]
       end
 
       def delete_classy_options(options, *keepers)
@@ -79,6 +183,8 @@ module Stonean
           as_opt = opts.delete(:as)
           opts = polymorphic_constraints(as_opt).merge(opts)
           has_one model_sym, opts
+        elsif options[:has_dependency]
+          has_one model_sym, opts
         else
           belongs_to model_sym, opts
         end
@@ -139,7 +245,7 @@ module Stonean
         if options[:postfix]
           accessor_method_name = (options[:postfix] == true) ? "#{accessor_method_name}_#{model_sym}" : "#{accessor_method_name}_#{options[:postfix]}"
         end
-
+        
         define_method accessor_method_name do
           eval("self.#{model_sym} ? self.#{model_sym}.#{attr} : nil")
         end
@@ -177,7 +283,7 @@ if Object.const_defined?("ActiveRecord") && ActiveRecord.const_defined?("Base")
   module ActiveRecord::Validations::ClassMethods
 
     def validates_associated_dependent(model_sym, options, configuration = {})
-      configuration = { :message => I18n.translate('activerecord.errors.messages.invalid'), :on => :save }.update(configuration)
+      configuration = { :message => I18n.translate('activerecord.errors.messages')[:invalid], :on => :save }.update(configuration)
 
       validates_each(model_sym, configuration) do |record, attr_name, value|
         associate = record.send(attr_name)
@@ -195,9 +301,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/tasks/rdoc.rake

@@ -19,10 +19,11 @@ namespace :doc do
             end
     rd.rdoc_files.push(*files)
 
-    title = "#{PROJ.name}-#{PROJ.version} Documentation"
-
+    name    = PROJ.name
     rf_name = PROJ.rubyforge.name
-    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != title
+
+    title = "#{name}-#{PROJ.version} Documentation"
+    title = "#{rf_name}'s " + title if rf_name.valid? and rf_name != name
 
     rd.options << "-t #{title}"
     rd.options.concat(rdoc.opts)

data/tasks/setup.rb

@@ -6,7 +6,7 @@ require 'fileutils'
 require 'ostruct'
 require 'find'
 
-class OpenStruct; undef :gem; end
+class OpenStruct; undef :gem if defined? :gem; end 
 
 # TODO: make my own openstruct type object that includes descriptions
 # TODO: use the descriptions to output help on the available bones options
@@ -124,9 +124,7 @@ import(*rakefiles)
 %w(lib ext).each {|dir| PROJ.libs << dir if test ?d, dir}
 
 # Setup some constants
-WIN32 = %r/djgpp|(cyg|ms|bcc)win|mingw/ =~ RUBY_PLATFORM unless defined? WIN32
-
-DEV_NULL = WIN32 ? 'NUL:' : '/dev/null'
+DEV_NULL = File.exist?('/dev/null') ? '/dev/null' : 'NUL:'
 
 def quiet( &block )
   io = [STDOUT.dup, STDERR.dup]
@@ -139,21 +137,15 @@ ensure
   $stdout, $stderr = STDOUT, STDERR
 end
 
-DIFF = if WIN32 then 'diff.exe'
-       else
-         if quiet {system "gdiff", __FILE__, __FILE__} then 'gdiff'
-         else 'diff' end
-       end unless defined? DIFF
-
-SUDO = if WIN32 then ''
-       else
-         if quiet {system 'which sudo'} then 'sudo'
-         else '' end
-       end
-
-RCOV = WIN32 ? 'rcov.bat' : 'rcov'
-RDOC = WIN32 ? 'rdoc.bat' : 'rdoc'
-GEM  = WIN32 ? 'gem.bat'  : 'gem'
+DIFF = if system("gdiff '#{__FILE__}' '#{__FILE__}' > #{DEV_NULL} 2>&1") then 'gdiff'
+       else 'diff' end unless defined? DIFF
+
+SUDO = if system("which sudo > #{DEV_NULL} 2>&1") then 'sudo'
+       else '' end unless defined? SUDO
+
+RCOV = "#{RUBY} -S rcov"
+RDOC = "#{RUBY} -S rdoc"
+GEM  = "#{RUBY} -S gem"
 
 %w(rcov spec/rake/spectask rubyforge bones facets/ansicode).each do |lib|
   begin

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

@@ -0,0 +1,91 @@
+require File.dirname(__FILE__) + '/test_helper.rb'
+
+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
+    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_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'
+    @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

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'
 
@@ -19,6 +21,22 @@ class SetupTestTables < ActiveRecord::Migration
       t.timestamps
     end
     
+    create_table :accounts, :force => true do |t|
+      t.string :first_name
+      t.string :last_name
+      t.string :email
+
+      t.timestamps
+    end
+    
+    create_table :account_logins, :force => true do |t|
+      t.string :login
+      t.string :password
+      t.string :account_email
+
+      t.timestamps
+    end
+    
     create_table :users, :force => true do |t|
       t.string :login
       t.integer :profile_id
@@ -40,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
@@ -84,6 +113,8 @@ class SetupTestTables < ActiveRecord::Migration
   end
   
   def self.down
+    drop_table :accounts
+    drop_table :account_logins
     drop_table :authors
     drop_table :artists
     drop_table :users
@@ -102,6 +133,22 @@ 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
+
+class AccountLogin < ActiveRecord::Base
+  validates_presence_of :login, :password
+end
+
 class User < ActiveRecord::Base
   validates_presence_of :login
 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: classy-inheritance
 version: !ruby/object:Gem::Version 
-  version: 0.6.4
+  version: 0.7.0
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-02-06 00:00:00 -05:00
+date: 2009-04-11 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -20,7 +20,7 @@ dependencies:
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        version: 2.4.0
+        version: 2.4.2
     version: 
 description: "Classy Inheritance adds a depends_on class method to your ActiveRecord model so that you can define requisite objects.  This functionality is provided using the existing ActiveRecord methods without monkey patching any core code. Essentially, it provides an easy interface to generate code that anyone could add to their model to receive the same result. Depending on the parameters to your depends_on call, it may add some of the following methods: validates_presence_of, validates_associated, has_one or belongs_to."
 email: andy@stonean.com
@@ -40,6 +40,7 @@ files:
 - Manifest.txt
 - README.txt
 - Rakefile
+- classy-inheritance.gemspec
 - lib/classy-inheritance.rb
 - tasks/ann.rake
 - tasks/bones.rake
@@ -55,6 +56,7 @@ files:
 - tasks/test.rake
 - test/database.sqlite3
 - test/test_classy-inheritance.rb
+- test/test_has_dependency.rb
 - test/test_helper.rb
 - test/test_polymorphic_associations.rb
 - test/test_with_class_name_ending_with_ss.rb
@@ -90,6 +92,7 @@ specification_version: 2
 summary: Classy Inheritance adds a depends_on class method to your ActiveRecord model so that you can define requisite objects
 test_files: 
 - test/test_classy-inheritance.rb
+- test/test_has_dependency.rb
 - test/test_helper.rb
 - test/test_polymorphic_associations.rb
 - test/test_with_class_name_ending_with_ss.rb