joosy 1.2.0.alpha.14 → 1.2.0.alpha.15

data/src/joosy/core/modules/renderer.coffee

@@ -89,9 +89,6 @@ Joosy.Modules.Renderer =
     # be passed as a context, not as a argument
     assignContext = false
 
-    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
@@ -102,8 +99,8 @@ Joosy.Modules.Renderer =
     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) && Object.extended().constructor != locals.constructor && !isResource && !isCollection
-      throw new Error "#{Joosy.Module.__className @}> locals (maybe @data?) not in: dumb hash, Resource, Collection"
+    if !Object.isObject(locals) && Object.extended().constructor != locals.constructor
+      throw new Error "#{Joosy.Module.__className @}> locals (maybe @data?) is not a hash"
 
     renderers =
       render: (template, locals={}) =>
@@ -116,11 +113,7 @@ Joosy.Modules.Renderer =
     context = =>
       data = {}
 
-      if isResource
-        Joosy.Module.merge data, stack.locals.data
-      else
-        Joosy.Module.merge data, stack.locals
-
+      Joosy.Module.merge data, stack.locals
       Joosy.Module.merge data, @__instantiateHelpers(), false
       Joosy.Module.merge data, renderers
       data
@@ -150,25 +143,13 @@ Joosy.Modules.Renderer =
 
       morph.__bindings = []
 
-      if isCollection
-        for resource in locals.data
-          binding = [resource, update]
-          resource.bind 'changed', update
-          stack.metamorphBindings.push binding
-          morph.__bindings.push binding
-      if isResource || isCollection
-        binding = [locals, update]
-        locals.bind 'changed', update
-        stack.metamorphBindings.push binding
-        morph.__bindings.push binding
-      else
-        for key, object of locals
-          if locals.hasOwnProperty key
-            if object?.bind? && object?.unbind?
-              binding = [object, update]
-              object.bind 'changed', update
-              stack.metamorphBindings.push binding
-              morph.__bindings.push binding
+      for key, object of locals
+        if locals.hasOwnProperty key
+          if object?.bind? && object?.unbind?
+            binding = [object, update]
+            object.bind 'changed', update
+            stack.metamorphBindings.push binding
+            morph.__bindings.push binding
 
       morph.outerHTML()
     else

data/src/joosy/core/{resource → resources}/watcher.coffee

@@ -1,4 +1,5 @@
-class Joosy.Resource.Watcher extends Joosy.Module
+#### !!!UNSPECED ####
+class Joosy.Resources.Watcher extends Joosy.Module
   @include Joosy.Modules.Events
 
   @cache: (cacheKey) -> @::__cacheKey = cacheKey

data/src/joosy/{core → extensions/form}/form.coffee

@@ -1,9 +1,3 @@
-#= require joosy/core/joosy
-#= require joosy/core/modules/module
-#= require joosy/core/modules/log
-#= require joosy/core/modules/events
-#= require joosy/core/modules/container
-
 #
 # AJAXifies form including file uploads and stuff. Built on top of jQuery.Form.
 #
@@ -94,7 +88,7 @@ class Joosy.Form extends Joosy.Module
   #   by returning false from your own error callback. Both of callbacks will run if
   #   you return true.
   #
-  # @option options [Joosy.Resource.Generic] resource      The resource to fill the form with
+  # @option options [Joosy.Resources.Base] resource        The resource to fill the form with
   # @option options [String] resourceName                  The string to use as a resource name prefix for fields to match invalidation
   # @option options [String] action                        Action URL for the form
   # @option options [String] method                        HTTP method, for example PUT, that will passed in _method param
@@ -196,10 +190,10 @@ class Joosy.Form extends Joosy.Module
             input.filter("[value='#{val}']").attr 'checked', 'checked'
           else
             input.val val
-        if val instanceof Joosy.Resource.RESTCollection
+        if val instanceof Joosy.Resources.RESTCollection
           for entity, i in val.data
             filler entity.data, @concatFieldName(scope, "[#{property}_attributes][#{i}]")
-        else if val instanceof Joosy.Resource.REST
+        else if val instanceof Joosy.Resources.REST
           filler val.data, @concatFieldName(scope, "[#{property}_attributes][0]")
         else if Object.isObject(val) || Object.isArray(val)
           filler val, key

data/src/joosy/{core → extensions/form}/helpers/form.coffee

@@ -1,4 +1,4 @@
-#= require joosy/core/joosy
+#= require ../form
 
 #
 # Form helper
@@ -6,7 +6,7 @@
 Joosy.helpers 'Application', ->
 
   description = (resource, method, extendIds, idSuffix) ->
-    if Joosy.Module.hasAncestor resource.constructor, Joosy.Resource.Generic
+    if Joosy.Module.hasAncestor resource.constructor, Joosy.Resources.Base
       id        = resource.id()
       resource  = resource.__entityName
 

data/src/joosy/extensions/form/index.coffee

@@ -0,0 +1 @@
+#= require_tree ./

data/src/joosy/extensions/preloaders/index.coffee

@@ -0,0 +1 @@
+#= require_tree ./

data/src/joosy/{core/resource/generic.coffee → extensions/resources/base.coffee}

@@ -2,7 +2,7 @@
 # Basic data wrapper with triggering and entity name binding
 #
 # @example Basic usage
-#   class R extends Joosy.Resource.Generic
+#   class R extends Joosy.Resources.Base
 #     @entity 'r'
 #
 #     @beforeLoad (data) ->
@@ -18,7 +18,7 @@
 # @include Joosy.Modules.Log
 # @include Joosy.Modules.Events
 #
-class Joosy.Resource.Generic extends Joosy.Module
+class Joosy.Resources.Base extends Joosy.Module
   @include Joosy.Modules.Log
   @include Joosy.Modules.Events
 
@@ -34,7 +34,7 @@ class Joosy.Resource.Generic extends Joosy.Module
   # ensure correct garbage collection.
   #
   @resetIdentity: ->
-    Joosy.Resource.Generic.identity = {}
+    Joosy.Resources.Base.identity = {}
 
   #
   # Allows to modify data before it gets stored.
@@ -71,7 +71,7 @@ class Joosy.Resource.Generic extends Joosy.Module
     #
     class Clone extends this
 
-    if entity instanceof Joosy.Resource.Generic
+    if entity instanceof Joosy.Resources.Base
       Clone.__source  = entity.memberPath()
       Clone.__source += '/' + @::__entityName.pluralize() if @::__entityName
     else
@@ -91,18 +91,18 @@ class Joosy.Resource.Generic extends Joosy.Module
   # Sets the collection to use
   #
   # @note By default will try to seek for `EntityNamesCollection`.
-  #   Will fallback to {Joosy.Resource.Collection}
+  #   Will fallback to {Joosy.Resources.Collection}
   #
   # @param [Class] klass       Class to assign as collection
   #
   @collection: (klass) -> @::__collection = -> klass
 
   #
-  # Implements {Joosy.Resource.Generic.collection} default behavior.
+  # Implements {Joosy.Resources.Base.collection} default behavior.
   #
   __collection: ->
     named = @__entityName.camelize().pluralize() + 'Collection'
-    if window[named] then window[named] else Joosy.Resource.Collection
+    if window[named] then window[named] else Joosy.Resources.Collection
 
   #
   # Dynamically creates collection of inline resources.
@@ -111,9 +111,9 @@ class Joosy.Resource.Generic extends Joosy.Module
   #   to handle inline changes with triggers and all that resources stuff
   #
   # @example Basic usage
-  #   class Zombie extends Joosy.Resource.Generic
+  #   class Zombie extends Joosy.Resources.Base
   #     @entity 'zombie'
-  #   class Puppy extends Joosy.Resource.Generic
+  #   class Puppy extends Joosy.Resources.Base
   #     @entity 'puppy'
   #     @map 'zombies'
   #
@@ -134,7 +134,7 @@ class Joosy.Resource.Generic extends Joosy.Module
       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)
+      klass = klass() unless Joosy.Module.hasAncestor(klass, Joosy.Resources.Base)
 
       @__map(data, name, klass)
 
@@ -142,13 +142,13 @@ class Joosy.Resource.Generic extends Joosy.Module
   # Wraps instance of resource inside shim-function allowing to track
   # data changes. See class example
   #
-  # @return [Joosy.Resource.Generic]
+  # @return [Joosy.Resources.Base]
   #
   @build: (data={}) ->
     klass = @::__entityName
 
-    Joosy.Resource.Generic.identity ||= {}
-    Joosy.Resource.Generic.identity[klass] ||= {}
+    Joosy.Resources.Base.identity ||= {}
+    Joosy.Resources.Base.identity[klass] ||= {}
 
     shim = ->
       shim.__call.apply shim, arguments
@@ -169,11 +169,11 @@ class Joosy.Resource.Generic extends Joosy.Module
     if Joosy.Application.identity
       id = data[shim.__primaryKey]
 
-      if id? && Joosy.Resource.Generic.identity[klass][id]
-        shim = Joosy.Resource.Generic.identity[klass][id]
+      if id? && Joosy.Resources.Base.identity[klass][id]
+        shim = Joosy.Resources.Base.identity[klass][id]
         shim.load data
       else
-        Joosy.Resource.Generic.identity[klass][id] = shim
+        Joosy.Resources.Base.identity[klass][id] = shim
         @apply shim, [data]
     else
       @apply shim, [data]
@@ -200,7 +200,7 @@ class Joosy.Resource.Generic extends Joosy.Module
   #
   # @param [Object] data      Data to store
   #
-  # @return [Joosy.Resource.Generic]      Returns self
+  # @return [Joosy.Resources.Base]      Returns self
   #
   load: (data) ->
     @__fillData data
@@ -215,7 +215,7 @@ class Joosy.Resource.Generic extends Joosy.Module
   __get: (path) ->
     target = @__callTarget path
 
-    if target[0] instanceof Joosy.Resource.Generic
+    if target[0] instanceof Joosy.Resources.Base
       return target[0](target[1])
     else
       return target[0][target[1]]
@@ -229,7 +229,7 @@ class Joosy.Resource.Generic extends Joosy.Module
   __set: (path, value) ->
     target = @__callTarget path
 
-    if target[0] instanceof Joosy.Resource.Generic
+    if target[0] instanceof Joosy.Resources.Base
       target[0](target[1], value)
     else
       target[0][target[1]] = value
@@ -251,7 +251,7 @@ class Joosy.Resource.Generic extends Joosy.Module
 
       for part in path
         target[part] ||= {}
-        if target instanceof Joosy.Resource.Generic
+        if target instanceof Joosy.Resources.Base
           target = target(part)
         else
           target = target[part]
@@ -261,7 +261,7 @@ class Joosy.Resource.Generic extends Joosy.Module
       [@data, path]
 
   #
-  # Wrapper for {Joosy.Resource.Generic.build} magic
+  # Wrapper for {Joosy.Resources.Base.build} magic
   #
   __call: (path, value) ->
     if arguments.length > 1

data/src/joosy/{core/resource → extensions/resources}/collection.coffee

@@ -3,14 +3,14 @@
 # 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}
-#   or {Joosy.Resource.REST.find}.
+#   automatically created by things like {Joosy.Resources.Base.map}
+#   or {Joosy.Resources.REST.find}.
 #
 # @example Basic sample
-#   class R extends Joosy.Resource.Generic
+#   class R extends Joosy.Resources.Base
 #     @entity 'r'
 #
-#   collection = new Joosy.Resource.Collection(R)
+#   collection = new Joosy.Resources.Collection(R)
 #
 #   collection.load [{foo: 'bar'}, {foo: 'baz'}]
 #   collection.each (resource) ->
@@ -18,7 +18,7 @@
 #
 # @include Joosy.Modules.Events
 #
-class Joosy.Resource.Collection extends Joosy.Module
+class Joosy.Resources.Collection extends Joosy.Module
   @include Joosy.Modules.Events
 
   #
@@ -63,7 +63,7 @@ class Joosy.Resource.Collection extends Joosy.Module
   #                                       If hash was given will seek for moodel name camelized and pluralized.
   # @param [Boolean] notify               Indicates whether to trigger 'changed' event
   #
-  # @return [Joosy.Resource.Collection]   Returns self.
+  # @return [Joosy.Resources.Collection]   Returns self.
   #
   load: (entities, notify=true) ->
     if @__beforeLoad?
@@ -110,7 +110,7 @@ class Joosy.Resource.Collection extends Joosy.Module
   #
   # @param [Function] description       Callback matcher
   #
-  # @return [Joosy.Resource.Generic]
+  # @return [Joosy.Resources.Base]
   #
   find: (description) ->
     @data.find description
@@ -123,7 +123,7 @@ class Joosy.Resource.Collection extends Joosy.Module
   #
   # @param [Integer] id       Id to find
   #
-  # @return [Joosy.Resource.Generic]
+  # @return [Joosy.Resources.Base]
   #
   findById: (id) ->
     @data.find (x) -> x.id().toString() == id.toString()
@@ -133,7 +133,7 @@ class Joosy.Resource.Collection extends Joosy.Module
   #
   # @param [Integer] i    Index
   #
-  # @return [Joosy.Resource.Generic]
+  # @return [Joosy.Resources.Base]
   #
   at: (i) ->
     @data[i]
@@ -145,7 +145,7 @@ class Joosy.Resource.Collection extends Joosy.Module
   # @param [Resource] target    Resource by itself
   # @param [Boolean] notify     Indicates whether to trigger 'changed' event
   #
-  # @return [Joosy.Resource.Generic]        Removed element
+  # @return [Joosy.Resources.Base]        Removed element
   #
   remove: (target, notify=true) ->
     if Object.isNumber target
@@ -165,7 +165,7 @@ class Joosy.Resource.Collection extends Joosy.Module
   # @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.Resource.Generic]    Added element
+  # @return [Joosy.Resources.Base]    Added element
   #
   add: (element, index=false, notify=true) ->
     if typeof index is 'number'

data/src/joosy/extensions/resources/index.coffee

@@ -0,0 +1 @@
+#= require_tree ./

data/src/joosy/{core/resource → extensions/resources}/rest.coffee

@@ -1,15 +1,18 @@
+#= require ./base
+#= require ./collection
+
 #
 # Resource with REST/JSON backend
 #
-class Joosy.Resource.REST extends Joosy.Resource.Generic
+class Joosy.Resources.REST extends Joosy.Resources.Base
 
   #
   # Implements `@collection` default behavior.
-  # Changes the default fallback to Joosy.Resource.RESTCollection.
+  # Changes the default fallback to Joosy.Resources.RESTCollection.
   #
   __collection: ->
     named = @__entityName.camelize().pluralize() + 'Collection'
-    if window[named] then window[named] else Joosy.Resource.RESTCollection
+    if window[named] then window[named] else Joosy.Resources.RESTCollection
 
   #
   # Builds parents part of member path based on parents array
@@ -21,7 +24,7 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
   #
   @__parentsPath: (parents) ->
     parents.reduce (path, parent) ->
-      path += if Joosy.Module.hasAncestor parent.constructor, Joosy.Resource.REST
+      path += if Joosy.Module.hasAncestor parent.constructor, Joosy.Resources.REST
         parent.memberPath()
       else
         parent
@@ -30,7 +33,7 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
   #
   # Builds base path
   #
-  # @param [Hash] options       See {Joosy.Resource.REST.find} for possible options
+  # @param [Hash] options       See {Joosy.Resources.REST.find} for possible options
   #
   # @example Basic usage
   #   Resource.basePath() # /resources
@@ -51,7 +54,7 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
   #
   # Builds base path
   #
-  # @see Joosy.Resource.REST.basePath
+  # @see Joosy.Resources.REST.basePath
   #
   basePath: (options={}) ->
     @constructor.basePath options
@@ -60,7 +63,7 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
   # Builds member path based on the given id.
   #
   # @param [String] id          ID of entity to build member path for
-  # @param [Hash] options       See {Joosy.Resource.REST.find} for possible options
+  # @param [Hash] options       See {Joosy.Resources.REST.find} for possible options
   #
   # @example Basic usage
   #   Resource.memberPath(1, from: 'foo') # /resources/1/foo
@@ -73,7 +76,7 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
   #
   # Builds member path
   #
-  # @param [Hash] options       See {Joosy.Resource.REST.find} for possible options
+  # @param [Hash] options       See {Joosy.Resources.REST.find} for possible options
   #
   # @example Basic usage
   #   resource.memberPath(from: 'foo') # /resources/1/foo
@@ -84,7 +87,7 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
   #
   # Builds collection path
   #
-  # @param [Hash] options       See {Joosy.Resource.REST.find} for possible options
+  # @param [Hash] options       See {Joosy.Resources.REST.find} for possible options
   #
   # @example Basic usage
   #   Resource.collectionPath() # /resources/
@@ -97,7 +100,7 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
   #
   # Builds collection path
   #
-  # @see Joosy.Resource.REST.collectionPath
+  # @see Joosy.Resources.REST.collectionPath
   #
   collectionPath: (options={}) ->
     @constructor.collectionPath options
@@ -217,7 +220,7 @@ class Joosy.Resource.REST extends Joosy.Resource.Generic
   # @param [Function] callback    Resulting callback
   #   (will receive retrieved Collection/Resource)
   #
-  # @option options [Joosy.Resource.REST] parent            Sets the given resource as a base path
+  # @option options [Joosy.Resources.REST] parent            Sets the given resource as a base path
   #   i.e. /parents/1/resources
   # @option options [String] parent                         Sets the given staring as a base path
   #   i.e. /trololo/resources
@@ -261,7 +264,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 [Hash] options         See {Joosy.Resources.REST.find} for possible options
   # @param [Function] callback    Resulting callback
   #
   reload: (options={}, callback=false) ->