joosy 1.2.0.alpha.68 → 1.2.0.alpha.70

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 007fa5ba359b8c5f4c5e52a53b483a285149c575
-  data.tar.gz: 15ac5b0c7eaf9eb93b08b487b0e493fcd8ec7075
+  metadata.gz: 0c0650d2b49ebccea7dfe767a26b0dc38db9871d
+  data.tar.gz: 936ce56008fbf989e1283776d5755af3a9aae82e
 SHA512:
-  metadata.gz: b33c07dd76c9a907ff66ce830a55f321b3ae54f9d9e5598e0d5c48aeab9d98c9a4ddfbe11a766fbff3c6b80173c22b90716bbabbdcf6fa1b8328361989a8148f
-  data.tar.gz: 9548d59875b23556613071537c1c09893ac777a7782dfb1fa2284e5de26c0ab3ceffb88f8b60aac3564c76eca419e992ab35529f96a7dce4cd6208782959deb2
+  metadata.gz: 0a3a635da761bc635707176b166d5d8418b211efaff7f0985386a75370128c94c2faf5fc66f6792ed0f2a3b4a7899600fc1acb456bfd05971152e4ce83c80128
+  data.tar.gz: ba2f0bcb06ca85faa460ab4f428cbd847d907e989199dcd73f285693925ff3232b3b06ade4b2bfee2b6db522377fde198344279c8aae09f2d054c5763f22afea

data/Gruntfile.coffee

@@ -1,5 +1,4 @@
-require 'sugar'
-
+moment = require 'moment'
 semver = require 'semver'
 
 module.exports = (grunt) ->
@@ -8,11 +7,17 @@ module.exports = (grunt) ->
   #
   testemOptions = (vendor, specs) ->
     return {
-      src: Array.create([
+      src: grunt.util._([
+        [
           'bower_components/sinonjs/sinon.js',
           'bower_components/sugar/release/sugar-full.min.js',
           'spec/helpers/*.coffee'
-        ], vendor, 'joosy.coffee', specs)
+        ], 
+        vendor, 
+        'joosy.coffee', 
+        specs
+      ]).flatten()
+
       assets:
         setup: ->
           grunt.grill.assetter('development').environment
@@ -101,7 +106,7 @@ module.exports = (grunt) ->
   #
   grunt.registerTask 'default', 'testem'
 
-  grunt.registerTask 'build', ['bowerize', 'grill:compile']
+  grunt.registerTask 'compile', ['bowerize', 'grill:compile']
 
   grunt.registerTask 'test', ->
     grunt.task.run 'coffeelint'
@@ -109,7 +114,7 @@ module.exports = (grunt) ->
 
   grunt.registerTask 'publish', [
     'test',
-    'build',
+    'compile',
     'ensureCommits',
     'gh-pages',
     'release',
@@ -169,7 +174,7 @@ module.exports = (grunt) ->
 
     date = (version) ->
       return undefined unless version
-      Date.create(grunt.file.read "doc/#{version}/DATE").format "{d} {Month} {yyyy}"
+      moment(grunt.file.read "doc/#{version}/DATE").format "D MMMM YYYY"
 
     args = ['source', '--output-dir', destination]
     grunt.file.delete destination if grunt.file.exists destination
@@ -183,9 +188,9 @@ module.exports = (grunt) ->
         versions.push version if semver.valid(version)
 
       versions = versions.sort(semver.rcompare)
-      edge     = versions.filter((x) -> x.has('-')).first()
-      stable   = versions.filter((x) -> !x.has('-')).first()
-      versions = versions.remove edge, stable
+      edge     = versions.filter((x) -> x.indexOf('-') != -1)[0]
+      stable   = versions.filter((x) -> x.indexOf('-') == -1)[0]
+      versions = grunt.util._(versions).without edge, stable
 
       versions = {
         edge:

data/bower.json

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

data/build/joosy/extensions/resources.js

@@ -62,60 +62,46 @@
     };
 
     Base.build = function(data) {
-      var id, klass, shim, _base, _base1;
+      var id, klass, _base, _base1, _base2;
       if (data == null) {
         data = {};
       }
-      klass = this.prototype.__entityName;
-      (_base = Joosy.Resources.Base).identity || (_base.identity = {});
-      (_base1 = Joosy.Resources.Base.identity)[klass] || (_base1[klass] = {});
-      shim = this.__makeShim(this.prototype);
       if (Object.isNumber(data) || Object.isString(data)) {
         id = data;
         data = {};
-        data[shim.__primaryKey] = id;
+        data[this.prototype.__primaryKey] = id;
       }
-      if (Joosy.Resources.Base.identity) {
-        id = data[shim.__primaryKey];
-        if ((id != null) && Joosy.Resources.Base.identity[klass][id]) {
-          shim = Joosy.Resources.Base.identity[klass][id];
-          shim.load(data);
-        } else {
-          Joosy.Resources.Base.identity[klass][id] = shim;
-          this.apply(shim, [data]);
+      klass = this.prototype.__entityName;
+      id = data[this.prototype.__primaryKey];
+      if ((klass != null) && (id != null)) {
+        if ((_base = Joosy.Resources.Base).identity == null) {
+          _base.identity = {};
         }
+        if ((_base1 = Joosy.Resources.Base.identity)[klass] == null) {
+          _base1[klass] = {};
+        }
+        if ((_base2 = Joosy.Resources.Base.identity[klass])[id] == null) {
+          _base2[id] = new this({
+            id: id
+          });
+        }
+        return Joosy.Resources.Base.identity[klass][id].load(data);
       } else {
-        this.apply(shim, [data]);
+        return new this(data);
       }
-      return shim;
     };
 
     Base.grab = function(form) {
       return this.build({}).grab(form);
     };
 
-    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 = {};
       }
-      this.__fillData(data, false);
+      return Base.__super__.constructor.call(this, function() {
+        return this.__fillData(data, false);
+      });
     }
 
     Base.prototype.id = function() {
@@ -231,21 +217,14 @@
     };
 
     Base.prototype.__prepareData = function(data) {
-      var bl, name, _i, _len, _ref;
+      var name;
       if (Object.isObject(data) && Object.keys(data).length === 1 && this.__entityName) {
         name = this.__entityName.camelize(false);
         if (data[name]) {
           data = data[name];
         }
       }
-      if (this.__beforeLoads != null) {
-        _ref = this.__beforeLoads;
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          bl = _ref[_i];
-          data = bl.call(this, data);
-        }
-      }
-      return data;
+      return this.__applyBeforeLoads(data);
     };
 
     Base.prototype.__map = function(data, name, klass) {
@@ -260,9 +239,13 @@
       return data;
     };
 
+    Base.prototype.toString = function() {
+      return "<Resource " + this.__entityName + "> " + (JSON.stringify(this.data));
+    };
+
     return Base;
 
-  })(Joosy.Module);
+  })(Joosy.Function);
 
 }).call(this);
 (function() {
@@ -511,12 +494,9 @@
     };
 
     REST.prototype.at = function() {
-      var args, _ref1,
-        _this = this;
+      var args, _ref1;
       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)));
+      return new ((_ref1 = this.constructor).at.apply(_ref1, args))(this.data);
     };
 
     REST.prototype.__collection = function() {

data/build/joosy.js

@@ -107,6 +107,9 @@
 
 }).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.Module = (function() {
     function Module() {}
 
@@ -207,6 +210,33 @@
 
   })();
 
+  Joosy.Function = (function(_super) {
+    __extends(Function, _super);
+
+    function Function(setup) {
+      var key, shim, value;
+      shim = function() {
+        return shim.__call.apply(shim, arguments);
+      };
+      if (shim.__proto__) {
+        shim.__proto__ = this;
+      } else {
+        for (key in this) {
+          value = this[key];
+          shim[key] = value;
+        }
+      }
+      shim.constructor = this.constructor;
+      if (setup != null) {
+        setup.call(shim);
+      }
+      return shim;
+    }
+
+    return Function;
+
+  })(Joosy.Module);
+
   if ((typeof define !== "undefined" && define !== null ? define.amd : void 0) != null) {
     define('joosy/module', function() {
       return Joosy.Module;
@@ -1263,7 +1293,24 @@
         return filters.each(function(filter) {
           var camelized;
           camelized = _this.__registerFilterCollector(filter);
-          return _this.prototype["__run" + camelized + "s"] = function() {
+          _this.prototype["__run" + camelized + "s"] = function() {
+            var callback, params, _i, _len, _ref, _results;
+            params = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
+            if (!this["__" + filter + "s"]) {
+              return;
+            }
+            _ref = this["__" + filter + "s"];
+            _results = [];
+            for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+              callback = _ref[_i];
+              if (typeof callback !== 'function') {
+                callback = this[callback];
+              }
+              _results.push(callback.apply(this, params));
+            }
+            return _results;
+          };
+          _this.prototype["__confirm" + camelized + "s"] = function() {
             var params,
               _this = this;
             params = 1 <= arguments.length ? __slice.call(arguments, 0) : [];
@@ -1271,12 +1318,28 @@
               return true;
             }
             return this["__" + filter + "s"].reduce(function(flag, callback) {
-              if (!Object.isFunction(callback)) {
+              if (typeof callback !== 'function') {
                 callback = _this[callback];
               }
               return flag && callback.apply(_this, params) !== false;
             }, true);
           };
+          return _this.prototype["__apply" + camelized + "s"] = function() {
+            var callback, data, params, _i, _len, _ref;
+            data = arguments[0], params = 2 <= arguments.length ? __slice.call(arguments, 1) : [];
+            if (!this["__" + filter + "s"]) {
+              return data;
+            }
+            _ref = this["__" + filter + "s"];
+            for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+              callback = _ref[_i];
+              if (typeof callback !== 'function') {
+                callback = this[callback];
+              }
+              data = callback.apply(this, [data].concat(params));
+            }
+            return data;
+          };
         });
       };
       return this.registerSequencedFilters = function() {
@@ -1783,7 +1846,7 @@
       this.params = params;
       this.previous = previous;
       this.layoutShouldChange = ((_ref = this.previous) != null ? _ref.__layoutClass : void 0) !== this.__layoutClass;
-      this.halted = !this.__runBeforeLoads();
+      this.halted = !this.__confirmBeforeLoads();
       this.layout = (function() {
         var _ref1, _ref2;
         switch (false) {
@@ -2203,6 +2266,131 @@
     });
   }
 
+}).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.Array = (function(_super) {
+    __extends(Array, _super);
+
+    Joosy.Module.include.call(Array, Joosy.Modules.Events);
+
+    function Array() {
+      var entry, _i, _len, _ref;
+      _ref = this.slice.call(arguments, 0);
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        entry = _ref[_i];
+        this.push(entry);
+      }
+    }
+
+    Array.prototype.get = function(index) {
+      return this[index];
+    };
+
+    Array.prototype.set = function(index, value) {
+      this[index] = value;
+      this.trigger('changed');
+      return this.length;
+    };
+
+    Array.prototype.push = function() {
+      var result;
+      result = Array.__super__.push.apply(this, arguments);
+      this.trigger('changed');
+      return result;
+    };
+
+    Array.prototype.pop = function() {
+      var result;
+      result = Array.__super__.pop.apply(this, arguments);
+      this.trigger('changed');
+      return result;
+    };
+
+    Array.prototype.shift = function() {
+      var result;
+      result = Array.__super__.shift.apply(this, arguments);
+      this.trigger('changed');
+      return result;
+    };
+
+    Array.prototype.unshift = function() {
+      var result;
+      result = Array.__super__.unshift.apply(this, arguments);
+      this.trigger('changed');
+      return result;
+    };
+
+    Array.prototype.splice = function() {
+      var result;
+      result = Array.__super__.splice.apply(this, arguments);
+      this.trigger('changed');
+      return result;
+    };
+
+    return Array;
+
+  })(Array);
+
+  if ((typeof define !== "undefined" && define !== null ? define.amd : void 0) != null) {
+    define('joosy/resources/array', function() {
+      return Joosy.Resources.Array;
+    });
+  }
+
+}).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.Scalar = (function(_super) {
+    __extends(Scalar, _super);
+
+    Scalar.include(Joosy.Modules.Events);
+
+    function Scalar(value) {
+      return Scalar.__super__.constructor.call(this, function() {
+        return this.value = value;
+      });
+    }
+
+    Scalar.prototype.__call = function() {
+      if (arguments.length > 0) {
+        return this.set(arguments[0]);
+      } else {
+        return this.get();
+      }
+    };
+
+    Scalar.prototype.get = function() {
+      return this.value;
+    };
+
+    Scalar.prototype.set = function(value) {
+      this.value = value;
+      return this.trigger('changed');
+    };
+
+    Scalar.prototype.valueOf = function() {
+      return this.value.valueOf();
+    };
+
+    Scalar.prototype.toString = function() {
+      return this.value.toString();
+    };
+
+    return Scalar;
+
+  })(Joosy.Function);
+
+  if ((typeof define !== "undefined" && define !== null ? define.amd : void 0) != null) {
+    define('joosy/resources/scalar', function() {
+      return Joosy.Resources.Scalar;
+    });
+  }
+
 }).call(this);
 (function() {
   var __hasProp = {}.hasOwnProperty,
@@ -2213,6 +2401,10 @@
 
     Watcher.include(Joosy.Modules.Events);
 
+    Watcher.include(Joosy.Modules.Filters);
+
+    Watcher.registerPlainFilters('beforeLoad');
+
     Watcher.cache = function(cacheKey) {
       return this.prototype.__cacheKey = cacheKey;
     };
@@ -2221,21 +2413,14 @@
       return this.prototype.__fetcher = fetcher;
     };
 
-    Watcher.beforeLoad = function(action) {
-      if (!this.prototype.hasOwnProperty('__beforeLoads')) {
-        this.prototype.__beforeLoads = [].concat(this.__super__.__beforeLoads || []);
-      }
-      return this.prototype.__beforeLoads.push(action);
-    };
-
-    function Watcher(cacheKey, fetcher) {
+    function Watcher(callback, cacheKey, fetcher) {
       if (cacheKey == null) {
         cacheKey = false;
       }
       if (fetcher == null) {
         fetcher = false;
       }
-      if (Object.isFunction(cacheKey)) {
+      if (typeof cacheKey === 'function') {
         fetcher = cacheKey;
         cacheKey = void 0;
       }
@@ -2245,30 +2430,20 @@
       if (cacheKey) {
         this.__cacheKey = cacheKey;
       }
-    }
-
-    Watcher.prototype.load = function(callback) {
-      var _this = this;
-      if (this.__cacheKey && localStorage[this.__cacheKey]) {
-        this.data = this.prepare(JSON.parse(localStorage[this.__cacheKey]));
-        this.trigger('changed');
+      if (this.__cacheKey && localStorage && localStorage[this.__cacheKey]) {
+        this.data = this.__applyBeforeLoads(JSON.parse(localStorage[this.__cacheKey]));
+        if (typeof callback === "function") {
+          callback(this);
+        }
         this.refresh();
-        return typeof callback === "function" ? callback(this) : void 0;
       } else {
-        return this.__fetcher(function(result) {
-          if (_this.__cacheKey) {
-            localStorage[_this.__cacheKey] = JSON.stringify(result);
-          }
-          _this.data = _this.prepare(result);
-          _this.trigger('changed');
-          return typeof callback === "function" ? callback(_this) : void 0;
-        });
+        this.refresh(callback);
       }
-    };
+    }
 
-    Watcher.prototype.clone = function() {
+    Watcher.prototype.clone = function(callback) {
       var copy;
-      copy = new this.constructor(this.__cacheKey, this.__fetcher);
+      copy = new this.constructor(callback, this.__cacheKey, this.__fetcher);
       copy.data = Object.clone(this.data, true);
       copy.trigger('changed');
       return copy;
@@ -2277,25 +2452,15 @@
     Watcher.prototype.refresh = function(callback) {
       var _this = this;
       return this.__fetcher(function(result) {
-        if (_this.__cacheKey) {
+        if (_this.__cacheKey && localStorage) {
           localStorage[_this.__cacheKey] = JSON.stringify(result);
         }
-        _this.data = _this.prepare(result);
-        _this.trigger('changed');
-        return typeof callback === "function" ? callback(_this) : void 0;
-      });
-    };
-
-    Watcher.prototype.prepare = function(data) {
-      var bl, _i, _len, _ref;
-      if (this.__beforeLoads != null) {
-        _ref = this.__beforeLoads;
-        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-          bl = _ref[_i];
-          data = bl.call(this, data);
+        _this.data = _this.__applyBeforeLoads(result);
+        if (typeof callback === "function") {
+          callback(_this);
         }
-      }
-      return data;
+        return _this.trigger('changed');
+      });
     };
 
     return Watcher;

data/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "joosy"
   ],
-  "version": "1.2.0-alpha.68",
+  "version": "1.2.0-alpha.70",
   "author": "Boris Staal <boris@staal.io>",
   "homepage": "http://joosy.ws/",
   "repository": {
@@ -15,16 +15,15 @@
     "node": ">=0.4.0"
   },
   "dependencies": {
-    "grill": "~1.0.0-alpha.12"
+    "grill": ">=1.0.0-alpha.19",
+    "moment": "~2.1.0"
   },
   "devDependencies": {
-    "coffee-script": "~1.6.3",
-    "sugar": "~1.3.8",
     "bower": "~1.2.1",
     "semver": "~2.1.0",
     "grunt-coffeelint": "0.0.6",
     "grunt-release": "~0.3.5",
-    "grunt-contrib-testem": ">=0.4.0",
+    "grunt-contrib-testem": ">=0.5.2",
     "grunt-gh-pages": "git+https://github.com/inossidabile/grunt-gh-pages.git"
   }
 }

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

@@ -25,7 +25,7 @@
 #   @param [Function] action    `(Object) -> Object` to call
 #
 #
-class Joosy.Resources.Base extends Joosy.Module
+class Joosy.Resources.Base extends Joosy.Function
   @include Joosy.Modules.Log
   @include Joosy.Modules.Events
   @include Joosy.Modules.Filters
@@ -122,31 +122,22 @@ class Joosy.Resources.Base extends Joosy.Module
   # @return [Joosy.Resources.Base]
   #
   @build: (data={}) ->
-    klass = @::__entityName
-
-    Joosy.Resources.Base.identity ||= {}
-    Joosy.Resources.Base.identity[klass] ||= {}
-
-    shim = @__makeShim(@::)
-
     if Object.isNumber(data) || Object.isString(data)
       id   = data
       data = {}
-      data[shim.__primaryKey] = id
+      data[@::__primaryKey] = id
+
+    klass = @::__entityName
+    id    = data[@::__primaryKey]
 
-    if Joosy.Resources.Base.identity
-      id = data[shim.__primaryKey]
+    if klass? && id?
+      Joosy.Resources.Base.identity            ?= {}
+      Joosy.Resources.Base.identity[klass]     ?= {}
+      Joosy.Resources.Base.identity[klass][id] ?= new @ id: id
 
-      if id? && Joosy.Resources.Base.identity[klass][id]
-        shim = Joosy.Resources.Base.identity[klass][id]
-        shim.load data
-      else
-        Joosy.Resources.Base.identity[klass][id] = shim
-        @apply shim, [data]
+      Joosy.Resources.Base.identity[klass][id].load data
     else
-      @apply shim, [data]
-
-    shim
+      new @ data
 
   #
   # Creates new instance of Resource using values from form
@@ -156,25 +147,6 @@ class Joosy.Resources.Base extends Joosy.Module
   @grab: (form) ->
     @build({}).grab form
 
-  #
-  # 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
   #
@@ -182,7 +154,8 @@ class Joosy.Resources.Base extends Joosy.Module
   # @param [Object] data      Data to store
   #
   constructor: (data={}) ->
-    @__fillData data, false
+    return super ->
+      @__fillData data, false
 
   id: ->
     @data?[@__primaryKey]
@@ -312,10 +285,7 @@ class Joosy.Resources.Base extends Joosy.Module
       name = @__entityName.camelize(false)
       data = data[name] if data[name]
 
-    if @__beforeLoads?
-      data = bl.call(this, data) for bl in @__beforeLoads
-
-    data
+    @__applyBeforeLoads data
 
   __map: (data, name, klass) ->
     if Object.isArray data[name]
@@ -325,3 +295,6 @@ class Joosy.Resources.Base extends Joosy.Module
     else if Object.isObject data[name]
       data[name] = klass.build data[name]
     data
+
+  toString: ->
+    "<Resource #{@__entityName}> #{JSON.stringify(@data)}"

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

@@ -54,7 +54,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
 
 
   #
-  # Creates the proxy of current resource instance binded as a child of given entity
+  # Creates the proxy of current resource instance binded as a children of given entity
   #
   # @param [Array] args      Array of parent entities. Can be a string or another REST resource.
   #
@@ -64,9 +64,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # @note accepts both array notation (comment.at(['admin', @blog, @post])) and args notation (comment.at('admin', @blog, @post))
   #
   at: (args...) ->
-    @constructor.__atWrapper (callback) =>
-      Object.tap @constructor.__makeShim(@), callback
-    , args...
+    new (@constructor.at args...) @data
 
   #
   # Implements `@collection` default behavior.

data/source/joosy/module.coffee

@@ -112,9 +112,9 @@ class Joosy.Module
 
     for key, value of object
       if key != 'included' && key != 'extended'
-        this::[key] = value
+        @::[key] = value
 
-    object.included?.apply this
+    object.included?.apply @
     null
 
   #
@@ -131,6 +131,34 @@ class Joosy.Module
     object.extended?.apply this
     null
 
+#
+# Class allowing to emulate Fn-based instances in JS
+#
+# @example
+#   class Foo extends Joosy.Module.Function
+#     constructor: (value)
+#       return super ->
+#         @value = value
+#
+#   __call: -> @value
+#
+#   foo = new Foo 'test'
+#   typeof(foo)             # 'function'
+#   foo()                   # 'test'
+#
+class Joosy.Function extends Joosy.Module
+  constructor: (setup) ->
+    shim = -> shim.__call.apply shim, arguments
+
+    if shim.__proto__
+      shim.__proto__ = @
+    else
+      shim[key] = value for key, value of @
+
+    shim.constructor = @constructor
+    setup?.call(shim)
+    return shim
+
 # AMD wrapper
 if define?.amd?
   define 'joosy/module', -> Joosy.Module

data/source/joosy/modules/filters.coffee

@@ -18,7 +18,7 @@ Joosy.Modules.Filters =
   #
   #     # private
   #
-  #     @__runBeforeLoads() # Runs filters registered as beforeLoad
+  #     @__confirmBeforeLoads() # Runs filters registered as beforeLoad
   #     @__runAfterLoads() # Runs filters registered as afterLoad
   #     @__runAfterUnloads() # Runs filters registered as afterUnload
   #
@@ -36,13 +36,29 @@ Joosy.Modules.Filters =
         camelized = @__registerFilterCollector filter
 
         @::["__run#{camelized}s"] = (params...) ->
+          return unless @["__#{filter}s"]
+
+          for callback in @["__#{filter}s"]
+            callback = @[callback] unless typeof(callback) == 'function'
+            callback.apply(@, params)
+
+        @::["__confirm#{camelized}s"] = (params...) ->
           return true unless @["__#{filter}s"]
 
           @["__#{filter}s"].reduce (flag, callback) =>
-            callback = @[callback] unless Object.isFunction callback
+            callback = @[callback] unless typeof(callback) == 'function'
             flag && callback.apply(@, params) != false
           , true
 
+        @::["__apply#{camelized}s"] = (data, params...) ->
+          return data unless @["__#{filter}s"]
+
+          for callback in @["__#{filter}s"]
+            callback = @[callback] unless typeof(callback) == 'function'
+            data = callback.apply(@, [data].concat params)
+
+          data
+
     @registerSequencedFilters = (filters...) =>
       filters.each (filter) =>
         camelized = @__registerFilterCollector filter

data/source/joosy/page.coffee

@@ -33,7 +33,7 @@ class Joosy.Page extends Joosy.Widget
   constructor: (@params, @previous) ->
     @layoutShouldChange = @previous?.__layoutClass != @__layoutClass
 
-    @halted = !@__runBeforeLoads()
+    @halted = !@__confirmBeforeLoads()
     @layout = switch
       when @layoutShouldChange && @__layoutClass
         new @__layoutClass(params, @previous?.layout)

data/source/joosy/resources/array.coffee

@@ -0,0 +1,43 @@
+class Joosy.Resources.Array extends Array
+
+  Joosy.Module.include.call @, Joosy.Modules.Events
+
+  constructor: ->
+    @push entry for entry in @slice.call(arguments, 0)
+
+  get: (index) ->
+    @[index]
+
+  set: (index, value) ->
+    @[index] = value
+    @trigger 'changed'
+    @length
+
+  push: ->
+    result = super
+    @trigger 'changed'
+    result
+
+  pop: ->
+    result = super
+    @trigger 'changed'
+    result
+
+  shift: ->
+    result = super
+    @trigger 'changed'
+    result
+
+  unshift: ->
+    result = super
+    @trigger 'changed'
+    result
+
+  splice: ->
+    result = super
+    @trigger 'changed'
+    result
+
+# AMD wrapper
+if define?.amd?
+  define 'joosy/resources/array', -> Joosy.Resources.Array

data/source/joosy/resources/scalar.coffee

@@ -0,0 +1,29 @@
+class Joosy.Resources.Scalar extends Joosy.Function
+
+  @include Joosy.Modules.Events
+
+  constructor: (value) ->
+    return super ->
+      @value = value
+
+  __call: ->
+    if arguments.length > 0
+      @set arguments[0]
+    else
+      @get()
+
+  get: ->
+    @value
+
+  set: (@value) ->
+    @trigger 'changed'
+
+  valueOf: ->
+    @value.valueOf()
+
+  toString: ->
+    @value.toString()
+
+# AMD wrapper
+if define?.amd?
+  define 'joosy/resources/scalar', -> Joosy.Resources.Scalar

data/source/joosy/resources/watcher.coffee

@@ -1,54 +1,40 @@
-#### !!!UNSPECED ####
 class Joosy.Resources.Watcher extends Joosy.Module
+
   @include Joosy.Modules.Events
+  @include Joosy.Modules.Filters
+
+  @registerPlainFilters 'beforeLoad'
 
   @cache: (cacheKey) -> @::__cacheKey = cacheKey
   @fetcher: (fetcher) -> @::__fetcher = fetcher
 
-  @beforeLoad: (action) ->
-    unless @::hasOwnProperty '__beforeLoads'
-      @::__beforeLoads = [].concat @.__super__.__beforeLoads || []
-    @::__beforeLoads.push action
-
-  constructor: (cacheKey=false, fetcher=false) ->
-    if Object.isFunction(cacheKey)
+  constructor: (callback, cacheKey=false, fetcher=false) ->
+    if typeof(cacheKey) == 'function'
       fetcher  = cacheKey
       cacheKey = undefined
 
-    @__fetcher = fetcher if fetcher
+    @__fetcher  = fetcher if fetcher
     @__cacheKey = cacheKey if cacheKey
 
-  load: (callback) ->
-    if @__cacheKey && localStorage[@__cacheKey]
-      @data = @prepare(JSON.parse localStorage[@__cacheKey])
-      @trigger 'changed'
-      @refresh()
+    if @__cacheKey && localStorage && localStorage[@__cacheKey]
+      @data = @__applyBeforeLoads(JSON.parse localStorage[@__cacheKey])
       callback? @
+      @refresh()
     else
-      @__fetcher (result) =>
-        localStorage[@__cacheKey] = JSON.stringify(result) if @__cacheKey
-        @data = @prepare result
-        @trigger 'changed'
-        callback? @
-
-  clone: ->
-    copy = new @constructor(@__cacheKey, @__fetcher)
+      @refresh callback
+
+  clone: (callback) ->
+    copy = new @constructor(callback, @__cacheKey, @__fetcher)
     copy.data = Object.clone(@data, true)
     copy.trigger 'changed'
     copy
 
   refresh: (callback) ->
     @__fetcher (result) =>
-      localStorage[@__cacheKey] = JSON.stringify(result) if @__cacheKey
-      @data = @prepare result
-      @trigger 'changed'
+      localStorage[@__cacheKey] = JSON.stringify(result) if @__cacheKey && localStorage
+      @data = @__applyBeforeLoads result
       callback? @
-
-  prepare: (data) ->
-    if @__beforeLoads?
-      data = bl.call(this, data) for bl in @__beforeLoads
-
-    data
+      @trigger 'changed'
 
 # AMD wrapper
 if define?.amd?

data/spec/joosy/core/modules/filters_spec.coffee

@@ -41,7 +41,7 @@ describe "Joosy.Modules.Filters", ->
       @Filters.afterLoad callbacks[1]
       @Filters.afterUnload callbacks[2]
 
-      @filters.__runBeforeLoads 1, 2
+      @filters.__confirmBeforeLoads 1, 2
       @filters.__runAfterLoads 1, 2
       @filters.__runAfterUnloads 1, 2
 
@@ -60,7 +60,7 @@ describe "Joosy.Modules.Filters", ->
         callbacks[0].returns true
         callbacks[1].returns true
 
-        expect(@filters.__runBeforeLoads()).toBeTruthy()
+        expect(@filters.__confirmBeforeLoads()).toBeTruthy()
 
         expect(callbacks[0].callCount).toEqual 1
         expect(callbacks[1].callCount).toEqual 1
@@ -74,7 +74,7 @@ describe "Joosy.Modules.Filters", ->
         callbacks[0].returns true
         callbacks[1].returns false
 
-        expect(@filters.__runBeforeLoads()).toBeFalsy()
+        expect(@filters.__confirmBeforeLoads()).toBeFalsy()
 
         expect(callbacks[0].callCount).toEqual 1
         expect(callbacks[1].callCount).toEqual 1
@@ -87,7 +87,7 @@ describe "Joosy.Modules.Filters", ->
       @Filters.afterLoad   'callback1'
       @Filters.afterUnload 'callback2'
         
-      @filters.__runBeforeLoads()
+      @filters.__confirmBeforeLoads()
       @filters.__runAfterLoads()
       @filters.__runAfterUnloads()
 
@@ -187,48 +187,4 @@ describe "Joosy.Modules.Filters", ->
         complete()
 
       @filters.__runBeforeLoads ['test'], ->
-        expect(spies).toBeSequenced()
-
-    # describe "chaining", ->
-
-    #   it "evaluates", ->
-    #     callbacks = 0.upto(1).map =>
-    #       callback = sinon.stub()
-    #       @Filters.beforeLoad callback
-    #       callback
-
-    #     callbacks[0].returns true
-    #     callbacks[1].returns true
-
-    #     expect(@filters.__runBeforeLoads()).toBeTruthy()
-
-    #     expect(callbacks[0].callCount).toEqual 1
-    #     expect(callbacks[1].callCount).toEqual 1
-
-    #   it "breaks on false", ->
-    #     callbacks = 0.upto(2).map =>
-    #       callback = sinon.stub()
-    #       @Filters.beforeLoad callback
-    #       callback
-
-    #     callbacks[0].returns true
-    #     callbacks[1].returns false
-
-    #     expect(@filters.__runBeforeLoads()).toBeFalsy()
-
-    #     expect(callbacks[0].callCount).toEqual 1
-    #     expect(callbacks[1].callCount).toEqual 1
-    #     expect(callbacks[2].callCount).toEqual 0
-
-    # it "accepts method names as callbacks", ->
-    #   @filters['callback' + i] = sinon.spy() for i in 0.upto(2)
-
-    #   @Filters.beforeLoad  'callback0'
-    #   @Filters.afterLoad   'callback1'
-    #   @Filters.afterUnload 'callback2'
-        
-    #   @filters.__runBeforeLoads()
-    #   @filters.__runAfterLoads()
-    #   @filters.__runAfterUnloads()
-
-    #   expect(@filters['callback' + i].callCount).toEqual 1 for i in 0.upto(2)
+        expect(spies).toBeSequenced()

data/spec/joosy/core/page_spec.coffee

@@ -35,8 +35,8 @@ describe "Joosy.Page", ->
       Joosy.Router.navigate.restore()
 
     it "respects beforeFilters cancelation", ->
-      sinon.stub @Page.prototype, '__runBeforeLoads'
-      @Page::__runBeforeLoads.returns(false)
+      sinon.stub @Page.prototype, '__confirmBeforeLoads'
+      @Page::__confirmBeforeLoads.returns(false)
 
       new @Page $('#application')
 

data/spec/joosy/environments/amd_spec.coffee

@@ -31,6 +31,8 @@ describe "Joosy", ->
       'joosy/modules/renderer',
       'joosy/modules/time_manager',
       'joosy/page',
+      'joosy/resources/array',
+      'joosy/resources/scalar',
       'joosy/resources/watcher',
       'joosy/router',
       'joosy/templaters/jst',

data/spec/joosy/extensions/resources/base_spec.coffee

@@ -148,6 +148,7 @@ describe "Joosy.Resources.Base", ->
     it "handles nested bi-directional reference", ->
       biDirectionTestNode = TestNode.build
         id: 1
-        children: [{id: 2, parent: {id: 1}}]
+        yolo: true
+        children: [{id: 2, parent: {id: 1, yolo: true}}]
 
       expect(biDirectionTestNode).toEqual(biDirectionTestNode('children').at(0)('parent'))

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.68
+  version: 1.2.0.alpha.70
 platform: ruby
 authors:
 - Boris Staal
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-30 00:00:00.000000000 Z
+date: 2013-09-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -85,6 +85,8 @@ files:
 - source/joosy/modules/time_manager.coffee
 - source/joosy/modules/widgets_manager.coffee
 - source/joosy/page.coffee
+- source/joosy/resources/array.coffee
+- source/joosy/resources/scalar.coffee
 - source/joosy/resources/watcher.coffee
 - source/joosy/router.coffee
 - source/joosy/templaters/jst.coffee