joosy 1.2.0.alpha.66 → 1.2.0.alpha.67

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 5a523d74a5fa8a4314ddc142838a493df197cad0
-  data.tar.gz: 41f0dc732482e3dc076c8a9d71f139eb04a09092
+  metadata.gz: dbc407e588673ab084cd80005526da25fca3be3d
+  data.tar.gz: 0a983ab54409d053fbe6fdc35171852bc0ddc76c
 SHA512:
-  metadata.gz: d9c267a7e7bf6a26cb8aff5d1f219f2053c203253cbcd9e21ff3bf75713e61719b06357eafe93d0f8dbab273a43c5faa09ce2e5310b542211199d7fd5d454686
-  data.tar.gz: 60983954587c99123ba9e2434ed0a9089a7069722801f4fa6d766ffe318dff822f92d35b17ddb2929ed770e8c914315193dbf3d3991dfb845b6d806cc1333886
+  metadata.gz: 8ee60dfccb024011cf8ab8f3d108386d813c54253c1d69e89b5718270c9cc5e9935e393882b37bd48628e42ae7c01754b4dd9e60808b687873032dbe3f8b04d2
+  data.tar.gz: 8b309f54f2acced3241d5e485161c4a304a99747ac8f040219d2a3c14010372bdbb1e5f49e647728a1306881eeef756f8573e0b07d8afc40ec02fa4498e82813

data/bower.json

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

data/build/joosy/extensions/resources.js

@@ -126,7 +126,13 @@
       return Object.keys(this.data);
     };
 
-    Base.prototype.load = function(data) {
+    Base.prototype.load = function(data, clear) {
+      if (clear == null) {
+        clear = false;
+      }
+      if (clear) {
+        this.data = {};
+      }
       this.__fillData(data);
       return this;
     };
@@ -401,9 +407,11 @@
         callback = options;
         options = {};
       }
-      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;
+      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;
       });
     };
 
@@ -437,6 +445,10 @@
       return _ref;
     }
 
+    REST.requestOptions = function(options) {
+      return this.prototype.__requestOptions = options;
+    };
+
     REST.source = function(location) {
       return this.__source = location;
     };
@@ -541,8 +553,8 @@
         }
         path += this.__entityName.pluralize();
       }
-      if (options.from) {
-        path += "/" + options.from;
+      if (options.action) {
+        path += "/" + options.action;
       }
       return path;
     };
@@ -554,7 +566,7 @@
     };
 
     REST.prototype.memberPath = function(ids, options) {
-      var from, id, path;
+      var action, id, path;
       if (ids == null) {
         ids = [];
       }
@@ -572,13 +584,13 @@
         ids = [ids];
       }
       id = this.id() || ids.pop();
-      from = options.from;
+      action = options.action;
       ids.push(this.id());
       path = this.collectionPath(ids, Object.merge(options, {
-        from: void 0
+        action: void 0
       })) + ("/" + id);
-      if (from != null) {
-        path += "/" + from;
+      if (action != null) {
+        path += "/" + action;
       }
       return path;
     };
@@ -652,9 +664,11 @@
       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;
+      this.__query(path, 'GET', options.params, function(error, data, xhr) {
+        if (data != null) {
+          result.load(data);
+        }
+        return typeof callback === "function" ? callback(error, result, data, xhr) : void 0;
       });
       return result;
     };
@@ -662,17 +676,29 @@
     REST.__query = function(path, method, params, callback) {
       var options;
       options = {
+        url: path,
         data: params,
         type: method,
         cache: false,
         dataType: 'json'
       };
       if (Object.isFunction(callback)) {
-        options.success = callback;
+        options.success = function(data, _, xhr) {
+          return callback(false, data, xhr);
+        };
+        options.error = function(xhr) {
+          return callback(xhr);
+        };
       } else {
         Joosy.Module.merge(options, callback);
       }
-      return $.ajax(path, options);
+      if (this.prototype.__requestOptions instanceof Function) {
+        this.prototype.__requestOptions(options);
+      } else if (this.prototype.__requestOptions) {
+        Joosy.Module.merge(options, this.prototype.__requestOptions);
+        console.log(this.prototype.__requestOptions);
+      }
+      return $.ajax(options);
     };
 
     REST.prototype.reload = function(options, callback) {
@@ -685,9 +711,11 @@
         callback = false;
       }
       _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;
+      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;
       });
     };
 

data/build/joosy.js

@@ -932,6 +932,7 @@
         if (options == null) {
           options = {};
         }
+        this.prototype.__view = template;
         return this.prototype.__renderDefault = function(locals) {
           if (locals == null) {
             locals = {};
@@ -1026,10 +1027,14 @@
           }
           return _this.renderDynamic(template, locals, parentStackPointer);
         },
-        renderInline: function(locals, template) {
+        renderInline: function(locals, partial) {
+          var template;
           if (locals == null) {
             locals = {};
           }
+          template = function(params) {
+            return partial.apply(params);
+          };
           return _this.renderDynamic(template, locals, parentStackPointer);
         }
       };

data/package.json

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

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

@@ -190,7 +190,8 @@ class Joosy.Resources.Base extends Joosy.Module
   #
   # @return [Joosy.Resources.Base]      Returns self
   #
-  load: (data) ->
+  load: (data, clear=false) ->
+    @data = {} if clear
     @__fillData data
     return this
 

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

@@ -6,6 +6,9 @@
 #
 class Joosy.Resources.REST extends Joosy.Resources.Base
 
+  @requestOptions: (options) ->
+    @::__requestOptions = options
+
   #
   # Sets default base url for fetching and modifiing resources
   #
@@ -39,7 +42,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # @param [Array] args      Array of parent entities. Can be a string or another REST resource.
   #
   # @example Basic usage
-  #   Comment.at(['admin', @blog, @post]).collectionPath() # => '/admin/blogs/555/posts/666/comments'
+  #   Comment.at('admin', @blog, @post).collectionPath() # => '/admin/blogs/555/posts/666/comments'
   #
   # @note accepts both array notation (Comment.at(['admin', @blog, @post])) and args notation (Comment.at('admin', @blog, @post))
   #
@@ -56,7 +59,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # @param [Array] args      Array of parent entities. Can be a string or another REST resource.
   #
   # @example Basic usage
-  #   Comment.build(1).at(['admin', @blog, @post]).memberPath() # => '/admin/blogs/555/posts/666/comments/1'
+  #   Comment.build(1).at('admin', @blog, @post).memberPath() # => '/admin/blogs/555/posts/666/comments/1'
   #
   # @note accepts both array notation (comment.at(['admin', @blog, @post])) and args notation (comment.at('admin', @blog, @post))
   #
@@ -87,11 +90,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # Builds collection path
   #
-  # @param [Array] id           IDs for interpolation for masked sources
-  # @param [Hash] options       See {Joosy.Resources.REST.find} for possible options
-  #
-  # @example Basic usage
-  #   Resource.collectionPath() # /resources/
+  # @see Joosy.Resources.REST#collectionPath
   #
   @collectionPath: (args...) ->
     @::collectionPath args...
@@ -99,7 +98,16 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # Builds collection path
   #
-  # @see Joosy.Resources.REST.collectionPath
+  # @param [Array] ids                Interpolation arguments for nested objects
+  # @param [Object] options
+  # @option options [String] url      Manually set URL
+  # @option options [String] action   Action to add to the URL as a suffix
+  #
+  # @example Basic usage
+  #   Resource.collectionPath() # /resources/
+  #
+  # @example Nested resources
+  #   Resource.collectionPath(['admin', Resource.build 1]) # /admin/resources/1/resources
   #
   collectionPath: (ids=[], options={}) ->
     if Object.isObject(ids)
@@ -117,18 +125,14 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
       path += @constructor.__namespace__.map(String::underscore).join('/') + '/' if @constructor.__namespace__.length > 0
       path += @__entityName.pluralize()
 
-    path += "/#{options.from}" if options.from
+    path += "/#{options.action}" if options.action
     path
 
 
   #
   # Builds member path based on the given id.
   #
-  # @param [String] id          ID of entity to build member path for
-  # @param [Hash] options       See {Joosy.Resources.REST.find} for possible options
-  #
-  # @example Basic usage
-  #   Resource.memberPath(1, from: 'foo') # /resources/1/foo
+  # @see Joosy.Resources.REST#memberPath
   #
   @memberPath: (args...) ->
     @::memberPath args...
@@ -136,10 +140,16 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # Builds member path
   #
-  # @param [Hash] options       See {Joosy.Resources.REST.find} for possible options
+  # @param [Array] ids                Interpolation arguments for nested objects
+  # @param [Object] options
+  # @option options [String] url      Manually set URL
+  # @option options [String] action   Action to add to the URL as a suffix
   #
   # @example Basic usage
-  #   resource.memberPath(from: 'foo') # /resources/1/foo
+  #   resource.memberPath(action: 'foo') # /resources/1/foo
+  #
+  # @example Nested resources
+  #   Resource.memberPath(['admin', Resource.build 1]) # /admin/resources/1/resources/2
   #
   memberPath: (ids=[], options={}) ->
     if Object.isObject(ids)
@@ -151,11 +161,11 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
     ids = [ids] unless Object.isArray(ids)
     id = @id() || ids.pop()
 
-    from  = options.from
+    action = options.action
 
     ids.push @id()
-    path  = @collectionPath(ids, Object.merge(options, from: undefined)) + "/#{id}"
-    path += "/#{from}" if from?
+    path  = @collectionPath(ids, Object.merge(options, action: undefined)) + "/#{id}"
+    path += "/#{action}" if action?
     path
 
   #
@@ -164,7 +174,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # @param [Hash] options         Options to proxy to collectionPath
   # @param [Function] callback    Resulting callback
-  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
+  # @param [Object]   callback    `(error, data) -> ...`
   #
   @get: (options, callback) ->
     [options, callback] = @::__extractOptionsAndCallback(options, callback)
@@ -176,7 +186,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # @param [Hash] options         Options to proxy to collectionPath
   # @param [Function] callback    Resulting callback
-  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
+  # @param [Object]   callback    `(error, data) -> ...`
   #
   @post: (options, callback) ->
     [options, callback] = @::__extractOptionsAndCallback(options, callback)
@@ -188,7 +198,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # @param [Hash] options         Options to proxy to collectionPath
   # @param [Function] callback    Resulting callback
-  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
+  # @param [Object]   callback    `(error, data) -> ...`
   #
   @put: (options, callback) ->
     [options, callback] = @::__extractOptionsAndCallback(options, callback)
@@ -200,7 +210,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # @param [Hash] options         Options to proxy to collectionPath
   # @param [Function] callback    Resulting callback
-  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
+  # @param [Object]   callback    `(error, data) -> ...`
   #
   @delete: (options, callback) ->
     [options, callback] = @::__extractOptionsAndCallback(options, callback)
@@ -212,7 +222,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # @param [Hash] options         Options to proxy to memberPath
   # @param [Function] callback    Resulting callback
-  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
+  # @param [Object]   callback    `(error, data) -> ...`
   #
   get: (options, callback) ->
     [options, callback] = @__extractOptionsAndCallback(options, callback)
@@ -224,7 +234,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # @param [Hash] options         Options to proxy to memberPath
   # @param [Function] callback    Resulting callback
-  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
+  # @param [Object]   callback    `(error, data) -> ...`
   #
   post: (options, callback) ->
     [options, callback] = @__extractOptionsAndCallback(options, callback)
@@ -236,7 +246,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # @param [Hash] options         Options to proxy to memberPath
   # @param [Function] callback    Resulting callback
-  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
+  # @param [Object]   callback    `(error, data) -> ...`
   #
   put: (options, callback) ->
     [options, callback] = @__extractOptionsAndCallback(options, callback)
@@ -247,7 +257,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # Callback will get parsed JSON object as a parameter.
   #
   # @param [Hash] options         Options to proxy to memberPath
-  # @param [Function] callback    Resulting callback
+  # @param [Function] callback    `(error, data) -> ...`
   #
   delete: (options, callback) ->
     [options, callback] = @__extractOptionsAndCallback(options, callback)
@@ -261,14 +271,13 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #   Everything else will be considered as an id string and will make resource
   #   query for single instance from memberPath.
   # @param [Hash] options         Path modification options
-  # @param [Function] callback    Resulting callback
-  #   (will receive retrieved Collection/Resource)
+  # @param [Function] callback    `(error, instance, data) -> ...`
   #
-  # @option options [String] from                           Adds the given string as a last path element
+  # @option options [String] action             Adds the given string as a last path element
   #   i.e. /resources/trololo
-  # @option options [String] url                            Sets url for request instead of generated
+  # @option options [String] url                Sets url for request instead of generated
   #   i.e. /some/custom/url
-  # @option options [Hash] params                           Passes the given params to the query
+  # @option options [Hash] params               Passes the given params to the query
   #
   @find: (where, options={}, callback=false) ->
     [options, callback] = @::__extractOptionsAndCallback(options, callback)
@@ -285,9 +294,9 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
     if Object.isArray(where) && where.length > 1
       result.__source = @collectionPath where
 
-    @__query path, 'GET', options.params, (data) =>
-      result.load data
-      callback?(result, data)
+    @__query path, 'GET', options.params, (error, data, xhr) =>
+      result.load data if data?
+      callback?(error, result, data, xhr)
 
     result
 
@@ -296,31 +305,39 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   @__query: (path, method, params, callback) ->
     options =
+      url: path
       data: params
       type: method
       cache: false
       dataType: 'json'
 
     if Object.isFunction(callback)
-      options.success = callback
+      options.success = (data, _, xhr) -> callback(false, data, xhr)
+      options.error   = (xhr) -> callback(xhr)
     else
       Joosy.Module.merge options, callback
 
-    $.ajax path, options
+    if @::__requestOptions instanceof Function
+      @::__requestOptions(options)
+    else if @::__requestOptions
+      Joosy.Module.merge options, @::__requestOptions
+      console.log @::__requestOptions
+
+    $.ajax options
 
   #
   # Refetches the data from backend and triggers `changed`
   #
   # @param [Hash] options         See {Joosy.Resources.REST.find} for possible options
   # @param [Function] callback    Resulting callback
-  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
+  # @param [Object]   callback    `(error, instance, data) -> ...`
   #
   reload: (options={}, callback=false) ->
     [options, callback] = @__extractOptionsAndCallback(options, callback)
 
-    @constructor.__query @memberPath(options), 'GET', options.params, (data) =>
-      @load data
-      callback? this
+    @constructor.__query @memberPath(options), 'GET', options.params, (error, data, xhr) =>
+      @load data if data?
+      callback?(error, @, data, xhr)
 
   #
   # utility function for better API support for unrequired first options parameter

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

@@ -15,16 +15,16 @@ class Joosy.Resources.RESTCollection extends Joosy.Resources.Collection
   #
   # @param [Hash] options         See {Joosy.Resources.REST.find} for possible options
   # @param [Function] callback    Resulting callback
-  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
+  # @param [Object]   callback    `(error, instance, data) -> ...`
   #
   reload: (options={}, callback=false) ->
     if Object.isFunction(options)
       callback = options
       options  = {}
 
-    @model.__query @model.collectionPath(options, @__source), 'GET', options.params, (data) =>
-      @load data
-      callback?(data)
+    @model.__query @model.collectionPath(options, @__source), 'GET', options.params, (error, data, xhr) =>
+      @load data if data?
+      callback?(error, @, data, xhr)
 
   load: (args...) ->
     res = super(args...)

data/source/joosy/modules/renderer.coffee

@@ -15,6 +15,7 @@ Joosy.Modules.Renderer =
   #
   included: ->
     @view = (template, options={}) ->
+      @::__view = template
       @::__renderDefault = (locals={}) ->
         if options.dynamic
           @renderDynamic template, locals
@@ -98,7 +99,8 @@ Joosy.Modules.Renderer =
       @render template, locals, parentStackPointer
     renderDynamic: (template, locals={}) =>
       @renderDynamic template, locals, parentStackPointer
-    renderInline: (locals={}, template) =>
+    renderInline: (locals={}, partial) =>
+      template = (params) -> partial.apply(params)
       @renderDynamic template, locals, parentStackPointer
 
   #

data/spec/joosy/extensions/form/form_spec.coffee

@@ -130,7 +130,7 @@ describe "Joosy.Form", ->
 
     it "should fill form with extended action", ->
       @nudeForm.fill @resource,
-        action: @resource.memberPath(from: 'calculate')
+        action: @resource.memberPath(action: 'calculate')
       expect(@nudeForm.$fields()[0].value).toEqual 'foo'
       expect(@nudeForm.$fields()[1].value).toEqual 'bar'
       expect(@nudeForm.$container.attr 'action').toEqual '/tests/1/calculate'
@@ -138,7 +138,7 @@ describe "Joosy.Form", ->
       resource = @Test.build 'someId'
 
       @nudeForm.fill resource,
-        action: resource.memberPath(from: 'calculate')
+        action: resource.memberPath(action: 'calculate')
       expect(@nudeForm.$container.attr 'action').toEqual '/tests/someId/calculate'
 
     it "should handle field name properly", ->

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

@@ -21,7 +21,7 @@ describe "Joosy.Resources.RESTCollection", ->
 
   it "reloads", ->
     @collection.load [{"id": 1, "name": "test1"}, {"id": 2, "name": "test2"}]
-    @collection.reload from: 'test'
+    @collection.reload action: 'test'
 
     target = @server.requests.last()
     expect(target.method).toEqual 'GET'

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

@@ -95,8 +95,8 @@ describe "Joosy.Resources.REST", ->
     it 'builds member path', ->
       expect(Fluffy.memberPath 1).toEqual '/fluffies/1'
 
-    it 'builds member path with from', ->
-      expect(Fluffy.memberPath 1, from: 'test').toEqual '/fluffies/1/test'
+    it 'builds member path with action', ->
+      expect(Fluffy.memberPath 1, action: 'test').toEqual '/fluffies/1/test'
 
     describe 'with interpolation', ->
       it 'builds member path', ->
@@ -116,8 +116,8 @@ describe "Joosy.Resources.REST", ->
     it 'builds collection path', ->
       expect(Fluffy.collectionPath()).toEqual '/fluffies'
 
-    it 'builds collection path with from', ->
-      expect(Fluffy.collectionPath from: 'test').toEqual '/fluffies/test'
+    it 'builds collection path with action', ->
+      expect(Fluffy.collectionPath action: 'test').toEqual '/fluffies/test'
 
     describe 'with interpolation', ->
       it 'builds collection path', ->
@@ -128,7 +128,7 @@ describe "Joosy.Resources.REST", ->
     rawData = '{"fluffy": {"id": 1, "name": "test1"}}'
 
     beforeEach ->
-      @callback = sinon.spy (target, data) ->
+      @callback = sinon.spy (error, target, data) ->
         expect(target instanceof Fluffy).toEqual true
         expect(target.id()).toEqual 1
         expect(target 'name').toEqual 'test1'
@@ -139,8 +139,8 @@ describe "Joosy.Resources.REST", ->
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/1\?_=\d+/, rawData
       expect(@callback.callCount).toEqual 1
 
-    it "gets item with from", ->
-      resource = Fluffy.find 1, {from: 'action'}, @callback
+    it "gets item with action", ->
+      resource = Fluffy.find 1, {action: 'action'}, @callback
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/1\/action\?_=\d+/, rawData
       expect(@callback.callCount).toEqual 1
 
@@ -155,7 +155,7 @@ describe "Joosy.Resources.REST", ->
       expect(@callback.callCount).toEqual 1
 
     it "gets item with direct assignation", ->
-      resource = Fluffy.find 1, (cbResource) ->
+      resource = Fluffy.find 1, (error, cbResource) ->
         expect(resource).toBe cbResource
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/1\?_=\d+/, rawData
 
@@ -163,7 +163,7 @@ describe "Joosy.Resources.REST", ->
     rawData = '{"page": 42, "fluffies": [{"id": 1, "name": "test1"}, {"id": 2, "name": "test2"}]}'
 
     beforeEach ->
-      @callback = sinon.spy (target, data) ->
+      @callback = sinon.spy (error, target, data) ->
         expect(target instanceof Joosy.Resources.RESTCollection).toEqual true
         expect(target.size()).toEqual 2
         expect(target.at(0) instanceof Fluffy).toEqual true
@@ -174,8 +174,8 @@ describe "Joosy.Resources.REST", ->
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\?_=\d+/, rawData
       expect(@callback.callCount).toEqual 1
 
-    it "gets collection with from", ->
-      resource = Fluffy.find 'all', {from: 'action'}, @callback
+    it "gets collection with action", ->
+      resource = Fluffy.find 'all', {action: 'action'}, @callback
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/action\?_=\d+/, rawData
       expect(@callback.callCount).toEqual 1
 
@@ -203,14 +203,14 @@ describe "Joosy.Resources.REST", ->
 
   describe "requests", ->
     rawData  = '{"foo": "bar"}'
-    callback = sinon.spy (data) ->
+    callback = sinon.spy (error, data) ->
       expect(data).toEqual {foo: 'bar'}
 
     describe "member", ->
       resource = Fluffy.build 1
 
       it "with get", ->
-        resource.get {from: 'foo', params: {foo: 'bar'}}, callback
+        resource.get {action: 'foo', params: {foo: 'bar'}}, callback
         checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/1\/foo\?foo=bar&_=\d+/, rawData
 
       it "with post", ->
@@ -229,7 +229,7 @@ describe "Joosy.Resources.REST", ->
       resource = Fluffy
 
       it "with get", ->
-        resource.get {from: 'foo', params: {foo: 'bar'}}, callback
+        resource.get {action: 'foo', params: {foo: 'bar'}}, callback
         checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/foo\?foo=bar&_=\d+/, rawData
 
       it "with post", ->

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.66
+  version: 1.2.0.alpha.67
 platform: ruby
 authors:
 - Boris Staal
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-08-27 00:00:00.000000000 Z
+date: 2013-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -168,3 +168,4 @@ signing_key:
 specification_version: 4
 summary: Joosy Framework
 test_files: []
+has_rdoc: