From 86772ac00a4337bc48800bfb890cc7eeea94d103 Mon Sep 17 00:00:00 2001
From: Ben Pickles <spideryoung@gmail.com>
Date: Thu, 15 Apr 2010 11:21:48 +0100
Subject: [PATCH] Version 0.8.3.

---
 CHANGELOG.markdown         |   6 +
 dist/js-model-0.8.3.js     | 394 +++++++++++++++++++++++++++++++++++++
 dist/js-model-0.8.3.min.js |  16 ++
 src/constants.yml          |   2 +-
 4 files changed, 417 insertions(+), 1 deletion(-)
 create mode 100644 dist/js-model-0.8.3.js
 create mode 100644 dist/js-model-0.8.3.min.js

diff --git a/CHANGELOG.markdown b/CHANGELOG.markdown
index 246c433..a75c082 100644
--- a/CHANGELOG.markdown
+++ b/CHANGELOG.markdown
@@ -1,5 +1,11 @@
 # Changelog
 
+## 0.8.3
+
+* Fix that `find`, `first`, `last` and `detect` return `null` when nothing is found.
+* Add `unbind` method to unbind all callbacks for a particular event or a specific callback by passing a reference to the original function.
+* Move callback functionality into a separate module and mix-in to class and instance.
+
 ## 0.8.2
 
 * Don't log an error when Rails returns a response of " " for a `head :ok` response.
diff --git a/dist/js-model-0.8.3.js b/dist/js-model-0.8.3.js
new file mode 100644
index 0000000..64c1191
--- /dev/null
+++ b/dist/js-model-0.8.3.js
@@ -0,0 +1,394 @@
+/*  js-model JavaScript library, version 0.8.3
+ *  (c) 2010 Ben Pickles
+ *
+ *  Released under MIT license.
+ */
+var Model = function(name, class_methods, instance_methods) {
+  class_methods = class_methods || {};
+  instance_methods = instance_methods || {};
+
+  var model = function(attributes) {
+    this.attributes = attributes || {};
+    this.changes = {};
+    this.errors = new Model.Errors(this);
+  };
+
+  jQuery.extend(model, Model.Callbacks, Model.ClassMethods, class_methods, {
+    _name: name,
+    collection: [],
+
+    chain: function(collection) {
+      return jQuery.extend({}, this, { collection: collection });
+    }
+  });
+
+  jQuery.extend(model.prototype, Model.Callbacks, Model.InstanceMethods,
+    instance_methods);
+
+  return model;
+};
+Model.Callbacks = {
+  callbacks: {},
+
+  bind: function(event, callback) {
+    this.callbacks[event] = this.callbacks[event] || [];
+    this.callbacks[event].push(callback);
+    return this;
+  },
+
+  trigger: function(name, data) {
+    var callbacks = this.callbacks[name];
+
+    if (callbacks) {
+      for (var i = 0; i < callbacks.length; i++) {
+        callbacks[i].apply(this, data || []);
+      }
+    }
+
+    return this;
+  },
+
+  unbind: function(event, callback) {
+    if (callback) {
+      var callbacks = this.callbacks[event] || [];
+
+      for (var i = 0; i < callbacks.length; i++) {
+        if (callbacks[i] === callback) {
+          this.callbacks[event].splice(i, 1);
+        }
+      }
+    } else {
+      delete this.callbacks[event];
+    }
+
+    return this;
+  }
+};
+Model.ClassMethods = {
+  add: function() {
+    var added = [];
+
+    for (var i = 0; i < arguments.length; i++) {
+      var model = arguments[i];
+      var existing_elem = this.detect(function() {
+        return this.id() !== null && this.id() == model.id();
+      });
+
+      if (!existing_elem) {
+        this.collection.push(model);
+        added.push(model);
+      }
+    }
+
+    if (added.length > 0) this.trigger("add", added);
+
+    return this;
+  },
+
+  all: function() {
+    return this.collection;
+  },
+
+  count: function() {
+    return this.collection.length;
+  },
+
+  detect: function(func) {
+    var model;
+    jQuery.each(this.all(), function(i) {
+      if (func.call(this, i)) {
+        model = this;
+        return false;
+      }
+    });
+    return model || null;
+  },
+
+  each: function(func) {
+    jQuery.each(this.all(), function(i) {
+      func.call(this, i);
+    });
+    return this;
+  },
+
+  find: function(id) {
+    return this.detect(function() {
+      return this.id() == id;
+    }) || null;
+  },
+
+  first: function() {
+    return this.all()[0] || null;
+  },
+
+  last: function() {
+    var all = this.all();
+    return all[all.length - 1] || null;
+  },
+
+  remove: function(id) {
+    var ids = _.invoke(this.collection, 'id');
+    var index = _.indexOf(ids, id);
+    if (index > -1) {
+      this.collection.splice(index, 1);
+      this.trigger("remove");
+      return true;
+    } else {
+      return false;
+    }
+  },
+
+  select: function(func) {
+    var selected = [];
+    jQuery.each(this.all(), function(i) {
+      if (func.call(this, i)) selected.push(this);
+    });
+    return this.chain(selected);
+  },
+
+  sort: function(func) {
+    var sorted = _.sortBy(this.all(), function(model, i) {
+      return func.call(model, i);
+    });
+    return this.chain(sorted);
+  }
+};
+Model.Errors = function(model) {
+  this.errors = {};
+  this.model = model;
+};
+
+Model.Errors.prototype = {
+  add: function(attribute, message) {
+    if (!this.errors[attribute]) this.errors[attribute] = [];
+    this.errors[attribute].push(message);
+  },
+
+  all: function() {
+    return this.errors;
+  },
+
+  clear: function() {
+    this.errors = {};
+  },
+
+  each: function(func) {
+    for (var attribute in this.errors) {
+      for (var i = 0; i < this.errors[attribute].length; i++) {
+        func.call(this, attribute, this.errors[attribute][i]);
+      }
+    }
+  },
+
+  on: function(attribute) {
+    return this.errors[attribute] || [];
+  },
+
+  size: function() {
+    var count = 0;
+    this.each(function() { count++; });
+    return count;
+  }
+};
+Model.InstanceMethods = {
+  attr: function(name, value) {
+    if (arguments.length === 0) {
+      return jQuery.extend({}, this.attributes, this.changes);
+    } else if (arguments.length === 2) {
+      if (_.isEqual(this.attributes[name], value)) {
+        delete this.changes[name];
+      } else {
+        this.changes[name] = value;
+      }
+      return this;
+    } else if (typeof name === "object") {
+      for (var key in name) {
+        this.attr(key, name[key]);
+      }
+      return this;
+    } else {
+      return (name in this.changes) ?
+        this.changes[name] :
+        this.attributes[name];
+    }
+  },
+
+  callPersistMethod: function(method, callback) {
+    var self = this;
+
+    var manageCollection = function() {
+      if (method === "create") {
+        self.constructor.add(self);
+      } else if (method === "destroy") {
+        self.constructor.remove(self.id());
+      }
+    };
+
+    var wrappedCallback = function(success) {
+      if (success) {
+        self.merge(self.changes).reset();
+
+        manageCollection();
+
+        self.trigger(method);
+      }
+
+      var value;
+
+      if (callback) value = callback.apply(self, arguments);
+
+      return value;
+    };
+
+    if (this.constructor.persistence) {
+      this.constructor.persistence[method](this, wrappedCallback);
+    } else {
+      wrappedCallback.call(this, true);
+    }
+  },
+
+  destroy: function(callback) {
+    this.callPersistMethod("destroy", callback);
+    return this;
+  },
+
+  id: function() {
+    return this.attributes.id || null;
+  },
+
+  merge: function(attributes) {
+    jQuery.extend(this.attributes, attributes);
+    return this;
+  },
+
+  newRecord: function() {
+    return this.id() === null;
+  },
+
+  reset: function() {
+    this.errors.clear();
+    this.changes = {};
+    return this;
+  },
+
+  save: function(callback) {
+    if (this.valid()) {
+      var method = this.newRecord() ? "create" : "update";
+      this.callPersistMethod(method, callback);
+    } else if (callback) {
+      callback(false);
+    }
+
+    return this;
+  },
+
+  update: function(attributes) {
+    this.merge(attributes).trigger("update");
+    return this;
+  },
+
+  valid: function() {
+    this.errors.clear();
+    this.validate();
+    return this.errors.size() === 0;
+  },
+
+  validate: function() {
+    return this;
+  }
+};
+Model.Log = function() {
+  if (window.console) window.console.log.apply(window.console, arguments);
+};
+Model.RestPersistence = function(resource, methods) {
+  var model_resource = function() {
+    this.resource = resource;
+  };
+
+  jQuery.extend(model_resource.prototype, {
+    create: function(model, callback) {
+      return this.xhr('POST', this.create_path(model), model, callback);
+    },
+
+    create_path: function(model) {
+      return this.resource;
+    },
+
+    destroy: function(model, callback) {
+      return this.xhr('DELETE', this.destroy_path(model), model, callback);
+    },
+
+    destroy_path: function(model) {
+      return this.update_path(model);
+    },
+
+    params: function(model) {
+      var params;
+      if (model) {
+        var attributes = model.attr();
+        delete attributes.id;
+        params = {};
+        params[model.constructor._name.toLowerCase()] = attributes;
+      } else {
+        params = null;
+      }
+      return params;
+    },
+
+    parseResponseData: function(xhr) {
+      try {
+        return /\S/.test(xhr.responseText) ?
+          jQuery.parseJSON(xhr.responseText) :
+          null;
+      } catch(e) {
+        Model.Log(e);
+      }
+    },
+
+    update: function(model, callback) {
+      return this.xhr('PUT', this.update_path(model), model, callback);
+    },
+
+    update_path: function(model) {
+      return [this.resource, model.id()].join('/');
+    },
+
+    xhr: function(method, url, model, callback) {
+      var self = this;
+      var data = method === "DELETE" ? null : this.params(model);
+
+      return jQuery.ajax({
+        type: method,
+        url: url,
+        dataType: "json",
+        data: data,
+        complete: function(xhr, textStatus) {
+          self.xhrComplete(xhr, textStatus, model, callback);
+        }
+      });
+    },
+
+    xhrComplete: function(xhr, textStatus, model, callback) {
+      var data = this.parseResponseData(xhr);
+      var success = textStatus === "success";
+
+      if (data) {
+        if (success) {
+          model.attr(data);
+        } else if (xhr.status === 422) {
+          model.errors.clear();
+
+          for (var attribute in data) {
+            for (var i = 0; i < data[attribute].length; i++) {
+              model.errors.add(attribute, data[attribute][i]);
+            }
+          }
+        }
+      }
+
+      if (callback) callback.call(model, success, xhr);
+    }
+  }, methods);
+
+  return new model_resource();
+};
diff --git a/dist/js-model-0.8.3.min.js b/dist/js-model-0.8.3.min.js
new file mode 100644
index 0000000..03d0e10
--- /dev/null
+++ b/dist/js-model-0.8.3.min.js
@@ -0,0 +1,16 @@
+/*  js-model JavaScript library, version 0.8.3
+ *  (c) 2010 Ben Pickles
+ *
+ *  Released under MIT license.
+ */
+var Model=function(a,b,c){b=b||{};c=c||{};var d=function(e){this.attributes=e||{};this.changes={};this.errors=new Model.Errors(this)};jQuery.extend(d,Model.Callbacks,Model.ClassMethods,b,{_name:a,collection:[],chain:function(e){return jQuery.extend({},this,{collection:e})}});jQuery.extend(d.prototype,Model.Callbacks,Model.InstanceMethods,c);return d};
+Model.Callbacks={callbacks:{},bind:function(a,b){this.callbacks[a]=this.callbacks[a]||[];this.callbacks[a].push(b);return this},trigger:function(a,b){if(a=this.callbacks[a])for(var c=0;c<a.length;c++)a[c].apply(this,b||[]);return this},unbind:function(a,b){if(b)for(var c=this.callbacks[a]||[],d=0;d<c.length;d++)c[d]===b&&this.callbacks[a].splice(d,1);else delete this.callbacks[a];return this}};
+Model.ClassMethods={add:function(){for(var a=[],b=0;b<arguments.length;b++){var c=arguments[b];if(!this.detect(function(){return this.id()!==null&&this.id()==c.id()})){this.collection.push(c);a.push(c)}}a.length>0&&this.trigger("add",a);return this},all:function(){return this.collection},count:function(){return this.collection.length},detect:function(a){var b;jQuery.each(this.all(),function(c){if(a.call(this,c)){b=this;return false}});return b||null},each:function(a){jQuery.each(this.all(),function(b){a.call(this,
+b)});return this},find:function(a){return this.detect(function(){return this.id()==a})||null},first:function(){return this.all()[0]||null},last:function(){var a=this.all();return a[a.length-1]||null},remove:function(a){var b=_.invoke(this.collection,"id");a=_.indexOf(b,a);if(a>-1){this.collection.splice(a,1);this.trigger("remove");return true}else return false},select:function(a){var b=[];jQuery.each(this.all(),function(c){a.call(this,c)&&b.push(this)});return this.chain(b)},sort:function(a){return this.chain(_.sortBy(this.all(),
+function(b,c){return a.call(b,c)}))}};Model.Errors=function(a){this.errors={};this.model=a};Model.Errors.prototype={add:function(a,b){this.errors[a]||(this.errors[a]=[]);this.errors[a].push(b)},all:function(){return this.errors},clear:function(){this.errors={}},each:function(a){for(var b in this.errors)for(var c=0;c<this.errors[b].length;c++)a.call(this,b,this.errors[b][c])},on:function(a){return this.errors[a]||[]},size:function(){var a=0;this.each(function(){a++});return a}};
+Model.InstanceMethods={attr:function(a,b){if(arguments.length===0)return jQuery.extend({},this.attributes,this.changes);else if(arguments.length===2){if(_.isEqual(this.attributes[a],b))delete this.changes[a];else this.changes[a]=b;return this}else if(typeof a==="object"){for(var c in a)this.attr(c,a[c]);return this}else return a in this.changes?this.changes[a]:this.attributes[a]},callPersistMethod:function(a,b){var c=this,d=function(){if(a==="create")c.constructor.add(c);else a==="destroy"&&c.constructor.remove(c.id())},
+e=function(f){if(f){c.merge(c.changes).reset();d();c.trigger(a)}var g;if(b)g=b.apply(c,arguments);return g};this.constructor.persistence?this.constructor.persistence[a](this,e):e.call(this,true)},destroy:function(a){this.callPersistMethod("destroy",a);return this},id:function(){return this.attributes.id||null},merge:function(a){jQuery.extend(this.attributes,a);return this},newRecord:function(){return this.id()===null},reset:function(){this.errors.clear();this.changes={};return this},save:function(a){if(this.valid())this.callPersistMethod(this.newRecord()?
+"create":"update",a);else a&&a(false);return this},update:function(a){this.merge(a).trigger("update");return this},valid:function(){this.errors.clear();this.validate();return this.errors.size()===0},validate:function(){return this}};Model.Log=function(){window.console&&window.console.log.apply(window.console,arguments)};
+Model.RestPersistence=function(a,b){var c=function(){this.resource=a};jQuery.extend(c.prototype,{create:function(d,e){return this.xhr("POST",this.create_path(d),d,e)},create_path:function(){return this.resource},destroy:function(d,e){return this.xhr("DELETE",this.destroy_path(d),d,e)},destroy_path:function(d){return this.update_path(d)},params:function(d){var e;if(d){var f=d.attr();delete f.id;e={};e[d.constructor._name.toLowerCase()]=f}else e=null;return e},parseResponseData:function(d){try{return/\S/.test(d.responseText)?
+jQuery.parseJSON(d.responseText):null}catch(e){Model.Log(e)}},update:function(d,e){return this.xhr("PUT",this.update_path(d),d,e)},update_path:function(d){return[this.resource,d.id()].join("/")},xhr:function(d,e,f,g){var h=this,i=d==="DELETE"?null:this.params(f);return jQuery.ajax({type:d,url:e,dataType:"json",data:i,complete:function(j,k){h.xhrComplete(j,k,f,g)}})},xhrComplete:function(d,e,f,g){var h=this.parseResponseData(d);e=e==="success";if(h)if(e)f.attr(h);else if(d.status===422){f.errors.clear();
+for(var i in h)for(var j=0;j<h[i].length;j++)f.errors.add(i,h[i][j])}g&&g.call(f,e,d)}},b);return new c};
diff --git a/src/constants.yml b/src/constants.yml
index 56ced2b..dc527e6 100644
--- a/src/constants.yml
+++ b/src/constants.yml
@@ -1 +1 @@
-VERSION: 0.8.2
+VERSION: 0.8.3