voraz-dr_nic_magic_models 0.9.2 → 0.9.3

data/Manifest.txt

@@ -19,14 +19,12 @@ lib/module.rb
 lib/rails.rb
 scripts/txt2html
 scripts/txt2js
-test.db
 test/abstract_unit.rb
 test/connections/native_mysql/connection.rb
 test/connections/native_postgresql/connection.rb
 test/connections/native_sqlite/connection.rb
 test/dummy_test.rb
 test/env_test.rb
-test/fixtures/.DS_Store
 test/fixtures/adjectives.yml
 test/fixtures/adjectives_fun_users.yml
 test/fixtures/db_definitions/mysql.drop.sql

data/README.rdoc

@@ -0,0 +1,11 @@
+= Magic Models
+  -Added the validates_associated (it´s fixed a object_daddy crash)
+  -fixed this bug: http://groups.google.com/group/magicmodels/browse_thread/thread/14e1d1fb2d
+abfdf0 
+
+== Install
+  gem sources -a http://gems.github.com
+  gem install voraz-dr_nic_magic_models
+
+== Readme
+  See http://magicmodels.rubyforge.org/dr_nic_magic_models for pretty README

data/lib/dr_nic_magic_models/validations.rb

@@ -14,27 +14,40 @@ module DrNicMagicModels
       # NOT NULL constraints
       self.columns.reject { |column| column.name =~ /(?i)^(((created|updated)_(at|on))|position|type|id)$/ }.each do |column|
         
-        if column.type == :integer   
-          logger.debug "validates_numericality_of #{column.name}, :allow_nil => #{column.null.inspect}, :only_integer => true"       
-          self.validates_numericality_of column.name, :allow_nil => column.null, :only_integer => true
-        elsif column.number?
-          logger.debug "validates_numericality_of #{column.name}, :allow_nil => #{column.null.inspect}"
-          self.validates_numericality_of column.name, :allow_nil => column.null
-        elsif column.text? && column.limit
-          logger.debug "validates_length_of #{column.name}, :allow_nil => #{column.null.inspect}, :maximum => #{column.limit}"
-          self.validates_length_of column.name, :allow_nil => column.null, :maximum => column.limit
-        end
+        inheritable = false
+        self.inheritable_attributes[:reflections].each_value{ |t| 
+          if "#{t.name}_id" == column.name 
+            inheritable = true
+            logger.debug "validates_associated #{t.name}"
+            self.validates_associated t.name, :allow_nil=>column.null, :allow_blank=>column.null
+            break
+          end
+        }rescue 0
         
-        # Active record seems to interpolate booleans anyway to either true, false or nil...
-        if column.type == :boolean
-          logger.debug "validates_inclusion_of #{column.name}, :in => [true, false], :allow_nil => #{column.null}, :message => ActiveRecord::Errors.default_error_messages[:blank]"
-          self.validates_inclusion_of column.name, :in => [true, false], :allow_nil => column.null, :message => ActiveRecord::Errors.default_error_messages[:blank]
-        elsif !column.null
-          logger.debug "validates_presence_of #{column.name}"
-          self.validates_presence_of column.name
+        if !inheritable
+          if column.type == :integer
+            logger.debug "validates_numericality_of #{column.name}, :allow_nil => #{column.null.inspect}, :only_integer => true"       
+            self.validates_numericality_of column.name, :allow_nil => column.null, :only_integer => true
+          elsif column.number?
+            logger.debug "validates_numericality_of #{column.name}, :allow_nil => #{column.null.inspect}"
+            self.validates_numericality_of column.name, :allow_nil => column.null
+          elsif column.text? && column.limit
+            logger.debug "validates_length_of #{column.name}, :allow_nil => #{column.null.inspect}, :maximum => #{column.limit}"
+            self.validates_length_of column.name, :allow_nil => column.null, :maximum => column.limit
+          end
+
+          # Active record seems to interpolate booleans anyway to either true, false or nil...
+          if column.type == :boolean
+            logger.debug "validates_inclusion_of #{column.name}, :in => [true, false], :allow_nil => #{column.null}, :message => ActiveRecord::Errors.default_error_messages[:blank]"
+            self.validates_inclusion_of column.name, :in => [true, false], :allow_nil => column.null, :message => ActiveRecord::Errors.default_error_messages[:blank]
+          elsif !column.null
+            #test if the column have a belongs_to association
+            logger.debug "validates_presence_of #{column.name}"
+            self.validates_presence_of column.name
+          end
         end
       end
-      
+
       # Single-column UNIQUE indexes
       get_unique_index_columns.each do |col|
         logger.debug "validates_uniqueness_of #{col}"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: voraz-dr_nic_magic_models
 version: !ruby/object:Gem::Version 
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors: 
 - nicwilliams
@@ -38,7 +38,7 @@ files:
 - CHANGELOG
 - History.txt
 - Manifest.txt
-- README
+- README.rdoc
 - Rakefile
 - install.rb
 - lib/base.rb
@@ -63,7 +63,6 @@ files:
 - test/connections/native_sqlite/connection.rb
 - test/dummy_test.rb
 - test/env_test.rb
-- test/fixtures/.DS_Store
 - test/fixtures/adjectives.yml
 - test/fixtures/adjectives_fun_users.yml
 - test/fixtures/db_definitions/mysql.drop.sql
@@ -97,7 +96,7 @@ licenses:
 post_install_message: 
 rdoc_options: 
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement