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

data/source/joosy/resources/hash.coffee

@@ -1,5 +1,3 @@
-#= require joosy/modules/resources/cacher
-
 class Joosy.Resources.Hash extends Joosy.Function
 
   @include Joosy.Modules.Events
@@ -11,7 +9,11 @@ class Joosy.Resources.Hash extends Joosy.Function
     return super ->
       @__fillData data, false
 
-  get: (path) ->
+  load: (data) ->
+    @__fillData data
+    @
+
+  __get: (path) ->
     [instance, property] = @__callTarget path, true
 
     return undefined unless instance
@@ -21,7 +23,7 @@ class Joosy.Resources.Hash extends Joosy.Function
     else
       instance[property]
 
-  set: (path, value) ->
+  __set: (path, value) ->
     [instance, property] = @__callTarget path
 
     if instance instanceof Joosy.Resources.Hash
@@ -32,18 +34,11 @@ class Joosy.Resources.Hash extends Joosy.Function
     @trigger 'changed'
     value
 
-  load: (data) ->
-    @__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/index.coffee

@@ -0,0 +1,2 @@
+#= require_tree ./
+#= require_tree ../modules/resources

data/source/joosy/{extensions/resources → resources}/rest.coffee

@@ -1,9 +1,22 @@
-#= require ./base
+#= require ./hash
+#= require joosy/modules/resources/model
 
 #
 # Resource with REST/JSON backend
 #
-class Joosy.Resources.REST extends Joosy.Resources.Base
+class Joosy.Resources.REST extends Joosy.Resources.Hash
+
+  @include Joosy.Modules.Resources.Model
+
+  @registerPlainFilters 'beforeSave'
+
+  @beforeLoad (data) ->
+    if data.constructor == Object && Object.keys(data).length == 1 && @__entityName
+      name = inflection.camelize(@__entityName, true)
+      data = data[name] if data[name]
+
+    data
+
 
   @requestOptions: (options) ->
     @::__requestOptions = options
@@ -23,7 +36,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # Makes needed changes with clone/wrapper for @at method to extend its' path
   #
   @__atWrapper: (definer, args...) ->
-    if args.length == 1 && Object.isArray(args[0])
+    if args.length == 1 && args[0] instanceof Array
       @__atWrapper(definer, args[0]...)
     else
       definer (clone) =>
@@ -33,7 +46,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
           else
             arg.replace(/^\/?/, '/')
         , ''
-        clone.__source += '/' + @::__entityName.pluralize()
+        clone.__source += '/' + inflection.pluralize(@::__entityName)
 
   #
   # Creates the proxy of current resource binded as a child of given entity
@@ -45,11 +58,11 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # @note accepts both array notation (Comment.at(['admin', @blog, @post])) and args notation (Comment.at('admin', @blog, @post))
   #
-  @at: (args...) ->
+  @at: ->
     @__atWrapper (callback) =>
       class Clone extends @
         callback(@)
-    , args...
+    , arguments...
 
 
   #
@@ -69,7 +82,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # Interpolates path with masks by given array of params
   #
   __interpolatePath: (source, ids) ->
-    ids = [ids] unless Object.isArray(ids)
+    ids = [ids] unless ids instanceof Array
     ids.reduce (path, id) ->
       id = id.id() if id instanceof Joosy.Resources.REST
       path.replace /:[^\/]+/, id
@@ -98,7 +111,8 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #   Resource.collectionPath(['admin', Resource.build 1]) # /admin/resources/1/resources
   #
   collectionPath: (ids=[], options={}) ->
-    if Object.isObject(ids)
+    # (options) ->
+    if ids.constructor == Object
       options = ids
       ids     = []
 
@@ -111,7 +125,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
     else
       path = '/'
       path += @constructor.__namespace__.map(String::underscore).join('/') + '/' if @constructor.__namespace__.length > 0
-      path += @__entityName.pluralize()
+      path += inflection.pluralize(@__entityName)
 
     path += "/#{options.action}" if options.action
     path
@@ -140,19 +154,19 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #   Resource.memberPath(['admin', Resource.build 1]) # /admin/resources/1/resources/2
   #
   memberPath: (ids=[], options={}) ->
-    if Object.isObject(ids)
+    if ids.constructor == Object
       options = ids
       ids     = []
 
     return options.url if options.url
 
-    ids = [ids] unless Object.isArray(ids)
+    ids = [ids] unless ids instanceof Array
     id = @id() || ids.pop()
 
     action = options.action
 
     ids.push @id()
-    path  = @collectionPath(ids, Object.merge(options, action: undefined)) + "/#{id}"
+    path  = @collectionPath(ids, Joosy.Module.merge(options, action: undefined)) + "/#{id}"
     path += "/#{action}" if action?
     path
 
@@ -281,12 +295,13 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   @find: (where, options={}, callback=false) ->
     [options, callback] = @::__extractOptionsAndCallback(options, callback)
 
-    id = if where instanceof Array
+    result = {}
+    result[@::__primaryKey] = if where instanceof Array
       where[where.length-1]
     else
       where
 
-    result = @build id
+    result = @build result
 
     # Substitute interpolation mask with actual path
     if where instanceof Array && where.length > 1
@@ -312,17 +327,17 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # @option options [Hash] params               Passes the given params to the query
   #
   @all: (where, options={}, callback=false) ->
-    if Object.isFunction(where) || Object.isObject(where)
+    if typeof(where) == 'function' || where.constructor == Object
       [options, callback] = @::__extractOptionsAndCallback(where, options)
       where = []
     else
       [options, callback] = @::__extractOptionsAndCallback(options, callback)
 
-    result = new Joosy.Resources.Array
+    result = new @::__collection
 
     @__query @collectionPath(where, options), 'GET', options.params, (error, rawData, xhr) =>
       if (data = rawData)?
-        if Object.isObject(data) && !(data = data[@::__entityName.pluralize()])
+        if data.constructor == Object && !(data = data[inflection.pluralize(@::__entityName)])
           throw new Error "Invalid data for `all` received: #{JSON.stringify(data)}"
 
         data = data.map (x) =>
@@ -337,6 +352,16 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
 
     result
 
+  save: (callback) ->
+    if @id()
+      @put {params: @__applyBeforeSaves(@data)}, (error, data) =>
+        @load data unless error
+        callback? error, @
+    else
+      @constructor.post {params: @__applyBeforeSaves(@data)}, (error, data) =>
+        @load data unless error
+        callback? error, @
+
   #
   # Wrapper for AJAX request
   #
@@ -348,7 +373,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
       cache: false
       dataType: 'json'
 
-    if Object.isFunction(callback)
+    if typeof(callback) == 'function'
       options.success = (data, _, xhr) -> callback(false, data, xhr)
       options.error   = (xhr) -> callback(xhr)
     else
@@ -365,7 +390,11 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   # utility function for better API support for unrequired first options parameter
   #
   __extractOptionsAndCallback: (options, callback) ->
-    if Object.isFunction(options)
+    if typeof(options) == 'function'
       callback = options
       options  = {}
     [options, callback]
+
+# AMD wrapper
+if define?.amd?
+  define 'joosy/resources/rest', -> Joosy.Resources.REST

data/source/joosy/resources/scalar.coffee

@@ -1,5 +1,3 @@
-#= require joosy/modules/resources/cacher
-
 class Joosy.Resources.Scalar extends Joosy.Function
 
   @include Joosy.Modules.Events
@@ -11,12 +9,6 @@ class Joosy.Resources.Scalar extends Joosy.Function
     return super ->
       @load value
 
-  get: ->
-    @value
-
-  set: (@value) ->
-    @trigger 'changed'
-
   load: (value) ->
     @value = @__applyBeforeLoads(value)
     @trigger 'changed'
@@ -27,9 +19,15 @@ class Joosy.Resources.Scalar extends Joosy.Function
 
   __call: ->
     if arguments.length > 0
-      @set arguments[0]
+      @__set arguments[0]
     else
-      @get()
+      @__get()
+
+  __get: ->
+    @value
+
+  __set: (@value) ->
+    @trigger 'changed'
 
   valueOf: ->
     @value.valueOf()

data/source/joosy/router.coffee

@@ -93,7 +93,8 @@ class Joosy.Router extends Joosy.Module
     # @option [Hash] options   "as", prefixes all other "as" commands
     # @param [Function] block  callback for child commands
     namespace: (name, options={}, block) ->
-      if Object.isFunction(options)
+      # (name, block) ->
+      if arguments.length == 2
         block = options
         options = {}
 
@@ -106,9 +107,9 @@ class Joosy.Router extends Joosy.Module
   # @param [Object] routes        Set of routes in inner format (see class description)
   #
   @map: (routes, namespace) ->
-    Object.each routes, (path, to) =>
+    for path, to of routes
       path = namespace + '/' + path if namespace?
-      if Object.isFunction(to) || to.prototype
+      if typeof(to) == 'function' || to.prototype
         @compileRoute path, to
       else
         @map to, path
@@ -118,7 +119,7 @@ class Joosy.Router extends Joosy.Module
   #
   # @param [Function] block   callback for child commands
   #
