joosy 1.2.0.alpha.71 → 1.2.0.alpha.73

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

@@ -108,9 +108,9 @@ describe "Joosy.Resources.REST", ->
         expect(item.memberPath()).toEqual '/grand_parents/1/parents/2/tests/3'
 
       it 'saves member path for instances collection', ->
-        items = Interpolated.find [1,2,'all']
+        items = Interpolated.all [1,2]
         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'
+        expect(items[0].memberPath()).toEqual '/grand_parents/1/parents/2/tests/3'
 
   describe '@collectionPath', ->
     it 'builds collection path', ->
@@ -159,33 +159,33 @@ describe "Joosy.Resources.REST", ->
         expect(resource).toBe cbResource
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/1\?_=\d+/, rawData
 
-  describe "@find('all')", ->
+  describe '@all', ->
     rawData = '{"page": 42, "fluffies": [{"id": 1, "name": "test1"}, {"id": 2, "name": "test2"}]}'
 
     beforeEach ->
       @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
+        expect(target instanceof Joosy.Resources.Array).toEqual true
+        expect(target.length).toEqual 2
+        expect(target[0] instanceof Fluffy).toEqual true
         expect(data).toEqual $.parseJSON(rawData)
 
     it "gets collection without params", ->
-      resource = Fluffy.find 'all', @callback
+      resource = Fluffy.all @callback
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\?_=\d+/, rawData
       expect(@callback.callCount).toEqual 1
 
     it "gets collection with action", ->
-      resource = Fluffy.find 'all', {action: 'action'}, @callback
+      resource = Fluffy.all {action: 'action'}, @callback
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\/action\?_=\d+/, rawData
       expect(@callback.callCount).toEqual 1
 
     it "gets collection with params", ->
-      resource = Fluffy.find 'all', params: {foo: 'bar'}, @callback
+      resource = Fluffy.all {params: {foo: 'bar'}}, @callback
       checkAndRespond @server.requests[0], 'GET', /^\/fluffies\?foo=bar&_=\d+/, rawData
       expect(@callback.callCount).toEqual 1
 
     it 'gets collection with url', ->
-      resource = Fluffy.find 'all', url: '/some/custom/url', @callback
+      resource = Fluffy.all url: '/some/custom/url', @callback
       checkAndRespond @server.requests[0], 'GET', /^\/some\/custom\/url\?_=\d+/, rawData
       expect(@callback.callCount).toEqual 1
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.71
+  version: 1.2.0.alpha.73
 platform: ruby
 authors:
 - Boris Staal
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-03 00:00:00.000000000 Z
+date: 2013-09-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -64,10 +64,8 @@ files:
 - source/joosy/extensions/resources-form/helpers/form.coffee
 - source/joosy/extensions/resources-form/index.coffee
 - source/joosy/extensions/resources/base.coffee
-- source/joosy/extensions/resources/collection.coffee
 - source/joosy/extensions/resources/index.coffee
 - source/joosy/extensions/resources/rest.coffee
-- source/joosy/extensions/resources/rest_collection.coffee
 - source/joosy/helpers/routes.coffee
 - source/joosy/helpers/view.coffee
 - source/joosy/helpers/widgets.coffee
@@ -82,11 +80,12 @@ files:
 - source/joosy/modules/page/scrolling.coffee
 - source/joosy/modules/page/title.coffee
 - source/joosy/modules/renderer.coffee
+- source/joosy/modules/resources.coffee
+- source/joosy/modules/resources/cacher.coffee
 - source/joosy/modules/time_manager.coffee
 - source/joosy/modules/widgets_manager.coffee
 - source/joosy/page.coffee
 - source/joosy/resources/array.coffee
-- source/joosy/resources/cacher.coffee
 - source/joosy/resources/hash.coffee
 - source/joosy/resources/scalar.coffee
 - source/joosy/router.coffee
@@ -107,8 +106,12 @@ files:
 - spec/joosy/core/modules/log_spec.coffee
 - spec/joosy/core/modules/module_spec.coffee
 - spec/joosy/core/modules/renderer_spec.coffee
+- spec/joosy/core/modules/resources/cacher_spec.coffee
 - spec/joosy/core/modules/time_manager_spec.coffee
 - spec/joosy/core/page_spec.coffee
