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

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

@@ -64,23 +64,6 @@ class Joosy.Resources.Base extends Joosy.Function
   @entity: (name) ->
     @::__entityName = name
 
-  #
-  # Sets the collection to use
-  #
-  # @note By default will try to seek for `EntityNamesCollection`.
-  #   Will fallback to {Joosy.Resources.Collection}
-  #
-  # @param [Class] klass       Class to assign as collection
-  #
-  @collection: (klass) -> @::__collection = -> klass
-
-  #
-  # Implements {Joosy.Resources.Base.collection} default behavior.
-  #
-  __collection: ->
-    named = @__entityName.camelize().pluralize() + 'Collection'
-    if window[named] then window[named] else Joosy.Resources.Collection
-
   #
   # Dynamically creates collection of inline resources.
   #
@@ -289,9 +272,8 @@ class Joosy.Resources.Base extends Joosy.Function
 
   __map: (data, name, klass) ->
     if Object.isArray data[name]
-      entry = new (klass::__collection()) klass
-      entry.load data[name]
-      data[name] = entry
+      entries = data[name].map (x) -> klass.build x
+      data[name] = new Joosy.Resources.Array entries...
     else if Object.isObject data[name]
       data[name] = klass.build data[name]
     data

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

@@ -1,5 +1,4 @@
 #= require ./base
-#= require ./rest_collection
 
 #
 # Resource with REST/JSON backend
@@ -66,15 +65,6 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   at: (args...) ->
     new (@constructor.at args...) @data
 
-  #
-  # Implements `@collection` default behavior.
-  # Changes the default fallback to Joosy.Resources.RESTCollection.
-  #
-  __collection: ->
-    named = @__entityName.camelize().pluralize() + 'Collection'
-    if window[named] then window[named] else Joosy.Resources.RESTCollection
-
-
   #
   # Interpolates path with masks by given array of params
   #
@@ -262,12 +252,23 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
     @constructor.__query @memberPath(options), 'DELETE', options.params, callback
 
   #
-  # Requests the required resources from backend
+  # 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) -> ...`
   #
-  # @param [String] where         Possible values: 'all', id.
-  #   'all' will query for collection from collectionPath.
-  #   Everything else will be considered as an id string and will make resource
-  #   query for single instance from memberPath.
+  reload: (options={}, callback=false) ->
+    [options, callback] = @__extractOptionsAndCallback(options, callback)
+
+    @constructor.__query @memberPath(options), 'GET', options.params, (error, data, xhr) =>
+      @load data if data?
+      callback?(error, @, data, xhr)
+
+  #
+  # Requests the required resource from backend
+  #
+  # @param [String] where         id or an array of ids for interpolated path
   # @param [Hash] options         Path modification options
   # @param [Function] callback    `(error, instance, data) -> ...`
   #
@@ -280,24 +281,62 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   @find: (where, options={}, callback=false) ->
     [options, callback] = @::__extractOptionsAndCallback(options, callback)
 
-    id = if Object.isArray(where) then where.last() else where
-
-    if id == 'all'
-      result = new (@::__collection()) this, options
-      path   = @collectionPath where, options
+    id = if where instanceof Array
+      where[where.length-1]
     else
-      result = @build id
-      path   = @memberPath where, options
+      where
+
+    result = @build id
 
-    if Object.isArray(where) && where.length > 1
+    # Substitute interpolation mask with actual path
+    if where instanceof Array && where.length > 1
       result.__source = @collectionPath where
 
-    @__query path, 'GET', options.params, (error, data, xhr) =>
+    @__query @memberPath(where, options), 'GET', options.params, (error, data, xhr) =>
       result.load data if data?
       callback?(error, result, data, xhr)
 
     result
 
+  #
+  # Requests the required collection of resources from backend
+  #
+  # @param [String] where         id or an array of ids for interpolated path
+  # @param [Hash] options         Path modification options
+  # @param [Function] callback    `(error, instance, data) -> ...`
+  #
+  # @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
+  #   i.e. /some/custom/url
+  # @option options [Hash] params               Passes the given params to the query
+  #
+  @all: (where, options={}, callback=false) ->
+    if Object.isFunction(where) || Object.isObject(where)
+      [options, callback] = @::__extractOptionsAndCallback(where, options)
+      where = []
+    else
+      [options, callback] = @::__extractOptionsAndCallback(options, callback)
+
+    result = new Joosy.Resources.Array
+
+    @__query @collectionPath(where, options), 'GET', options.params, (error, rawData, xhr) =>
+      if (data = rawData)?
+        if Object.isObject(data) && !(data = data[@::__entityName.pluralize()])
+          throw new Error "Invalid data for `all` received: #{JSON.stringify(data)}"
+
+        data = data.map (x) =>
+          instance = @build x
+          # Substitute interpolation mask with actual path
+          instance.__source = @collectionPath where if where.length > 1
+          instance
+
+        result.load data...
+
+      callback?(error, result, rawData, xhr)
+
+    result
+
   #
   # Wrapper for AJAX request
   #