-  @draw: (block)->
+  @draw: (block) ->
     Drawer.run block
 
   #
@@ -276,8 +277,9 @@ class Joosy.Router extends Joosy.Module
     helper = (options) ->
       result = path
 
-      path.match(/\/:[^\/]+/g)?.each? (param) ->
-        result = result.replace(param.substr(1), options[param.substr(2)])
+      if match = path.match(/\/:[^\/]+/g)
+        for param in match
+          result = result.replace(param.substr(1), options[param.substr(2)])
 
       if Joosy.Router.config.html5
         "#{Joosy.Router.config.prefix}#{result}"
@@ -299,14 +301,13 @@ class Joosy.Router extends Joosy.Module
     # Collect parameters from route placeholers
     match.shift() # First entry is full route regexp match that should be just skipped
 
-    route?.capture?.each (key) ->
-      params[key] = decodeURIComponent match.shift()
+    if captures = route?.capture
+      params[key] = decodeURIComponent match.shift() for key in captures
 
     # Collect parameters from URL query section
-    query.each (entry) ->
-      unless entry.isBlank()
-        [key, value] = entry.split '='
-        params[key] = value
+    for entry in query when entry.length > 0
+      [key, value] = entry.split '='
+      params[key] = value
 
     params
 

data/source/joosy/templaters/jst.coffee

@@ -39,10 +39,11 @@ class Joosy.Templaters.JST
   # @param [String] entity      Entity to lookup template path by its namespace
   #
   resolveTemplate: (section, template, entity) ->
-    if template.startsWith '/'
+    if template[0] == '/'
       return template.substr 1
 
-    path = entity.constructor?.__namespace__?.map('underscore') || []
+    path = entity.constructor?.__namespace__?.map (x) -> inflection.underscore(x)
+    path ||= []
     path.unshift section
 
     "#{path.join '/'}/#{template}"

data/source/joosy/widget.coffee

@@ -130,8 +130,8 @@ class Joosy.Widget extends Joosy.Module
   #
   @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
 
   #
   # Declares widget as indepent changing the way it behaves during the bootstrap
@@ -156,7 +156,7 @@ class Joosy.Widget extends Joosy.Module
   # @param [Joosy.Widget] widget        Class or object of Joosy.Widget to register
   #
   registerWidget: ($container, widget) ->
-    if Object.isString $container
+    if typeof($container) == 'string'
       $container = @__normalizeSelector($container)
 
     widget = @__normalizeWidget(widget)
@@ -251,12 +251,13 @@ class Joosy.Widget extends Joosy.Module
     @data = {}
 
     @synchronize (context) =>
-      Object.each nestingMap, (selector, section) ->
-        section.instance.__fetch(section.nested)
+      for selector, section of nestingMap
+        do (selector, section) ->
+          section.instance.__fetch(section.nested)
 
-        if !section.instance.__independent
-          context.do (done) ->
-            section.instance.wait 'section:fetched', done
+          if !section.instance.__independent
+            context.do (done) ->
+              section.instance.wait 'section:fetched', done
 
       context.do (done) =>
         @__runFetchs [], done
@@ -287,13 +288,14 @@ class Joosy.Widget extends Joosy.Module
 
     @__load()
 
-    Object.each nestingMap, (selector, section) =>
-      $container = @__normalizeSelector(selector)
+    for selector, section of nestingMap
+      do (selector, section) =>
+        $container = @__normalizeSelector(selector)
 
-      if !section.instance.__independent || section.instance.__triggeredEvents?['section:fetched']
-        section.instance.__paint @, section.nested, $container
-      else
-        section.instance.__bootstrap @, section.nested, $container, false
+        if !section.instance.__independent || section.instance.__triggeredEvents?['section:fetched']
+          section.instance.__paint @, section.nested, $container
+        else
+          section.instance.__bootstrap @, section.nested, $container, false
 
   #
   # Initializes section that was injected into DOM
@@ -347,7 +349,7 @@ class Joosy.Widget extends Joosy.Module
   # Besides already being instance it cann be either class or lambda
   #
   __normalizeWidget: (widget) ->
-    if Object.isFunction(widget) && !Joosy.Module.hasAncestor(widget, Joosy.Widget)
+    if typeof(widget) == 'function' && !Joosy.Module.hasAncestor(widget, Joosy.Widget)
       widget = widget.call(@)
 
     if Joosy.Module.hasAncestor widget, Joosy.Widget

data/source/joosy.coffee

@@ -1 +1,3 @@
+#= require vendor/es5-shim
+#= require vendor/inflections
 #= require joosy/application