joosy 1.2.0.alpha.58 → 1.2.0.alpha.59

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 877691f0d3fe49b4f115f111663aba62396a0421
-  data.tar.gz: 7996ed76d2bddc7349b6ec2d316ee0a7ab4c1883
+  metadata.gz: bca3233835310754afca28be9330ec70a839b55e
+  data.tar.gz: fcd2fbff79196181a4f6babbf812d84ee5778ec0
 SHA512:
-  metadata.gz: 5b169f311b2a03478e24b1be422843e2ceb4786c4389217029f04b10e7a8245a0b6b156295cd1cdfae2486cd17d0c5b26a3a99c307b09d6dd5d251c1072d36d6
-  data.tar.gz: 673c4f423886679626cf29d4255bba23aba634aeca135358243b9e9b7efacfb4c3d5d37a9c6b3882b67f8dc0454f69e03b596a1820e177c832764d5b23b1ccd6
+  metadata.gz: ba8c3caae6da6816987fcab5008ed02fb6a3a62c99accf8af987a15ab564a1afbbe0bae233777a405fabc87c2dd07d777f81fa486ec6f087139095e11d9f7044
+  data.tar.gz: 78f4d74388d85d3ae2cb05c88061cea9e153fa5edfb1d85c6538e081aaf098d845f4f5354dd01e3896df0c4b8c0cfed1101d2c2348d61938feaa2217d89017d7

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "joosy",
-  "version": "1.2.0-alpha.58",
+  "version": "1.2.0-alpha.59",
   "main": "lib/joosy.js",
   "ignore": [
     "bin",

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

@@ -266,6 +266,9 @@
       var result,
         _this = this;
       result = {};
+      if (Object.isObject(errors != null ? errors.errors : void 0)) {
+        errors = errors.errors;
+      }
       Object.each(errors, function(field, notifications) {
         var f, name, splited, _i, _len;
         if (_this.substitutions[field] != null) {

data/build/joosy/extensions/resources.js

@@ -11,8 +11,6 @@
 
     Base.prototype.__primaryKey = 'id';
 
-    Base.prototype.__source = false;
-
     Base.resetIdentity = function() {
       return Joosy.Resources.Base.identity = {};
     };
@@ -67,26 +65,14 @@
     };
 
     Base.build = function(data) {
-      var id, key, klass, shim, value, _base, _base1, _ref;
+      var id, klass, shim, _base, _base1;
       if (data == null) {
         data = {};
       }
       klass = this.prototype.__entityName;
       (_base = Joosy.Resources.Base).identity || (_base.identity = {});
       (_base1 = Joosy.Resources.Base.identity)[klass] || (_base1[klass] = {});
-      shim = function() {
-        return shim.__call.apply(shim, arguments);
-      };
-      if (shim.__proto__) {
-        shim.__proto__ = this.prototype;
-      } else {
-        _ref = this.prototype;
-        for (key in _ref) {
-          value = _ref[key];
-          shim[key] = value;
-        }
-      }
-      shim.constructor = this;
+      shim = this.__makeShim(this.prototype);
       if (Object.isNumber(data) || Object.isString(data)) {
         id = data;
         data = {};
@@ -107,6 +93,23 @@
       return shim;
     };
 
+    Base.__makeShim = function(proto) {
+      var key, shim, value;
+      shim = function() {
+        return shim.__call.apply(shim, arguments);
+      };
+      if (shim.__proto__) {
+        shim.__proto__ = proto;
+      } else {
+        for (key in proto) {
+          value = proto[key];
+          shim[key] = value;
+        }
+      }
+      shim.constructor = this;
+      return shim;
+    };
+
     function Base(data) {
       if (data == null) {
         data = {};
@@ -115,7 +118,8 @@
     }
 
     Base.prototype.id = function() {
-      return this.data[this.__primaryKey];
+      var _ref;
+      return (_ref = this.data) != null ? _ref[this.__primaryKey] : void 0;
     };
 
     Base.prototype.knownAttributes = function() {
@@ -385,31 +389,51 @@
       return this.__source = location;
     };
 
+    REST.__atWrapper = function() {
+      var args, definer,
+        _this = this;
+      definer = arguments[0], args = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+      if (args.length === 1 && Object.isArray(args[0])) {
+        return this.__atWrapper.apply(this, [definer].concat(__slice.call(args[0])));
+      } else {
+        return definer(function(clone) {
+          clone.__source = args.reduce(function(path, arg) {
+            return path += arg instanceof Joosy.Resources.REST ? arg.memberPath() : arg.replace(/^\/?/, '/');
+          }, '');
+          return clone.__source += '/' + _this.prototype.__entityName.pluralize();
+        });
+      }
+    };
+
     REST.at = function() {
-      var Clone, args, _ref1;
+      var args,
+        _this = this;
       args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
-      Clone = (function(_super1) {
-        __extends(Clone, _super1);
+      return this.__atWrapper.apply(this, [function(callback) {
+        var Clone, _ref1;
+        return Clone = (function(_super1) {
+          __extends(Clone, _super1);
+
+          function Clone() {
+            _ref1 = Clone.__super__.constructor.apply(this, arguments);
+            return _ref1;
+          }
 
-        function Clone() {
-          _ref1 = Clone.__super__.constructor.apply(this, arguments);
-          return _ref1;
-        }
+          callback(Clone);
 
-        return Clone;
+          return Clone;
 
-      })(this);
-      if (args.length === 1 && Object.isArray(args[0])) {
-        return this.at.apply(this, args[0]);
-      } else {
-        Clone.__source = args.reduce(function(path, arg) {
-          return path += arg instanceof Joosy.Resources.Base ? arg.memberPath() : arg.replace(/^\/?/, '/');
-        }, '');
-        if (this.prototype.__entityName && args[args.length - 1] instanceof Joosy.Resources.Base) {
-          Clone.__source += '/' + this.prototype.__entityName.pluralize();
-        }
-        return Clone;
-      }
+        })(_this);
+      }].concat(__slice.call(args)));
+    };
+
+    REST.prototype.at = function() {
+      var args, _ref1,
+        _this = this;
+      args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+      return (_ref1 = this.constructor).__atWrapper.apply(_ref1, [function(callback) {
+        return Object.tap(_this.constructor.__makeShim(_this), callback);
+      }].concat(__slice.call(args)));
     };
 
     REST.prototype.__collection = function() {
@@ -422,57 +446,83 @@
       }
     };
 
-    REST.__parentsPath = function(parents) {
-      return parents.reduce(function(path, parent) {
-        return path += Joosy.Module.hasAncestor(parent.constructor, Joosy.Resources.REST) ? parent.memberPath() : parent;
-      }, '');
+    REST.prototype.__interpolatePath = function(source, ids) {
+      if (!Object.isArray(ids)) {
+        ids = [ids];
+      }
+      return ids.reduce(function(path, id) {
+        if (id instanceof Joosy.Resources.REST) {
+          id = id.id();
+        }
+        return path.replace(/:[^\/]+/, id);
+      }, source);
+    };
+
+    REST.collectionPath = function() {
+      var args, _ref1;
+      args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+      return (_ref1 = this.prototype).collectionPath.apply(_ref1, args);
     };
 
-    REST.collectionPath = function(options) {
-      var path;
+    REST.prototype.collectionPath = function(ids, options) {
+      var path, source;
+      if (ids == null) {
+        ids = [];
+      }
       if (options == null) {
         options = {};
       }
+      if (Object.isObject(ids)) {
+        options = ids;
+        ids = [];
+      }
       if (options.url) {
         return options.url;
       }
-      if ((this.__source != null) && (options.parent == null)) {
-        path = this.__source;
+      source = this.__source || this.constructor.__source;
+      if (source) {
+        path = this.__interpolatePath(source, ids);
       } else {
         path = '/';
-        if (this.__namespace__.length > 0) {
-          path += this.__namespace__.map(function(s) {
-            return s.toLowerCase();
-          }).join('/') + '/';
+        if (this.constructor.__namespace__.length > 0) {
+          path += this.constructor.__namespace__.map(String.prototype.underscore).join('/') + '/';
         }
-        path += this.prototype.__entityName.pluralize();
+        path += this.__entityName.pluralize();
       }
-      if (options.parent != null) {
-        path = this.__parentsPath(Object.isArray(options.parent) ? options.parent : [options.parent]) + path;
-      }
-      if (options.from != null) {
+      if (options.from) {
         path += "/" + options.from;
       }
       return path;
     };
 
-    REST.prototype.collectionPath = function(options) {
-      if (options == null) {
-        options = {};
-      }
-      return this.constructor.collectionPath(options);
+    REST.memberPath = function() {
+      var args, _ref1;
+      args = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+      return (_ref1 = this.prototype).memberPath.apply(_ref1, args);
     };
 
-    REST.memberPath = function(id, options) {
-      var from, path;
+    REST.prototype.memberPath = function(ids, options) {
+      var from, id, path;
+      if (ids == null) {
+        ids = [];
+      }
       if (options == null) {
         options = {};
       }
+      if (Object.isObject(ids)) {
+        options = ids;
+        ids = [];
+      }
       if (options.url) {
         return options.url;
       }
+      if (!Object.isArray(ids)) {
+        ids = [ids];
+      }
+      id = this.id() || ids.pop();
       from = options.from;
-      path = this.collectionPath(Object.merge(options, {
+      ids.push(this.id());
+      path = this.collectionPath(ids, Object.merge(options, {
         from: void 0
       })) + ("/" + id);
       if (from != null) {
@@ -481,79 +531,56 @@
       return path;
     };
 
-    REST.prototype.memberPath = function(options) {
-      if (options == null) {
-        options = {};
-      }
-      return this.constructor.memberPath(this.id(), options);
-    };
-
     REST.get = function(options, callback) {
-      if (Object.isFunction(options)) {
-        callback = options;
-        options = {};
-      }
+      var _ref1;
+      _ref1 = this.prototype.__extractOptionsAndCallback(options, callback), options = _ref1[0], callback = _ref1[1];
       return this.__query(this.collectionPath(options), 'GET', options.params, callback);
     };
 
     REST.post = function(options, callback) {
-      if (Object.isFunction(options)) {
-        callback = options;
-        options = {};
-      }
+      var _ref1;
+      _ref1 = this.prototype.__extractOptionsAndCallback(options, callback), options = _ref1[0], callback = _ref1[1];
       return this.__query(this.collectionPath(options), 'POST', options.params, callback);
     };
 
     REST.put = function(options, callback) {
-      if (Object.isFunction(options)) {
-        callback = options;
-        options = {};
-      }
+      var _ref1;
+      _ref1 = this.prototype.__extractOptionsAndCallback(options, callback), options = _ref1[0], callback = _ref1[1];
       return this.__query(this.collectionPath(options), 'PUT', options.params, callback);
     };
 
     REST["delete"] = function(options, callback) {
-      if (Object.isFunction(options)) {
-        callback = options;
-        options = {};
-      }
+      var _ref1;
+      _ref1 = this.prototype.__extractOptionsAndCallback(options, callback), options = _ref1[0], callback = _ref1[1];
       return this.__query(this.collectionPath(options), 'DELETE', options.params, callback);
     };
 
     REST.prototype.get = function(options, callback) {
-      if (Object.isFunction(options)) {
-        callback = options;
-        options = {};
-      }
+      var _ref1;
+      _ref1 = this.__extractOptionsAndCallback(options, callback), options = _ref1[0], callback = _ref1[1];
       return this.constructor.__query(this.memberPath(options), 'GET', options.params, callback);
     };
 
     REST.prototype.post = function(options, callback) {
-      if (Object.isFunction(options)) {
-        callback = options;
-        options = {};
-      }
+      var _ref1;
+      _ref1 = this.__extractOptionsAndCallback(options, callback), options = _ref1[0], callback = _ref1[1];
       return this.constructor.__query(this.memberPath(options), 'POST', options.params, callback);
     };
 
     REST.prototype.put = function(options, callback) {
-      if (Object.isFunction(options)) {
-        callback = options;
-        options = {};
-      }
+      var _ref1;
+      _ref1 = this.__extractOptionsAndCallback(options, callback), options = _ref1[0], callback = _ref1[1];
       return this.constructor.__query(this.memberPath(options), 'PUT', options.params, callback);
     };
 
     REST.prototype["delete"] = function(options, callback) {
-      if (Object.isFunction(options)) {
-        callback = options;
-        options = {};
-      }
+      var _ref1;
+      _ref1 = this.__extractOptionsAndCallback(options, callback), options = _ref1[0], callback = _ref1[1];
       return this.constructor.__query(this.memberPath(options), 'DELETE', options.params, callback);
     };
 
     REST.find = function(where, options, callback) {
-      var result,
+      var id, path, result, _ref1,
         _this = this;
       if (options == null) {
         options = {};
@@ -561,23 +588,22 @@
       if (callback == null) {
         callback = false;
       }
-      if (Object.isFunction(options)) {
-        callback = options;
-        options = {};
-      }
-      if (where === 'all') {
+      _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);
-        this.__query(this.collectionPath(options), 'GET', options.params, function(data) {
-          result.load(data);
-          return typeof callback === "function" ? callback(result, data) : void 0;
-        });
+        path = this.collectionPath(where, options);
       } else {
-        result = this.build(where);
-        this.__query(this.memberPath(where, options), 'GET', options.params, function(data) {
-          result.load(data);
-          return typeof callback === "function" ? callback(result, data) : void 0;
-        });
+        result = this.build(id);
+        path = this.memberPath(where, options);
       }
+      if (Object.isArray(where) && where.length > 1) {
+        result.__source = this.collectionPath(where);
+      }
+      this.__query(path, 'GET', options.params, function(data) {
+        result.load(data);
+        return typeof callback === "function" ? callback(result, data) : void 0;
+      });
       return result;
     };
 
@@ -598,23 +624,29 @@
     };
 
     REST.prototype.reload = function(options, callback) {
-      var _this = this;
+      var _ref1,
+        _this = this;
       if (options == null) {
         options = {};
       }
       if (callback == null) {
         callback = false;
       }
-      if (Object.isFunction(options)) {
-        callback = options;
-        options = {};
-      }
+      _ref1 = this.__extractOptionsAndCallback(options, callback), options = _ref1[0], callback = _ref1[1];
       return this.constructor.__query(this.memberPath(options), 'GET', options.params, function(data) {
         _this.load(data);
         return typeof callback === "function" ? callback(_this) : void 0;
       });
     };
 
+    REST.prototype.__extractOptionsAndCallback = function(options, callback) {
+      if (Object.isFunction(options)) {
+        callback = options;
+        options = {};
+      }
+      return [options, callback];
+    };
+
     return REST;
 
   })(Joosy.Resources.Base);
@@ -623,7 +655,8 @@
 (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; };
+    __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);
@@ -649,12 +682,23 @@
         callback = options;
         options = {};
       }
-      return this.model.__query(this.model.collectionPath(options), 'GET', options.params, function(data) {
+      return this.model.__query(this.model.collectionPath(options, this.__source), 'GET', options.params, function(data) {
         _this.load(data);
         return typeof callback === "function" ? callback(data) : 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);

data/build/joosy.js

@@ -1809,6 +1809,7 @@
 (function() {
   Joosy.helpers('Routes', function() {
     return this.linkTo = function(name, url, tagOptions) {
+      var block, _ref;
       if (name == null) {
         name = '';
       }
@@ -1819,9 +1820,9 @@
         tagOptions = {};
       }
       if (Object.isFunction(tagOptions)) {
-        url = name;
-        tagOptions = url;
-        name = tagOptions();
+        block = tagOptions;
+        _ref = [name, url], url = _ref[0], tagOptions = _ref[1];
+        name = block();
       }
       return Joosy.Helpers.Application.contentTag('a', name, Joosy.Module.merge(tagOptions, {
         'data-joosy': true,

data/generators/templates/application/base/application.coffee

@@ -3,7 +3,6 @@
 #= require joosy
 #
 #= require_tree ./
-#= require_self
 
 $ ->
   Joosy.Application.initialize 'body',

data/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "joosy"
   ],
-  "version": "1.2.0-alpha.58",
+  "version": "1.2.0-alpha.59",
   "author": "Boris Staal <boris@staal.io>",
   "homepage": "http://joosy.ws/",
   "repository": {
@@ -18,7 +18,7 @@
     "node": ">=0.4.0"
   },
   "dependencies": {
-    "bower": "~1.1.0",
+    "grill": "~1.0.0-alpha.3",
     "sugar": "~1.3.8",
     "coffee-script": "~1.6.3",
     "command-router": "0.0.5",
@@ -28,10 +28,6 @@
     "colors": "~0.6.0-1",
     "grunt": "~0.4.1",
     "mincer": ">= 0.5.5",
-    "connect": "~2.7.11",
-    "haml-coffee": "~1.11.1",
-    "proxy-middleware": "~0.4.0",
-    "gzippo": "~0.2.0",
     "stylus": "~0.32.1",
     "nib": "~0.9.1"
   },
@@ -42,6 +38,7 @@
     "grunt-contrib-connect": "~0.3.0",
     "grunt-coffeelint": "0.0.6",
     "grunt-release": "~0.3.5",
-    "semver": "~2.1.0"
+    "semver": "~2.1.0",
+    "bower": "~1.1.2"
   }
 }

data/source/joosy/extensions/resources/base.coffee

@@ -27,8 +27,6 @@ class Joosy.Resources.Base extends Joosy.Module
   #
   __primaryKey: 'id'
 
-  __source: false
-
   #
   # Clears the identity map cache. Recomended to be called during layout switch to
   # ensure correct garbage collection.
@@ -55,7 +53,8 @@ class Joosy.Resources.Base extends Joosy.Module
   #
   # @param [String] primary     Name of the field
   #
-  @primaryKey: (primaryKey) -> @::__primaryKey = primaryKey
+  @primaryKey: (primaryKey) ->
+    @::__primaryKey = primaryKey
 
   #
   # Sets the entity text name:
@@ -63,7 +62,8 @@ class Joosy.Resources.Base extends Joosy.Module
   #
   # @param [String] name    Singular name of resource
   #
-  @entity: (name) -> @::__entityName = name
+  @entity: (name) ->
+    @::__entityName = name
 
   #
   # Sets the collection to use
@@ -128,16 +128,7 @@ class Joosy.Resources.Base extends Joosy.Module
     Joosy.Resources.Base.identity ||= {}
     Joosy.Resources.Base.identity[klass] ||= {}
 
-    shim = ->
-      shim.__call.apply shim, arguments
-
-    if shim.__proto__
-      shim.__proto__ = @prototype
-    else
-      for key, value of @prototype
-        shim[key] = value
-
-    shim.constructor = @
+    shim = @__makeShim(@::)
 
     if Object.isNumber(data) || Object.isString(data)
       id   = data
@@ -158,6 +149,25 @@ class Joosy.Resources.Base extends Joosy.Module
 
     shim
 
+  #
+  # Makes base shim-function for making instances through build or making instance clones
+  #
+  # @param [Object] proto         Any function or object whose properties will be inherited by a new function
+  #
+  @__makeShim: (proto) ->
+    shim = ->
+      shim.__call.apply shim, arguments
+
+    if shim.__proto__
+      shim.__proto__ = proto
+    else
+      for key, value of proto
+        shim[key] = value
+
+    shim.constructor = @
+
+    shim
+
   #
   # Should NOT be called directly, use {::build} instead
   #
@@ -168,7 +178,7 @@ class Joosy.Resources.Base extends Joosy.Module
     @__fillData data, false
 
   id: ->
-    @data[@__primaryKey]
+    @data?[@__primaryKey]
 
   knownAttributes: ->
     Object.keys @data