rails-ujs-form 0.1.3 → 0.2.0

data/app/assets/javascripts/ujs-form/rails_form.js

@@ -42,6 +42,16 @@ var methods = {
     return $field.parent('.field_with_errors').length > 0;
   },
   
+  clear_errors: function() {
+    var $form = this;
+    this.rails_form('fields').each(function() {
+      $form.rails_form('clear_error', $(this));
+    });
+    
+    // clear base errors too
+    this.find('.errors').html('');
+  },
+  
   clear_error: function($field) {
     var id = $field.attr('id');
     if (this.rails_form('has_error', $field)) { $field.unwrap() }
@@ -50,24 +60,59 @@ var methods = {
       .unwrap()
       .next('.formError').remove();
     
-    return this;
-  },
-  
-  add_error: function($field, error) {
-    var id = $field.attr('id');
-    $field.wrap('<div class="field_with_errors">');
-    this.find('label[for=' + id + ']')
-      .after('<div class="formError">' + error + '</div>')
-      .wrap('<div class="field_with_errors">');
+    // remove from a .errors ul
+    this.find('.errors [data-for=' + id + ']').remove();
     
     return this;
   },
   
   // display standard errors as returned by JSON
   set_errors: function(errors) {
+    this.rails_form('clear_errors');
     for (var name in errors) {
-      this.rails_form('add_error', this.fields().filter('[name*=' + name + ']'), errors[name][0]);
+      for (var i in errors[name]) {
+        this.rails_form('add_error', name, errors[name][i]);
+      }
     }
+    return this;
+  },
+  
+  add_error: function(name, error) {
+    var $field = this.rails_form('fields').filter('[name*=' + name + ']');
+    $field.filter('.field_with_errors > *').unwrap();
+    $field.wrap('<div class="field_with_errors">');
+    
+    // if there is a field, and it has a label, show the error after it
+    if ($field.length) {
+      var id = $field.attr('id');
+      var $label = this.rails_form('label_for', $field);
+      var $error = $label.parent().next('.formError');
+      
+      if ($error.length) {
+        $error.text(function(i, text) {
+          return text + ', ' + error;
+        });
+      } else {
+        $label.after('<div class="formError">' + error + '</div>')
+          .wrap('<div class="field_with_errors">');
+      }
+    }
+    
+    // if there is an .errors list, show the error there
+    var $errors = this.find('ul.errors');
+    if ($errors.length) {
+      var message = name.charAt(0).toUpperCase() + name.substring(1).replace('_', ' ') + 
+        ' ' + error;
+      
+      var $li = $('<li>' + message + '</li>');
+      
+      if ($field.length) {
+        $li.attr('data-for', $field.attr('id'));
+      }
+      
+      $errors.append($li);
+    }
+    
     return this;
   }
 };

data/app/assets/javascripts/ujs-form/show-errors.js

@@ -7,14 +7,14 @@
       // if data is html, we replace this content of the form with the content
       // of the form that we've just received back
       var contentType = request.getResponseHeader('Content-Type');
-      if (contentType =~ /html/) {
+      if (/html/.test(contentType)) {
         // wrap in a div incase there are a bunch of floating elements, pull the form out
         var $new_form = $('<div>' + request.responseText + '</div>').find('#' + $(this).attr('id'));
         $(this).html($new_form.html());
         
-      } else if (contentType =~ /json/) {
+      } else if (/json/.test(contentType)) {
         // we will be receiving an error object back, we can pass it straight into rails_form.js
-        this.rails_form('set_errors', $.parseJSON(request.responseText));
+        $(this).rails_form('set_errors', $.parseJSON(request.responseText));
       } else {
         throw "ujs-form/show-errors: Don't know how to handle dataType " + request.dataType;
       }

data/lib/rails-ujs-form.rb

@@ -1,4 +1,8 @@
+require 'rails-ujs-form/helper'
+
 module RailsUjsForm
   class Engine < Rails::Engine
   end
 end
+
+ActionView::Base.send :include, RailsUjsForm::Helper

data/lib/rails-ujs-form/helper.rb

@@ -0,0 +1,22 @@
+module RailsUjsForm
+  module Helper
+    # not sure why there isn't something like this in rails
+    #
+    # render the errors on an object in a fairly standard way:
+    #
+    # <ul class="errors">
+    #   <li data-for="name">Name cannot be blank</li>
+    # </ul>
+    def render_errors(builder)
+      errors = builder.object.errors
+      messages = errors.full_messages
+      content_tag :ul, :class => :errors do
+        output = ''
+        errors.each_with_index do |error, i|
+          output << content_tag(:li, :'data-for' => "#{builder.object_name}_#{error[0]}") { messages[i] }
+        end
+        output.html_safe
+      end
+    end
+  end
+end

data/lib/rails-ujs-form/version.rb

@@ -1,3 +1,3 @@
 module RailsUjsForm
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: rails-ujs-form
 version: !ruby/object:Gem::Version 
-  hash: 29
+  hash: 23
   prerelease: 
   segments: 
   - 0
-  - 1
-  - 3
-  version: 0.1.3
+  - 2
+  - 0
+  version: 0.2.0
 platform: ruby
 authors: 
 - Tom Coleman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-14 00:00:00 Z
+date: 2011-12-02 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: jquery-rails
@@ -46,6 +46,7 @@ files:
 - app/assets/javascripts/ujs-form/rails_form.js
 - app/assets/javascripts/ujs-form/show-errors.js
 - lib/rails-ujs-form.rb
+- lib/rails-ujs-form/helper.rb
 - lib/rails-ujs-form/version.rb
 - rails-ujs-form.gemspec
 homepage: