RubyGems - validatious-on-rails - Versions diffs - 0.3.9 → 0.4.0 - Mend

validatious-on-rails 0.3.9 → 0.4.0

Files changed (23) hide show

data/Rakefile CHANGED Viewed

@@ -24,7 +24,7 @@ begin
     gemspec.require_paths = %w{lib}
     gemspec.files = SUPPORT_FILES << %w(Rakefile) <<
-      Dir.glob(File.join('{generators,lib,test,rails}', '**', '*').to_s).reject { |v| v =~ /\.log/i }
+      Dir.glob(File.join('{app,config,generators,lib,test,rails}', '**', '*').to_s).reject { |v| v =~ /\.log/i }
     gemspec.executables = %w()
     gemspec.extra_rdoc_files = SUPPORT_FILES
   end

data/app/controllers/validates_controller.rb ADDED Viewed

@@ -0,0 +1,4 @@
+# encoding: utf-8
+class ValidatesController < ::ValidatiousOnRails::Controller
+end

data/config/routes.rb ADDED Viewed

@@ -0,0 +1,5 @@
+# encoding: utf-8
+::ActionController::Routing::Routes.draw do |map|
+  map.connect '/validates/:action', :controller => 'validates', :conditions => {:method => :get}
+end

data/generators/validatious/templates/XMLHttpRequest.js ADDED Viewed

@@ -0,0 +1 @@

data/generators/validatious/templates/{validatious.config.js → v2.config.js} RENAMED Viewed

File without changes

data/generators/validatious/templates/v2.rails.js ADDED Viewed

@@ -0,0 +1,102 @@
+/**
+ *  Helpers for Validatious-On-Rails, mostly related to remote validations.
+ */
+if (typeof v2.Rails === 'undefined' || v2.Rails === null) {
+  v2.Rails = {};
+}
+/**
+ *  Generic validator that acts as a client-side validator/helper for remote validator responses.
+ */
+v2.Validator.add({acceptEmpty: true, fn: function(field, value, params) { return !!params[0]; }, message: null, name: 'remote-client'});
+/**
+ *  Perform a remote validation on a given field the Validatious way, slightly modified
+ */
+v2.Rails.performRemoteValidation = function performRemoteValidation(name, field, value, params, message) {
+  var field_element = field.__elements[0];
+  var url = v2.Rails.remoteValidationUrlFor(name, field_element, value, params);
+  var xmlHttpRequest = new XMLHttpRequest;
+  xmlHttpRequest.open('GET', url, true);
+  xmlHttpRequest.onreadystatechange = function() {
+    if (this.readyState == XMLHttpRequest.DONE) {
+      var validationResult = (this.responseText == 'true' || this.responseText == '1') ? true : false;
+      /* console.log('Validation result: ' + validationResult); */
+      /* Get all validators for this field, except the current validator. */
+      var fieldClasses = field_element.getAttribute('class').replace(new RegExp(name + '\w*'), '').replace(/^\s+|\s+$/g, '');
+      var theOtherValidators = v2.html.validatorsFromString(fieldClasses);
+      /* Make remote-client validator trigger validation failure or not. */
+      var thisValidator = field_element.id.is('remote-client', validationResult).explain(message);
+      v2.html.applyValidators(theOtherValidators, thisValidator);
+      thisValidator.item.validate();
+    };
+  };
+  xmlHttpRequest.send(null);
+  return true;
+};
+/**
+ *  Generate a remote validation poll URL the validatious-on-rails-way,
+ *  i.e. auto-detect required params from form builder generated DOM.
+ *
+ *  Example:
+ *    /validates/uniqueness_of?model=article&attribute=title(&id=2)&value=Lorem&params[0]=334&params[1]=hello&...
+ */
+v2.Rails.remoteValidationUrlFor = function remoteValidationUrlFor(name, field, value, params) {
+  var modelName = v2.Rails.modelNameByField(field);
+  var attributeName = v2.Rails.attributeNameByField(field);
+  var recordId = v2.Rails.recordIdByField(field);
+  var paramsString = new Array(params.length);
+  for (var i = 0; i < params.length; i++) {
+    paramsString[i] = 'params[' + i + ']=' + escape(params[i]);
+  }
+  var url = ['/validates/', name, '?',
+              [
+                ['model', escape(modelName)].join('='),
+                ['attribute', escape(attributeName)].join('='),
+                ['id', recordId].join('='),
+                ['value', escape(value)].join('='),
+                paramsString.join('&')
+              ].join('&')
+            ].join('').replace(/\&$/, '');
+  return url;
+};
+/**
+ *  Get form containing a specified field.
+ */
+v2.Rails.formByField = function formByField(field) {
+  var parent = field.parentNode;
+  while((parent.tagName != 'FORM')) { parent = parent.parentNode; }
+  return parent;
+};
+/**
+ *  form_element.id="edit_account_34" => 34
+ *  form_element.id="new_account" => nil
+ */
+v2.Rails.recordIdByField = function recordIdByField(field) {
+  var form = v2.Rails.formByField(field);
+  var recordId = form.id.match(/(\d+)$/);
+  return (recordId && recordId.length > 1) ? +recordId[1] : null;
+};
+/**
+ *  field_element.name="account[login]" => 'account'
+ */
+v2.Rails.modelNameByField = function modelNameByField(field) {
+  var modelName = field.name.match(/^(.*)\[.*\]$/);
+  return (modelName.length > 1) ? modelName[1] : '';
+};
+/**
+ * field_element.name="account[login]" => 'login'
+ */
+v2.Rails.attributeNameByField = function attributeNameByField(field) {
+  var attributeName = field.name.match(/^.*\[(.*)\]$/);
+  return (attributeName.length > 1) ? attributeName[1] : '';
+};

