joosy 1.2.0.alpha.73 → 1.2.0.beta.1

data/source/joosy/modules/dom.coffee

@@ -23,8 +23,8 @@ Joosy.Modules.DOM =
     #
     @mapElements = (map) ->
       unless @::hasOwnProperty "__elements"
-        @::__elements = Object.clone(@.__super__.__elements) || {}
-      Object.merge @::__elements, map
+        @::__elements = Joosy.Module.merge {}, @.__super__.__elements
+      Joosy.Module.merge @::__elements, map
 
     #
     # Extends events mapping scheme
@@ -37,8 +37,8 @@ Joosy.Modules.DOM =
     #
     @mapEvents = (map) ->
       unless @::hasOwnProperty "__events"
-        @::__events = Object.clone(@.__super__.__events) || {}
-      Object.merge @::__events, map
+        @::__events = Joosy.Module.merge {}, @.__super__.__events
+      Joosy.Module.merge @::__events, map
 
   $: (selector, context) ->
     $(selector, context || @$container)
@@ -77,12 +77,13 @@ Joosy.Modules.DOM =
     return unless entries
 
     for key,value of entries
-      if Object.isObject(value)
-        @__assignElements root['$'+key]={}, value
-      else
-        value = @__extractSelector value
-        root['$'+key] = @__wrapElement(value)
-        root['$'+key].selector = value
+      do (key, value) =>
+        if typeof(value) != 'string'
+          @__assignElements root['$'+key]={}, value
+        else
+          value = @__extractSelector value
+          root['$'+key] = @__wrapElement(value)
+          root['$'+key].selector = value
 
   #
   # Wraps actual element closures. Required to clear context to avoid circular reference
@@ -110,27 +111,28 @@ Joosy.Modules.DOM =
 
     return unless events
 
-    Object.each events, (keys, method) =>
-      for key in keys.split(',')
-        key = key.replace(/^\s+/, '')
-
-        unless Object.isFunction method
-          method = @[method]
-        callback = (event) ->
-          method.call module, $(this), event
-
-        match      = key.match @eventSplitter
-        eventName  = match[1]
-        selector   = @__extractSelector match[2]
-
-        if selector == ""
-          @$container.bind eventName, callback
-          Joosy.Modules.Log.debugAs @, "#{eventName} binded on container"
-        else if selector == undefined
-          throw new Error "Unknown element #{match[2]} in #{Joosy.Module.__className @constructor} (maybe typo?)"
-        else
-          @$container.on eventName, selector, callback
-          Joosy.Modules.Log.debugAs @, "#{eventName} binded on #{selector}"
+    for keys, method of events
+      do (keys, method) =>
+        for key in keys.split(',')
+          key = key.replace(/^\s+/, '')
+
+          unless typeof(method) == 'function'
+            method = @[method]
+          callback = (event) ->
+            method.call module, $(this), event
+
+          match      = key.match @eventSplitter
+          eventName  = match[1]
+          selector   = @__extractSelector match[2]
+
+          if selector == ""
+            @$container.bind eventName, callback
+            Joosy.Modules.Log.debugAs @, "#{eventName} binded on container"
+          else if selector == undefined
+            throw new Error "Unknown element #{match[2]} in #{Joosy.Module.__className @constructor} (maybe typo?)"
+          else
+            @$container.on eventName, selector, callback
+            Joosy.Modules.Log.debugAs @, "#{eventName} binded on #{selector}"
 
   # @private
   __clearContainer: ->

data/source/joosy/modules/events.coffee

@@ -67,8 +67,8 @@ Joosy.Modules.Events =
   wait: (name, events, callback) ->
     @__oneShotEvents = {} unless @hasOwnProperty('__oneShotEvents')
 
-    # unnamed binding
-    if Object.isFunction(events)
+    # (events, callback) ->
+    if arguments.length == 2
       callback = events
       events   = name
       name     = Object.keys(@__oneShotEvents).length.toString()
@@ -100,8 +100,8 @@ Joosy.Modules.Events =
   bind: (name, events, callback) ->
     @__boundEvents = {} unless @hasOwnProperty '__boundEvents'
 
-    # unnamed binding
-    if Object.isFunction(events)
+    # (events, callback) ->
+    if arguments.length == 2
       callback = events
       events   = name
       name     = Object.keys(@__boundEvents).length.toString()
@@ -131,26 +131,29 @@ Joosy.Modules.Events =
   trigger: (event, data...) ->
     Joosy.Modules.Log.debugAs @, "Event #{event} triggered"
 
-    if Object.isObject event
+    if typeof(event) == 'string'
+      remember = false
+    else
       remember = event.remember
       event    = event.name
-    else
-      remember = false
 
     if @hasOwnProperty '__oneShotEvents'
       fire = []
       for name, [events, callback] of @__oneShotEvents
-        events.remove event
+        while (needle = events.indexOf(event)) != -1
+          events.splice needle, 1
+
         if events.length == 0
           fire.push name
-      fire.each (name) =>
-        callback = @__oneShotEvents[name][1]
-        delete @__oneShotEvents[name]
-        callback data...
+      for name in fire
+        do (name) =>
+          callback = @__oneShotEvents[name][1]
+          delete @__oneShotEvents[name]
+          callback data...
 
     if @hasOwnProperty '__boundEvents'
       for name, [events, callback] of @__boundEvents
-        if events.any event
+        if events.indexOf(event) != -1
           callback data...
 
     if remember
@@ -178,20 +181,21 @@ Joosy.Modules.Events =
     if context.actions.length == 0
       context.after.call(@)
     else
-      context.actions.each (action) =>
-        action.call @, ->
-          if ++counter >= context.actions.length
-            context.after.call(@)
+      for action in context.actions
+        do (action) =>
+          action.call @, ->
+            if ++counter >= context.actions.length
+              context.after.call(@)
 
   __splitEvents: (events) ->
-    if Object.isString events
-      if events.isBlank()
+    if typeof(events) == 'string'
+      if events.length == 0
         events = []
       else
         events = events.trim().split /\s+/
 
     if @hasOwnProperty '__triggeredEvents'
-      events = events.findAll (e) => !@__triggeredEvents[e]
+      events = events.filter (e) => !@__triggeredEvents[e]
 
     events
 

data/source/joosy/modules/filters.coffee

@@ -23,7 +23,7 @@ Joosy.Modules.Filters =
   #     @__runAfterUnloads() # Runs filters registered as afterUnload
   #
   included: ->
-    @__registerFilterCollector = (filter) =>
+    @__registerFilterCollector = (filter) ->
       @[filter] = (callback) ->
         unless @::hasOwnProperty "__#{filter}s"
           @::["__#{filter}s"] = [].concat @.__super__["__#{filter}s"] || []
@@ -31,52 +31,55 @@ Joosy.Modules.Filters =
 
       filter.charAt(0).toUpperCase() + filter.slice(1)
 
-    @registerPlainFilters = (filters...) =>
-      filters.each (filter) =>
-        camelized = @__registerFilterCollector filter
+    @registerPlainFilters = (filters...) ->
+      for filter in filters
+        do (filter) =>
+          camelized = @__registerFilterCollector filter
 
-        @::["__run#{camelized}s"] = (params...) ->
-          return unless @["__#{filter}s"]
+          @::["__run#{camelized}s"] = (params...) ->
+            return unless @["__#{filter}s"]
 
-          for callback in @["__#{filter}s"]
-            callback = @[callback] unless typeof(callback) == 'function'
-            callback.apply(@, params)
+            for callback in @["__#{filter}s"]
+              callback = @[callback] unless typeof(callback) == 'function'
+              callback.apply(@, params)
 
-        @::["__confirm#{camelized}s"] = (params...) ->
-          return true unless @["__#{filter}s"]
+          @::["__confirm#{camelized}s"] = (params...) ->
+            return true unless @["__#{filter}s"]
 
-          @["__#{filter}s"].reduce (flag, callback) =>
-            callback = @[callback] unless typeof(callback) == 'function'
-            flag && callback.apply(@, params) != false
-          , true
+            @["__#{filter}s"].reduce (flag, callback) =>
+              callback = @[callback] unless typeof(callback) == 'function'
+              flag && callback.apply(@, params) != false
+            , true
 
-        @::["__apply#{camelized}s"] = (data, params...) ->
-          return data unless @["__#{filter}s"]
+          @::["__apply#{camelized}s"] = (data, params...) ->
+            return data unless @["__#{filter}s"]
 
-          for callback in @["__#{filter}s"]
-            callback = @[callback] unless typeof(callback) == 'function'
-            data = callback.apply(@, [data].concat params)
+            for callback in @["__#{filter}s"]
+              callback = @[callback] unless typeof(callback) == 'function'
+              data = callback.apply(@, [data].concat params)
 
-          data
+            data
 
-    @registerSequencedFilters = (filters...) =>
-      filters.each (filter) =>
-        camelized = @__registerFilterCollector filter
+    @registerSequencedFilters = (filters...) ->
+      for filter in filters
+        do (filter) =>
+          camelized = @__registerFilterCollector filter
 
-        @::["__run#{camelized}s"] = (params, callback) ->
-          return callback() unless @["__#{filter}s"]
+          @::["__run#{camelized}s"] = (params, callback) ->
+            return callback() unless @["__#{filter}s"]
 
-          runners  = @["__#{filter}s"]
-          filterer = @
+            runners  = @["__#{filter}s"]
+            filterer = @
 
-          if runners.length == 1
-            return runners[0].apply @, params.include(callback)
+            if runners.length == 1
+              return runners[0].apply @, params.concat(callback)
 
-          Joosy.synchronize (context) ->
-            runners.each (runner) ->
-              context.do (done) ->
-                runner.apply filterer, params.include(done)
-            context.after callback
+            Joosy.synchronize (context) ->
+              for runner in runners
+                do (runner) ->
+                  context.do (done) ->
+                    runner.apply filterer, params.concat(done)
+              context.after callback
 
 # AMD wrapper
 if define?.amd?

data/source/joosy/modules/page/title.coffee

@@ -12,10 +12,10 @@ Joosy.Modules.Page.Title =
   #
   title: (title, separator=' / ') ->
     @afterLoad ->
-      titleStr = if Object.isFunction(title) then title.apply(@) else title
-      titleStr = titleStr.join(separator) if Object.isArray(titleStr)
+      title = title.apply(@) if typeof(title) == 'function'
+      title = title.join(separator) if title instanceof Array
       @__previousTitle = document.title
-      document.title = titleStr
+      document.title = title
 
     @afterUnload ->
       document.title = @__previousTitle

data/source/joosy/modules/renderer.coffee

@@ -1,4 +1,4 @@
-#= require metamorph
+#= require vendor/metamorph
 #= require joosy/joosy
 
 #
@@ -24,10 +24,10 @@ Joosy.Modules.Renderer =
 
     @helper = (helpers...) ->
       unless @::hasOwnProperty "__helpers"
-        @::__helpers = @.__super__.__helpers?.clone() || []
+        @::__helpers = @.__super__.__helpers?.slice() || []
 
-      @::__helpers = @::__helpers.add(helpers).unique()
-      @::__helpers = @::__helpers.unique()
+      @::__helpers = @::__helpers.concat(helpers).filter (value, i, array) ->
+        array.indexOf(value) == i
 
   #
   # Renders given template with given locals
@@ -60,15 +60,16 @@ Joosy.Modules.Renderer =
     return unless @__helpers?
   
     unless @hasOwnProperty "__helpers"
-      @__helpers = @__helpers.clone()
+      @__helpers = @__helpers.slice()
 
-    @__helpers.each (helper, i) =>
-      unless Object.isObject(helper)
-        unless @[helper]?
-          throw new Error "Cannot find method '#{helper}' to use as helper"
+    for helper, i in @__helpers
+      do (helper, i) =>
+        unless helper.constructor == Object
+          unless @[helper]?
+            throw new Error "Cannot find method '#{helper}' to use as helper"
 
-        @__helpers[i] = {}
-        @__helpers[i][helper] = => @[helper] arguments...
+          @__helpers[i] = {}
+          @__helpers[i][helper] = => @[helper] arguments...
 
   #
   # Collects and merges all requested helpers including global scope to one cached object
@@ -112,14 +113,14 @@ Joosy.Modules.Renderer =
     stack.template = template
     stack.locals   = locals
 
-    if Object.isString template
+    if typeof(template) == 'string'
       if @__renderSection?
         template = Joosy.templater().resolveTemplate @__renderSection(), template, this
       template = Joosy.templater().buildView template
-    else if !Object.isFunction template
+    else if typeof(template) != 'function'
       throw new Error "#{Joosy.Module.__className @}> template (maybe @view) does not look like a string or lambda"
 
-    if !Object.isObject(locals) && Object.extended().constructor != locals.constructor
+    if locals.constructor != Object
       throw new Error "#{Joosy.Module.__className @}> locals (maybe @data?) is not a hash"
 
     context = =>
@@ -147,12 +148,15 @@ Joosy.Modules.Renderer =
 
       # This is here to break stack tree and save from
       # repeating DOM modification
-      update = update.debounce 0
+      timeout = null
+      debouncedUpdate = ->
+        clearTimeout timeout
+        timeout = setTimeout update, 0
 
       for key, object of locals
         if locals.hasOwnProperty key
           if object?.bind? && object?.unbind?
-            binding = [object, object.bind('changed', update)]
+            binding = [object, object.bind('changed', debouncedUpdate)]
             stack.metamorphBindings.push binding
 
       morph.__bindings = stack.metamorphBindings
@@ -202,8 +206,9 @@ Joosy.Modules.Renderer =
         stackPointer.metamorphBindings = []
 
     unless stackPointer
-      @__renderingStack?.each (stackPointer) ->
-        remove stackPointer
+      if @__renderingStack?
+        remove stackPointer for stackPointer in @__renderingStack
+        
     else
       remove stackPointer
 

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

@@ -0,0 +1,45 @@
+#= require ../resources
+
+Joosy.Modules.Resources.IdentityMap =
+
+  extended: ->
+    @::__identityHolder = @
+
+  #
+  # Clears the identity map cache. Recomended to be called during layout switch to
+  # ensure correct garbage collection.
+  #
+  identityReset: ->
+    @::__identityHolder.identity = {}
+
+  identityPath: (data) ->
+    [
+      @::__entityName,         # entity name as a first-level entry to make inheritance safe
+      "s#{@__source || ''}",   # save identity from overlaping on `@at` calls
+      data[@::__primaryKey]    # direct identifier as a main distinguisher
+    ]
+
+  #
+  # Wraps instance of resource inside shim-function allowing to track
+  # data changes. See class example
+  #
+  # @return [Joosy.Resources.REST]
+  #
+  build: (data={}) ->
+    elements = @identityPath(data)
+
+    if elements.filter((element) -> !element?).length == 0
+      location    = @::__identityHolder.identity ?= {}
+      destination = elements.pop()
+      location    = location[element] ?= {} for element in elements
+
+      # Data can be circulary referenced so we have to
+      # init identity cell as a first step...
+      preload = {}
+      preload[@::__primaryKey] = data[@::__primaryKey]
+      location[destination] ?= new @ preload
+
+      # ...and load data as a second
+      location[destination].load data
+    else
+      new @ data

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

@@ -0,0 +1,146 @@
+#= require ../resources
+
+Joosy.Modules.Resources.Model =
+
+  included: ->
+    #
+    # Sets the field containing primary key.
+    #
+    # @note It has no direct use inside the REST resource itself and can be omited.
+    #   But it usually should not since we have plans on adding some kind of Identity Map to Joosy.
+    #
+    # @param [String] primary     Name of the field
+    #
+    @primaryKey = (primaryKey) ->
+      @::__primaryKey = primaryKey
+
+    #
+    # Sets the collection to use
+    #
+    # @param [Class] klass       Class to use as a collection wrapper
+    #
+    @collection = (klass) ->
+      @::__collection = klass
+
+    #
+    # Sets the entity text name:
+    #   required to do some magic like skipping the root node.
+    #
+    # @param [String] name    Singular name of resource
+    #
+    @entity = (name) ->
+      @::__entityName = name
+
+    #
+    # Dynamically creates collection of inline resources.
+    #
+    # Inline resources share the instance with direct data and therefore can be used
+    #   to handle inline changes with triggers and all that resources stuff
+    #
+    # @example Basic usage
+    #   class Zombie extends Joosy.Resources.REST
+    #     @entity 'zombie'
+    #   class Puppy extends Joosy.Resources.REST
+    #     @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
+    #
+    # @param [String] name    Pluralized name of property to define
+    # @param [Class] klass    Resource class to instantiate
+    #
+    @map = (name, klass=false) ->
+      unless klass
+
+        klass = window[inflection.camelize inflection.singularize(name)]
+
+      if !klass
+        throw new Error "#{Joosy.Module.__className @}> class can not be detected for '#{name}' mapping"
+
+      @beforeLoad (data) ->
+        klass = klass() unless klass.build?
+
+        if data[name] instanceof Array
+          entries = data[name].map (x) -> klass.build x
+          data[name] = new klass::__collection entries...
+        else if data[name]
+          data[name] = klass.build data[name]
+        data
+
+    #
+    # @return [Joosy.Resources.REST]
+    #
+    @build = (data={}) ->
+      new @ data
+
+    #
+    # Creates new instance of Resource using values from form
+    #
+    # @param [DOMElement] form      Form to grab
+    #
+    @grab = (form) ->
+      @build({}).grab form
+
+  #
+  # Default primary key field 'id'
+  #
+  __primaryKey: 'id'
+
+  #
+  # Default collection: Joosy.Resources.Array
+  #
+  __collection: Joosy.Resources.Array
+
+  id: ->
+    @data?[@__primaryKey]
+
+  knownAttributes: ->
+    Object.keys @data
+
+  #
+  # Set the resource data manually
+  #
+  # @param [Object] data      Data to store
+  #
+  # @return [Object]          Returns self
+  #
+  load: (data, clear=false) ->
+    @data = {} if clear
+    @__fillData data
+    @
+
+  #
+  # Defines how exactly prepared data should be saved
+  #
+  # @param [Object] data    Raw data to store
+  #
+  __fillData: (data, notify=true) ->
+    @raw  = data
+    @data = {} unless @hasOwnProperty 'data'
+
+    Joosy.Module.merge @data, @__applyBeforeLoads(data)
+    @trigger 'changed' if notify
+    null
+
+  #
+  # Updates the Resource with a data from given form
+  #
+  # @param [DOMElement] form      Form to grab
+  #
+  grab: (form) ->
+    data = {}
+    for field in $(form).serializeArray()
+      unless data[field.name]
+        data[field.name] = field.value
+      else
+        data[field.name] = [data[field.name]] unless data[field.name] instanceof Array
+        data[field.name].push field.value
+
+    @load data
+
+  toString: ->
+    "<Resource #{@__entityName}> #{JSON.stringify(@data)}"

data/source/joosy/modules/widgets_manager.coffee

@@ -10,8 +10,8 @@ Joosy.Modules.WidgetsManager =
   included: ->
     @mapWidgets = (map) ->
       unless @::hasOwnProperty "__widgets"
-        @::__widgets = Object.clone(@.__super__.__widgets) || {}
-      Object.merge @::__widgets, map
+        @::__widgets = Joosy.Module.merge {}, @.__super__.widgets
+      Joosy.Module.merge @::__widgets, map
 
   #
   # Registeres and runs widget inside specified container
@@ -23,7 +23,7 @@ Joosy.Modules.WidgetsManager =
     if Joosy.Module.hasAncestor widget, Joosy.Widget
       widget = new widget()
 
-    if Object.isFunction(widget)
+    if typeof(widget) == 'function'
       widget = widget()
 
     @__activeWidgets ||= []
@@ -47,16 +47,16 @@ Joosy.Modules.WidgetsManager =
   __setupWidgets: ->
     return unless @__widgets
 
-    registered = Object.extended()
+    registered = {}
 
-    Object.each @__widgets, (selector, widget) =>
+    for selector, widget of @__widgets
       if selector == '$container'
         activeSelector = @$container
       else
         selector = @__extractSelector(selector) if @__extractSelector?
         activeSelector = $(selector, @$container)
 
-      registered[selector] = Object.extended()
+      registered[selector] = {}
 
       activeSelector.each (index, elem) =>
         if Joosy.Module.hasAncestor widget, Joosy.Widget
@@ -73,8 +73,8 @@ Joosy.Modules.WidgetsManager =
     @__widgets = {}
 
     if Joosy.debug()
-      registered.each (selector, value) =>
-        value.each (widget, count) =>
+      for selector, value of registered
+        for widget, count of value
           Joosy.Modules.Log.debugAs @, "Widget #{widget} registered at '#{selector}'. Elements: #{count}"
 
   #

data/source/joosy/resources/array.coffee

@@ -1,5 +1,3 @@
-#= require joosy/modules/resources/cacher
-
 class Joosy.Resources.Array extends Array
 
   Joosy.Module.merge @, Joosy.Module
@@ -12,9 +10,6 @@ class Joosy.Resources.Array extends Array
   constructor: ->
     @__fillData arguments, false
 
-  get: (index) ->
-    @[index]
-
   set: (index, value) ->
     @[index] = value
     @trigger 'changed'