edifice 0.8.0 → 0.9.0

data/app/assets/javascripts/edifice.js

@@ -1,5 +1,3 @@
 /*
  *= require edifice/framework
- *= require edifice/edifice_form
- *= require edifice/form
  */

data/lib/edifice/version.rb

@@ -1,3 +1,3 @@
 module Edifice
-  VERSION = "0.8.0"
+  VERSION = "0.9.0"
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: edifice
 version: !ruby/object:Gem::Version 
-  hash: 63
+  hash: 59
   prerelease: 
   segments: 
   - 0
-  - 8
+  - 9
   - 0
-  version: 0.8.0
+  version: 0.9.0
 platform: ruby
 authors: 
 - Tom Coleman
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-10-13 00:00:00 Z
+date: 2011-10-14 00:00:00 Z
 dependencies: []
 
 description: The idea here is to communicate which view is rendering to the javascript so that we can call the correct javascript files in an automagical way.
@@ -40,8 +40,6 @@ files:
 - README
 - Rakefile
 - app/assets/javascripts/edifice.js
-- app/assets/javascripts/edifice/edifice_form.js
-- app/assets/javascripts/edifice/form.js
 - app/assets/javascripts/edifice/framework.js
 - edifice.gemspec
 - init.rb

data/app/assets/javascripts/edifice/edifice_form.js

@@ -1,112 +0,0 @@
-// add methods to a form element so it can be easily manipulated
-//
-// add client side validation
-// understands:
-//   - rails form structures
-//   - rails form errors in JSON
-//   - etc
-(function($) {
-$.fn.edifice_form = function() {
-  $.extend(this, methods);
-  return this;
-};
-
-// VALIDATORS: 
-  // validators expect a form element and return true or an error message
-$.fn.edifice_form.validators = {
-  not_empty: function($input) {
-    return $input.val() ? true : 'must not be empty';
-  }
-};
-
-
-// in these 'this' is the $form
-var methods = {
-  fields: function() {
-    return this.find('input, textarea, select');
-  },
-  
-  error_fields: function() {
-    var $form = this;
-    return this.fields().filter(function() {
-      return $form.has_error($(this));
-    });
-  },
-  
-  submits: function() {
-    return this.find('input[type=submit], button[type=submit]');
-  },
-  
-  valid: function() {
-    var $form = this, valid = true;
-    
-    this.fields().each(function() {
-      if (!$form.validate($(this))) { valid = false; }
-    });
-    
-    return valid;
-  },
-  
-  // 'prepare' a validator --> validator returns true or an error string
-  set_validator: function($field, validator) {
-    if (typeof validator === 'string') {
-      validator = $.fn.edifice_form.validators[validator] || validator;
-      if (typeof validator !== 'function') { throw "Validator not defined: '" + validator + "'"; }
-    };
-    $field.data('validator', validator);
-  },
-  
-  // validate a single field
-  validate: function($field, validator) {
-    if (typeof validator === 'undefined') { validator = $field.data('validator'); }
-    if (validator) {
-      var error = validator($field), valid = error === true;
-      this.clear_error($field);
-      if (!valid) {
-        this.add_error($field, error);
-      }
-
-      return valid;      
-    } else {
-      return true;
-    }
-  },
-  
-  label_for: function($field) {
-    return this.find('label[for=' + $field.attr('id') + ']');
-  },
-  
-  error_on: function($field) {
-    return this.label_for($field).parents('.field_with_errors').next('.formError');
-  },
-  
-  has_error: function($field) {
-    return $field.parent('.field_with_errors').length > 0;
-  },
-  
-  clear_error: function($field) {
-   var id = $field.attr('id');
-   if (this.has_error($field)) { $field.unwrap() }
-   
-   this.find('.field_with_errors label[for=' + id + ']')
-    .unwrap()
-    .next('.formError').remove();
-  },
-  
-  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">');
-      
-  },
-  
-  set_errors: function(errors) {
-    for (var name in errors) {
-      this.add_error(this.fields().filter('[name*=' + name + ']'), errors[name][0]);
-    }
-  }
-};
-
-}(jQuery));

data/app/assets/javascripts/edifice/form.js

@@ -1,137 +0,0 @@
-(function($) {
-var defaults = {
-  status_element: this, // element to set to .submitting/.success/.error as we submit
-  // a hash of input selector -> validation functions/names
-  validators: {},
-  // stop the form from submitting and use ajax
-  ajax: true,
-  // type of data to pass around (and thus what's seen by e.g. success)
-  dataType: 'html'
-};
-
-// EVENTS that fire during the course of the life of the submission:
-//  submit, invalid, success | error (+ user_error | server_error), complete
-//
-// -> success,errors + complete are all passed the data you would expect from 
-// jQuery.ajax
-//
-// obviously on submit + invalid fire for non-ajax forms
-
-$.edifice_widgets.form = function() { return this.each(form); }
-  
-function form() {
-  var $form = $(this).edifice_form();
-  $form.settings = $form.read_options(defaults); 
-  $.extend($form, methods);
-  
-  $form.initialize();
-}
-var methods = {
-  initialize: function() {
-    // I don't know why, but FF seems to helpful remember that these are disabled
-    this.submits().removeAttr('disabled');
-    this.prepare_validators();
-    this.prepare_submit();
-  },
-  
-  prepare_validators: function() {
-    var $form = this;
-    
-    // setup validators from settings
-    for (var selector in $form.settings.validators) {
-      $form.set_validator($(selector), $form.settings.validators[selector]);
-    }
-    
-    // setup validators from html
-    $form.fields().filter('[data-widget-validator]').each(function() {
-      $form.set_validator($(this), $(this).attr('data-widget-validator'));
-    });
-    
-    // listen to validator
-    this.fields().live('change.ajax_form focusout.ajax_form', function() { 
-      if ($form.validate($(this)) === false) { $form.trigger('invalid', [$form, $(this)]); }
-    });
-  },
-  
-  prepare_submit: function() {
-    var $form = this;
-    this.submit(function(event) {
-      // do pre-submit validations
-      if (!$form.valid()) {
-        $form.invalid();
-        return false; // we are done.
-      }
-      
-      $form.submits().attr('disabled', true); // disable submit buttons
-      
-      // TODO - set status class
-      if ($form.settings.ajax && $form.settings.ajax !== 'false') {
-        // send up the form and process the results
-        $.ajax({
-          url: $form.attr('action'), type: $form.attr('method'),
-          dataType: $form.settings.dataType,
-          data: $.param($form.serializeArray()),
-          cache: false,
-          error: function (x, t, e) { $form.error(x, t, e); },
-          success: function (data, status) {
-            $form.trigger('success', [data, status, $form]);
-          },
-          complete: function (request, text_status) {
-            $form.trigger('complete', [request, text_status, $form]);
-
-            $form.submits().removeAttr('disabled');
-          }
-        });        
-        event.preventDefault();
-      }
-      
-    });
-  },
-  
-  invalid: function() {
-    // focus the first error
-    this.error_fields().eq(0).focus();
-    this.trigger('invalid', [this]);
-  },
-  
-  error: function(request, text_status, error) {
-    this.trigger('error', [request, status, error, this]);
-    
-    // handle the different possible errors that we can see
-    if (request.status >= 400 && request.status < 500) { 
-      // CLIENT ERROR -- server-side validation failed.
-      this.trigger('client_error', [request, status, error, this]);
-      
-      // if data is html, we replace this content of the form with the content
-      // of the form that we've just received back
-      if (this.settings.dataType === 'html') {
-        // wrap in a div incase there are a bunch of floating elements, pull the form out
-        var $new_form = $('<div>').append(request.responseText).find('#' + this.attr('id'));
-        
-        this.html($new_form.html());
-        this.prepare_validators();
-        
-      } else if (this.settings.dataType === 'json') {
-        // we will be receiving an error object back, we can pass it straight into form.js
-        this.set_errors($.parseJSON(request.responseText));
-      } else {
-        throw "Don't know how to handle dataType " + this.settings.dataType;
-      }
-      
-      this.invalid();
-    } else if (request.status >= 500 && request.status < 600) { 
-      // a SERVER ERROR -- something unrecoverable happened on the server
-      this.trigger('server_error', [request, status, error, this]);
-      
-      // we aren't going to do anything here.
-      // FIXME: we should probably have a way to set this behaviour at the application level.
-      // for instance, you probably just want to redirect to somewhere, or show a dialog,
-      // or popup something or.....?
-    } else {
-      // some other kind of error- something in the browser (e.g. navigating away)
-      this.trigger('browser_error', [request, status, error, this]);
-    }
-  },
-}
-  
-}(jQuery));