validatious-on-rails 0.4.3 → 0.4.4

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

@@ -18,11 +18,14 @@ v2.Rails.performRemoteValidation = function performRemoteValidation(name, field,
   var field_element = field.__elements[0];
   var url = v2.Rails.remoteValidationUrlFor(name, field_element, value, params);
 
+  v2.Rails.initializeLastResult(name, field_element.id);
+
   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;
+      v2.Rails.lastRemoteValidationResult[name][field_element.id] = validationResult;
       /* console.log('Validation result: ' + validationResult); */
 
       /* Get all validators for this field, except the current validator. */
@@ -36,7 +39,23 @@ v2.Rails.performRemoteValidation = function performRemoteValidation(name, field,
     };
   };
   xmlHttpRequest.send(null);
-  return true;
+  return v2.Rails.lastRemoteValidationResult[name][field_element.id];
+};
+
+/**
+ *  Initialize data structure for holding info about last remote AJAX validation result.
+ *  We need this to make Validatious play well with remote validations.
+ */
+v2.Rails.initializeLastResult = function initializeLastResult(validator_name, field_id) {
+  if (typeof v2.Rails.lastRemoteValidationResult == 'undefined') {
+    v2.Rails.lastRemoteValidationResult = new Array();
+  }
+  if (typeof v2.Rails.lastRemoteValidationResult[validator_name] == 'undefined') {
+    v2.Rails.lastRemoteValidationResult[validator_name] = new Array();
+  };
+  if (typeof v2.Rails.lastRemoteValidationResult[validator_name][field_id] == 'undefined') {
+    v2.Rails.lastRemoteValidationResult[validator_name][field_id] = false;
+  };
 };
 
 /** 

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

@@ -34,7 +34,7 @@ module ValidatiousOnRails
 
         if validator_klass.present?
           # Perform validation.
-          if record = ((params[:id].present? && params[:id] > 0) ? record_klass.find(params[:id]) : record_klass.new)
+          if record = (((params[:id].present? && params[:id].to_i > 0) ? record_klass.find(params[:id]) : record_klass.new) rescue nil)
             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)

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

@@ -77,8 +77,7 @@ module ValidatiousOnRails
                   else
                     object_or_class
                   end
-          # FIXME: Forgot how to check this on the class instead of an instance of the class.
-          return validators unless klass.new.is_a?(::ActiveRecord::Base)
+          return validators unless klass.respond_to?(:reflect_on_validations_for)
         rescue
           ::ValidatiousOnRails.log "Missing constant: #{object_or_class}", :debug
           return validators

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

@@ -16,19 +16,6 @@ module ActionView # :nodoc:
         define_with_validatious_support(field_type)
       end
 
-      # Adds the title attribute to label tags when there is no title
-      # set, and the label text is provided. The title is set to object_name.humanize
-      #
-      def label_with_title(object_name, method, text = nil, options = {})
-        begin
-          options[:title] ||= object_name.to_s.classify.constantize.human_attribute_name(method.to_s) unless text.nil?
-        rescue
-          # skip
-        end
-        label_without_title(object_name, method, text, options)
-      end
-      alias_method_chain :label, :title
-
     end
 
     module FormOptionsHelper # :nodoc:

data/test/validatious_on_rails/rails/action_view_helpers_test.rb

@@ -230,26 +230,6 @@ class FormHelperTest < ::ActionView::TestCase
     # TODO: The other validators...
   end
 
-  # TODO: Re-visit label - needed still?
-  context "label" do
-    test "regular" do
-      # Using helper
-      assert_equal "<label for=\"bogus_item_name\">Name</label>", label(:bogus_item, :name)
-    end
-    
-    test "with title" do
-      # Using helper
-      assert_equal "<label for=\"bogus_item_name\" title=\"craaazy\">Name</label>",
-                   label(:bogus_item, :name, nil, :title => "craaazy")
-    end
-    
-    test "without title" do
-      # Using helper
-      assert_equal "<label for=\"bogus_item_name\" title=\"Name\">Your name</label>",
-                   label(:bogus_item, :name, "Your name")
-    end
-  end
-
   private
 
     def protect_against_forgery?

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: validatious-on-rails
 version: !ruby/object:Gem::Version 
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors: 
 - Jonas Grimfelt