data/generators/validatious/validatious_generator.rb CHANGED Viewed

@@ -4,9 +4,11 @@ class ValidatiousGenerator < Rails::Generator::Base
   def manifest
     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')
+      m.template 'initializer.rb',            File.join(*%[config initializers validatious-on-rails.rb])
+      m.template 'XMLHttpRequest.js',         File.join(*%[public javascripts XMLHttpRequest.js])
+      m.template 'v2.standalone.full.min.js', File.join(*%[public javascripts v2.standalone.full.min.js])
+      m.template 'v2.config.js',              File.join(*%[public javascripts v2.config.js])
+      m.template 'v2.rails.js',               File.join(*%[public javascripts v2.rails.js])
     end
   end

data/lib/validatious-on-rails/controller.rb ADDED Viewed

@@ -0,0 +1,56 @@
+# encoding: utf-8
+module ValidatiousOnRails
+  class Controller < ::ActionController::Base
+    # To validate, poll request:
+    #
+    #   /validates/uniqueness_of?model={MODEL_NAME}&attribute={ATTRIBUTE_NAME}&value={INPUT_VALUE}(&id=RECORD_ID)
+    #
+    # == Example:
+    #
+    #   /validates/uniqueness_of?model=article&attribute=title&value=hello123(&id=1)
+    #
+    def method_missing(action, *args, &block)
+      ::ValidatiousOnRails.log "Remote validation called: #{action.inspect}, with params: #{params.inspect}", :info
+      begin
+        record_klass = "::#{params[:model].to_s.classify}".constantize
+      rescue
+        raise RemoteValidationInvalid, "Not a valid model: #{params[:model].inspect}"
+      end
+      if record_klass.blank? || params[:attribute].nil? ||
+        record_klass.content_columns.collect { |c| c.name.to_sym }.include?(params[:attribute].to_sym) == false
+        raise RemoteValidationInvalid, "Not a valid attribute for #{record_klass.inspect}: #{params[:attribute].inspect}"
+      end
+      # Only check for method matching: validates_*.
+      if record_klass.present? && defined?(record_klass) &&
+        (record_klass.respond_to?(:"validates_#{action}") || record_klass.respond_to?(:"validates_#{action}_of"))
+        validator_klass_name = "#{action.to_s.gsub(/_of/, '')}_validator".classify
+        remote_validators = ::Object.subclasses_of(::ValidatiousOnRails::Validatious::RemoteValidator)
+        validator_klass = remote_validators.select { |v| v.to_s.split('::').last == validator_klass_name }.first
+        if validator_klass.present?
+          # Perform validation.
+          if record = ((params[:id].present? && params[:id] > 0) ? record_klass.find(params[:id]) : record_klass.new)
+            validation_result = validator_klass.perform_validation(record, params[:attribute].to_sym, params[:value], params)
+            ::ValidatiousOnRails.log "#{validator_klass} validation result: #{validation_result.to_s.upcase}. #{record_klass}##{params[:attribute]} => #{params[:value].inspect}", :info
+            # validation_result = (validation_result ? 1 : 0)
+            return render(:text => validation_result, :status => 200)
+          else
+            raise RemoteValidationInvalid, "Invalid record ID for class #{record_klass.inspect}: #{params[:id]}. No such record found."
+          end
+        else
+          raise RemoteValidationInvalid, "No remote validator matching: #{validator_klass.inspect}."
+        end
+      else
+        raise RemoteValidationInvalid, "#{record_klass} don't respond to: #{"validates_#{action}".inspect}."
+      end
+    rescue RemoteValidationInvalid => e
+      return render(:text => false, :status => 405)
+    end
+  end
+end

data/lib/validatious-on-rails/helpers.rb CHANGED Viewed

@@ -1,3 +1,5 @@
+# encoding: utf-8
 module ValidatiousOnRails
   module Helpers

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

@@ -283,7 +283,8 @@ module ValidatiousOnRails
       # TODO: Implement using RemoteValidator.
       #
       def uniqueness_of(validation)
-        nil
+        validators = []
+        validators << Validatious::UniquenessValidator.new(validation)
       end
       # Unknown validations - if no matching custom validator is found/registered.

data/lib/validatious-on-rails/validatious/client_side_validator.rb CHANGED Viewed

@@ -4,11 +4,17 @@ require File.join(File.dirname(__FILE__), 'validator')
 module ValidatiousOnRails
   module Validatious
     class ClientSideValidator < Validator
       def initialize(name, *args)
         super
       end
+      # Override default Validator-fn, with default a ClientSideValidator-fn.
+      #
+      def fn
+        (@fn ||= "function(field, value, params) {return true;}").gsub(/[\n\t]/, '')
+      end
     end
   end
 end

data/lib/validatious-on-rails/validatious/remote_validator.rb CHANGED Viewed

@@ -4,21 +4,72 @@ require File.join(File.dirname(__FILE__), 'validator')
 module ValidatiousOnRails
   module Validatious
     class RemoteValidator < Validator
-      def initialize(name, *args)
-        super
+      def initialize(validation, *args)
+        name = self.class.name.split('::').last.underscore.gsub(/_validator$/, '')
+        super name, *args
+        self.message = self.class.generate_message(validation)
       end
-      # TODO: Implement server side validator class, i.e. for validatios that requires AJAX
-      # Idea:
-      #
-      #   Perform AJAX-request to a specified/generated URL
-      #   (e.g. /validatious/unique?model=article&attribute=...&value=...), with an attached
-      #   callback-method that should trigger a client-side validation.
-      #   Well, this is one possible approach...
+      # Override default Validator-fn, with default a RemoteValidator-fn.
+      #
+      #   1. Perform AJAX request (dependencies: validatious-on-rails.js, XMLHttpRequest.js).
+      #   2. Always return true, callback-function should perform the actual client side validation.
       #
+      def fn
+        (@fn ||= %{
+            function(field, value, params) {
+              return !!v2.Rails.performRemoteValidation('#{self.name}', field, value, params, '#{self.message}');
+            }
+          }).gsub(/[\n\t]/, '')
+      end
+      class << self
+        # Perform the actual validation on the server-side.
+        # Requires an instance of the class to validate, the attribute that
+        #  needs to be validated, and the current (input) value to validate.
+        #
+        # Base case: Return "true".
+        #
+        def perform_validation(record, attribute_name, value, params = {})
+          return true if record.blank?
+          record.send :"#{attribute_name}=", value
+          if record.valid?
+            ValidatiousOnRails.log "Validation: SUCCESS"
+            true
+          else
+            return true if record.errors[attribute_name.to_sym].blank?
+            # TODO: Refactor this when "the better" namin convention is used (see TODO).
+            validation_macro = ("validates_%s" % self.name.split('::').last.underscore.gsub(/_validator$/, ''))
+            validation = record.class.reflect_on_validations_for(attribute_name.to_sym).select { |v|
+                v.macro.to_s == validation_macro || v.macro.to_s == "#{validation_macro}_of"
+              }.first
+            return true if validation.blank?
+            # {{variable}} => .*
+            validation_error_message = self.new(validation).message.gsub(/\{\{.*\}\}/, '.*')
+            # Ugly, but probably the only way (?) to identify a certain error without open
+            # up rails core validation methods - not scalable.
+            is_invalid = record.errors[attribute_name.to_sym].any? do |error_message|
+              #ValidatiousOnRails.log error_message + " =~ " + /^#{validation_error_message}$/.inspect
+              error_message =~ /^#{validation_error_message}$/u
+            end
+            if is_invalid
+              ValidatiousOnRails.log "Validation: FAIL: " + record.errors[attribute_name.to_sym].to_s
+              false
+            else
+              true
+            end
+          end
+        end
+      end
     end
   end
 end

data/lib/validatious-on-rails/validatious/validator.rb CHANGED Viewed

@@ -15,13 +15,14 @@
 #     }
 #   });
 #
+# Reference: http://validatious.org/learn/features/core/custom_validators
+#
 module ValidatiousOnRails
   module Validatious
-    class Validator
-      # Reference: http://validatious.org/learn/features/core/custom_validators
+    ValidatorError = ::Class.new(::StandardError) unless defined?(ValidatorError)
-      ValidatorError = ::Class.new(::StandardError) unless defined?(ValidatorError)
+    class Validator
       attr_accessor :name
       attr_writer   :message,
@@ -30,7 +31,7 @@ module ValidatiousOnRails
                     :accept_empty,
                     :fn,
                     :args
       def initialize(name, *args)
         raise ValidatorError, "Parameter :name is required for an Validatious validator" unless name.present?
         self.name = name
@@ -84,6 +85,7 @@ module ValidatiousOnRails
         @aliases ||= []
       end
       # Decides if the validator should pass (return true) when the value is empty.
       # This is usually a good idea because you can leave it up to the required validator
       # to specifically check for emptiness. One benefit of this approach is more
@@ -124,10 +126,6 @@ module ValidatiousOnRails
         end
       end