+- spec/joosy/core/resources/array_spec.coffee
+- spec/joosy/core/resources/hash_spec.coffee
+- spec/joosy/core/resources/scalar_spec.coffee
 - spec/joosy/core/router_spec.coffee
 - spec/joosy/core/templaters/jst_spec.coffee
 - spec/joosy/core/widget_spec.coffee
@@ -117,8 +120,6 @@ files:
 - spec/joosy/extensions/form/form_spec.coffee
 - spec/joosy/extensions/form/helpers/forms_spec.coffee
 - spec/joosy/extensions/resources/base_spec.coffee
-- spec/joosy/extensions/resources/collection_spec.coffee
-- spec/joosy/extensions/resources/rest_collection_spec.coffee
 - spec/joosy/extensions/resources/rest_spec.coffee
 - spec/support/test.js
 - tasks/joosy.coffee

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

@@ -1,178 +0,0 @@
-#
-# Basic collection of Resources.
-# Turns JSON array into array of Resources and manages them.
-#
-# @note You should not use Collection directly. It will be
-#   automatically created by things like {Joosy.Resources.Base.map}
-#   or {Joosy.Resources.REST.find}.
-#
-# @example Basic sample
-#   class R extends Joosy.Resources.Base
-#     @entity 'r'
-#
-#   collection = new Joosy.Resources.Collection(R)
-#
-#   collection.load [{foo: 'bar'}, {foo: 'baz'}]
-#   collection.each (resource) ->
-#     resource('foo')
-#
-# @include Joosy.Modules.Events
-#
-class Joosy.Resources.Collection extends Joosy.Module
-  @include Joosy.Modules.Events
-
-  #
-  # Allows to modify data before it gets stored
-  #
-  # @note Supposed to be used in descendants
-  #
-  # @param [Function] action    `(Object) -> Object` to call
-  #
-  @beforeLoad: (action) -> @::__beforeLoad = action
-
-  #
-  # Sets the default model for collection
-  #
-  # @note Supposed to be used in descendants
-  #
-  # @param [Class] model     Model class
-  #
-  @model: (model) -> @::model = model
-
-  #
-  # If model param was empty it will fallback to `@model`
-  # If both param and `@model` were empty it will throw an exception.
-  #
-  # @param [Class] model    Resource class which this collection will handle
-  #
-  constructor: (model=false, @findOptions) ->
-    @model = model if model
-
-    #
-    # Modelized data storage
-    #
-    @data = []
-
-    if !@model
-      throw new Error "#{Joosy.Module.__className @}> model can't be empty"
-
-  #
-  # Clears the storage and attempts to import given array
-  #
-  # @param [Array, Hash] entities         Array of entities to import.
-  #                                       If hash was given will seek for moodel name camelized and pluralized.
-  # @param [Boolean] notify               Indicates whether to trigger 'changed' event
-  #
-  # @return [Joosy.Resources.Collection]   Returns self.
-  #
-  load: (entities, notify=true) ->
-    if @__beforeLoad?
-      entities = @__beforeLoad entities
-
-    @data = @modelize entities
-
-    @trigger 'changed' if notify
-    this
-
-  #
-  # Turns Objects array into array of Resources
-  #
-  # @param [Array] collection     Array of Objects
-  #
-  modelize: (collection) ->
-    root = @model::__entityName.pluralize()
-
-    if collection not instanceof Array
-      collection = collection?[root.camelize(false)]
-
-      if collection not instanceof Array
-        throw new Error "Can not read incoming JSON"
-
-    collection.map (x) =>
-      @model.build x
-
-  #
-  # Calls callback for each Resource inside Collection
-  #
-  # @param [Function] callback        `(mixed) -> mixed` to call for each Resource in collection
-  #
-  each: (callback) ->
-    @data.each callback
-
-  #
-  # Returns number of Resources inside Collection
-  #
-  size: ->
-    @data.length
-
-  #
-  # Gets first resource matching description (see Sugar.js Array#find)
-  #
-  # @param [Function] description       Callback matcher
-  #
-  # @return [Joosy.Resources.Base]
-  #
-  find: (description) ->
-    @data.find description
-
-  sortBy: (params...) ->
-    @data.sortBy params...
-
-  #
-  # Gets resource by id
-  #
-  # @param [Integer] id       Id to find
-  #
-  # @return [Joosy.Resources.Base]
-  #
-  findById: (id) ->
-    @data.find (x) -> x.id().toString() == id.toString()
-
-  #
-  # Gets resource by its index inside collection
-  #
-  # @param [Integer] i    Index
-  #
-  # @return [Joosy.Resources.Base]
-  #
-  at: (i) ->
-    @data[i]
-
-  #
-  # Removes resource from collection by its index or by === comparison
-  #
-  # @param [Integer] target     Index
-  # @param [Resource] target    Resource by itself
-  # @param [Boolean] notify     Indicates whether to trigger 'changed' event
-  #
-  # @return [Joosy.Resources.Base]        Removed element
-  #
-  remove: (target, notify=true) ->
-    if Object.isNumber target
-      index = target
-    else
-      index = @data.indexOf target
-    if index >= 0
-      result = @data.splice(index, 1)[0]
-      if notify
-        @trigger 'changed'
-    result
-
-  #
-  # Adds resource to collection to given index or to the end
-  #
-  # @param [Resource] element       Resource to add
-  # @param [Integer] index          Index to add to. If omited will be pushed to the end
-  # @param [Boolean] notify         Indicates whether to trigger 'changed' event
-  #
-  # @return [Joosy.Resources.Base]    Added element
-  #
-  add: (element, index=false, notify=true) ->
-    if typeof index is 'number'
-      @data.splice index, 0, element
-    else
-      @data.push element
-
-    if notify
-      @trigger 'changed'
-    element

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

@@ -1,33 +0,0 @@
-#= require ./collection
-
-#
-# Collection of REST Resources
-#
-# @include Joosy.Modules.Log
-# @include Joosy.Modules.Events
-#
-class Joosy.Resources.RESTCollection extends Joosy.Resources.Collection
-  @include Joosy.Modules.Log
-  @include Joosy.Modules.Events
-
-  #
-  # 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    `(error, instance, data) -> ...`
-  #
-  reload: (options={}, callback=false) ->
-    if Object.isFunction(options)
-      callback = options
-      options  = {}
-
-    @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.each (x) =>
-      x.__source = @__source
-    res

data/source/joosy/resources/cacher.coffee

@@ -1,41 +0,0 @@
-class Joosy.Resources.Cacher extends Joosy.Module
-
-  @include Joosy.Modules.Events
-  @include Joosy.Modules.Filters
-
-  @registerPlainFilters 'beforeLoad'
-
-  @cache: (cacheKey) -> @::__cacheKey = cacheKey
-  @fetcher: (fetcher) -> @::__fetcher = fetcher
-
-  constructor: (callback, cacheKey=false, fetcher=false) ->
-    if typeof(cacheKey) == 'function'
-      fetcher  = cacheKey
-      cacheKey = undefined
-
-    @__fetcher  = fetcher if fetcher
-    @__cacheKey = cacheKey if cacheKey
-
-    if @__cacheKey && localStorage && localStorage[@__cacheKey]
-      @data = @__applyBeforeLoads(JSON.parse localStorage[@__cacheKey])
-      callback? @
-      @refresh()
-    else
-      @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 && localStorage
-      @data = @__applyBeforeLoads result
-      callback? @
-      @trigger 'changed'
-
-# AMD wrapper
-if define?.amd?
-  define 'joosy/resources/cacher', -> Joosy.Resources.Cacher

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

