joosy 1.0.0.RC4 → 1.0.0.RC5

data/app/assets/javascripts/joosy/core/layout.js.coffee

@@ -48,11 +48,11 @@ class Joosy.Layout extends Joosy.Module
   #   @beforePaint (complete) ->
   #     if !@data # checks if parallel fetching finished
   #       $('preloader').slideDown -> complete()
-  # 
+  #
   #
   @beforePaint: (callback) ->
     @::__beforePaint = callback
-    
+
   #
   # Sets the method which will controll the painting proccess.
   #
@@ -86,7 +86,7 @@ class Joosy.Layout extends Joosy.Module
   #
   @erase: (callback) ->
     @::__erase = callback
-  
+
   #
   # Sets the method which will controll the data fetching proccess.
   #
@@ -101,7 +101,7 @@ class Joosy.Layout extends Joosy.Module
   #     $.get '/rumbas', (@data) => complete()
   #
   @fetch: (callback) ->
-    @::__fetch = (complete) -> 
+    @::__fetch = (complete) ->
       @data = {}
       callback.call this, =>
         @dataFetched = true
@@ -112,7 +112,7 @@ class Joosy.Layout extends Joosy.Module
   #
   data: false
   dataFetched: false
-  
+
   #
   # @param [Hash] params              List of route params
   #

data/app/assets/javascripts/joosy/core/modules/events.js.coffee

@@ -12,7 +12,8 @@ Joosy.Modules.Events =
   # @param [Function] callback          Action to run when all events were triggered at least once
   #
   wait: (events, callback) ->
-    events = events.split /\s+/ if Object.isString events
+    events = @__splitEvents events
+    @__validateEvents events
 
     @__oneShotEvents ||= []
     @__oneShotEvents.push [events, callback]
@@ -24,7 +25,8 @@ Joosy.Modules.Events =
   # @param [Function] callback          Action to run on trigger
   #
   bind: (events, callback) ->
-    events = events.split /\s+/
+    events = @__splitEvents events
+    @__validateEvents events
 
     @__boundEvents ||= []
     @__boundEvents.push [events, callback]
@@ -61,7 +63,7 @@ Joosy.Modules.Events =
       for [events, callback] in @__boundEvents
         if events.has event
           callback data...
-  
+
   #
   # Runs set of callbacks finializing with result callback
   #
@@ -77,13 +79,29 @@ Joosy.Modules.Events =
   synchronize: (block) ->
     context = new Joosy.Modules.Events.SynchronizationContext(this)
     block.call(this, context)
-    
-    @wait context.expectations, => context.after.call(this)
 
-    context.actions.each (data) =>
-      data[0].call this, =>
-        @trigger data[1]
-        
+    if context.expectations.length == 0
+      context.after.call(this)
+    else
+      @wait context.expectations, => context.after.call(this)
+      context.actions.each (data) =>
+        data[0].call this, =>
+          @trigger data[1]
+
+  __splitEvents: (events) ->
+    if Object.isString events
+      if events.isBlank()
+        []
+      else
+        events.trim().split /\s+/
+    else
+      events
+
+  __validateEvents: (events) ->
+    unless Object.isArray(events) && events.length > 0
+      throw new Error "#{Joosy.Module.__className @}> bind invalid events: #{events}"
+
+
 #
 # Internal representation of {Joosy.Modules.Events.synchronize} context
 #
@@ -114,7 +132,7 @@ class Joosy.Modules.Events.SynchronizationContext
     @actions.push [action, event]
 
   #
-  # Registers finalizer: the action that will be called when all do-functions 
+  # Registers finalizer: the action that will be called when all do-functions
   #   marked themselves as complete.
   #
   # @param [Function] after       Function to call.

data/app/assets/javascripts/joosy/core/modules/log.js.coffee

@@ -4,7 +4,7 @@
 # @mixin
 #
 Joosy.Modules.Log =
-  
+
   #
   # Checks if console is available and proxies given arguments directly to `console.log`
   #

data/app/assets/javascripts/joosy/core/modules/module.js.coffee

@@ -1,7 +1,7 @@
 moduleKeywords = ['included', 'extended']
 
 #
-# Base Joosy class extending Coffee class with module-like injections 
+# Base Joosy class extending Coffee class with module-like injections
 #   and other tiny stuff.
 #
 class Joosy.Module
