joosy 0.1.0.RC1 → 0.1.0.RC2

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

@@ -4,37 +4,39 @@ Joosy.Modules.Container =
 
   eventSplitter: /^(\S+)\s*(.*)$/
 
-  $: (selector) -> $(selector, @container)
+  $: (selector) ->
+    $(selector, @container)
 
   refreshElements: ->
     @__collectElements().each (key, value) =>
+      # TODO: Check for possible collisions?
       @[key] = @$(value)
 
   swapContainer: (container, data) ->
-    realContainer = container.clone().html(data)
-    container.replaceWith realContainer
-    realContainer
+    container.unbind().off()
+    container.html data
+    container
 
   __collectElements: ->
-    elements = Object.extended(@elements || {})
+    elements = Object.extended @elements || {}
 
     klass = this
     while klass = klass.constructor.__super__
-      elements.merge(klass.elements, false)
+      Joosy.Module.merge elements, klass.elements, false
 
     elements
 
   __collectEvents: ->
-    events = Object.extended(@events || {})
+    events = Object.extended @events || {}
 
     klass = this
     while klass = klass.constructor.__super__
-      events.merge(klass.events, false)
+      Joosy.Module.merge events, klass.events, false
 
     events
 
   __extractSelector: (selector) ->
-    if r = selector.match(/\$([A-z]+)/)
+    if r = selector.match /\$([A-z]+)/
       selector = @__collectElements()[r[1]]
 
     selector
@@ -44,16 +46,18 @@ Joosy.Modules.Container =
     events = @__collectEvents()
 
     events.each (key, method) =>
-      method   = @[method] unless typeof(method) == 'function'
-      callback = (event) -> method.call(module, this, event)
+      unless Object.isFunction method
+        method = @[method]
+      callback = (event) ->
+        method.call module, this, event
 
-      match      = key.match(@eventSplitter)
+      match      = key.match @eventSplitter
       eventName  = match[1]
-      selector   = @__extractSelector(match[2])
+      selector   = @__extractSelector match[2]
 
       if selector == ""
-        @container.bind(eventName, callback)
+        @container.bind eventName, callback
         Joosy.Modules.Log.debugAs @, "#{eventName} binded on container"
       else
-        @container.on(eventName, selector, callback)
+        @container.on eventName, selector, callback
         Joosy.Modules.Log.debugAs @, "#{eventName} binded on #{selector}"

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

@@ -1,12 +1,12 @@
 Joosy.Modules.Events =
   wait: (events, callback) ->
-    events = events.split(/\s+/)
+    events = events.split /\s+/
 
     @__oneShotEvents ||= []
     @__oneShotEvents.push [events, callback]
 
   bind: (events, callback) ->
-    events = events.split(/\s+/)
+    events = events.split /\s+/
 
     @__boundEvents ||= []
     @__boundEvents.push [events, callback]
@@ -14,22 +14,23 @@ Joosy.Modules.Events =
   unbind: (target) ->
     for [events, callback], index in @__boundEvents
       if callback == target
-        @__boundEvents.splice(index, 1)
+        @__boundEvents.splice index, 1
         return
 
   trigger: (event) ->
     Joosy.Modules.Log.debugAs @, "Event #{event} triggered"
     if @__oneShotEvents
       for [events, callback], index in @__oneShotEvents
-        position = events.indexOf(event)
-        events.splice(position, 1) if position >= 0
+        position = events.indexOf event
+        if position >= 0
+          events.splice position, 1
 
         if events.length == 0
-          @__oneShotEvents.splice(index, 1)
+          @__oneShotEvents.splice index, 1
 
           callback()
 
     if @__boundEvents
-      for [ events, callback ] in @__boundEvents
-        if events.has(event)
-          callback()
+      for [events, callback] in @__boundEvents
+        if events.has event
+          callback()

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

@@ -1,39 +1,43 @@
 Joosy.Modules.Filters =
   included: ->
     @beforeLoad = (callback) ->
