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

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

@@ -18,31 +18,52 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
     @__source = location
 
   #
-  # Creates the proxy of current resource binded as a child of given entity
+  # Makes needed changes with clone/wrapper for @at method to extend its' path
   #
-  @at: (args...) ->
-    #
-    # Class inheritance used to create proxy
-    #
-    # @private
-    #
-    class Clone extends this
-
+  @__atWrapper: (definer, args...) ->
     if args.length == 1 && Object.isArray(args[0])
-      @at(args[0]...)
+      @__atWrapper(definer, args[0]...)
     else
-      Clone.__source = args.reduce (path, arg) ->
-        path += if arg instanceof Joosy.Resources.Base
-          arg.memberPath()
-        else
-          arg.replace(/^\/?/, '/')
+      definer (clone) =>
+        clone.__source = args.reduce (path, arg) ->
+          path += if arg instanceof Joosy.Resources.REST
+            arg.memberPath()
+          else
+            arg.replace(/^\/?/, '/')
+        , ''
+        clone.__source += '/' + @::__entityName.pluralize()
 
-      , ''
+  #
+  # Creates the proxy of current resource binded as a child of given entity
+  #
+  # @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'
+  #
+  # @note accepts both array notation (Comment.at(['admin', @blog, @post])) and args notation (Comment.at('admin', @blog, @post))
+  #
+  @at: (args...) ->
+    @__atWrapper (callback) =>
+      class Clone extends @
+        callback(@)
+    , args...
 
-      if @::__entityName && args[args.length - 1] instanceof Joosy.Resources.Base
-        Clone.__source += '/' + @::__entityName.pluralize()
 
-      Clone
+  #
+  # Creates the proxy of current resource instance binded as a child of given entity
+  #
+  # @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'
+  #
+  # @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...
 
   #
   # Implements `@collection` default behavior.
@@ -52,54 +73,53 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
     named = @__entityName.camelize().pluralize() + 'Collection'
     if window[named] then window[named] else Joosy.Resources.RESTCollection
 
+
   #
-  # Builds parents part of member path based on parents array
-  #
-  # @param [Array] parents      Array of parents
-  #
-  # @example Basic usage
-  #   Resource.__parentsPath([otherResource, '/bars/1']) # /other_resources/1/bars/1
+  # Interpolates path with masks by given array of params
   #
-  @__parentsPath: (parents) ->
-    parents.reduce (path, parent) ->
-      path += if Joosy.Module.hasAncestor parent.constructor, Joosy.Resources.REST
-        parent.memberPath()
-      else
-        parent
-    , ''
+  __interpolatePath: (source, ids) ->
+    ids = [ids] unless Object.isArray(ids)
+    ids.reduce (path, id) ->
+      id = id.id() if id instanceof Joosy.Resources.REST
+      path.replace /:[^\/]+/, id
+    , source
 
   #
   # 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/
   #
-  @collectionPath: (options={}) ->
+  @collectionPath: (args...) ->
+    @::collectionPath args...
+
+  #
+  # Builds collection path
+  #
+  # @see Joosy.Resources.REST.collectionPath
+  #
+  collectionPath: (ids=[], options={}) ->
+    if Object.isObject(ids)
+      options = ids
+      ids     = []
+
     return options.url if options.url
 
-    if @__source? && !options.parent?
-      path = @__source
+    source = @__source || @constructor.__source
+
+    if source
+      path = @__interpolatePath source, ids
     else
       path = '/'
-      path += @__namespace__.map((s)-> s.toLowerCase()).join('/') + '/' if @__namespace__.length > 0
-      path += @::__entityName.pluralize()
-
-    if options.parent?
-      path = @__parentsPath(if Object.isArray(options.parent) then options.parent else [options.parent]) + path
-
-    path += "/#{options.from}" if options.from?
+      path += @constructor.__namespace__.map(String::underscore).join('/') + '/' if @constructor.__namespace__.length > 0
+      path += @__entityName.pluralize()
 
+    path += "/#{options.from}" if options.from
     path
 
-  #
-  # Builds collection path
-  #
-  # @see Joosy.Resources.REST.collectionPath
-  #
-  collectionPath: (options={}) ->
-    @constructor.collectionPath options
 
   #
   # Builds member path based on the given id.
@@ -110,13 +130,8 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # @example Basic usage
   #   Resource.memberPath(1, from: 'foo') # /resources/1/foo
   #
-  @memberPath: (id, options={}) ->
-    return options.url if options.url
-
-    from = options.from
-    path  = @collectionPath(Object.merge(options, from: undefined)) + "/#{id}"
-    path += "/#{from}" if from?
-    path
+  @memberPath: (args...) ->
+    @::memberPath args...
 
   #
   # Builds member path