@@ -65,7 +65,7 @@ class Joosy.Module
 
     @[chained] = @[method]
     @[method] = action
-    
+
   #
   # Simple and fast shallow merge implementation.
   #

data/app/assets/javascripts/joosy/core/modules/time_manager.js.coffee

@@ -4,7 +4,7 @@
 # @mixin
 #
 Joosy.Modules.TimeManager =
-  
+
   #
   # Registeres timeout for current object
   #

data/app/assets/javascripts/joosy/core/page.js.coffee

@@ -132,7 +132,7 @@ class Joosy.Page extends Joosy.Module
   #     $.get '/rumbas', (@data) => complete()
   #
   @fetch: (callback) ->
-    @::__fetch = (complete) -> 
+    @::__fetch = (complete) ->
       @data = {}
       callback.call this, =>
         @dataFetched = true

data/app/assets/javascripts/joosy/core/resource/collection.js.coffee

@@ -3,15 +3,15 @@
 # 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.Resource.Generic.map} 
+#   automatically created by things like {Joosy.Resource.Generic.map}
 #   or {Joosy.Resource.REST.find}.
 #
 # @example Basic sample
 #   class R extends Joosy.Resource.Generic
 #     @entity 'r'
-#     
+#
 #   collection = new Joosy.Resource.Collection(R)
-#     
+#
 #   collection.load [{foo: 'bar'}, {foo: 'baz'}]
 #   collection.each (resource) ->
 #     resource('foo')
@@ -20,7 +20,7 @@
 #
 class Joosy.Resource.Collection extends Joosy.Module
   @include Joosy.Modules.Events
-  
+
   #
   # Allows to modify data before it gets stored
   #
@@ -29,7 +29,7 @@ class Joosy.Resource.Collection extends Joosy.Module
   # @param [Function] action    `(Object) -> Object` to call
   #
   @beforeLoad: (action) -> @::__beforeLoad = action
-  
+
   #
   # Sets the default model for collection
   #
@@ -38,24 +38,24 @@ class Joosy.Resource.Collection extends Joosy.Module
   # @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) ->
+  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
   #
@@ -70,10 +70,10 @@ class Joosy.Resource.Collection extends Joosy.Module
       entities = @__beforeLoad entities
 
     @data = @modelize entities
-    
+
     @trigger 'changed' if notify
     this
-  
+
   #
   # Turns Objects array into array of Resources
   #
@@ -86,11 +86,11 @@ class Joosy.Resource.Collection extends Joosy.Module
       collection = collection?[root.camelize(false)]
 
       if collection not instanceof Array
-        throw new Error "Can not read incoming JSON" 
+        throw new Error "Can not read incoming JSON"
 
     collection.map (x) =>
       @model.build x
-      
+
   #
   # Calls callback for each Resource inside Collection
   #
@@ -117,7 +117,7 @@ class Joosy.Resource.Collection extends Joosy.Module
 
   sortBy: (params...) ->
     @data.sortBy params...
-  
+
   #
   # Gets resource by id
   #
@@ -127,7 +127,7 @@ class Joosy.Resource.Collection extends Joosy.Module
   #
   findById: (id) ->
     @data.find (x) -> x.id().toString() == id.toString()
-  
+
   #
   # Gets resource by its index inside collection
   #
@@ -168,11 +168,11 @@ class Joosy.Resource.Collection extends Joosy.Module
   # @return [Joosy.Resource.Generic]    Added element
   #
   add: (element, index=false, notify=true) ->
-    if index
+    if typeof index is 'number'
       @data.splice index, 0, element
     else
       @data.push element
-      
+
     if notify
       @trigger 'changed'
-    element
+    element

data/app/assets/javascripts/joosy/core/resource/generic.js.coffee

@@ -4,12 +4,12 @@
 # @example Basic usage
 #   class R extends Joosy.Resource.Generic
 #     @entity 'r'
-#   
+#
 #     @beforeLoad (data) ->
 #       data.real = true
-#   
+#
 #   r = R.build {r: {foo: {bar: 'baz'}}}
-#   
+#
 #   r('foo')                  # {baz: 'baz'}
 #   r('real')                 # true
 #   r('foo.bar')              # baz