-      unless @::hasOwnProperty('__beforeLoads')
+      unless @::hasOwnProperty '__beforeLoads'
         @::__beforeLoads = [].concat @.__super__.__beforeLoads || []
       @::__beforeLoads.push callback
 
     @afterLoad = (callback) ->
-      unless @::hasOwnProperty('__afterLoads')
+      unless @::hasOwnProperty '__afterLoads'
         @::__afterLoads = [].concat @.__super__.__afterLoads || []
       @::__afterLoads.push callback
 
     @afterUnload = (callback) ->
-      unless @::hasOwnProperty('__afterUnloads')
+      unless @::hasOwnProperty '__afterUnloads'
         @::__afterUnloads = [].concat @.__super__.__afterUnloads || []
       @::__afterUnloads.push callback
 
   __runBeforeLoads: (opts...) ->
-    return true unless @__beforeLoads?.length > 0
+    unless @__beforeLoads?.length > 0
+      return true
 
     flag = true
 
     for filter in @__beforeLoads
-      filter = @[filter] unless typeof(filter) is 'function'
-      flag = flag && filter.apply(@, opts)
+      unless Object.isFunction filter
+        filter = @[filter]
+      flag = flag && filter.apply @, opts
 
     return flag
 
   __runAfterLoads: (opts...) ->
-    if @__afterLoads?
+    if @__afterLoads?.length > 0
       for filter in @__afterLoads
-        filter = @[filter] unless typeof(filter) is 'function'
-        filter.apply(@, opts)
+        unless Object.isFunction filter
+          filter = @[filter]
+        filter.apply @, opts
 
   __runAfterUnloads: (opts...) ->
-    if @__afterUnloads?
+    if @__afterUnloads?.length > 0
       for filter in @__afterUnloads
-        filter = @[filter] unless typeof(filter) is 'function'
-        filter.apply(@, opts)
+        unless Object.isFunction filter
+          filter = @[filter]
+        filter.apply @, opts

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

@@ -1,15 +1,18 @@
 Joosy.Modules.Log =
   log: (args...) ->
-    return if typeof console is 'undefined'
+    return unless console?
 
     if console.log.apply?
       args.unshift "Joosy>"
-      console.log(args...)
+      console.log args...
     else
-      console.log(args.first())
+      console.log args.first()
 
   debug: (args...) ->
-    @log(args...) if Joosy.debug
+    return unless Joosy.debug
+    @log args...
 
   debugAs: (context, string, args...) ->
-    @debug "#{Joosy.Module.__className__(context) || 'unknown context'}> #{string}", args...
+    return unless Joosy.debug
+    context = Joosy.Module.__className(context) || 'unknown context'
+    @debug "#{context}> #{string}", args...

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

@@ -3,41 +3,51 @@ moduleKeywords = ['included', 'extended']
 class Joosy.Module
   @__namespace__: []
 
-  @__className__ = (klass) ->
-    klass = klass.constructor unless Object.isFunction(klass)
+  @__className = (klass) ->
+    unless Object.isFunction(klass)
+      klass = klass.constructor
 
     if klass.name?
       klass.name
     else