@@ -126,8 +141,22 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # @example Basic usage
   #   resource.memberPath(from: 'foo') # /resources/1/foo
   #
-  memberPath: (options={}) ->
-    @constructor.memberPath @id(), options
+  memberPath: (ids=[], options={}) ->
+    if Object.isObject(ids)
+      options = ids
+      ids     = []
+
+    return options.url if options.url
+
+    ids = [ids] unless Object.isArray(ids)
+    id = @id() || ids.pop()
+
+    from  = options.from
+
+    ids.push @id()
+    path  = @collectionPath(ids, Object.merge(options, from: undefined)) + "/#{id}"
+    path += "/#{from}" if from?
+    path
 
   #
   # Sends the GET query using collectionPath.
@@ -138,9 +167,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
   #
   @get: (options, callback) ->
-    if Object.isFunction(options)
-      callback = options
-      options  = {}
+    [options, callback] = @::__extractOptionsAndCallback(options, callback)
     @__query @collectionPath(options), 'GET', options.params, callback
 
   #
@@ -152,9 +179,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
   #
   @post: (options, callback) ->
-    if Object.isFunction(options)
-      callback = options
-      options  = {}
+    [options, callback] = @::__extractOptionsAndCallback(options, callback)
     @__query @collectionPath(options), 'POST', options.params, callback
 
   #
@@ -166,9 +191,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
   #
   @put: (options, callback) ->
-    if Object.isFunction(options)
-      callback = options
-      options  = {}
+    [options, callback] = @::__extractOptionsAndCallback(options, callback)
     @__query @collectionPath(options), 'PUT', options.params, callback
 
   #
@@ -180,9 +203,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
   #
   @delete: (options, callback) ->
-    if Object.isFunction(options)
-      callback = options
-      options  = {}
+    [options, callback] = @::__extractOptionsAndCallback(options, callback)
     @__query @collectionPath(options), 'DELETE', options.params, callback
 
   #
@@ -194,9 +215,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
   #
   get: (options, callback) ->
-    if Object.isFunction(options)
-      callback = options
-      options  = {}
+    [options, callback] = @__extractOptionsAndCallback(options, callback)
     @constructor.__query @memberPath(options), 'GET', options.params, callback
 
   #
@@ -208,9 +227,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
   #
   post: (options, callback) ->
-    if Object.isFunction(options)
-      callback = options
-      options  = {}
+    [options, callback] = @__extractOptionsAndCallback(options, callback)
     @constructor.__query @memberPath(options), 'POST', options.params, callback
 
   #
@@ -222,9 +239,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
   #
   put: (options, callback) ->
-    if Object.isFunction(options)
-      callback = options
-      options  = {}
+    [options, callback] = @__extractOptionsAndCallback(options, callback)
     @constructor.__query @memberPath(options), 'PUT', options.params, callback
 
   #
@@ -235,9 +250,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # @param [Function] callback    Resulting callback
   #
   delete: (options, callback) ->
-    if Object.isFunction(options)
-      callback = options
-      options  = {}
+    [options, callback] = @__extractOptionsAndCallback(options, callback)
     @constructor.__query @memberPath(options), 'DELETE', options.params, callback
 
   #
@@ -251,33 +264,36 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # @param [Function] callback    Resulting callback
   #   (will receive retrieved Collection/Resource)
   #
-  # @option options [Joosy.Resources.REST] parent            Sets the given resource as a base path
-  #   i.e. /parents/1/resources
-  # @option options [String] parent                         Sets the given staring as a base path
-  #   i.e. /trololo/resources
   # @option options [String] from                           Adds the given string as a last path element
   #   i.e. /resources/trololo
+  # @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
   #
   @find: (where, options={}, callback=false) ->
-    if Object.isFunction(options)
-      callback = options
-      options  = {}
+    [options, callback] = @::__extractOptionsAndCallback(options, callback)
 
-    if where == 'all'
-      result = new (@::__collection()) this, options
+    id = if Object.isArray(where) then where.last() else where
 
-      @__query @collectionPath(options), 'GET', options.params, (data) =>
-        result.load data
-        callback?(result, data)
+    if id == 'all'
+      result = new (@::__collection()) this, options
+      path   = @collectionPath where, options
     else
-      result = @build where
-      @__query @memberPath(where, options), 'GET', options.params, (data) =>
-        result.load data
-        callback?(result, data)
+      result = @build id
+      path   = @memberPath where, options
+
+    if Object.isArray(where) && where.length > 1
+      result.__source = @collectionPath where
+
+    @__query path, 'GET', options.params, (data) =>
+      result.load data
+      callback?(result, data)
 
     result
 