@@ -322,20 +361,6 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
 
     $.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    `(error, instance, data) -> ...`
-  #
-  reload: (options={}, callback=false) ->
-    [options, callback] = @__extractOptionsAndCallback(options, callback)
-
-    @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-form/form.coffee

@@ -190,11 +190,11 @@ class Joosy.Form extends Joosy.Module
             input.filter("[value='#{val}']").attr 'checked', 'checked'
           else
             input.val val
-        if val instanceof Joosy.Resources.RESTCollection
-          for entity, i in val.data
+        if val instanceof Joosy.Resources.Array
+          for entity, i in val
             filler entity.data, @concatFieldName(scope, "[#{property}_attributes][#{i}]")
         else if val instanceof Joosy.Resources.REST
-          filler val.data, @concatFieldName(scope, "[#{property}_attributes][0]")
+          filler val.data, @concatFieldName(scope, "[#{property}_attributes]")
         else if Object.isObject(val) || Object.isArray(val)
           filler val, key
         else

data/source/joosy/modules/resources/cacher.coffee

@@ -0,0 +1,38 @@
+#= require ../resources
+
+Joosy.Modules.Resources.Cacher =
+
+  included: ->
+    @cache   = (cacheKey) -> @::__cacheKey = cacheKey
+    @fetcher = (fetcher) -> @::__fetcher = fetcher
+
+    @cached = (callback, cacheKey=false, fetcher=false) ->
+      if typeof(cacheKey) == 'function'
+        fetcher  = cacheKey
+        cacheKey = undefined
+
+      cacheKey ||= @::__cacheKey
+      fetcher  ||= @::__fetcher
+
+      if cacheKey && localStorage && localStorage[cacheKey]
+        instance = new @ JSON.parse(localStorage[cacheKey])...
+        callback? instance
+        instance.refresh()
+      else
+        @fetch (results) =>
+          instance = new @ results...
+          callback? instance
+
+    @fetch = (callback) ->
+      @::__fetcher (results...) =>
+        localStorage[@::__cacheKey] = JSON.stringify(results) if @::__cacheKey && localStorage
+        callback results
+
+  refresh: (callback) ->
+    @constructor.fetch (results) =>
+      @load results...
+      callback? @
+
+# AMD wrapper
+if define?.amd?
+  define 'joosy/modules/resources/cacher', -> Joosy.Modules.Resources.Cacher

data/source/joosy/modules/resources.coffee

@@ -0,0 +1 @@
+Joosy.Modules.Resources = {}

data/source/joosy/resources/array.coffee

@@ -1,7 +1,11 @@
+#= require joosy/modules/resources/cacher
+
 class Joosy.Resources.Array extends Array
 
-  Joosy.Module.include.call @, Joosy.Modules.Events
-  Joosy.Module.include.call @, Joosy.Modules.Filters
+  Joosy.Module.merge @, Joosy.Module
+
+  @include Joosy.Modules.Events
+  @include Joosy.Modules.Filters
 
   @registerPlainFilters 'beforeLoad'
 
@@ -19,6 +23,11 @@ class Joosy.Resources.Array extends Array
   load: ->
     @__fillData arguments
 
+  clone: (callback) ->
+    clone = new @constructor
+    clone.data = @slice 0
+    clone
+
   push: ->
     result = super
     @trigger 'changed'
@@ -45,10 +54,7 @@ class Joosy.Resources.Array extends Array
     result
 
   __fillData: (data, notify=true) ->
-    data = if data[0] instanceof Array
-      data[0]
-    else
-      @slice.call(data, 0)
+    data = @slice.call(data, 0)
 
     @splice 0, @length if @length > 0
     @push entry for entry in @__applyBeforeLoads(data)

data/source/joosy/resources/hash.coffee

@@ -1,8 +1,12 @@
+#= require joosy/modules/resources/cacher
+
 class Joosy.Resources.Hash extends Joosy.Function
 
   @include Joosy.Modules.Events
   @include Joosy.Modules.Filters
 
+  @registerPlainFilters 'beforeLoad'
+
   constructor: (data={}) ->
     return super ->
       @__fillData data, false
@@ -32,11 +36,14 @@ class Joosy.Resources.Hash extends Joosy.Function
     @__fillData data
     @
 
+  clone: (callback) ->
+    new @constructor Object.clone(@data, true)
+
   __call: (path, value) ->
     if arguments.length > 1
-      @__set path, value
+      @set path, value
     else
-      @__get path
+      @get path
 
   #
   # Locates the actual instance of attribute path `foo.bar` from get/set

data/source/joosy/resources/scalar.coffee

@@ -1,23 +1,30 @@
+#= require joosy/modules/resources/cacher
+
 class Joosy.Resources.Scalar extends Joosy.Function
 
   @include Joosy.Modules.Events
   @include Joosy.Modules.Filters
 
+  @registerPlainFilters 'beforeLoad'
+
   constructor: (value) ->
     return super ->
-      @value = value
+      @load value
 
   get: ->
     @value
 
-  set: ->
-    @load arguments...
+  set: (@value) ->
+    @trigger 'changed'
 
   load: (value) ->
     @value = @__applyBeforeLoads(value)
     @trigger 'changed'
     @value
 
+  clone: (callback) ->
+    new @constructor @value
+
   __call: ->
     if arguments.length > 0
       @set arguments[0]

data/spec/joosy/core/modules/resources/cacher_spec.coffee

@@ -0,0 +1,81 @@
+describe 'Joosy.Modules.Resources.Cacher', ->
+
+  beforeEach ->
+    @spy = sinon.spy()
+
+  afterEach ->
+    localStorage.clear()
+
+  describe 'Scalar', ->
+
+    beforeEach ->
+      spy = @spy
+
+      class @Cacher extends Joosy.Resources.Scalar
+        @include Joosy.Modules.Resources.Cacher
+
+        @cache 'scalar'
+        @fetcher (callback) ->
+          spy(); callback 1
+
+    it 'caches', ->
+      @Cacher.cached (instance) =>
+        expect(instance()).toEqual 1
+
+        expect(localStorage['scalar']).toEqual '[1]'
+        expect(@spy.callCount).toEqual 1
+
+        instance.refresh (instance) =>
+          expect(instance()).toEqual 1
+          expect(@spy.callCount).toEqual 2
+
+  describe 'Array', ->
+
+    beforeEach ->
+      spy = @spy
+
+      class @Cacher extends Joosy.Resources.Array
+        @include Joosy.Modules.Resources.Cacher
+
+        @cache 'array'
+        @fetcher (callback) ->
+          spy(); callback 1, 2
+
+    it 'caches', ->
+      @Cacher.cached (instance) =>
+        expect(instance[0]).toEqual 1
+        expect(instance[1]).toEqual 2
+        expect(instance.length).toEqual 2
+
+        expect(localStorage['array']).toEqual '[1,2]'
+        expect(@spy.callCount).toEqual 1
+
+        instance.refresh (instance) =>
+          expect(instance[0]).toEqual 1
+          expect(instance[1]).toEqual 2
+          expect(instance.length).toEqual 2
+
+          expect(@spy.callCount).toEqual 2
+
+  describe 'Hash', ->
+
+    beforeEach ->
+      spy = @spy
+
+      class @Cacher extends Joosy.Resources.Hash
+        @include Joosy.Modules.Resources.Cacher
+
+        @cache 'hash'
+        @fetcher (callback) ->
+          spy(); callback {foo: 'bar'}
+
+    it 'caches', ->
+      @Cacher.cached (instance) =>
+        expect(instance.data).toEqual {foo: 'bar'}
+
+        expect(localStorage['hash']).toEqual '[{"foo":"bar"}]'
+        expect(@spy.callCount).toEqual 1
+
+        instance.refresh (instance) =>
+          expect(instance.data).toEqual {foo: 'bar'}
+          expect(@spy.callCount).toEqual 2

data/spec/joosy/core/resources/array_spec.coffee