@@ -1,92 +0,0 @@
-describe "Joosy.Resources.Collection", ->
-
-  beforeEach ->
-    Joosy.Resources.Base?.resetIdentity()
-
-  class Test extends Joosy.Resources.Base
-    @entity 'test'
-
-  data = '[{"id": 1, "name": "test1"}, {"id": 2, "name": "test2"}]'
-
-  checkData = (collection) ->
-    expect(collection.data.length).toEqual 2
-    expect(collection.data[0].constructor == Test).toBeTruthy()
-    expect(collection.data[0].data.name).toEqual 'test1'
-
-  beforeEach ->
-    @collection = new Joosy.Resources.Collection(Test)
-
-  it "should initialize", ->
-    expect(@collection.model).toEqual Test
-    expect(@collection.data).toEqual []
-
-  it "should modelize", ->
-    result = @collection.modelize $.parseJSON(data)
-    expect(result[0].constructor == Test).toBeTruthy()
-    expect(result[0].data.name).toEqual 'test1'
-
-  it "should load", ->
-    @collection.load $.parseJSON(data)
-    checkData @collection
-
-  it "should trigger changes", ->
-    @collection.bind 'changed', callback = sinon.spy()
-    @collection.load $.parseJSON(data)
-    expect(callback.callCount).toEqual 1
-
-  it "should not trigger changes", ->
-    @collection.bind 'changed', callback = sinon.spy()
-    @collection.load $.parseJSON(data), false
-    expect(callback.callCount).toEqual 0
-
-  it "should properly handle the before filter", ->
-    class RC extends Joosy.Resources.Collection
-      @beforeLoad (data) ->
-        data.each (entry, i) ->
-          data[i].tested = true
-        data
-
-    collection = new RC(Test)
-    collection.load $.parseJSON(data)
-
-    expect(collection.at(0)('tested')).toBeTruthy()
-
-  it "should remove item from collection", ->
-    @collection.load $.parseJSON(data)
-    @collection.bind 'changed', callback = sinon.spy()
-    @collection.remove @collection.data[1]
-    expect(@collection.data.length).toEqual 1
-    @collection.remove 0
-    expect(@collection.data.length).toEqual 0
-    expect(callback.callCount).toEqual 2
-
-  it "should silently remove item from collection", ->
-    @collection.load $.parseJSON(data)
-    @collection.bind 'changed', callback = sinon.spy()
-    @collection.remove @collection.data[1], false
-    expect(@collection.data.length).toEqual 1
-    @collection.remove 0, false
-    expect(@collection.data.length).toEqual 0
-    expect(callback.callCount).toEqual 0
-
-  it "should add item to collection", ->
-    @collection.load $.parseJSON(data)
-    @collection.bind 'changed', callback = sinon.spy()
-    @collection.add new Test {'rocking': 'mocking'}
-    expect(@collection.data.length).toEqual 3
-    expect(@collection.at(2).data).toEqual {'rocking': 'mocking'}
-    @collection.add new Test({'happy': 'stubbing'}), 0
-    expect(@collection.data.length).toEqual 4
-    expect(@collection.at(0).data).toEqual {'happy': 'stubbing'}
-    expect(@collection.at(3).data).toEqual {'rocking': 'mocking'}
-    @collection.add new Test({'nerdy': 'coding'}), 1
-    expect(@collection.data.length).toEqual 5
-    expect(@collection.at(0).data).toEqual {'happy': 'stubbing'}
-    expect(@collection.at(1).data).toEqual {'nerdy': 'coding'}
-    expect(@collection.at(4).data).toEqual {'rocking': 'mocking'}
-
-  it "should find items by id", ->
-    @collection.load $.parseJSON(data)
-
-    expect(@collection.findById 1).toEqual @collection.data[0]
-    expect(@collection.findById 2).toEqual @collection.data[1]

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

@@ -1,41 +0,0 @@
-describe "Joosy.Resources.RESTCollection", ->
-
-  beforeEach ->
-    Joosy.Resources.Base?.resetIdentity()
-
-  class Test extends Joosy.Resources.REST
-    @entity 'test'
-
-  beforeEach ->
-    @server = sinon.fakeServer.create()
-    @collection = new Joosy.Resources.RESTCollection(Test)
-
-  afterEach ->
-    @server.restore()
-
-  it "loads", ->
-    @collection.load [{"id": 1, "name": "test1"}, {"id": 2, "name": "test2"}]
-    expect(@collection.data.length).toEqual 2
-    expect(@collection.data[0] instanceof Test).toBeTruthy()
-    expect(@collection.data[0].data.name).toEqual 'test1'
-
-  it "reloads", ->
-    @collection.load [{"id": 1, "name": "test1"}, {"id": 2, "name": "test2"}]
-    @collection.reload action: 'test'
-
-    target = @server.requests.last()
-    expect(target.method).toEqual 'GET'
-    expect(target.url).toMatch /^\/tests\/test\?_=\d+/
-    target.respond 200, 'Content-Type': 'application/json', '[{"id": 3, "name": "test3"}, {"id": 4, "name": "test4"}, {"id": 5, "name": "test5"}]'
-
-    expect(@collection.data.length).toEqual 3
-    expect(@collection.data[0].constructor == Test).toBeTruthy()
-    expect(@collection.data[0].data.name).toEqual 'test3'
-
-  it "should use own storage", ->
-    class TestsCollection extends Joosy.Resources.RESTCollection
-      @model Test
-    collection = new TestsCollection()
-    collection.add 'test'
-    expect(collection.data).toEqual ['test']
-    expect(collection.hasOwnProperty 'data').toBeTruthy()