joosy 1.2.0.alpha.71 → 1.2.0.alpha.73

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0dee5804bf618851443ae7da79979ae1ba847e23
-  data.tar.gz: 733416f347d8bc7ea08f1a84418b89d633f9fe9e
+  metadata.gz: c93a94e26133a7f31ce8568c0f30123014c392ec
+  data.tar.gz: 8d69ccc6b80a2da510a272e1bda09b543a79a49a
 SHA512:
-  metadata.gz: 8a80dd2a1acfcec49e9857758ef5993bb52aa2b6110270d66ae2048eb5f8ee0ea8ff2357686664855425ef1667631f3db6f63f83e054ac481b774baf946e9a74
-  data.tar.gz: a93ebfa487fc46b8cd8fbd63d6b43eed9e3f9aecace0fd7c3734f8384afb6017258d8126b89a98dd338d33ccaaf85077394afe1868b64d623ea6138b401967b0
+  metadata.gz: 57cead0f12f2bc1e652e723247688a78ed4bcf842d657d9396e9a13b8bc7bd90ea524f2f868be2a570c114a6601e7907fc2c7f5892ef389022170144791639af
+  data.tar.gz: 477925bb13b147ad0d52a822262bc20cbfda09d687dc1125e571cf4afd8c738234cf30fcedc1618437f71dbdf82ae035b047cad0b598f2e3bafb2b08c60f7da1

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "joosy",
-  "version": "1.2.0-alpha.71",
+  "version": "1.2.0-alpha.73",
   "main": "build/joosy.js",
   "ignore": [
     "lib",

data/build/joosy/extensions/resources-form.js

@@ -130,7 +130,7 @@
         }
         data.__joosy_form_filler_lock = true;
         Object.each(data, function(property, val) {
-          var entity, i, input, key, _i, _len, _ref, _results;
+          var entity, i, input, key, _i, _len, _results;
           key = _this.concatFieldName(scope, property);
           input = _this.$fields().filter("[name='" + key + "']:not(:file),[name='" + (key.underscore()) + "']:not(:file),[name='" + (key.camelize(false)) + "']:not(:file)");
           if (input.length > 0) {
@@ -146,16 +146,15 @@
               input.val(val);
             }
           }
-          if (val instanceof Joosy.Resources.RESTCollection) {
-            _ref = val.data;
+          if (val instanceof Joosy.Resources.Array) {
             _results = [];
-            for (i = _i = 0, _len = _ref.length; _i < _len; i = ++_i) {
-              entity = _ref[i];
+            for (i = _i = 0, _len = val.length; _i < _len; i = ++_i) {
+              entity = val[i];
               _results.push(filler(entity.data, _this.concatFieldName(scope, "[" + property + "_attributes][" + i + "]")));
             }
             return _results;
           } else if (val instanceof Joosy.Resources.REST) {
-            return filler(val.data, _this.concatFieldName(scope, "[" + property + "_attributes][0]"));
+            return filler(val.data, _this.concatFieldName(scope, "[" + property + "_attributes]"));
           } else if (Object.isObject(val) || Object.isArray(val)) {
             return filler(val, key);
           } else {

data/build/joosy/extensions/resources.js

@@ -27,22 +27,6 @@
       return this.prototype.__entityName = name;
     };
 
-    Base.collection = function(klass) {
-      return this.prototype.__collection = function() {
-        return klass;
-      };
-    };
-
-    Base.prototype.__collection = function() {
-      var named;
-      named = this.__entityName.camelize().pluralize() + 'Collection';
-      if (window[named]) {
-        return window[named];
-      } else {
-        return Joosy.Resources.Collection;
-      }
-    };
-
     Base.map = function(name, klass) {
       if (klass == null) {
         klass = false;
@@ -228,11 +212,16 @@
     };
 
     Base.prototype.__map = function(data, name, klass) {
-      var entry;
+      var entries;
       if (Object.isArray(data[name])) {
-        entry = new (klass.prototype.__collection())(klass);
-        entry.load(data[name]);
-        data[name] = entry;
+        entries = data[name].map(function(x) {
+          return klass.build(x);
+        });
+        data[name] = (function(func, args, ctor) {
+          ctor.prototype = func.prototype;
+          var child = new ctor, result = func.apply(child, args);
+          return Object(result) === result ? result : child;
+        })(Joosy.Resources.Array, entries, function(){});
       } else if (Object.isObject(data[name])) {
         data[name] = klass.build(data[name]);
       }
@@ -247,191 +236,6 @@
 
   })(Joosy.Function);
 
-}).call(this);
-(function() {
-  var __hasProp = {}.hasOwnProperty,
-    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    __slice = [].slice;
-
-  Joosy.Resources.Collection = (function(_super) {
-    __extends(Collection, _super);
-
-    Collection.include(Joosy.Modules.Events);
-
-    Collection.beforeLoad = function(action) {
-      return this.prototype.__beforeLoad = action;
-    };
-
-    Collection.model = function(model) {
-      return this.prototype.model = model;
-    };
-
-    function Collection(model, findOptions) {
-      if (model == null) {
-        model = false;
-      }
-      this.findOptions = findOptions;
-      if (model) {
-        this.model = model;
-      }
-      this.data = [];
-      if (!this.model) {
-        throw new Error("" + (Joosy.Module.__className(this)) + "> model can't be empty");
-      }
-    }
-
-    Collection.prototype.load = function(entities, notify) {
-      if (notify == null) {
-        notify = true;
-      }
-      if (this.__beforeLoad != null) {
-        entities = this.__beforeLoad(entities);
-      }
-      this.data = this.modelize(entities);
-      if (notify) {
-        this.trigger('changed');
-      }
-      return this;
-    };
-
-    Collection.prototype.modelize = function(collection) {
-      var root,
-        _this = this;
-      root = this.model.prototype.__entityName.pluralize();
-      if (!(collection instanceof Array)) {
-        collection = collection != null ? collection[root.camelize(false)] : void 0;
-        if (!(collection instanceof Array)) {
-          throw new Error("Can not read incoming JSON");
-        }
-      }
-      return collection.map(function(x) {
-        return _this.model.build(x);
-      });
-    };
-
-    Collection.prototype.each = function(callback) {
-      return this.data.each(callback);
-    };
-
-    Collection.prototype.size = function() {
-      return this.data.length;
-    };
-
-    Collection.prototype.find = function(description) {
-      return this.data.find(description);
-    };
-
-    Collection.prototype.sortBy = function() {
-      var params, _ref;
-      params = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
-      return (_ref = this.data).sortBy.apply(_ref, params);
-    };
-
-    Collection.prototype.findById = function(id) {
-      return this.data.find(function(x) {
-        return x.id().toString() === id.toString();
-      });
-    };
-
-    Collection.prototype.at = function(i) {
-      return this.data[i];
-    };
-
-    Collection.prototype.remove = function(target, notify) {
-      var index, result;
-      if (notify == null) {
-        notify = true;
-      }
-      if (Object.isNumber(target)) {
-        index = target;
-      } else {
-        index = this.data.indexOf(target);
-      }
-      if (index >= 0) {
-        result = this.data.splice(index, 1)[0];
-        if (notify) {
-          this.trigger('changed');
-        }
-      }
-      return result;
-    };
-
-    Collection.prototype.add = function(element, index, notify) {
-      if (index == null) {
-        index = false;
-      }
-      if (notify == null) {
-        notify = true;
-      }
-      if (typeof index === 'number') {
-        this.data.splice(index, 0, element);
-      } else {
-        this.data.push(element);
-      }
-      if (notify) {
-        this.trigger('changed');
-      }
-      return element;
-    };
-
-    return Collection;
-
-  })(Joosy.Module);
-
-}).call(this);
-(function() {
-  var _ref,
-    __hasProp = {}.hasOwnProperty,
-    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; },
-    __slice = [].slice;
-
-  Joosy.Resources.RESTCollection = (function(_super) {
-    __extends(RESTCollection, _super);
-
-    function RESTCollection() {
-      _ref = RESTCollection.__super__.constructor.apply(this, arguments);
-      return _ref;
-    }
-
-    RESTCollection.include(Joosy.Modules.Log);
-
-    RESTCollection.include(Joosy.Modules.Events);
-
-    RESTCollection.prototype.reload = function(options, callback) {
-      var _this = this;
-      if (options == null) {
-        options = {};
-      }
-      if (callback == null) {
-        callback = false;
-      }
-      if (Object.isFunction(options)) {
-        callback = options;
-        options = {};
-      }
-      return this.model.__query(this.model.collectionPath(options, this.__source), 'GET', options.params, function(error, data, xhr) {
-        if (data != null) {
-          _this.load(data);
-        }
-        return typeof callback === "function" ? callback(error, _this, data, xhr) : void 0;
-      });
-    };
-
-    RESTCollection.prototype.load = function() {
-      var args, res,
-        _this = this;
-      args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
-      res = RESTCollection.__super__.load.apply(this, args);
-      this.data.each(function(x) {
-        return x.__source = _this.__source;
-      });
-      return res;
-    };
-
-    return RESTCollection;
-
-  })(Joosy.Resources.Collection);
-
 }).call(this);
 (function() {
   var _ref,
@@ -499,16 +303,6 @@
       return new ((_ref1 = this.constructor).at.apply(_ref1, args))(this.data);
     };
 
-    REST.prototype.__collection = function() {
-      var named;
-      named = this.__entityName.camelize().pluralize() + 'Collection';
-      if (window[named]) {
-        return window[named];
-      } else {
-        return Joosy.Resources.RESTCollection;
-      }
-    };
-
     REST.prototype.__interpolatePath = function(source, ids) {
       if (!Object.isArray(ids)) {
         ids = [ids];
@@ -642,8 +436,26 @@
       return this.constructor.__query(this.memberPath(options), 'DELETE', options.params, callback);
     };
 
+    REST.prototype.reload = function(options, callback) {
+      var _ref1,
+        _this = this;
+      if (options == null) {
+        options = {};
+      }
+      if (callback == null) {
+        callback = false;
+      }
+      _ref1 = this.__extractOptionsAndCallback(options, callback), options = _ref1[0], callback = _ref1[1];
+      return this.constructor.__query(this.memberPath(options), 'GET', options.params, function(error, data, xhr) {
+        if (data != null) {
+          _this.load(data);
+        }
+        return typeof callback === "function" ? callback(error, _this, data, xhr) : void 0;
+      });
+    };
+
     REST.find = function(where, options, callback) {
-      var id, path, result, _ref1,
+      var id, result, _ref1,
         _this = this;
       if (options == null) {
         options = {};
@@ -652,18 +464,12 @@
         callback = false;
       }
       _ref1 = this.prototype.__extractOptionsAndCallback(options, callback), options = _ref1[0], callback = _ref1[1];
-      id = Object.isArray(where) ? where.last() : where;
-      if (id === 'all') {
-        result = new (this.prototype.__collection())(this, options);
-        path = this.collectionPath(where, options);
-      } else {
-        result = this.build(id);
-        path = this.memberPath(where, options);
-      }
-      if (Object.isArray(where) && where.length > 1) {
+      id = where instanceof Array ? where[where.length - 1] : where;
+      result = this.build(id);
+      if (where instanceof Array && where.length > 1) {
         result.__source = this.collectionPath(where);
       }
-      this.__query(path, 'GET', options.params, function(error, data, xhr) {
+      this.__query(this.memberPath(where, options), 'GET', options.params, function(error, data, xhr) {
         if (data != null) {
           result.load(data);
         }
@@ -672,6 +478,43 @@
       return result;
     };
 
+    REST.all = function(where, options, callback) {
+      var result, _ref1, _ref2,
+        _this = this;
+      if (options == null) {
+        options = {};
+      }
+      if (callback == null) {
+        callback = false;
+      }
+      if (Object.isFunction(where) || Object.isObject(where)) {
+        _ref1 = this.prototype.__extractOptionsAndCallback(where, options), options = _ref1[0], callback = _ref1[1];
+        where = [];
+      } else {
+        _ref2 = this.prototype.__extractOptionsAndCallback(options, callback), options = _ref2[0], callback = _ref2[1];
+      }
+      result = new Joosy.Resources.Array;
+      this.__query(this.collectionPath(where, options), 'GET', options.params, function(error, rawData, xhr) {
+        var data;
+        if ((data = rawData) != null) {
+          if (Object.isObject(data) && !(data = data[_this.prototype.__entityName.pluralize()])) {
+            throw new Error("Invalid data for `all` received: " + (JSON.stringify(data)));
+          }
+          data = data.map(function(x) {
+            var instance;
+            instance = _this.build(x);
+            if (where.length > 1) {
+              instance.__source = _this.collectionPath(where);
+            }
+            return instance;
+          });
+          result.load.apply(result, data);
+        }
+        return typeof callback === "function" ? callback(error, result, rawData, xhr) : void 0;
+      });
+      return result;
+    };
+
     REST.__query = function(path, method, params, callback) {
       var options;
       options = {
@@ -699,24 +542,6 @@
       return $.ajax(options);
     };
 
-    REST.prototype.reload = function(options, callback) {
-      var _ref1,
-        _this = this;
-      if (options == null) {
-        options = {};
-      }
-      if (callback == null) {
-        callback = false;
-      }
-      _ref1 = this.__extractOptionsAndCallback(options, callback), options = _ref1[0], callback = _ref1[1];
-      return this.constructor.__query(this.memberPath(options), 'GET', options.params, function(error, data, xhr) {
-        if (data != null) {
-          _this.load(data);
-        }
-        return typeof callback === "function" ? callback(error, _this, data, xhr) : void 0;
-      });
-    };
-
     REST.prototype.__extractOptionsAndCallback = function(options, callback) {
       if (Object.isFunction(options)) {
         callback = options;

data/build/joosy.js

@@ -2276,6 +2276,85 @@
     });
   }
 
+}).call(this);
+(function() {
+  Joosy.Modules.Resources = {};
+
+}).call(this);
+(function() {
+  var __slice = [].slice;
+
+  Joosy.Modules.Resources.Cacher = {
+    included: function() {
+      this.cache = function(cacheKey) {
+        return this.prototype.__cacheKey = cacheKey;
+      };
+      this.fetcher = function(fetcher) {
+        return this.prototype.__fetcher = fetcher;
+      };
+      this.cached = function(callback, cacheKey, fetcher) {
+        var instance,
+          _this = this;
+        if (cacheKey == null) {
+          cacheKey = false;
+        }
+        if (fetcher == null) {
+          fetcher = false;
+        }
+        if (typeof cacheKey === 'function') {
+          fetcher = cacheKey;
+          cacheKey = void 0;
+        }
+        cacheKey || (cacheKey = this.prototype.__cacheKey);
+        fetcher || (fetcher = this.prototype.__fetcher);
+        if (cacheKey && localStorage && localStorage[cacheKey]) {
+          instance = (function(func, args, ctor) {
+            ctor.prototype = func.prototype;
+            var child = new ctor, result = func.apply(child, args);
+            return Object(result) === result ? result : child;
+          })(this, JSON.parse(localStorage[cacheKey]), function(){});
+          if (typeof callback === "function") {
+            callback(instance);
+          }
+          return instance.refresh();
+        } else {
+          return this.fetch(function(results) {
+            instance = (function(func, args, ctor) {
+              ctor.prototype = func.prototype;
+              var child = new ctor, result = func.apply(child, args);
+              return Object(result) === result ? result : child;
+            })(_this, results, function(){});
+            return typeof callback === "function" ? callback(instance) : void 0;
+          });
+        }
+      };
+      return this.fetch = function(callback) {
+        var _this = this;
+        return this.prototype.__fetcher(function() {
+          var results;
+          results = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+          if (_this.prototype.__cacheKey && localStorage) {
+            localStorage[_this.prototype.__cacheKey] = JSON.stringify(results);
+          }
+          return callback(results);
+        });
+      };
+    },
+    refresh: function(callback) {
+      var _this = this;
+      return this.constructor.fetch(function(results) {
+        _this.load.apply(_this, results);
+        return typeof callback === "function" ? callback(_this) : void 0;
+      });
+    }
+  };
+
+  if ((typeof define !== "undefined" && define !== null ? define.amd : void 0) != null) {
+    define('joosy/modules/resources/cacher', function() {
+      return Joosy.Modules.Resources.Cacher;
+    });
+  }
+
 }).call(this);
 (function() {
   var __hasProp = {}.hasOwnProperty,
@@ -2284,9 +2363,11 @@
   Joosy.Resources.Array = (function(_super) {
     __extends(Array, _super);
 
-    Joosy.Module.include.call(Array, Joosy.Modules.Events);
+    Joosy.Module.merge(Array, Joosy.Module);
+
+    Array.include(Joosy.Modules.Events);
 
-    Joosy.Module.include.call(Array, Joosy.Modules.Filters);
+    Array.include(Joosy.Modules.Filters);
 
     Array.registerPlainFilters('beforeLoad');
 
@@ -2308,6 +2389,13 @@
       return this.__fillData(arguments);
     };
 
+    Array.prototype.clone = function(callback) {
+      var clone;
+      clone = new this.constructor;
+      clone.data = this.slice(0);
+      return clone;
+    };
+
     Array.prototype.push = function() {
       var result;
       result = Array.__super__.push.apply(this, arguments);
@@ -2348,7 +2436,7 @@
       if (notify == null) {
         notify = true;
       }
-      data = data[0] instanceof Array ? data[0] : this.slice.call(data, 0);
+      data = this.slice.call(data, 0);
       if (this.length > 0) {
         this.splice(0, this.length);
       }
@@ -2373,88 +2461,6 @@
     });
   }
 
-}).call(this);
-(function() {
-  var __hasProp = {}.hasOwnProperty,
-    __extends = function(child, parent) { for (var key in parent) { if (__hasProp.call(parent, key)) child[key] = parent[key]; } function ctor() { this.constructor = child; } ctor.prototype = parent.prototype; child.prototype = new ctor(); child.__super__ = parent.prototype; return child; };
-
-  Joosy.Resources.Cacher = (function(_super) {
-    __extends(Cacher, _super);
-
-    Cacher.include(Joosy.Modules.Events);
-
-    Cacher.include(Joosy.Modules.Filters);
-
-    Cacher.registerPlainFilters('beforeLoad');
-
-    Cacher.cache = function(cacheKey) {
-      return this.prototype.__cacheKey = cacheKey;
-    };
-
-    Cacher.fetcher = function(fetcher) {
-      return this.prototype.__fetcher = fetcher;
-    };
-
-    function Cacher(callback, cacheKey, fetcher) {
-      if (cacheKey == null) {
-        cacheKey = false;
-      }
-      if (fetcher == null) {
-        fetcher = false;
-      }
-      if (typeof cacheKey === 'function') {
-        fetcher = cacheKey;
-        cacheKey = void 0;
-      }
-      if (fetcher) {
-        this.__fetcher = fetcher;
-      }
-      if (cacheKey) {
-        this.__cacheKey = cacheKey;
-      }
-      if (this.__cacheKey && localStorage && localStorage[this.__cacheKey]) {
-        this.data = this.__applyBeforeLoads(JSON.parse(localStorage[this.__cacheKey]));
-        if (typeof callback === "function") {
-          callback(this);
-        }
-        this.refresh();
-      } else {
-        this.refresh(callback);
-      }
-    }
-
-    Cacher.prototype.clone = function(callback) {
-      var copy;
-      copy = new this.constructor(callback, this.__cacheKey, this.__fetcher);
-      copy.data = Object.clone(this.data, true);
-      copy.trigger('changed');
-      return copy;
-    };
-
-    Cacher.prototype.refresh = function(callback) {
-      var _this = this;
-      return this.__fetcher(function(result) {
-        if (_this.__cacheKey && localStorage) {
-          localStorage[_this.__cacheKey] = JSON.stringify(result);
-        }
-        _this.data = _this.__applyBeforeLoads(result);
-        if (typeof callback === "function") {
-          callback(_this);
-        }
-        return _this.trigger('changed');
-      });
-    };
-
-    return Cacher;
-
-  })(Joosy.Module);
-
-  if ((typeof define !== "undefined" && define !== null ? define.amd : void 0) != null) {
-    define('joosy/resources/cacher', function() {
-      return Joosy.Resources.Cacher;
-    });
-  }
-
 }).call(this);
 (function() {
   var __hasProp = {}.hasOwnProperty,
@@ -2467,6 +2473,8 @@
 
     Hash.include(Joosy.Modules.Filters);
 
+    Hash.registerPlainFilters('beforeLoad');
+
     function Hash(data) {
       if (data == null) {
         data = {};
@@ -2506,11 +2514,15 @@
       return this;
     };
 
+    Hash.prototype.clone = function(callback) {
+      return new this.constructor(Object.clone(this.data, true));
+    };
+
     Hash.prototype.__call = function(path, value) {
       if (arguments.length > 1) {
-        return this.__set(path, value);
+        return this.set(path, value);
       } else {
-        return this.__get(path);
+        return this.get(path);
       }
     };
 
@@ -2576,9 +2588,11 @@
 
     Scalar.include(Joosy.Modules.Filters);
 
+    Scalar.registerPlainFilters('beforeLoad');
+
     function Scalar(value) {
       return Scalar.__super__.constructor.call(this, function() {
-        return this.value = value;
+        return this.load(value);
       });
     }
 
@@ -2586,8 +2600,9 @@
       return this.value;
     };
 
-    Scalar.prototype.set = function() {
-      return this.load.apply(this, arguments);
+    Scalar.prototype.set = function(value) {
+      this.value = value;
+      return this.trigger('changed');
     };
 
     Scalar.prototype.load = function(value) {
@@ -2596,6 +2611,10 @@
       return this.value;
     };
 
+    Scalar.prototype.clone = function(callback) {
+      return new this.constructor(this.value);
+    };
+
     Scalar.prototype.__call = function() {
       if (arguments.length > 0) {
         return this.set(arguments[0]);

data/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "joosy"
   ],
-  "version": "1.2.0-alpha.71",
+  "version": "1.2.0-alpha.73",
   "author": "Boris Staal <boris@staal.io>",
   "homepage": "http://joosy.ws/",
   "repository": {