@@ -0,0 +1,60 @@
+describe "Joosy.Resources.Array", ->
+
+  describe 'in general', ->
+    beforeEach ->
+      @array = new Joosy.Resources.Array(1, 2, 3)
+
+    it 'wraps', ->
+      expect(@array instanceof Array).toBeTruthy()
+      expect(@array.length).toEqual 3
+      expect(@array[0]).toEqual 1
+      expect(@array[1]).toEqual 2
+      expect(@array[2]).toEqual 3
+
+    it 'clones', ->
+      clone = @array.clone()
+      clone.push 5
+      clone.unshift 6
+      expect(@array.length).toEqual 3
+      expect(@array[0]).toEqual 1
+      expect(@array[1]).toEqual 2
+      expect(@array[2]).toEqual 3      
+
+    it 'triggers', ->
+      spy = sinon.spy()
+      @array.bind 'changed', spy
+
+      @array.set(0, 0)
+      expect(@array[0]).toEqual 0
+
+      @array.unshift(9)
+      expect(@array[0]).toEqual 9
+      expect(@array.length).toEqual 4
+
+      expect(@array.shift()).toEqual 9
+      expect(@array.length).toEqual 3
+
+      expect(@array.push(9)).toEqual 4
+      expect(@array.length).toEqual 4
+      expect(@array[3]).toEqual 9
+
+      expect(@array.pop()).toEqual 9
+      expect(@array.length).toEqual 3
+
+      expect(spy.callCount).toEqual 5
+
+  describe 'filters', ->
+    it 'runs beforeFilter', ->
+      class RealArray extends Joosy.Resources.Array
+        @beforeLoad (data) ->
+          data.push 2
+          data
+
+      array = new RealArray(1)
+      expect(array[0]).toEqual 1
+      expect(array[1]).toEqual 2
+
+      array.load(5,6)
+      expect(array[0]).toEqual 5
+      expect(array[1]).toEqual 6
+      expect(array[2]).toEqual 2

data/spec/joosy/core/resources/hash_spec.coffee

@@ -0,0 +1,58 @@
+describe "Joosy.Resources.Hash", ->
+
+  describe 'in general', ->
+    beforeEach ->
+      @hash = new Joosy.Resources.Hash({foo: 'bar', bar: {baz: 'yummy!'}})
+
+    it 'wraps', ->
+      expect(typeof(@hash)).toEqual 'function'
+      expect(@hash 'foo').toEqual 'bar'
+      expect(@hash 'bar').toEqual {baz: 'yummy!'}
+      expect(@hash 'bar.baz').toEqual 'yummy!'
+
+    it 'clones', ->
+      clone = @hash.clone()
+      clone.data.foo = 'new'
+      clone('bar', 'new as well')
+      expect(@hash 'foo').toEqual 'bar'
+      expect(@hash 'bar').toEqual {baz: 'yummy!'}
+      expect(@hash 'bar.baz').toEqual 'yummy!'
+
+    it 'sets', ->
+      @hash('bar.baz', 'the ignition')
+      expect(@hash.data.bar.baz).toEqual 'the ignition'
+      expect(@hash 'bar.baz').toEqual 'the ignition'
+
+    it 'gets', ->
+      expect(@hash 'foo.bar.baz').toBeUndefined()
+      expect(@hash.data.foo.bar).toBeUndefined()
+
+    it 'triggers', ->
+      spy = sinon.spy()
+      @hash.bind 'changed', spy
+
+      @hash 'bar.baz', 'rocking'
+      expect(spy.callCount)
+
+  describe 'nested hash', ->
+    beforeEach ->
+      @nested = new Joosy.Resources.Hash(trolo: 'lo')
+      @hash   = new Joosy.Resources.Hash({foo: 'bar', bar: @nested})
+
+    it 'gets', ->
+      expect(@hash 'bar.trolo').toEqual 'lo'
+
+    it 'sets', ->
+      @hash 'bar.trolo', 'lolo'
+      expect(@nested.data.trolo).toEqual 'lolo'
+
+  describe 'filters', ->
+    it 'runs beforeFilter', ->
+      class Hash extends Joosy.Resources.Hash
+        @beforeLoad (data) ->
+          data.test = true
+          data
+
+      hash = new Hash(foo: 'bar')
+      expect(hash.data.test).toBeTruthy()
+      expect(hash 'test').toBeTruthy()

data/spec/joosy/core/resources/scalar_spec.coffee

@@ -0,0 +1,41 @@
+describe "Joosy.Resources.Scalar", ->
+
+  describe 'in general', ->
+    beforeEach ->
+      @scalar = new Joosy.Resources.Scalar(5)
+
+    it 'wraps', ->
+      expect(@scalar+1).toEqual(6)
+      expect("#{@scalar}").toEqual('5')
+
+    it 'clones', ->
+      clone = @scalar.clone()
+      clone.set(1)
+      expect(@scalar()).toEqual(5)
+
+    it 'triggers', ->
+      spy = sinon.spy()
+      @scalar.bind 'changed', spy
+
+      @scalar.set(7)
+      expect(@scalar.get()).toEqual 7
+
+      @scalar.load(8)
+      expect(@scalar.get()).toEqual 8
+
+      expect(spy.callCount).toEqual 2
+
+  describe 'filters', ->
+    it 'runs beforeFilter', ->
+      class Scalar extends Joosy.Resources.Scalar
+        @beforeLoad (data) ->
+          data + 1
+
+      scalar = new Scalar(5)
+      expect(scalar.get()).toEqual 6
+
+      scalar.set(5)
+      expect(scalar.get()).toEqual 5
+
+      scalar.load(7)
+      expect(scalar.get()).toEqual 8

