valibot 0.2.5 → 0.2.6

data/js/valibot.js

@@ -52,6 +52,7 @@ function Valibot(opts) {
   this.formId =              '';
   this.appUrl =              null;
   this.dependents =          {};
+  this.radiomatons =         [];
 
   if (opts != null) {
     if (opts.fancy != null && opts.fancy) {
@@ -110,13 +111,17 @@ function Valibot(opts) {
 
       var bindEvent = (_this.bindEvents[field] != null) ? _this.bindEvents[field] : _defaultBindEvent;
 
-      if (_this.include[modelName] instanceof Array && _this.include[modelName].indexOf(field) != -1) {
-        _this.valitrons.push(new Valitron(f, modelName, field, bindEvent, _this));
-      } else if (_this.exclude[modelName] instanceof Array && _this.exclude[modelName].indexOf(field) != -1) {
-        // NOOP
+      if (_type == 'radio') {
+        if (!_this.hasRadiomaton(field)) _this.radiomatons.push(new Radiomaton(modelName, field, _this));
       } else {
-        if (_valibotFieldRegExp.test(f.name))
+        if (_this.include[modelName] instanceof Array && _this.include[modelName].indexOf(field) != -1) {
           _this.valitrons.push(new Valitron(f, modelName, field, bindEvent, _this));
+        } else if (_this.exclude[modelName] instanceof Array && _this.exclude[modelName].indexOf(field) != -1) {
+          // NOOP
+        } else {
+          if (_valibotFieldRegExp.test(f.name))
+            _this.valitrons.push(new Valitron(f, modelName, field, bindEvent, _this));
+        }
       }
 
     });
@@ -134,7 +139,9 @@ function Valibot(opts) {
     });
   }
 
-  this.form = this.valitrons.concat(this.confirmomats).concat(this.agreepeeohs)[0].tag.form;
+  this.form = this.valitrons.concat(this.confirmomats)
+                            .concat(this.agreepeeohs)
+                            .concat(this.radiomatons)[0].tag.form;
   if (this.bindOnSubmit)
     $(this.form).submit(function(e){ e.preventDefault(); _this.onSubmit(); });
 
@@ -166,13 +173,14 @@ Valibot.prototype = {
       $(this.valitrons).each(function(i,tron){ if (!_this.valids.contains(tron) && !_this.invalids.contains(tron)) uc.push(tron); });
       $(this.confirmomats).each(function(i,mat){ if (!_this.valids.contains(mat) && !_this.invalids.contains(mat)) uc.push(mat); });
       $(this.agreepeeohs).each(function(i,oh){ if (!_this.valids.contains(oh) && !_this.invalids.contains(oh)) uc.push(oh); });
+      $(this.radiomatons).each(function(i,rad){ if (!_this.valids.contains(rad) && !_this.invalids.contains(rad)) uc.push(rad); });
       return uc;
     },
 
   allValid:
     function() {
       return this.invalids.length == 0 &&
-        this.valids.length == this.valitrons.length + this.confirmomats.length + this.agreepeeohs.length;
+        this.valids.length == this.valitrons.length + this.confirmomats.length + this.agreepeeohs.length + this.radiomatons.length;
     },
 
   onSubmit:
@@ -222,6 +230,13 @@ Valibot.prototype = {
              this.valibot.appUrl != null ? 'jsonp' : 'json');
     },
 
+  hasRadiomaton:
+    function(field) {
+      var has = false;
+      $(this.radiomatons).each(function(i, r){ if (r.field == field){ has = true; }});
+      return has;
+    },
+
   _defaultErrorTagPlacer:
     function(tag, errorTag, self, minion) {
       $(errorTag).insertAfter($(tag));
@@ -501,3 +516,95 @@ AgreePeeOh.prototype = {
       this.valid = false;
     }
 };
+
+// ---
+
+/* the Radiomaton class. instantiated on a set of radio buttons by an overseeing
+ * Valibot. handles the actual XHR between the JS and the valibot sinatra app.
+ */
+function Radiomaton(model, field, valibot) {
+  this.valid = false;
+  this.model = model;
+  this.field = field;
+  this.valibot = valibot;
+  this.errorTag = null;
+  this.selector = this.valibot.formId + 'input[name="' + this.model + '[' + this.field + ']"]';
+  this.radioInputs = $(this.selector);
+  this.tag = this.radioInputs[this.radioInputs.length - 1]; // default to the last one
+  var _this = this;
+  $(this.radioInputs).each(function(i,r){ $(r).change(function(event){ _this.checkValue(event); }); });
+}
+
+Radiomaton.prototype = {
+
+  checkValue:
+    function(event, callback) {
+      var _this = this;
+      var path = (this.valibot.appUrl != null ? this.valibot.appUrl : '') +
+                 '/' + this.valibot.pathPrefix +
+                 '/' + this.model +
+                 '/' + this.field +
+                 (this.valibot.context != null ? ('/in/' + this.valibot.context) : '');
+      var val = $(this.selector + ':checked').val() || '';
+      var params = {value: val};
+      if (this.valibot.dependents[this.field]) {
+        $(this.valibot.dependents[this.field]).each(function(i,dep) {
+          params[_this.model + '[' + dep + ']'] =
+            $('input[name="' + _this.model + '[' + dep + ']"], ' +
+              'select[name="' + _this.model + '[' + dep + ']"], ' +
+              'textarea[name="' + _this.model + '[' + dep + ']"]').val();
+        });
+      }
+      $.post(path, params, function(res){ _this.handleResponse(res, callback); },
+             this.valibot.appUrl != null ? 'jsonp' : 'json');
+    },
+
+  handleResponse:
+    function(res, callback) {
+
+      // bad state -> good state
+      if (res == null && this.errorTag != null) {
+        var _this = this;
+        this.valibot.errorTagRemover(this.errorTag, this.valibot, function(ret){ _this.errorTag = null; }, this);
+        this.valibot.addValid(this);
+        if (callback != null) callback(true);
+        this.valid = true;
+
+      // null state -> good state
+      } else if (res == null && this.errorTag == null) {
+        this.valibot.addValid(this);
+        if (callback != null) callback(true);
+        this.valid = true;
+
+      // bad state -> bad state
+      } else if (res != null && res.error != null && this.errorTag != null) {
+        this.errorTag = this.valibot.errorTagTransformer(this.parseErrorStrings(res.error), this.errorTag, this.valibot, this);
+        this.valibot.addInvalid(this);
+        if (callback != null) callback(false);
+        this.valid = false;
+
+      // null state -> bad state
+      } else if (res != null && res.error != null && this.errorTag == null) {
+        this.errorTag = this.valibot.errorTagBuilder(this.parseErrorStrings(res.error), this.valibot, this);
+        this.valibot.errorTagPlacer(this.tag, this.errorTag, this.valibot, this);
+        this.valibot.addInvalid(this);
+        if (callback != null) callback(false);
+        this.valid = false;
+      }
+    },
+
+  parseErrorStrings:
+    function(error) {
+      var es = '';
+      $(error).each(function(i, e) { es += e + '<br/>' });
+      return es.substring(0, es.length - 5); // remove last <br/>
+    },
+
+  reset:
+    function() {
+      this.valibot.removeValid(this);
+      this.valid = false;
+    }
+
+};
+

metadata

@@ -1,90 +1,83 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: valibot
-version: !ruby/object:Gem::Version 
+version: !ruby/object:Gem::Version
+  version: 0.2.6
   prerelease: 
-  version: 0.2.5
 platform: ruby
-authors: 
+authors:
 - Kenichi Nakamura
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2011-08-02 00:00:00 Z
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2011-08-18 00:00:00.000000000Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: dm-core
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &70307150903600 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: dm-validations
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *70307150903600
+- !ruby/object:Gem::Dependency
+  name: dm-validations
+  requirement: &70307150902900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.0.0
   type: :runtime
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: sinatra
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *70307150902900
+- !ruby/object:Gem::Dependency
+  name: sinatra
+  requirement: &70307150902160 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.1.0
   type: :runtime
-  version_requirements: *id003
+  prerelease: false
+  version_requirements: *70307150902160
 description: 
-email: 
+email:
 - kenichi.nakamura@gmail.com
 executables: []
-
 extensions: []
-
 extra_rdoc_files: []
-
-files: 
+files:
 - lib/valibot.rb
 - js/valibot.js
 - LICENSE
 - README.md
 homepage: https://github.com/kenichi/valibot
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+required_ruby_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
       version: 1.3.4
 requirements: []
-
 rubyforge_project: valibot
 rubygems_version: 1.8.6
 signing_key: 
 specification_version: 3
-summary: Automatic field validation for forms backed by  DataMapper models through Sinatra.
+summary: Automatic field validation for forms backed by  DataMapper models through
+  Sinatra.
 test_files: []
-