johnsbrn-classy-inheritance 0.6.3.2 → 0.6.4

data/History.txt

@@ -1,3 +1,6 @@
+== 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

data/lib/classy-inheritance.rb

@@ -40,7 +40,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"
@@ -62,7 +65,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)
@@ -78,6 +81,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
@@ -138,7 +143,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
@@ -176,7 +181,7 @@ if Object.const_defined?("ActiveRecord") && ActiveRecord.const_defined?("Base")
   module ActiveRecord::Validations::ClassMethods
 
     def validates_associated_dependent(model_sym, options, configuration = {})
-      configuration = { :message => ActiveRecord::Errors.default_error_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)

data/test/test_helper.rb

@@ -19,6 +19,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.integer :account_id
+
+      t.timestamps
+    end
+    
     create_table :users, :force => true do |t|
       t.string :login
       t.integer :profile_id
@@ -82,6 +98,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
@@ -100,6 +118,14 @@ class Profile < ActiveRecord::Base
   validates_presence_of :first_name, :last_name, :email
 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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: johnsbrn-classy-inheritance
 version: !ruby/object:Gem::Version 
-  version: 0.6.3.2
+  version: 0.6.4
 platform: ruby
 authors: 
 - Andrew Stone
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-01-21 00:00:00 -08:00
+date: 2009-02-01 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -44,6 +44,7 @@ files:
 - test/test_with_optional_dependency.rb
 - test/test_with_prefix_postfix.rb
 - test/test_with_standard_attributes.rb
+- test/test_has_dependency.rb
 has_rdoc: true
 homepage: http://stonean.com/wiki/classy-inheritance
 post_install_message: 
@@ -73,6 +74,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_optional_dependency.rb