data/spec/joosy/environments/amd_spec.coffee

@@ -29,10 +29,10 @@ describe "Joosy", ->
       'joosy/modules/filters',
       'joosy/modules/log',
       'joosy/modules/renderer',
+      'joosy/modules/resources/cacher',
       'joosy/modules/time_manager',
       'joosy/page',
       'joosy/resources/array',
-      'joosy/resources/cacher',
       'joosy/resources/hash',
       'joosy/resources/scalar',
       'joosy/router',

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

@@ -8,7 +8,7 @@ describe "Joosy.Form", ->
     @nudeForm = "<form id='nude'><input name='test[foo]'/><input name='test[bar]'/><input name='test[bool]' type='checkbox' value='1'/><input name='test[set]' type='radio' value='qwe' /><input name='test[set]' type='radio' value='zxc' /></form>"
     @putForm  = "<form id='put' method='put'><input name='test[camel_baz]'/></form>"
     @moreForm = "<form id='more' method='put'><input name='test[ololo]'/></form>"
-    @nestedForm = "<form id='nested'><input name='test[zee][capped][test]'/><input name='test[items_attributes][0][attr]'/><input name='test[items_attributes][1][attr]'/><input name='test[single_attributes][0][attr]'/></form>"
+    @nestedForm = "<form id='nested'><input name='test[zee][capped][test]'/><input name='test[items_attributes][0][attr]'/><input name='test[items_attributes][1][attr]'/><input name='test[single_attributes][attr]'/></form>"
     @exactForm = "<form id='exact'><input name='test[EXact][MATCH]'/></form>"
     @arrayForm = "<form id='array'><input name='test[arr][1][0][1]'/></form>"
 
@@ -38,7 +38,7 @@ describe "Joosy.Form", ->
           test: 'test'
       EXact:
         MATCH: 'works'
-      items: (new Joosy.Resources.RESTCollection(Test)).load([{attr: 'one'}, {attr: 'two'}])
+      items: new Joosy.Resources.Array Test.build(attr: 'one'), Test.build(attr: 'two')
       single: Test.build(attr: 'sin')
 
   afterEach ->

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

@@ -85,49 +85,14 @@ describe "Joosy.Resources.Base", ->
         {foo: 'bar'},
         {bar: 'baz'}
       ]
-    expect(resource('rumbaMumbas') instanceof Joosy.Resources.Collection).toBeTruthy()
-    expect(resource('rumbaMumbas').at(0)('foo')).toEqual 'bar'
+    expect(resource('rumbaMumbas') instanceof Joosy.Resources.Array).toBeTruthy()
+    expect(resource('rumbaMumbas')[0]('foo')).toEqual 'bar'
 
     resource = S.build
       rumbaMumba: {foo: 'bar'}
     expect(resource('rumbaMumba') instanceof Joosy.Resources.Base).toBeTruthy()
     expect(resource('rumbaMumba.foo')).toEqual 'bar'
 
-  it "should use magic collections", ->
-    class window.RumbaMumbasCollection extends Joosy.Resources.Collection
-
-    class RumbaMumba extends Joosy.Resources.Base
-      @entity 'rumba_mumba'
-    class R extends Joosy.Resources.Base
-      @map 'rumbaMumbas', RumbaMumba
-
-    resource = R.build
-      rumbaMumbas: [
-        {foo: 'bar'},
-        {bar: 'baz'}
-      ]
-    expect(resource('rumbaMumbas') instanceof RumbaMumbasCollection).toBeTruthy()
-    expect(resource('rumbaMumbas').at(0)('foo')).toEqual 'bar'
-
-    window.RumbaMumbasCollection = undefined
-
-  it "should use manually set collections", ->
-    class OloCollection extends Joosy.Resources.Collection
-
-    class RumbaMumba extends Joosy.Resources.Base
-      @entity 'rumba_mumba'
-      @collection OloCollection
-    class R extends Joosy.Resources.Base
-      @map 'rumbaMumbas', RumbaMumba
-
-    resource = R.build
-      rumbaMumbas: [
-        {foo: 'bar'},
-        {bar: 'baz'}
-      ]
-    expect(resource('rumbaMumbas') instanceof OloCollection).toBeTruthy()
-    expect(resource('rumbaMumbas').at(0)('foo')).toEqual 'bar'
-
   describe "identity map", ->
     it "handles builds", ->
       foo = Test.build 1