-      def fn
-        (@fn ||= "function(field, value, params) {return true;}").gsub(/[\n\t]/, '')
-      end
       def to_js
         options = {
             :name => self.name,
@@ -191,8 +189,6 @@ module ValidatiousOnRails
         # Generate proper error message using explicit message, or I18n-lookup.
         # Core validations gets treated by Rails - unless explicit message is set that is.
         #
-        # NOTE: Might refactor this into a even more abstract class/module.
-        #
         def generate_message(validation, *args)
           options = args.extract_options!
           explicit_message = validation.options[:message]
@@ -218,32 +214,14 @@ module ValidatiousOnRails
           message.gsub(/\{\{/, '${').gsub(/\}\}/, '}')
         end
-        # Rails core validation messages:
-        #
-        # messages:
-        #   inclusion: "is not included in the list"
-        #   exclusion: "is reserved"
-        #   invalid: "is invalid"
-        #   confirmation: "doesn't match confirmation"
-        #   accepted: "must be accepted"
-        #   empty: "can't be empty"
-        #   blank: "can't be blank"
-        #   too_long: "is too long (maximum is {{count}} characters)"
-        #   too_short: "is too short (minimum is {{count}} characters)"
-        #   wrong_length: "is the wrong length (should be {{count}} characters)"
-        #   taken: "has already been taken"
-        #   not_a_number: "is not a number"
-        #   greater_than: "must be greater than {{count}}"
-        #   greater_than_or_equal_to: "must be greater than or equal to {{count}}"
-        #   equal_to: "must be equal to {{count}}"
-        #   less_than: "must be less than {{count}}"
-        #   less_than_or_equal_to: "must be less than or equal to {{count}}"
-        #   odd: "must be odd"
-        #   even: "must be even"
-        #   record_invalid: "is invalid"
       end
+      protected
+        def generic_name
+          self.class.name.split('::').last.underscore.gsub(/_validator$/, '')
+        end
     end
   end
 end

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

@@ -19,7 +19,7 @@ module ValidatiousOnRails
       def initialize(validation, options = {})
         name, alias_name = self.class.generate_name(validation, :with, self.class.generate_id(validation.options[:with].inspect))
         super name, options
-        self.message = self.class.generate_message(validation)
+        self.message = self.class.generate_message(validation, :key => :invalid)
         self.accept_empty = validation.options[:allow_nil]
         self.fn = %{
           #{self.class.validate_blank(validation)}

data/lib/validatious-on-rails/validatious/validators/invalid_validator.rb ADDED Viewed

@@ -0,0 +1,19 @@
+# encoding: utf-8
+require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. validator]))
+module ValidatiousOnRails
+  module Validatious
+    class RemoteClientValidator < ClientSideValidator
+      def initialize(validation, options = {})
+        super 'remote-client', options
+        self.message = self.class.generate_message(validation)
+        self.accept_empty = false
+        self.fn = %{
+          return !!params[0];
+        }
+      end
+    end
+  end
+end

data/lib/validatious-on-rails/validatious/validators/remote_client_validator.rb ADDED Viewed

@@ -0,0 +1,19 @@
+# encoding: utf-8
+require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. validator]))
+module ValidatiousOnRails
+  module Validatious
+    class RemoteClientValidator < ClientSideValidator
+      def initialize(validation, options = {})
+        super 'remote-client', options
+        self.message = self.class.generate_message(validation)
+        self.accept_empty = false
+        self.fn = %{
+          return !!params[0];
+        }
+      end
+    end
+  end
+end

data/lib/validatious-on-rails/validatious/validators/uniqueness_validator.rb ADDED Viewed

@@ -0,0 +1,23 @@
+# encoding: utf-8
+require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. validator]))
+module ValidatiousOnRails
+  module Validatious
+    class UniquenessValidator < RemoteValidator
+      def initialize(validation, options = {})
+        super
+        self.accept_empty = false
+      end
+      class << self
+        def generate_message(validation)
+          super(validation, :key => :taken)
+        end
+      end
+    end
+  end
+end

data/lib/validatious-on-rails.rb CHANGED Viewed

@@ -3,6 +3,7 @@ require File.join(File.dirname(__FILE__), *%w[validatious-on-rails validatious])
 require File.join(File.dirname(__FILE__), *%w[validatious-on-rails model_validations])
 require File.join(File.dirname(__FILE__), *%w[validatious-on-rails rails])
 require File.join(File.dirname(__FILE__), *%w[validatious-on-rails helpers])
+require File.join(File.dirname(__FILE__), *%w[validatious-on-rails controller])
 module ValidatiousOnRails # :nodoc:
@@ -12,10 +13,11 @@ module ValidatiousOnRails # :nodoc:
   #
   class ValidatiousOnRailsError < ::StandardError
     def initialize(message)
-      ::Validatious.log message, :debug
+      ::ValidatiousOnRails.log message, :error
       super message
     end
   end
+  RemoteValidationInvalid = ::Class.new(::ValidatiousOnRails::ValidatiousOnRailsError)
   @@verbose = ::Object.const_defined?(:RAILS_ENV) ? (::RAILS_ENV.to_sym == :development) : true
   @@client_side_validations_by_default = true
@@ -29,7 +31,7 @@ module ValidatiousOnRails # :nodoc:
     return unless @@verbose
     level = :info if level.blank?
     @@logger ||= ::Logger.new(::STDOUT)
-    @@logger.send(level.to_sym, message)
+    @@logger.send(level.to_sym, "[validatious-on-rails:]  #{level.to_s.upcase}  #{message}")
   end
 end

data/test/test_helper.rb CHANGED Viewed

@@ -33,6 +33,9 @@ extend RR::Adapters::RRMethods
 require 'validatious-on-rails'
+require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. app controllers validates_controller]))
+require File.expand_path(File.join(File.dirname(__FILE__), *%w[.. config routes]))
 # TODO: Should extend Rails validators with this - to test respond_to.
 module ActiveRecord
   module Validations
@@ -64,6 +67,7 @@ build_model :bogus_items do
   string :field_without_client_side_validations
   validates_presence_of :name, :body, :variant, :file_path, :dummie
+  validates_uniqueness_of :name
   validates_confirmation_of :name
   validates_acceptance_of :signed, :accept => true
   validates_format_of :url,
@@ -86,6 +90,10 @@ end
 #
 RAILS_ROOT = File.join(File.dirname(__FILE__)) unless defined?(RAILS_ROOT)
+# To show debug messages in test output, set this to true.
+#
+::ValidatiousOnRails.verbose = false
 #
 # Log file for testing only.
 #

data/test/validatious_on_rails/controller_test.rb ADDED Viewed

@@ -0,0 +1,97 @@
+# encoding: utf-8
+require File.expand_path(File.join(File.dirname(__FILE__), *%w(.. test_helper)))
+require 'action_controller/test_case'
+class ControllerTest < ::ActionController::TestCase
+  # /validates/uniqueness_of?model={MODEL_NAME}&attribute={ATTRIBUTE_NAME}&value={INPUT_VALUE}(&id=RECORD_ID)
+  before do
+    @controller = ::ValidatesController.new
+    @bogus_item = ::BogusItem.new
+  end
+  context "routes" do
+    test "remote validations route" do
+      assert_routing 'validates/craziness_of', :controller => 'validates', :action => 'craziness_of'
+    end
+  end
+  context "remote validations" do
+    context "invalid validation" do
+      test "without any params - should fail" do
+        get :bananas
+        assert_response 405
+        assert_equal 'false', @response.body
+      end
+    end
+    context "valid validation" do
+      test "without any params - should fail" do
+        get :uniqueness_of
+        assert_response 405
+        assert_equal 'false', @response.body
+      end
+      test "with params: :model - should fail" do
+        get :uniqueness_of, :model => 'bogus_item'
+        assert_response 405
+        assert_equal 'false', @response.body
+      end
+      context "with params: :model, :attribute" do
+        test "any invalid - should fail" do
+          get :uniqueness_of, :model => 'duck', :attribute => 'name'
+          assert_response 405
+          assert_equal 'false', @response.body
+          get :uniqueness_of, :model => 'bogus_item', :attribute => 'jedi'
+          assert_response 405
+          assert_equal 'false', @response.body
+        end
+        context "all valid" do
+          test "invalid validation methods/actions - should fail" do
+            get :bananas, :model => 'bogus_item', :attribute => 'name'
+            assert_response 405
+            assert_equal 'false', @response.body
+          end
+          context "without :value" do
+            # test ":value is not allowed to be blank - should fail" do
+            #   get :uniqueness_of, :model => 'bogus_item', :attribute => 'name'
+            #   assert_response 405
+            #   assert_equal 'false', @response.body
+            # end
+             # test ":value is allowed to be blank - should succeed" do
+             #   get :uniqueness_of, :model => 'bogus_item', :attribute => 'name'
+             #   assert_response 200
+             #   assert_equal 'true', @response.body
+             # end
+          end
+          context "with :value" do
+            # FIXME: Fails, but why? Works "in practice".
+            test "invalid value - should fail" do
+              @existing_bogus_item = ::BogusItem.new(:name => 'carrot')
+              @existing_bogus_item.save(false)
+              get :uniqueness_of, :model => 'bogus_item', :attribute => 'name', :value => 'carrot'
+              assert_response 200
+              assert_equal 'false', @response.body
+            end
+            test "valid :value - should succeed" do
+              get :uniqueness_of, :model => 'bogus_item', :attribute => 'name', :value => 'unique carrot'
+              assert_response 200
+              assert_equal 'true', @response.body
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/test/validatious_on_rails/helpers_test.rb CHANGED Viewed

@@ -28,9 +28,9 @@ class HelpersTest < ::ActionView::TestCase
         concat javascript_for_validatious
         # In parts...
-        assert_match /<script.+>.*v2.Validator.*<\/script>/, output_buffer
-        assert_match /<script.*id="custom_validators".*>/, output_buffer
-        assert_match /<script.*type="text\/javascript".*>/, output_buffer
+        assert_match /<script.+>.*v2.Validator.*<\/script>/m, output_buffer
+        assert_match /<script.*id="custom_validators".*>/m, output_buffer
+        assert_match /<script.*type="text\/javascript".*>/m, output_buffer
       end
     end

data/test/validatious_on_rails/validatious/validator_test.rb CHANGED Viewed

@@ -6,8 +6,8 @@ require 'active_support/test_case'
 class ValidatorTest < ::ActiveSupport::TestCase
   def setup
-    @empty_validator = ValidatiousOnRails::Validatious::Validator.new('dummie')
-    @custom_validator = returning ValidatiousOnRails::Validatious::Validator.new('dummie') do |v|
+    @empty_validator = ValidatiousOnRails::Validatious::ClientSideValidator.new('dummie')
+    @custom_validator = returning ValidatiousOnRails::Validatious::ClientSideValidator.new('dummie') do |v|
       v.message = 'Fail, fail, fail!'
       v.params = ['some', 'params']
       v.aliases = ['some', 'aliases']

metadata CHANGED Viewed

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: validatious-on-rails
 version: !ruby/object:Gem::Version
-  version: 0.3.9
+  version: 0.4.0
 platform: ruby
 authors:
 - Jonas Grimfelt
@@ -10,7 +10,7 @@ autorequire:
 bindir: bin
 cert_chain: []
-date: 2009-10-19 00:00:00 +02:00
+date: 2009-10-20 00:00:00 +02:00
 default_executable:
 dependencies: []
@@ -22,11 +22,16 @@ extensions: []
 extra_rdoc_files:
 - Rakefile
+- app/controllers/validates_controller.rb
+- config/routes.rb
+- generators/validatious/templates/XMLHttpRequest.js
 - generators/validatious/templates/initializer.rb
+- generators/validatious/templates/v2.config.js
+- generators/validatious/templates/v2.rails.js
 - generators/validatious/templates/v2.standalone.full.min.js
-- generators/validatious/templates/validatious.config.js
 - generators/validatious/validatious_generator.rb
 - lib/validatious-on-rails.rb
+- lib/validatious-on-rails/controller.rb
 - lib/validatious-on-rails/helpers.rb
 - lib/validatious-on-rails/model_validations.rb
 - lib/validatious-on-rails/rails.rb
@@ -41,6 +46,7 @@ extra_rdoc_files:
 - lib/validatious-on-rails/validatious/validators/exclusion_validator.rb
 - lib/validatious-on-rails/validatious/validators/format_validator.rb
 - lib/validatious-on-rails/validatious/validators/inclusion_validator.rb
+- lib/validatious-on-rails/validatious/validators/invalid_validator.rb
 - lib/validatious-on-rails/validatious/validators/length/is_validator.rb
 - lib/validatious-on-rails/validatious/validators/length/maximum_validator.rb
 - lib/validatious-on-rails/validatious/validators/length/minimum_validator.rb
@@ -53,8 +59,11 @@ extra_rdoc_files:
 - lib/validatious-on-rails/validatious/validators/numericality/odd_validator.rb
 - lib/validatious-on-rails/validatious/validators/numericality/only_integer_validator.rb
 - lib/validatious-on-rails/validatious/validators/presence_validator.rb
+- lib/validatious-on-rails/validatious/validators/remote_client_validator.rb
+- lib/validatious-on-rails/validatious/validators/uniqueness_validator.rb
 - rails/init.rb
 - test/test_helper.rb
+- test/validatious_on_rails/controller_test.rb
 - test/validatious_on_rails/helpers_test.rb
 - test/validatious_on_rails/model_validations_test.rb
 - test/validatious_on_rails/rails/action_view_helpers_test.rb
@@ -62,11 +71,16 @@ extra_rdoc_files:
 - test/validatious_on_rails_test.rb
 files:
 - Rakefile
+- app/controllers/validates_controller.rb
+- config/routes.rb
+- generators/validatious/templates/XMLHttpRequest.js
 - generators/validatious/templates/initializer.rb
+- generators/validatious/templates/v2.config.js
+- generators/validatious/templates/v2.rails.js
 - generators/validatious/templates/v2.standalone.full.min.js
-- generators/validatious/templates/validatious.config.js
 - generators/validatious/validatious_generator.rb
 - lib/validatious-on-rails.rb
+- lib/validatious-on-rails/controller.rb
 - lib/validatious-on-rails/helpers.rb
 - lib/validatious-on-rails/model_validations.rb
 - lib/validatious-on-rails/rails.rb
@@ -81,6 +95,7 @@ files:
 - lib/validatious-on-rails/validatious/validators/exclusion_validator.rb
 - lib/validatious-on-rails/validatious/validators/format_validator.rb
 - lib/validatious-on-rails/validatious/validators/inclusion_validator.rb
+- lib/validatious-on-rails/validatious/validators/invalid_validator.rb
 - lib/validatious-on-rails/validatious/validators/length/is_validator.rb
 - lib/validatious-on-rails/validatious/validators/length/maximum_validator.rb
 - lib/validatious-on-rails/validatious/validators/length/minimum_validator.rb
@@ -93,8 +108,11 @@ files:
 - lib/validatious-on-rails/validatious/validators/numericality/odd_validator.rb
 - lib/validatious-on-rails/validatious/validators/numericality/only_integer_validator.rb
 - lib/validatious-on-rails/validatious/validators/presence_validator.rb
+- lib/validatious-on-rails/validatious/validators/remote_client_validator.rb
+- lib/validatious-on-rails/validatious/validators/uniqueness_validator.rb
 - rails/init.rb
 - test/test_helper.rb
+- test/validatious_on_rails/controller_test.rb
 - test/validatious_on_rails/helpers_test.rb
 - test/validatious_on_rails/model_validations_test.rb
 - test/validatious_on_rails/rails/action_view_helpers_test.rb
@@ -130,6 +148,7 @@ specification_version: 3
 summary: Rails plugin that maps model validations to class names on form elements to integrate with Validatious.
 test_files:
 - test/test_helper.rb
+- test/validatious_on_rails/controller_test.rb
 - test/validatious_on_rails/helpers_test.rb
 - test/validatious_on_rails/model_validations_test.rb
 - test/validatious_on_rails/rails/action_view_helpers_test.rb