@@ -30,7 +30,7 @@ class Joosy.Resource.Generic extends Joosy.Module
   __source: false
 
   #
-  # Clears the identity map cache. Recomended to be called during layout switch to 
+  # Clears the identity map cache. Recomended to be called during layout switch to
   # ensure correct garbage collection.
   #
   @resetIdentity: ->
@@ -72,7 +72,7 @@ class Joosy.Resource.Generic extends Joosy.Module
     class clone extends this
 
     if entity instanceof Joosy.Resource.Generic
-      clone.__source  = entity.memberPath() 
+      clone.__source  = entity.memberPath()
       clone.__source += '/' + @::__entityName.pluralize() if @::__entityName
     else
       clone.__source = entity
@@ -86,7 +86,7 @@ class Joosy.Resource.Generic extends Joosy.Module
   # @param [String] name    Singular name of resource
   #
   @entity: (name) -> @::__entityName = name
-  
+
   #
   # Sets the collection to use
   #
@@ -96,7 +96,7 @@ class Joosy.Resource.Generic extends Joosy.Module
   # @param [Class] klass       Class to assign as collection
   #
   @collection: (klass) -> @::__collection = -> klass
-  
+
   #
   # Implements {Joosy.Resource.Generic.collection} default behavior.
   #
@@ -116,9 +116,9 @@ class Joosy.Resource.Generic extends Joosy.Module
   #   class Puppy extends Joosy.Resource.Generic
   #     @entity 'puppy'
   #     @map 'zombies'
-  #   
+  #
   #   p = Puppy.build {zombies: [{foo: 'bar'}]}
-  #   
+  #
   #   p('zombies')            # Direct access: [{foo: 'bar'}]
   #   p.zombies               # Wrapped Collection of Zombie instances
   #   p.zombies.at(0)('foo')  # bar
@@ -129,11 +129,13 @@ class Joosy.Resource.Generic extends Joosy.Module
   @map: (name, klass=false) ->
     unless klass
       klass = window[name.singularize().camelize()]
-      
+
     if !klass
       throw new Error "#{Joosy.Module.__className @}> class can not be detected for '#{name}' mapping"
 
     @beforeLoad (data) ->
+      klass = klass() unless Joosy.Module.hasAncestor(klass, Joosy.Resource.Generic)
+
       @__map(data, name, klass)
 
   #
@@ -156,14 +158,14 @@ class Joosy.Resource.Generic extends Joosy.Module
     else
       for key, value of @prototype
         shim[key] = value
-        
+
     shim.constructor = @
 
     if Object.isNumber(data) || Object.isString(data)
       id   = data
       data = {}
       data[shim.__primaryKey] = id
-    
+
     if Joosy.Application.identity
       id = data[shim.__primaryKey]
 
@@ -203,7 +205,7 @@ class Joosy.Resource.Generic extends Joosy.Module
   load: (data) ->
     @__fillData data
     return this
-  
+
   #
   # Getter for wrapped data
   #
@@ -231,7 +233,7 @@ class Joosy.Resource.Generic extends Joosy.Module
       target[0](target[1], value)
     else
       target[0][target[1]] = value
-    
+
     @trigger 'changed'
     null
 
@@ -246,7 +248,7 @@ class Joosy.Resource.Generic extends Joosy.Module
       path    = path.split '.'
       keyword = path.pop()
       target  = @data
-      
+
       for part in path
         target[part] ||= {}
         if target instanceof Joosy.Resource.Generic
@@ -277,7 +279,7 @@ class Joosy.Resource.Generic extends Joosy.Module
     @data = {} unless @hasOwnProperty 'data'
 
     Joosy.Module.merge @data, @__prepareData(data)
-    
+
     @trigger 'changed' if notify
 
     null
@@ -288,14 +290,14 @@ class Joosy.Resource.Generic extends Joosy.Module
   # @param [Hash] data    Raw data to prepare
   # @return [Hash]
   #
-  __prepareData: (data) ->    
+  __prepareData: (data) ->
     if Object.isObject(data) && Object.keys(data).length == 1 && @__entityName
       name = @__entityName.camelize(false)
       data = data[name] if data[name]
 
     if @__beforeLoads?
       data = bl.call(this, data) for bl in @__beforeLoads
-      
+
     data
 
   __map: (data, name, klass) ->
@@ -305,4 +307,4 @@ class Joosy.Resource.Generic extends Joosy.Module
       data[name] = entry
     else if Object.isObject data[name]
       data[name] = klass.build data[name]
-    data
+    data

data/app/assets/javascripts/joosy/core/resource/rest.js.coffee

@@ -11,6 +11,22 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
     named = @__entityName.camelize().pluralize() + 'Collection'
     if window[named] then window[named] else Joosy.Resource.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
+  #
+  @__parentsPath: (parents) ->
+    parents.reduce (path, parent) ->
+      path += if Joosy.Module.hasAncestor parent.constructor, Joosy.Resource.REST
+        parent.memberPath()
+      else
+        parent
+    , ''
+
   #
   # Builds member path based on the given id.
   #
@@ -25,10 +41,8 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
     path  = @__source if @__source? && !options.parent?
     path += "/#{id}"
 
-    if options.parent instanceof Joosy.Resource.Generic
-      path = options.parent.memberPath() + path
-    else if options.parent?
-      path = options.parent + path
+    if options.parent?
+      path = @__parentsPath(if Object.isArray(options.parent) then options.parent else [options.parent]) + path
 
     path += "/#{options.from}" if options.from?
     path
@@ -56,10 +70,8 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
     path = ("/" + @::__entityName.pluralize())
     path = @__source if @__source? && !options.parent?
 
-    if options.parent instanceof Joosy.Resource.Generic
-      path = options.parent.memberPath() + path
-    else if options.parent?
-      path = options.parent + path
+    if options.parent?
+      path = @__parentsPath(if Object.isArray(options.parent) then options.parent else [options.parent]) + path
 
     path += "/#{options.from}" if options.from?
     path
@@ -181,10 +193,10 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
   #
   # @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 
+  #   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 
+  # @param [Function] callback    Resulting callback
   #   (will receive retrieved Collection/Resource)
   #
   # @option options [Joosy.Resource.REST] parent            Sets the given resource as a base path
@@ -205,12 +217,12 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
 
       @__query @collectionPath(options), 'GET', options.params, (data) =>
         result.load data
-        callback?(result)
+        callback?(result, data)
     else
       result = @build where
       @__query @memberPath(where, options), 'GET', options.params, (data) =>
         result.load data
-        callback?(result)
+        callback?(result, data)
 
     result
 
@@ -232,7 +244,7 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
   # Refetches the data from backend and triggers `changed`
   #
   # @param [Hash] options         See {Joosy.Resource.REST.find} for possible options
-  # @param [Function] callback    Resulting callback 
+  # @param [Function] callback    Resulting callback
   #
   reload: (options={}, callback=false) ->
     if Object.isFunction(options)
@@ -241,4 +253,4 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
 
     @constructor.__query @memberPath(options), 'GET', options.params, (data) =>
       @load data
-      callback? this
+      callback? this

data/app/assets/javascripts/joosy/core/resource/rest_collection.js.coffee

@@ -12,7 +12,7 @@ class Joosy.Resource.RESTCollection extends Joosy.Resource.Collection
   # Refetches the data from backend and triggers `changed`
   #
   # @param [Hash] options         See {Joosy.Resource.REST.find} for possible options
-  # @param [Function] callback    Resulting callback 
+  # @param [Function] callback    Resulting callback
   #
   reload: (options={}, callback=false) ->
     if Object.isFunction(options)
@@ -21,4 +21,4 @@ class Joosy.Resource.RESTCollection extends Joosy.Resource.Collection
 
     @model.__query @model.collectionPath(options), 'GET', options.params, (data) =>
       @load data
-      callback?(data)
+      callback?(data)

data/app/assets/javascripts/joosy/core/router.js.coffee

@@ -87,7 +87,7 @@ Joosy.Router =
   __setupRoutes: ->
     $(window).hashchange =>
       unless @__ignoreRequest && location.hash.match(@__ignoreRequest)
-        @__respondRoute location.hash 
+        @__respondRoute location.hash
 
     @__prepareRoutes @rawRoutes
     @__respondRoute location.hash
@@ -200,4 +200,4 @@ Joosy.Router =
 
     params
 
-Joosy.Module.merge Joosy.Router, Joosy.Modules.Events
+Joosy.Module.merge Joosy.Router, Joosy.Modules.Events

data/app/assets/javascripts/joosy/core/widget.js.coffee

@@ -29,6 +29,7 @@ class Joosy.Widget extends Joosy.Module
   @include Joosy.Modules.Renderer
   @include Joosy.Modules.Filters
   @include Joosy.Modules.TimeManager
+  @include Joosy.Modules.WidgetsManager
 
   #
   # By default widget will not render on load
@@ -69,6 +70,7 @@ class Joosy.Widget extends Joosy.Module
       @swapContainer @container, @__renderer(@data || {})
     @refreshElements()
     @__delegateEvents()
+    @__setupWidgets()
     @__runAfterLoads()
 
     this
@@ -81,5 +83,6 @@ class Joosy.Widget extends Joosy.Module
   #
   __unload: ->
     @__clearTime()
+    @__unloadWidgets()
     @__removeMetamorphs()
     @__runAfterUnloads()

data/app/assets/javascripts/joosy/preloaders/caching.js.coffee

@@ -1,12 +1,12 @@
 #
 # Preloader for libraries with localStorage cache
 #
-# @note The `start` callback will only be called if loading required. 
+# @note The `start` callback will only be called if loading required.
 #   While working with cache, `complete` is the only callback that will be triggered.
 #
 # @example Basic usage
 #   libraries = [['/test1.js', 100], ['/test2.js', 500]] #100, 500 - size in bytes
-#   
+#
 #   CachingPreloader.load libraries,
 #     start:    -> console.log 'preloading started'
 #     progress: (percent) -> console.log "#{percent}% loaded"
@@ -19,17 +19,17 @@
   # If set to true, localStorage cache will be avoided
   #
   force: false
-  
+
   #
   # Prefix for localStorage keys
   #
   prefix: "cache:"
-  
+
   #
   # Number of libraries have been loaded (increases after lib was loaded)
   #
   counter: 0
-  
+
   #
   # Loads (or takes from cache) set of libraries using xhr and caches them in localStorage
   # See class description for example of usage
@@ -142,7 +142,7 @@
   #
   clean: ->
     i = 0
-    
+
     find = (arr, obj) ->
       (return i if obj == x) for x in arr
       return -1
@@ -166,4 +166,4 @@ window.evalGlobaly = (src) ->
   else
     window.eval src
 
-@Preloader = @CachingPreloader
+@Preloader = @CachingPreloader

data/app/assets/javascripts/joosy/preloaders/inline.js.coffee

@@ -3,7 +3,7 @@
 #
 # @example Basic usage
 #   libraries = [['/test1.js'], ['/test2.js']]
-#   
+#
 #   InlinePreloader.load libraries,
 #     start:    -> console.log 'preloading started'
 #     complete: -> console.log 'preloading finished'
@@ -12,15 +12,15 @@
 #
 @InlinePreloader =
   #
-  # Loads set of libraries by adding `script src` to DOM head 
+  # Loads set of libraries by adding `script src` to DOM head
   # See class description for example of usage
   #
   # @param [Array] 2-levels array of libraries URLs i.e. [['/test1.js'],['/test2.js']]
   # @param [Hash] Available options:
-  #   * start: `() -> null` to call before load starts: 
+  #   * start: `() -> null` to call before load starts:
   #   * complete: `() -> null` to call after load completes
   #
-  load: (libraries, options) ->    
+  load: (libraries, options) ->
     @[key] = val for key, val of options
     @start?()
 
@@ -53,4 +53,4 @@
     head.appendChild script
     return undefined
 
-@Preloader = @InlinePreloader
+@Preloader = @InlinePreloader

data/lib/joosy/rails/version.rb

@@ -1,5 +1,5 @@
 module Joosy
   module Rails
-    VERSION = "1.0.0.RC4"
+    VERSION = "1.0.0.RC5"
   end
 end

data/lib/rails/generators/joosy/templates/app/helpers/application.js.coffee

@@ -1,4 +1,4 @@
 Joosy.helpers 'Application', ->
-  
+
   # @helloWorld = (name) ->
-  #   "Hello World, #{name}"
+  #   "Hello World, #{name}"