+  #
+  # Wrapper for AJAX request
+  #
   @__query: (path, method, params, callback) ->
     options =
       data: params
@@ -300,10 +316,17 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
   #
   reload: (options={}, callback=false) ->
-    if Object.isFunction(options)
-      callback = options
-      options  = {}
+    [options, callback] = @__extractOptionsAndCallback(options, callback)
 
     @constructor.__query @memberPath(options), 'GET', options.params, (data) =>
       @load data
       callback? this
+
+  #
+  # utility function for better API support for unrequired first options parameter
+  #
+  __extractOptionsAndCallback: (options, callback) ->
+    if Object.isFunction(options)
+      callback = options
+      options  = {}
+    [options, callback]

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

@@ -22,6 +22,12 @@ class Joosy.Resources.RESTCollection extends Joosy.Resources.Collection
       callback = options
       options  = {}
 
-    @model.__query @model.collectionPath(options), 'GET', options.params, (data) =>
+    @model.__query @model.collectionPath(options, @__source), 'GET', options.params, (data) =>
       @load data
       callback?(data)
+
+  load: (args...) ->
+    res = super(args...)
+    @data.each (x) =>
+      x.__source = @__source
+    res

data/source/joosy/extensions/resources-form/form.coffee

@@ -330,6 +330,8 @@ class Joosy.Form extends Joosy.Module
   __stringifyErrors: (errors) ->
     result = {}
 
+    errors = errors.errors if Object.isObject(errors?.errors)
+
     Object.each errors, (field, notifications) =>
       if @substitutions[field]?
         field = @substitutions[field]

data/source/joosy/helpers/routes.coffee

@@ -8,8 +8,8 @@ Joosy.helpers 'Routes', ->
 
   @linkTo = (name='', url='', tagOptions={}) ->
     if Object.isFunction tagOptions
-      url = name
-      tagOptions = url
-      name = tagOptions()
+      block = tagOptions
+      [url, tagOptions] = [name, url]
+      name = block()
 
     Joosy.Helpers.Application.contentTag 'a', name, Joosy.Module.merge(tagOptions, 'data-joosy': true, href: url)

data/source/joosy/joosy.coffee

@@ -78,7 +78,7 @@
       generator = generator.apply space
     for key, klass of space
       if space.hasOwnProperty(key) &&
-         Joosy.Module.hasAncestor klass, Joosy.Module
+          Joosy.Module.hasAncestor(klass, Joosy.Module)
         klass.__namespace__ = name
 
   #

data/source/joosy/module.coffee

@@ -13,7 +13,7 @@ class Joosy.Module
   # Gets Object/Class class name.
   #
   # @note Never use this to make some magical auto-suggestions!!!
-  #   Remember: minifcation will rename your classes. Therefore it
+  #   Remember: minification will rename your classes. Therefore it
   #   is only intended for development debugging purposes.
   #
   # @return [String]

data/source/joosy/router.coffee

@@ -9,7 +9,7 @@
 # Internal storage rules:
 #
 #  * HTML5 Prefix option is stored with both leading and trailing slashes
-#  * Helpers pathes are stored without leading trailing slash
+#  * Helpers' paths are stored without leading trailing slash
 #  * Route matchers declare leading and trailing slashes as optional
 #
 # @example

data/spec/joosy/core/helpers/routes_spec.coffee

@@ -0,0 +1,9 @@
+describe "Joosy.Helpers.Routes", ->
+
+  it "renders data-joosy links", ->
+    link = Joosy.Helpers.Routes.linkTo 'test', '/app/link', nice: true
+    expect(link).toEqual '<a nice="true" data-joosy="true" href="/app/link">test</a>'
+
+  it "renders data-joosy links yielding block", ->
+    link = Joosy.Helpers.Routes.linkTo '/app/link', nice: true, -> 'test'
+    expect(link).toEqual '<a nice="true" data-joosy="true" href="/app/link">test</a>'

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

@@ -241,6 +241,10 @@ describe "Joosy.Form", ->
       @target.respond 422, 'Content-Type': 'application/json', '{"foo": "error!"}'
       expect($(@nudeForm.$fields()[0]).attr 'class').toEqual 'field_with_errors'
 
+    it "should fill class for invalidated fields by default", ->
+      @target.respond 422, 'Content-Type': 'application/json', '{"errors":{"foo": "error!"}}'
+      expect($(@nudeForm.$fields()[0]).attr 'class').toEqual 'field_with_errors'
+
     it "should trigger 'error' and complete default action if it returned true", ->
       @nudeForm.error = sinon.spy ->
         true
@@ -312,7 +316,7 @@ describe "Joosy.Form", ->
 
       expect(result).toEqual { "test[zombie]": ['suck'], "test[puppies]": ['rock'] }
 
-    it "should prepare complexe response", ->
+    it "should prepare complex response", ->
       @nudeForm.fill @resource
       errors = {fluffies: {zombie: {mumbas: ['ololo']}}}
       result = @nudeForm.__stringifyErrors(errors)

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

@@ -13,6 +13,10 @@ describe "Joosy.Resources.REST", ->
     @entity 'fluffy'
     @map 'fluffy_inlines', FluffyInline
 
+  class Interpolated extends Joosy.Resources.REST
+    @entity 'test'
+    @source '/grand_parents/:grand_parent_id/parents/:parent_id/tests'
+
   Joosy.namespace 'Animal', ->
     class @Cat extends Joosy.Resources.REST
       @entity 'cat'
@@ -38,54 +42,87 @@ describe "Joosy.Resources.REST", ->
 
     it 'returns base class child', ->
       clone = @Test.at 'rumbas'
-      expect(Joosy.Module.hasAncestor clone, @Test).toBeTruthy()
+      expect(Joosy.Module.hasAncestor(clone, @Test)).toBeTruthy()
 
     it 'accepts string', ->
       clone = @Test.at 'rumbas'
-      expect(clone.__source).toEqual '/rumbas'
+      expect(clone.collectionPath()).toEqual '/rumbas/tests'
+
+    it 'makes a class whose instances get new source too', ->
+      clone = @Test.at 'rumbas'
+      expect(clone.build(1).memberPath()).toEqual '/rumbas/tests/1'
 
     it 'accepts another resource instance', ->
       clone = @Test.at Fluffy.build(1)
-      expect(clone.__source).toEqual '/fluffies/1/tests'
+      expect(clone.collectionPath()).toEqual '/fluffies/1/tests'
 
     it 'accepts array', ->
       clone = @Test.at ['rumbas', Fluffy.build(1), 'salsas']
-      expect(clone.__source).toEqual '/rumbas/fluffies/1/salsas'
+      expect(clone.collectionPath()).toEqual '/rumbas/fluffies/1/salsas/tests'
 
     it 'accepts sequential attributes', ->
       clone = @Test.at 'rumbas', 'salsas', Fluffy.build(1)
-      expect(clone.__source).toEqual '/rumbas/salsas/fluffies/1/tests'
+      expect(clone.collectionPath()).toEqual '/rumbas/salsas/fluffies/1/tests'
 
-  describe '@memberPath', ->
+  describe '::at', ->
     beforeEach ->
-      @parent = FluffyParent.build 1
-      @grandParent = FluffyParent.build 666
+      class @Test extends Joosy.Resources.REST
+        @entity 'test'
+
+    it 'returns base class instance', ->
+      original = @Test.build id: 1, name: 'foobar'
+      clone    = original.at 'rumbas'
+      expect(clone instanceof @Test).toBeTruthy()
+      expect(clone.data).toEqual original.data
+
+    it 'accepts string', ->
+      clone = @Test.build(1).at('rumbas')
+      expect(clone.memberPath()).toEqual '/rumbas/tests/1'
+
+    it 'accepts another resource instance', ->
+      clone = @Test.build(1).at(Fluffy.build(1))
+      expect(clone.memberPath()).toEqual '/fluffies/1/tests/1'
 
+    it 'accepts array', ->
+      clone = @Test.build(1).at ['rumbas', Fluffy.build(1), 'salsas']
+      expect(clone.memberPath()).toEqual '/rumbas/fluffies/1/salsas/tests/1'
+
+    it 'accepts sequential attributes', ->
+      clone = @Test.build(1).at 'rumbas', 'salsas', Fluffy.build(1)
+      expect(clone.memberPath()).toEqual '/rumbas/salsas/fluffies/1/tests/1'
+
+  describe '@memberPath', ->
     it 'builds member path', ->
       expect(Fluffy.memberPath 1).toEqual '/fluffies/1'
 
-    it 'builds member path with single parent', ->
-      expect(Fluffy.memberPath 1, parent: @parent).toEqual '/fluffy_parents/1/fluffies/1'
+    it 'builds member path with from', ->
+      expect(Fluffy.memberPath 1, from: 'test').toEqual '/fluffies/1/test'
 
-    it 'builds member path with array parent', ->
-      expect(Fluffy.memberPath 1, parent: [@grandParent, @parent]).toEqual '/fluffy_parents/666/fluffy_parents/1/fluffies/1'
+    describe 'with interpolation', ->
+      it 'builds member path', ->
+        expect(Interpolated.memberPath([1,2,3])).toEqual '/grand_parents/1/parents/2/tests/3'
 
-    it 'builds member path with parent and from', ->
-      expect(Fluffy.memberPath 1, parent: @parent, from: 'test').toEqual '/fluffy_parents/1/fluffies/1/test'
+      it 'saves member path for single instance', ->
+        item = Interpolated.find [1,2,3]
+        checkAndRespond @server.requests[0], 'GET', /^\/grand_parents\/1\/parents\/2\/tests\/3\?_=\d+/, '{"test": {"id": 3}}'
+        expect(item.memberPath()).toEqual '/grand_parents/1/parents/2/tests/3'
 
-    it 'builds member path with parent, from and params', ->
-      expect(Fluffy.memberPath 1, parent: @parent, from: 'test', params: {foo: 'bar'}).toEqual '/fluffy_parents/1/fluffies/1/test'
+      it 'saves member path for instances collection', ->
+        items = Interpolated.find [1,2,'all']
+        checkAndRespond @server.requests[0], 'GET', /^\/grand_parents\/1\/parents\/2\/tests\?_=\d+/, '{"tests": [{"test": {"id": 3}}]}'
+        expect(items.at(0).memberPath()).toEqual '/grand_parents/1/parents/2/tests/3'
 
+  describe '@collectionPath', ->
+    it 'builds collection path', ->
+      expect(Fluffy.collectionPath()).toEqual '/fluffies'
 
-  it "builds collection path", ->
-    parent = FluffyParent.build 1
-    grandParent = FluffyParent.build 666
+    it 'builds collection path with from', ->
+      expect(Fluffy.collectionPath from: 'test').toEqual '/fluffies/test'
+
+    describe 'with interpolation', ->
+      it 'builds collection path', ->
+        expect(Interpolated.collectionPath([1,2])).toEqual '/grand_parents/1/parents/2/tests'
 
-    expect(Fluffy.collectionPath()).toEqual '/fluffies'
-    expect(Fluffy.collectionPath parent: parent).toEqual '/fluffy_parents/1/fluffies'
-    expect(Fluffy.collectionPath parent: [grandParent, parent]).toEqual '/fluffy_parents/666/fluffy_parents/1/fluffies'
-    expect(Fluffy.collectionPath parent: parent, from: 'test').toEqual '/fluffy_parents/1/fluffies/test'
-    expect(Fluffy.collectionPath parent: parent, from: 'test', params: {foo: 'bar'}).toEqual '/fluffy_parents/1/fluffies/test'
 
   describe '@find(:id)', ->
     rawData = '{"fluffy": {"id": 1, "name": "test1"}}'
@@ -107,11 +144,6 @@ describe "Joosy.Resources.REST", ->
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/1\/action\?_=\d+/, rawData
       expect(@callback.callCount).toEqual 1
 
-    it "gets item with from and parent", ->
-      resource = Fluffy.find 1, {parent: FluffyParent.build(1), from: 'action'}, @callback
-      checkAndRespond @server.requests[0], 'GET', /^\/fluffy_parents\/1\/fluffies\/1\/action\?_=\d+/, rawData
-      expect(@callback.callCount).toEqual 1
-
     it "gets item with params", ->
       resource = Fluffy.find 1, params: {foo: 'bar'}, @callback
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/1\?foo=bar&_=\d+/, rawData
@@ -127,7 +159,7 @@ describe "Joosy.Resources.REST", ->
         expect(resource).toBe cbResource
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/1\?_=\d+/, rawData
 
-  describe '@find(\'all\')', ->
+  describe "@find('all')", ->
     rawData = '{"page": 42, "fluffies": [{"id": 1, "name": "test1"}, {"id": 2, "name": "test2"}]}'
 
     beforeEach ->
@@ -147,11 +179,6 @@ describe "Joosy.Resources.REST", ->
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/action\?_=\d+/, rawData
       expect(@callback.callCount).toEqual 1
 
-    it "gets collection with from and parent", ->
-      resource = Fluffy.find 'all', {parent: FluffyParent.build(1), from: 'action'}, @callback
-      checkAndRespond @server.requests[0], 'GET', /^\/fluffy_parents\/1\/fluffies\/action\?_=\d+/, rawData
-      expect(@callback.callCount).toEqual 1
-
     it "gets collection with params", ->
       resource = Fluffy.find 'all', params: {foo: 'bar'}, @callback
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\?foo=bar&_=\d+/, rawData