joosy 1.2.0.alpha.67 → 1.2.0.alpha.68

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: dbc407e588673ab084cd80005526da25fca3be3d
-  data.tar.gz: 0a983ab54409d053fbe6fdc35171852bc0ddc76c
+  metadata.gz: 007fa5ba359b8c5f4c5e52a53b483a285149c575
+  data.tar.gz: 15ac5b0c7eaf9eb93b08b487b0e493fcd8ec7075
 SHA512:
-  metadata.gz: 8ee60dfccb024011cf8ab8f3d108386d813c54253c1d69e89b5718270c9cc5e9935e393882b37bd48628e42ae7c01754b4dd9e60808b687873032dbe3f8b04d2
-  data.tar.gz: 8b309f54f2acced3241d5e485161c4a304a99747ac8f040219d2a3c14010372bdbb1e5f49e647728a1306881eeef756f8573e0b07d8afc40ec02fa4498e82813
+  metadata.gz: b33c07dd76c9a907ff66ce830a55f321b3ae54f9d9e5598e0d5c48aeab9d98c9a4ddfbe11a766fbff3c6b80173c22b90716bbabbdcf6fa1b8328361989a8148f
+  data.tar.gz: 9548d59875b23556613071537c1c09893ac777a7782dfb1fa2284e5de26c0ab3ceffb88f8b60aac3564c76eca419e992ab35529f96a7dce4cd6208782959deb2

data/Gruntfile.coffee

@@ -101,7 +101,7 @@ module.exports = (grunt) ->
   #
   grunt.registerTask 'default', 'testem'
 
-  grunt.registerTask 'build', 'grill:compile'
+  grunt.registerTask 'build', ['bowerize', 'grill:compile']
 
   grunt.registerTask 'test', ->
     grunt.task.run 'coffeelint'

data/bower.json

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

data/build/joosy.js

@@ -511,26 +511,33 @@
       if (!events) {
         return;
       }
-      return Object.each(events, function(key, method) {
-        var callback, eventName, match, selector;
-        if (!Object.isFunction(method)) {
-          method = _this[method];
-        }
-        callback = function(event) {
-          return method.call(module, $(this), event);
-        };
-        match = key.match(_this.eventSplitter);
-        eventName = match[1];
-        selector = _this.__extractSelector(match[2]);
-        if (selector === "") {
-          _this.$container.bind(eventName, callback);
-          return Joosy.Modules.Log.debugAs(_this, "" + eventName + " binded on container");
-        } else if (selector === void 0) {
-          throw new Error("Unknown element " + match[2] + " in " + (Joosy.Module.__className(_this.constructor)) + " (maybe typo?)");
-        } else {
-          _this.$container.on(eventName, selector, callback);
-          return Joosy.Modules.Log.debugAs(_this, "" + eventName + " binded on " + selector);
+      return Object.each(events, function(keys, method) {
+        var callback, eventName, key, match, selector, _i, _len, _ref, _results;
+        _ref = keys.split(',');
+        _results = [];
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          key = _ref[_i];
+          key = key.replace(/^\s+/, '');
+          if (!Object.isFunction(method)) {
+            method = _this[method];
+          }
+          callback = function(event) {
+            return method.call(module, $(this), event);
+          };
+          match = key.match(_this.eventSplitter);
+          eventName = match[1];
+          selector = _this.__extractSelector(match[2]);
+          if (selector === "") {
+            _this.$container.bind(eventName, callback);
+            _results.push(Joosy.Modules.Log.debugAs(_this, "" + eventName + " binded on container"));
+          } else if (selector === void 0) {
+            throw new Error("Unknown element " + match[2] + " in " + (Joosy.Module.__className(_this.constructor)) + " (maybe typo?)");
+          } else {
+            _this.$container.on(eventName, selector, callback);
+            _results.push(Joosy.Modules.Log.debugAs(_this, "" + eventName + " binded on " + selector));
+          }
         }
+        return _results;
       });
     },
     __clearContainer: function() {
@@ -2370,7 +2377,7 @@
         } else if (Object.isFunction(action)) {
           return action(params);
         } else {
-          throw new "Unknown kind of route action";
+          throw new Error("Unknown kind of route action: " + action);
         }
       });
       return this.initialized = true;

data/build/joosy/extensions/resources.js

@@ -9,18 +9,15 @@
 
     Base.include(Joosy.Modules.Events);
 
+    Base.include(Joosy.Modules.Filters);
+
     Base.prototype.__primaryKey = 'id';
 
     Base.resetIdentity = function() {
       return Joosy.Resources.Base.identity = {};
     };
 
-    Base.beforeLoad = function(action) {
-      if (!this.prototype.hasOwnProperty('__beforeLoads')) {
-        this.prototype.__beforeLoads = [].concat(this.__super__.__beforeLoads || []);
-      }
-      return this.prototype.__beforeLoads.push(action);
-    };
+    Base.registerPlainFilters('beforeLoad');
 
     Base.primaryKey = function(primaryKey) {
       return this.prototype.__primaryKey = primaryKey;
@@ -93,6 +90,10 @@
       return shim;
     };
 
+    Base.grab = function(form) {
+      return this.build({}).grab(form);
+    };
+
     Base.__makeShim = function(proto) {
       var key, shim, value;
       shim = function() {
@@ -137,6 +138,24 @@
       return this;
     };
 
+    Base.prototype.grab = function(form) {
+      var data, field, _i, _len, _ref;
+      data = {};
+      _ref = $(form).serializeArray();
+      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+        field = _ref[_i];
+        if (!data[field.name]) {
+          data[field.name] = field.value;
+        } else {
+          if (!(data[field.name] instanceof Array)) {
+            data[field.name] = [data[field.name]];
+          }
+          data[field.name].push(field.value);
+        }
+      }
+      return this.load(data);
+    };
+
     Base.prototype.__get = function(path) {
       var target;
       target = this.__callTarget(path, true);
@@ -696,7 +715,6 @@
         this.prototype.__requestOptions(options);
       } else if (this.prototype.__requestOptions) {
         Joosy.Module.merge(options, this.prototype.__requestOptions);
-        console.log(this.prototype.__requestOptions);
       }
       return $.ajax(options);
     };

data/package.json

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

data/source/joosy/application.coffee

@@ -50,7 +50,7 @@ class Joosy.Application
       else if Object.isFunction(action)
         action(params)
       else
-        throw new "Unknown kind of route action"
+        throw new Error "Unknown kind of route action: #{action}"
 
     @initialized = true
 

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

@@ -17,10 +17,18 @@
 #
 # @include Joosy.Modules.Log
 # @include Joosy.Modules.Events
+# @include Joosy.Modules.Filters
+#
+# @method .beforeLoad(callback)
+#   Allows to modify data before it gets stored.
+#   You can define several beforeLoad filters that will be chained.
+#   @param [Function] action    `(Object) -> Object` to call
+#
 #
 class Joosy.Resources.Base extends Joosy.Module
   @include Joosy.Modules.Log
   @include Joosy.Modules.Events
+  @include Joosy.Modules.Filters
 
   #
   # Default primary key field 'id'
@@ -34,16 +42,7 @@ class Joosy.Resources.Base extends Joosy.Module
   @resetIdentity: ->
     Joosy.Resources.Base.identity = {}
 
-  #
-  # Allows to modify data before it gets stored.
-  # You can define several beforeLoad filters that will be chained.
-  #
-  # @param [Function] action    `(Object) -> Object` to call
-  #
-  @beforeLoad: (action) ->
-    unless @::hasOwnProperty '__beforeLoads'
-      @::__beforeLoads = [].concat @.__super__.__beforeLoads || []
-    @::__beforeLoads.push action
+  @registerPlainFilters 'beforeLoad'
 
   #
   # Sets the field containing primary key.
@@ -149,6 +148,14 @@ class Joosy.Resources.Base extends Joosy.Module
 
     shim
 
+  #
+  # Creates new instance of Resource using values from form
+  #
+  # @param [DOMElement] form      Form to grab
+  #
+  @grab: (form) ->
+    @build({}).grab form
+
   #
   # Makes base shim-function for making instances through build or making instance clones
   #
@@ -193,7 +200,23 @@ class Joosy.Resources.Base extends Joosy.Module
   load: (data, clear=false) ->
     @data = {} if clear
     @__fillData data
-    return this
+    return @
+
+  #
+  # Updates the Resource with a data from given form
+  #
+  # @param [DOMElement] form      Form to grab
+  #
+  grab: (form) ->
+    data = {}
+    for field in $(form).serializeArray()
+      unless data[field.name]
+        data[field.name] = field.value
+      else
+        data[field.name] = [data[field.name]] unless data[field.name] instanceof Array
+        data[field.name].push field.value
+
+    @load data
 
   #
   # Getter for wrapped data

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

@@ -321,7 +321,6 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
       @::__requestOptions(options)
     else if @::__requestOptions
       Joosy.Module.merge options, @::__requestOptions
-      console.log @::__requestOptions
 
     $.ajax options
 

data/source/joosy/modules/dom.coffee

@@ -110,24 +110,27 @@ Joosy.Modules.DOM =
 
     return unless events
 
-    Object.each events, (key, method) =>
-      unless Object.isFunction method
-        method = @[method]
-      callback = (event) ->
-        method.call module, $(this), event
-
-      match      = key.match @eventSplitter
-      eventName  = match[1]
-      selector   = @__extractSelector match[2]
-
-      if selector == ""
-        @$container.bind eventName, callback
-        Joosy.Modules.Log.debugAs @, "#{eventName} binded on container"
-      else if selector == undefined
-        throw new Error "Unknown element #{match[2]} in #{Joosy.Module.__className @constructor} (maybe typo?)"
-      else
-        @$container.on eventName, selector, callback
-        Joosy.Modules.Log.debugAs @, "#{eventName} binded on #{selector}"
+    Object.each events, (keys, method) =>
+      for key in keys.split(',')
+        key = key.replace(/^\s+/, '')
+
+        unless Object.isFunction method
+          method = @[method]
+        callback = (event) ->
+          method.call module, $(this), event
+
+        match      = key.match @eventSplitter
+        eventName  = match[1]
+        selector   = @__extractSelector match[2]
+
+        if selector == ""
+          @$container.bind eventName, callback
+          Joosy.Modules.Log.debugAs @, "#{eventName} binded on container"
+        else if selector == undefined
+          throw new Error "Unknown element #{match[2]} in #{Joosy.Module.__className @constructor} (maybe typo?)"
+        else
+          @$container.on eventName, selector, callback
+          Joosy.Modules.Log.debugAs @, "#{eventName} binded on #{selector}"
 
   # @private
   __clearContainer: ->

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.67
+  version: 1.2.0.alpha.68
 platform: ruby
 authors:
 - Boris Staal
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-28 00:00:00.000000000 Z
+date: 2013-08-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets