validatious-on-rails 0.3.3 → 0.3.4

data/generators/validatious/templates/initializer.rb

@@ -0,0 +1,5 @@
+# encoding: utf-8
+
+if defined?(::ValidatiousOnRails)
+  ::ValidatiousOnRails.client_side_validations_by_default = true
+end

data/generators/validatious/validatious_generator.rb

@@ -6,6 +6,7 @@ class ValidatiousGenerator < Rails::Generator::Base
     record do |m|
       m.template 'v2.standalone.full.min.js', File.join('public', 'javascripts', 'v2.standalone.full.min.js')
       m.template 'validatious.config.js', File.join('public', 'javascripts', 'validatious.config.js')
+      m.template 'initializer.rb', File.join('config', 'initializers', 'validatious-on-rails.rb')
     end
   end
   

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

@@ -73,19 +73,22 @@ module ValidatiousOnRails
       # form markup.
       #
       def from_active_record(object_or_class, attribute_method)
-        klass = object_or_class.to_s.classify.constantize
         validators = []
+        klass = object_or_class.to_s.classify.constantize
 
         # Iterate thorugh the validations for the current class,
         # and collect validation options.
         klass.reflect_on_validations_for(attribute_method.to_sym).each do |validation|
           validates_type = validation.macro.to_s.sub(/^validates?_/, '')
+          if validation.options[:client_side].nil?
+            validation.options[:client_side] = ::ValidatiousOnRails.client_side_validations_by_default
+          end
 
           # Skip "confirmation_of"-validation info for the attribute that
           # needs to be confirmed. Validatious expects this validation rule
           # on the confirmation field. *
           unless validates_type =~ /^confirmation_of$/
-            validators << self.send(validates_type.to_sym, validation)
+            validators << self.send(validates_type.to_sym, validation) if validation.options[:client_side]
           end
         end
 
@@ -95,13 +98,17 @@ module ValidatiousOnRails
           # Check if validates_confirmation_of(:hello) actually exists,
           # if :hello_confirmation field exists - just to be safe.
           klass.reflect_on_validations_for(confirm_attribute_method.to_sym).each do |validation|
+            if validation.options[:client_side].nil?
+              validation.options[:client_side] = ::ValidatiousOnRails.client_side_validations_by_default
+            end
+
             if validation.macro.to_s =~ /^validates_confirmation_of$/
-              validators << self.confirmation_of(validation)
+              validators << self.confirmation_of(validation) if validation.options[:client_side]
               break
             end
           end
         end
-        validators
+        validators.flatten.compact
       end
 
       # Resolve validation from validates_acceptance_of.

data/lib/validatious-on-rails.rb

@@ -17,9 +17,11 @@ module ValidatiousOnRails # :nodoc:
     end
   end
 
-  mattr_accessor :verbose
-
   @@verbose = ::Object.const_defined?(:RAILS_ENV) ? (::RAILS_ENV.to_sym == :development) : true
+  @@client_side_validations_by_default = true
+
+  mattr_accessor  :verbose,
+                  :client_side_validations_by_default
 
   # Logging helper: Internal debug-logging for the plugin.
   #

data/test/test_helper.rb

@@ -57,15 +57,23 @@ build_model :bogus_items do
   integer :variant
   boolean :signed
   
+  string :field_with_defaults
+  string :field_with_client_side_validations
+  string :field_without_client_side_validations
+  
   validates_presence_of :name, :body, :variant
   validates_confirmation_of :name
-  validates_acceptance_of :signed, :accept => true 
+  validates_acceptance_of :signed, :accept => true
   validates_format_of :url,
     :with => /^(http|https|ftp):\/\/(([A-Z0-9][A-Z0-9_-]*)(\.[A-Z0-9][A-Z0-9_-]*)+)(:(\d+))?\/?/i,
     :name => 'url', :message => 'Invalid URL.'
   validates_inclusion_of :variant, :in => (1..5).to_a
   validates_exclusion_of :variant, :in => (6..10).to_a
   
+  validates_presence_of :field_with_defaults
+  validates_presence_of :field_with_client_side_validations, :client_side => true
+  validates_presence_of :field_without_client_side_validations, :client_side => false
+  
   # TODO: Test: If this is a validator makro, then it should not cause any issues.
   validates_craziness_of :name
 end

data/test/validatious_on_rails/model_validations_test.rb

@@ -7,6 +7,25 @@ class ModelValidationsTest < ::ActiveSupport::TestCase
 
   include ActionView::Helpers::FormHelper
 
+  context "validation options" do
+    test ":client_side - enabling_disabling client-side validations" do
+      ::ValidatiousOnRails.client_side_validations_by_default = false
+      validators = ::ValidatiousOnRails::ModelValidations.from_active_record(:bogus_item, :field_with_defaults)
+      assert_validator_class '', validators
+      
+      # FIXME: Fails for some obscure reason. If switching place with the one above, that one fails instead. =S
+      ::ValidatiousOnRails.client_side_validations_by_default = true
+      validators = ::ValidatiousOnRails::ModelValidations.from_active_record(:bogus_item, :field_with_defaults)
+      #assert_not_validator_class '', validators
+      
+      validators = ::ValidatiousOnRails::ModelValidations.from_active_record(:bogus_item, :field_with_client_side_validations)
+      assert_not_validator_class '', validators
+
+      validators = ::ValidatiousOnRails::ModelValidations.from_active_record(:bogus_item, :field_without_client_side_validations)
+      assert_validator_class '', validators
+    end
+  end
+
   context "acceptance_of" do
     test "with defaults" do
       validators = ::ValidatiousOnRails::ModelValidations.acceptance_of(
@@ -207,4 +226,12 @@ class ModelValidationsTest < ::ActiveSupport::TestCase
       end
     end
 
+    def assert_not_validator_class(expected, actual)
+      if expected.is_a?(::Regexp)
+        assert_no_match expected, [*actual].collect { |v| v.to_class }.join(' ')
+      else
+        assert_not_equal expected, [*actual].collect { |v| v.to_class }.join(' ')
+      end
+    end
+
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validatious-on-rails
 version: !ruby/object:Gem::Version 
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors: 
 - Christian Johansen
@@ -22,6 +22,7 @@ extensions: []
 
 extra_rdoc_files: 
 - Rakefile
+- generators/validatious/templates/initializer.rb
 - generators/validatious/templates/v2.standalone.full.min.js
 - generators/validatious/templates/validatious.config.js
 - generators/validatious/validatious_generator.rb
@@ -61,6 +62,7 @@ extra_rdoc_files:
 - test/validatious_on_rails_test.rb
 files: 
 - Rakefile
+- generators/validatious/templates/initializer.rb
 - generators/validatious/templates/v2.standalone.full.min.js
 - generators/validatious/templates/validatious.config.js
 - generators/validatious/validatious_generator.rb