-      klass.toString().replace(/^function ([a-zA-Z]+)\([\s\S]+/, '$1')
+      klass.toString().replace /^function ([a-zA-Z]+)\([\s\S]+/, '$1'
 
-  @hasAncestor = (what, klass) ->
-    return false unless what?
+  @hasAncestor: (what, klass) ->
+    unless what? && klass?
+      return false
 
-    [ what, klass ] = [ what.prototype, klass.prototype ]
+    [what, klass] = [what.prototype, klass.prototype]
 
     while what
-      return true if what == klass
+      if what == klass
+        return true
       what = what.constructor?.__super__
 
     false
-
-  @include: (obj) ->
-    throw new Error 'include(obj) requires obj' unless obj
-
-    Object.extended(obj).each (key, value) =>
+    
+  @merge: (destination, source, unsafe=true) ->
+    for key, value of source
+      if source.hasOwnProperty(key)
+        if unsafe || !destination.hasOwnProperty(key)
+          destination[key] = value
+    destination
+
+  @include: (object) ->
+    unless object
+      throw new Error 'include(object) requires obj'
+
+    Object.each object, (key, value) =>
       if key not in moduleKeywords
         this::[key] = value
 
-    obj.included?.apply(this)
-    this
+    object.included?.apply this
+    null
 
-  @extend: (obj) ->
-    throw new Error 'extend(obj) requires obj' unless obj
+  @extend: (object) ->
+    unless object
+      throw new Error 'extend(object) requires object'
 
-    Object.extended(obj).each (key, value) =>
-      if key not in moduleKeywords
-        this[key] = value
+    @merge this, object
 
-    obj.extended?.apply(this)
-    this
+    object.extended?.apply this
+    null

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

@@ -4,17 +4,20 @@
 Joosy.Modules.Renderer =
 
   __renderer: ->
-    throw new Error "#{@constructor.name} does not have an attached template"
+    throw new Error "#{Joosy.Module.__className @constructor} does not have an attached template"
 
   __helpers: null
 
   included: ->
-    @view = (template) ->
-      if Object.isFunction(template)
+    @view = (template, options={}) ->
+      if Object.isFunction template
         @::__renderer = template
       else
         @::__renderer = (locals={}) ->
-          @render(template, locals)
+          if options.dynamic
+            @renderDynamic template, locals
+          else
+            @render template, locals
 
     @helpers = (helpers...) ->
       @::__helpers ||= []
@@ -30,26 +33,23 @@ Joosy.Modules.Renderer =
   __instantiateHelpers: ->
     unless @__helpersInstance
       @__helpersInstance = Object.extended Joosy.Helpers.Application
-
-      @__helpersInstance.render = =>
-        @render(arguments...)
         
       @__helpersInstance.widget = (element, widget) =>
         @widgets ||= {}
         
         uuid    = Joosy.uuid()
-        element = document.createElement(element)
-        temp    = document.createElement("div")
+        element = document.createElement element
+        temp    = document.createElement 'div'
         
-        element.id     = uuid
+        element.id = uuid
         @widgets['#'+uuid] = widget
 
-        temp.appendChild(element)
+        temp.appendChild element
         temp.innerHTML
 
       if @__helpers
         for helper in @__helpers
-          @__helpersInstance.merge helper
+          Joosy.Module.merge @__helpersInstance, helper
 
     @__helpersInstance
 
@@ -57,60 +57,123 @@ Joosy.Modules.Renderer =
   __proxifyHelpers: (locals) ->
     if locals.hasOwnProperty '__proto__'
       locals.__proto__ = @__instantiateHelpers()
-
       locals
     else
       unless @__helpersProxyInstance
         @__helpersProxyInstance = (locals) ->
-          Object.merge(this, locals)
+          Joosy.Module.merge this, locals
 
         @__helpersProxyInstance.prototype = @__instantiateHelpers()
 
-      new @__helpersProxyInstance(locals)
+      new @__helpersProxyInstance locals
 
-  render: (template, locals={}) ->
-    isResource = Joosy.Module.hasAncestor(locals.constructor, Joosy.Resource.Generic)
+  render: (template, locals={}, parentStackPointer=false) ->
+    @__render false, template, locals, parentStackPointer
+    
+  renderDynamic: (template, locals={}, parentStackPointer=false) ->
+    @__render true, template, locals, parentStackPointer
+
+  __render: (dynamic, template, locals={}, parentStackPointer=false) ->
+    stack = @__renderingStackChildFor parentStackPointer
+    
+    stack.template = template
+    
+    isResource   = Joosy.Module.hasAncestor locals.constructor, Joosy.Resource.Generic
+    isCollection = Joosy.Module.hasAncestor locals.constructor, Joosy.Resource.Collection
     
     if Object.isString template
       if @__renderSection?
         template = Joosy.Application.templater.resolveTemplate @__renderSection(), template, this
 
       template = Joosy.Application.templater.buildView template
-    else if !Object.isFunction(template)
-      throw new Error "#{Joosy.Module.__className__ @}> template (maybe @view) does not look like a string or lambda"
-
-    if !Object.isObject(locals) && !isResource
-      throw new Error "#{Joosy.Module.__className__ @}> locals (maybe @data?) can only be dumb hash or Resource"
-
-    # Small code dup due to the fact we sometimes 
-    # actually CLONE object when proxying helpers
-    if !isResource
-      locals = @__proxifyHelpers(locals)
-      morph  = Metamorph template(locals)
-      update = => morph.html template(locals)
+    else if !Object.isFunction template
+      throw new Error "#{Joosy.Module.__className @}> template (maybe @view) does not look like a string or lambda"
+    
+    if !Object.isObject(locals) && !isResource && !isCollection
+      throw new Error "#{Joosy.Module.__className @}> locals (maybe @data?) not in: dumb hash, Resource, Collection"
+
+    if isResource
+      stack.locals = locals.e
     else
-      locals.e = @__proxifyHelpers(locals.e)
-      morph    = Metamorph template(locals.e)
-      update   = => morph.html template(locals.e)
+      stack.locals = locals
       
-    # This is here to break stack tree and save from 
-    # repeating DOM handling
-    update = update.debounce(0)
-
-    @__metamorphs ||= []
+    renderers =
+      render: (template, locals={}) =>
+        @render template, locals, stack
+      renderDynamic: (template, locals={}) =>
+        @renderDynamic template, locals, stack
+        
+    context = =>
+      data = {}
+      Joosy.Module.merge data, stack.locals
+      Joosy.Module.merge data, @__instantiateHelpers(), false
+      Joosy.Module.merge data, renderers
+      data
+    
+    if dynamic
+      morph  = Metamorph template(context())
+      update = =>
+        for child in stack.children
+          @__removeMetamorphs child
+        stack.children = []
+        morph.html template(context())
+        @refreshElements?()
+
+      # This is here to break stack tree and save from 
+      # repeating DOM handling
+      update = update.debounce 0
+
+      if isCollection
+        for resource in locals.data
+          resource.bind 'changed', update
+          stack.metamorphBindings.push [resource, update]
+      if isResource || isCollection
+        locals.bind 'changed', update
+        stack.metamorphBindings.push [locals, update]
+      else
+        for key, object of locals
+          if locals.hasOwnProperty key
+            if object?.bind? && object?.unbind?
+              object.bind 'changed', update
+              stack.metamorphBindings.push [object, update]
 
-    if isResource
-      locals.bind 'changed', update
+      morph.outerHTML()
+    else
+      template context()
+
+  __renderingStackElement: (parent=null) ->
+    metamorphBindings: []
+    locals: null
+    template: null
+    children: []
+    parent: parent
+
+  __renderingStackChildFor: (parentPointer) ->
+    if !@__renderingStack
+      @__renderingStack = []
+    
+    if !parentPointer
+      element = @__renderingStackElement()
+      @__renderingStack.push element
+      element
+    else
+      element = @__renderingStackElement parentPointer
+      parentPointer.children.push element
+      element
+
+  __removeMetamorphs: (stackPointer=false) ->
+    remove = (stackPointer) =>
+      if stackPointer?.children
+        for child in stackPointer.children
+          @__removeMetamorphs child
+  
+      if stackPointer?.metamorphBindings
+        for [object, callback] in stackPointer.metamorphBindings
+          object.unbind callback
+        stackPointer.metamorphBindings = []
+    
+    unless stackPointer
+      @__renderingStack?.each (stackPointer) ->
+        remove stackPointer
     else
-      for key, object of locals
-        if locals.hasOwnProperty key
-          if object?.bind? && object?.unbind?
-            object.bind 'changed', update
-            @__metamorphs.push [object, update]
-
-    morph.outerHTML()
-
-  __removeMetamorphs: ->
-    if @__metamorphs
-      for [object, callback] in @__metamorphs
-        object.unbind callback
+      remove stackPointer

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

@@ -15,11 +15,11 @@ Joosy.Modules.TimeManager =
 
     timer
 
-  clearTime: ->
+  __clearTime: ->
     if @__intervals
       for entry in @__intervals
         window.clearInterval entry
 
     if @__timeouts
       for entry in @__timeouts
-        window.clearTimeout entry
+        window.clearTimeout entry

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

@@ -1,6 +1,6 @@
 Joosy.Modules.WidgetsManager =
   registerWidget: (container, widget) ->
-    if Joosy.Module.hasAncestor(widget, Joosy.Widget)
+    if Joosy.Module.hasAncestor widget, Joosy.Widget
       widget = new widget()
 
     @__activeWidgets ||= []
@@ -11,14 +11,14 @@ Joosy.Modules.WidgetsManager =
   unregisterWidget: (widget) ->
     widget.__unload()
 
-    @__activeWidgets.splice(@__activeWidgets.indexOf(widget), 1)
+    @__activeWidgets.splice @__activeWidgets.indexOf(widget), 1
 
   __collectWidgets: ->
-    widgets = Object.extended(@widgets || {})
+    widgets = Object.extended @widgets || {}
 
     klass = this
     while klass = klass.constructor.__super__
-      widgets.merge(klass.widgets, false)
+      Joosy.Module.merge widgets, klass.widgets, false
 
     widgets
 
@@ -30,7 +30,7 @@ Joosy.Modules.WidgetsManager =
       if selector == '$container'
         activeSelector = @container
       else
-        if r = selector.match(/\$([A-z_]+)/)
+        if r = selector.match /\$([A-z_]+)/
           selector = @elements[r[1]]
 
         activeSelector = $(selector, @container)
@@ -38,15 +38,15 @@ Joosy.Modules.WidgetsManager =
       registered[selector] = Object.extended()
 
       activeSelector.each (index, elem) =>
-        if Joosy.Module.hasAncestor(widget, Joosy.Widget)
+        if Joosy.Module.hasAncestor widget, Joosy.Widget
           instance = new widget
         else
           instance = widget.call this, index
 
-        registered[selector][Joosy.Module.__className__ instance] ||= 0
-        registered[selector][Joosy.Module.__className__ instance]  += 1
+        registered[selector][Joosy.Module.__className instance] ||= 0
+        registered[selector][Joosy.Module.__className instance]  += 1
 
-        @registerWidget($(elem), instance)
+        @registerWidget $(elem), instance
 
     registered.each (selector, value) =>
       value.each (widget, count) =>
@@ -55,4 +55,4 @@ Joosy.Modules.WidgetsManager =
   __unloadWidgets: ->
     if @__activeWidgets
       for widget in @__activeWidgets
-        widget.__unload()
+        widget.__unload()

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

@@ -33,21 +33,26 @@ class Joosy.Page extends Joosy.Module
   @layout: (layoutClass) ->
     @::__layoutClass = layoutClass
 
-  @beforePaint: (callback) -> @::__beforePaint = callback
-  @paint: (callback) -> @::__paint = callback
-  @afterPaint: (callback) -> @::__afterPaint = callback
-  @erase: (callback) -> @::__erase = callback
+  @beforePaint: (callback) ->
+    @::__beforePaint = callback
+  @paint: (callback) ->
+    @::__paint = callback
+  @afterPaint: (callback) ->
+    @::__afterPaint = callback
+  @erase: (callback) ->
+    @::__erase = callback
 
   constructor: (@params, @previous) ->
     @__layoutClass ||= ApplicationLayout
 
-    if @__runBeforeLoads(@params, @previous)
+    if @__runBeforeLoads @params, @previous
       if !@previous?.layout?.uuid? || @previous?.__layoutClass != @__layoutClass
         @__bootstrapLayout()
       else
         @__bootstrap()
 
-  navigate: (args...) -> Joosy.Router.navigate(args...)
+  navigate: (args...) ->
+    Joosy.Router.navigate(args...)
 
   __renderSection: ->
     'pages'
@@ -62,23 +67,23 @@ class Joosy.Page extends Joosy.Module
     @refreshElements()
     @__delegateEvents()
     @__setupWidgets()
-    @__runAfterLoads(@params, @previous)
+    @__runAfterLoads @params, @previous
     if @__scrollElement
-      scroll = $(@__extractSelector(@__scrollElement)).offset()?.top + @__scrollMargin
-      Joosy.Modules.Log.debugAs @, "Scrolling to #{@__extractSelector(@__scrollElement)}"
+      scroll = $(@__extractSelector @__scrollElement).offset()?.top + @__scrollMargin
+      Joosy.Modules.Log.debugAs @, "Scrolling to #{@__extractSelector @__scrollElement}"
       $('html, body').animate {scrollTop: scroll}, @__scrollSpeed, =>
-        @__releaseHeight() if @__scrollSpeed != 0
+        if @__scrollSpeed != 0
+          @__releaseHeight()
 
     Joosy.Modules.Log.debugAs @, "Page loaded"
 
   __unload: ->
-    @clearTime()
+    @__clearTime()
     @__unloadWidgets()
     @__removeMetamorphs()
-    @__runAfterUnloads(@params, @previous)
+    @__runAfterUnloads @params, @previous
     delete @previous
 
-
   __callSyncedThrough: (entity, receiver, params, callback) ->
     if entity?[receiver]?
       entity[receiver].apply entity, params.clone().add(callback)
@@ -99,7 +104,8 @@ class Joosy.Page extends Joosy.Module
 
     callbacksParams = [@layout.content()]
     
-    @__fixHeight() if @__scrollElement && @__scrollSpeed != 0
+    if @__scrollElement && @__scrollSpeed != 0
+     @__fixHeight()
 
     @wait "stageClear dataReceived", =>
       @__callSyncedThrough this, '__paint', callbacksParams, =>
@@ -123,17 +129,20 @@ class Joosy.Page extends Joosy.Module
 
   __bootstrapLayout: ->
     Joosy.Modules.Log.debugAs @, "Boostraping page with layout"
-    @layout = new @__layoutClass
+    @layout = new @__layoutClass(@params)
 
     callbacksParams = [Joosy.Application.content(), this]
     
-    @__fixHeight() if @__scrollElement && @__scrollSpeed != 0
+    if @__scrollElement && @__scrollSpeed != 0
+      @__fixHeight()
 
     @wait "stageClear dataReceived", =>
       @__callSyncedThrough @layout, '__paint', callbacksParams, =>
         # Layout HTML
-        @swapContainer Joosy.Application.content(), @layout.__renderer
-          yield: => @layout.yield()
+        data = Joosy.Module.merge {}, @layout.data || {}
+        data = Joosy.Module.merge data, yield: => @layout.yield()
+        
+        @swapContainer Joosy.Application.content(), @layout.__renderer data
 
         # Page HTML
         @swapContainer @layout.content(), @__renderer(@data || {})
@@ -151,6 +160,7 @@ class Joosy.Page extends Joosy.Module
       @__callSyncedThrough @layout, '__beforePaint', callbacksParams, =>
         @trigger 'stageClear'
 
-    @__callSyncedThrough this, '__fetch', [], =>
-      Joosy.Modules.Log.debugAs @, "Fetch complete"
-      @trigger 'dataReceived'
+    @__callSyncedThrough @layout, '__fetch', [], =>
+      @__callSyncedThrough this, '__fetch', [], =>
+        Joosy.Modules.Log.debugAs @, "Fetch complete"
+        @trigger 'dataReceived'