validatious-on-rails 0.3.5 → 0.3.6

data/lib/validatious-on-rails/model_validations.rb

@@ -40,6 +40,9 @@ module ValidatiousOnRails
       # name along with a method/field.
       #
       def options_for(object_name, attribute_method, options = {}, existing_validators = nil)
+        # Handle Nested form.
+        object_name = options[:object].present? ? options[:object].class.name : object_name
+        
         validators = self.from_active_record(object_name, attribute_method)
         validator_classes, validator_js = [options[:class]], []
 
@@ -66,7 +69,12 @@ module ValidatiousOnRails
       #
       def from_active_record(object_or_class, attribute_method)
         validators = []
-        klass = object_or_class.to_s.classify.constantize
+        begin
+          klass = object_or_class.to_s.classify.constantize
+        rescue
+          ::ValidatiousOnRails.log "Missing constant: #{object_or_class}", :debug
+          return validators
+        end
 
         # Iterate thorugh the validations for the current class,
         # and collect validation options.

data/lib/validatious-on-rails/validatious/validators/format_validator.rb

@@ -23,7 +23,7 @@ module ValidatiousOnRails
         self.accept_empty = validation.options[:allow_nil]
         self.fn = %{
           #{self.class.validate_blank(validation)}
-          return #{validation.options[:with].inspect}.test(value);
+          return #{validation.options[:with].inspect.gsub(/\\A/, '^').gsub(/\\z/, '$')}.test(value);
         }
         self.fn.freeze
       end

data/lib/validatious-on-rails/validatious/validators/presence_validator.rb

@@ -8,7 +8,7 @@ module ValidatiousOnRails
       def initialize(validation, options = {})
         name = 'presence'
         super name, options
-        self.message = self.class.generate_message(validation)
+        self.message = self.class.generate_message(validation, :key => :blank)
         self.accept_empty = false
         # Identical to Validatious "required" validator, but we want Rails I18n message support, so...
         self.fn = %{

data/test/validatious_on_rails/model_validations_test.rb

@@ -26,6 +26,15 @@ class ModelValidationsTest < ::ActiveSupport::TestCase
     end
   end
 
+  context "from_active_record" do
+    test "non concrete models" do
+      assert_nothing_raised(NameError) do
+        ::ValidatiousOnRails::ModelValidations.from_active_record(:thing, :field_with_defaults)
+      end
+      assert_equal [], ::ValidatiousOnRails::ModelValidations.from_active_record(:thing, :field_with_defaults)
+    end
+  end
+  
   context "acceptance_of" do
     test "with defaults" do
       validators = ::ValidatiousOnRails::ModelValidations.acceptance_of(

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validatious-on-rails
 version: !ruby/object:Gem::Version 
-  version: 0.3.5
+  version: 0.3.6
 platform: ruby
 authors: 
 - Christian Johansen
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-10 00:00:00 +02:00
+date: 2009-10-17 00:00:00 +02:00
 default_executable: 
 dependencies: []