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

data/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "joosy"
   ],
-  "version": "1.2.0-alpha.73",
+  "version": "1.2.0-beta.1",
   "author": "Boris Staal <boris@staal.io>",
   "homepage": "http://joosy.ws/",
   "repository": {
@@ -15,15 +15,16 @@
     "node": ">=0.4.0"
   },
   "dependencies": {
-    "grill": ">=1.0.0-alpha.19"
+    "grill": ">=1.0.0-alpha.22"
   },
   "devDependencies": {
     "bower": "~1.2.1",
     "semver": "~2.1.0",
     "grunt-coffeelint": "0.0.6",
     "grunt-release": "~0.3.5",
-    "grunt-contrib-testem": ">=0.5.2",
+    "grunt-contrib-testem": ">=0.5.3",
     "grunt-gh-pages": "git+https://github.com/inossidabile/grunt-gh-pages.git",
-    "moment": "~2.1.0"
+    "moment": "~2.1.0",
+    "grunt-contrib-uglify": "~0.2.4"
   }
 }

data/source/joosy/application.coffee

@@ -1,8 +1,7 @@
 #= require joosy/joosy
 #= require joosy/router
-#= require_tree ./templaters
-#= require_tree ./resources
-#= require_tree ./helpers
+#= require joosy/templaters/jst
+#= require joosy/helpers
 
 #
 # Joosy Application container
@@ -15,7 +14,7 @@ class Joosy.Application
   @initialized: false
   @loading: true
 
-  @config:
+  @defaultConfig:
     test:     false
     debug:    false
     templater:
@@ -36,8 +35,11 @@ class Joosy.Application
     if @initialized
       throw new Error 'Attempted to initialize Application twice'
 
-    Object.merge @config, window.JoosyEnvironment, true if window.JoosyEnvironment?
-    Object.merge @config, options, true
+    @config = {}
+
+    Joosy.Module.merge @config, @defaultConfig, true, true
+    Joosy.Module.merge @config, window.JoosyEnvironment, true, true if window.JoosyEnvironment?
+    Joosy.Module.merge @config, options, true, true
 
     @forceSandbox() if @config.test
 
@@ -47,7 +49,7 @@ class Joosy.Application
     Joosy.Router.setup @config.router, (action, params) =>
       if Joosy.Module.hasAncestor action, Joosy.Page
         @changePage action, params
-      else if Object.isFunction(action)
+      else if typeof(action) == 'function'
         action(params)
       else
         throw new Error "Unknown kind of route action: #{action}"

data/source/joosy/{extensions/resources-form/form.coffee → form.coffee}

@@ -95,11 +95,10 @@ class Joosy.Form extends Joosy.Module
   # @option options [Boolean] debounce                     Drop submit events while there is a pending submit request
   #
   constructor: (form, options={}) ->
-    if Object.isFunction options
+    if typeof(options) == 'function'
       @success = options
     else
-      Object.each options, (key, value) =>
-        @[key] = value
+      @[key] = value for key, value of options
 
     @$container = $(form)
     return if @$container.length == 0
@@ -108,7 +107,7 @@ class Joosy.Form extends Joosy.Module
     @__delegateEvents()
 
     method = @$container.get(0).getAttribute('method')?.toLowerCase()
-    if method && !['get', 'post'].any method
+    if method && !['get', 'post'].indexOf(method) != -1
       @__markMethod method
       @$container.attr 'method', 'POST'
 
@@ -155,7 +154,7 @@ class Joosy.Form extends Joosy.Module
 
   #
   # Links current form with given resource and sets values of form inputs from with it.
-  # Form will use give resource while doing invalidation routine.
+  # Form will use given resource while doing invalidation routine.
   #
   # @param [Resource] resource      Resource to fill fields with
   # @param [Hash] options           Options
@@ -166,7 +165,7 @@ class Joosy.Form extends Joosy.Module
   # @option options [String] action          Action URL for the form
   #
   fill: (resource, options) ->
-    resource = resource.build() if Object.isFunction(resource.build)
+    resource = resource.build() if typeof(resource.build) == 'function'
     @__resource = resource
 
     if options?.decorator?
@@ -177,27 +176,29 @@ class Joosy.Form extends Joosy.Module
     filler = (data, scope) =>
       return if data.__joosy_form_filler_lock
       data.__joosy_form_filler_lock = true
-      Object.each data, (property, val) =>
-        key = @concatFieldName scope, property
-        input = @$fields().filter("[name='#{key}']:not(:file),[name='#{key.underscore()}']:not(:file),[name='#{key.camelize(false)}']:not(:file)")
-        if input.length > 0
-          if input.is ':checkbox'
-            if val
-              input.attr 'checked', 'checked'
+
+      for property, val of data
+        do (property, val) =>
+          key = @concatFieldName scope, property
+          input = @$fields().filter("[name='#{key}']:not(:file),[name='#{inflection.underscore(key)}']:not(:file),[name='#{inflection.camelize(key, true)}']:not(:file)")
+          if input.length > 0
+            if input.is ':checkbox'
+              if val
+                input.attr 'checked', 'checked'
+              else
+                input.removeAttr 'checked'
+            else if input.is ':radio'
+              input.filter("[value='#{val}']").attr 'checked', 'checked'
             else
-              input.removeAttr 'checked'
-          else if input.is ':radio'
-            input.filter("[value='#{val}']").attr 'checked', 'checked'
+              input.val val
+          if val instanceof Joosy.Resources.Array
+            for entity, i in val
+              filler entity.data, @concatFieldName(scope, "[#{property}_attributes][#{i}]")
+          else if val instanceof Joosy.Resources.REST
+            filler val.data, @concatFieldName(scope, "[#{property}_attributes]")
+          else if val?.constructor == Object || val instanceof Array
+            filler val, key
           else
-            input.val val
-        if val instanceof Joosy.Resources.Array
-          for entity, i in val
-            filler entity.data, @concatFieldName(scope, "[#{property}_attributes][#{i}]")
-        else if val instanceof Joosy.Resources.REST
-          filler val.data, @concatFieldName(scope, "[#{property}_attributes]")
-        else if Object.isObject(val) || Object.isArray(val)
-          filler val, key
-        else
       delete data.__joosy_form_filler_lock
 
     filler data, resource.__entityName || options.resourceName
@@ -264,9 +265,10 @@ class Joosy.Form extends Joosy.Module
     if !@error? || @error(errors) is true
       errors = @__stringifyErrors(errors)
 
-      Object.each errors, (field, notifications) =>
-        input = @findField(field).addClass @invalidationClass
-        @notification? input, notifications
+      for field, notifications of errors
+        do (field, notifications) =>
+          input = @findField(field).addClass @invalidationClass
+          @notification? input, notifications
 
       return errors
 
@@ -330,29 +332,30 @@ class Joosy.Form extends Joosy.Module
   __stringifyErrors: (errors) ->
     result = {}
 
-    errors = errors.errors if Object.isObject(errors?.errors)
+    errors = errors.errors if errors?.errors?.constructor == Object
 
-    Object.each errors, (field, notifications) =>
-      if @substitutions[field]?
-        field = @substitutions[field]
+    for field, notifications of errors
+      do (field, notifications) =>
+        if @substitutions[field]?
+          field = @substitutions[field]
 
-      if Object.isObject(notifications) || @isArrayOfObjects(notifications)
-        Object.each @__foldInlineEntities(notifications), (key, value) ->
-          result[field+key] = value
-      else
-        if field.indexOf(".") != -1
-          splited = field.split '.'
-          field   = splited.shift()
-          if @resourceName || @__resource
-            name    = @resourceName || @__resource.__entityName
-            field   = name + "[#{field}]"
-          field  += "[#{f}]" for f in splited
+        if notifications.constructor == Object || @isArrayOfObjects(notifications)
+          result[field+key] = value for key, value of @__foldInlineEntities(notifications)
+            
+        else
+          if field.indexOf(".") != -1
+            splited = field.split '.'
+            field   = splited.shift()
+            if @resourceName || @__resource
+              name    = @resourceName || @__resource.__entityName
+              field   = name + "[#{field}]"
+            field  += "[#{f}]" for f in splited
 
-        else if @resourceName || @__resource
-          name  = @resourceName || @__resource.__entityName
-          field = name + "[#{field}]"
+          else if @resourceName || @__resource
+            name  = @resourceName || @__resource.__entityName
+            field = name + "[#{field}]"
 
-        result[field] = notifications
+          result[field] = notifications
 
     result
 
@@ -372,8 +375,8 @@ class Joosy.Form extends Joosy.Module
   # @return [Hash]
   #
   __foldInlineEntities: (hash, scope="", result={}) ->
-    Object.each hash, (key, value) =>
-      if Object.isObject(value) || @isArrayOfObjects(value)
+    for key, value of hash
+      if value?.constructor == Object || @isArrayOfObjects(value)
         @__foldInlineEntities(value, "#{scope}[#{key}]", result)
       else
         result["#{scope}[#{key}]"] = value
@@ -388,7 +391,7 @@ class Joosy.Form extends Joosy.Module
     items = name.split('][')
     first = items[0].split('[')
     if first.length == 2
-      if first[0].isBlank()
+      if first[0].length == 0
         items.splice 0, 1, first[1]
       else
         items.splice 0, 1, first[0], first[1]
@@ -396,4 +399,8 @@ class Joosy.Form extends Joosy.Module
     items
 
   isArrayOfObjects: (array) ->
-    Object.isArray(array) && array.every((elem) -> Object.isObject(elem))
+    array instanceof Array && array.filter((elem) -> elem?.constructor != Object).length == 0
+
+# AMD wrapper
+if define?.amd?
+  define 'joosy/form', -> Joosy.Form

data/source/joosy/helpers/form.coffee

@@ -0,0 +1,241 @@
+#
+# @private
+#
+class Form
+  constructor: (@context, @resource, @options) ->
+
+  __extend: (options) ->
+    options.extendIds = @options.extendIds
+    options
+
+  for type in ['text', 'file', 'hidden', 'password']
+    do (type) =>
+      @::[type+'Field'] = (property, options={}) ->
+        @context[type+'Field'] @resource, property, @__extend(options)
+
+  label: (property, options={}, content='') ->
+    # (property, content) ->
+    if arguments.length == 2
+      content = options
+      options = {}
+
+    @context.label @resource, property, @__extend(options), content
+
+  radioButton: (property, tagValue, options={}) ->
+    @context.radioButton @resource, property, tagValue, @__extend(options)
+
+  textArea: (property, options={}) ->
+    @context.textArea @resource, property, @__extend(options)
+
+  checkBox: (property, options={}, checkedValue=1, uncheckedValue=0) ->
+    @context.checkBox @resource, property, @__extend(options), checkedValue, uncheckedValue
+
+  select: (property, selectOptions={}, options={}) ->
+    @context.select @resource, property, selectOptions, @__extend(options)
+
+#
+# Form helper
+#
+Joosy.helpers 'Application', ->
+
+  separateOptions = (options, keys) ->
+    attributes = {}
+    parameters = {}
+
+    for key, value of options
+      if keys.indexOf(key) != -1
+        parameters[key] = value
+      else
+        attributes[key] = value
+
+    [parameters, attributes]
+
+  #
+  # Generates main attributes of a single field for a form
+  #
+  # @param [String]  resource            Name of resource
+  # @param [Object]  resource            Instance of something that includes Joosy.Modules.Resources.Module
+  # @param [String]  property            Name of attribute the field is for
+  # @param [Boolean] extendIds           Marks whether DOM id of a field should contain primary key of resource
+  # @param [String]  idSuffix            Suffix to append to DOM id
+  # @param [Hash]    DOM attributes      Initial set that should be extended
+  #
+  domify = (resource, property, extendIds, idSuffix, attributes) ->
+    if resource.__entityName? && resource.id?
+      resourceId = resource.id()
+      resource   = resource.__entityName
+
+    unless attributes
+      attributes = {}
+    else
+      attributes = Joosy.Module.merge {}, attributes
+
+    attributes.name  = resource
+    attributes.name += if property.match(/^\[.*\]$/) then property else "[#{property}]"
+
+    # Parameterizing property
+    property = property.replace(/[^a-z0-9\-_]+/gi, '_')
+    property = property.replace /^_+|_+$|(_)_+/g, '$1'
+    property = property.toLowerCase()
+
+    attributes.id  = resource
+    attributes.id += "_#{resourceId}" if resourceId? && extendIds
+    attributes.id += "_#{property}"
+    attributes.id += "_#{idSuffix}" if idSuffix
+
+    attributes
+
+  #
+  # Generates input field
+  #
+  input = (type, resource, property, extendIds, idSuffix, attributes={}) =>
+    attributes.type = type
+    attributes = domify(resource, property, extendIds, idSuffix, attributes)
+
+    @tag 'input', attributes
+
+  #
+  # ======================================================================
+  #
+
+  #
+  # Instantiates a form builder
+  #
+  # @param [String]   resource             Name of resource
+  # @param [Object]   resource             Instance of something that includes Joosy.Modules.Resources.Module
+  # @param [Function] block                Inline template that will be rendered as a form
+  # @param [Object] options
+  #
+  # @option options [Boolean] extendIds    Marks if DOM ids of fields should include primary key of resource (default: false)
+  #
+  # @example
+  #   != @formFor Resource, {extendIds: true}, (form) =>
+  #     != form.textField 'property'
+  #
+  @formFor = (resource, options={}, block) ->
+    # (options, block) ->
+    if arguments.length == 2
+      block   = options
+      options = {}
+
+    attributes = Joosy.Module.merge(options.html || {}, id: uuid)
+    uuid = Joosy.uuid()
+    form = new Form @, resource, options
+
+    @tag 'form', attributes, block?.call(@, form)
+
+  #
+  # Generates `label` tag
+  #
+  # @param [String] resource               Name of resource
+  # @param [Object] resource               Instance of something that includes Joosy.Modules.Resources.Module
+  # @param [String] property               Attribute of a resource to use
+  # @param [Object] options
+  # @option options [Boolean] extendIds    Marks if DOM ids of fields should include primary key of resource (default: false)
+  # @param [String] content                Content of the label
+  #
+  @label = (resource, property, options={}, content='') ->
+    # (resource, property, content) ->
+    if arguments.length == 3
+      content = options
+      options = {}
+
+    [parameters, attributes] = separateOptions options, ['extendIds']
+
+    attributes.for = domify(resource, property, parameters.extendIds, '', attributes).id
+
+    @contentTag 'label', content, attributes
+
+  #
+  # Set of typical generators for basic inputs: textField, fileField, hiddenField, passwordField
+  #
+  for type in ['text', 'file', 'hidden', 'password']
+    do (type) =>
+      @[type+'Field'] = (resource, property, options={}) ->
+        [parameters, attributes] = separateOptions options, ['extendIds']
+
+        input type, resource, property, parameters.extendIds, '', attributes
+
+  #
+  # Generates a radio button
+  #
+  # @param [String] resource               Name of resource
+  # @param [Object] resource               Instance of something that includes Joosy.Modules.Resources.Module
+  # @param [String] property               Attribute of a resource to use
+  # @param [Object] options
+  # @option options [Boolean] extendIds    Marks if DOM ids of fields should include primary key of resource (default: false)
+  # @param [String] tagValue               Value of the button
+  #
+  @radioButton = (resource, property, tagValue, options={}) ->
+    [parameters, attributes] = separateOptions(options, ['extendIds'])
+
+    attributes.value = tagValue
+    input 'radio', resource, property, options.extendIds, tagValue, attributes
+
+  #
+  # Generates a checkbox
+  #
+  # @param [String] resource               Name of resource
+  # @param [Object] resource               Instance of something that includes Joosy.Modules.Resources.Module
+  # @param [String] property               Attribute of a resource to use
+  # @param [Object] options
+  # @option options [Boolean] extendIds    Marks if DOM ids of fields should include primary key of resource (default: false)
+  # @param [String] checkedValue           Value for the checked condition
+  # @param [String] uncheckedValue         Value for the unchecked condition
+  #
+  @checkBox = (resource, property, options={}, checkedValue=1, uncheckedValue=0) ->
+    [parameters, attributes] = separateOptions(options, ['extendIds'])
+
+    spyAttributes = domify resource, property, parameters.extendIds, '', attributes
+    spy = @tag 'input', name: spyAttributes.name, value: uncheckedValue, type: 'hidden'
+
+    attributes.value = checkedValue
+    box = input 'checkbox', resource, property, parameters.extendIds, '', attributes
+
+    spy+box
+
+  #
+  # Generates a select
+  #
+  # @param [String] resource                Name of resource
+  # @param [Object] resource                Instance of something that includes Joosy.Modules.Resources.Module
+  # @param [String] property                Attribute of a resource to use
+  # @param [Object] options
+  # @option options [Boolean] extendIds     Marks if DOM ids of fields should include primary key of resource (default: false)
+  # @option options [String] value          Sets current value of a select
+  # @option options [Boolean] includeBlank  Marks if select should contain blank starting option
+  # @param [Object] selectOptions           Options to build select with `{foo: 'bar'}`
+  # @param [Array] selectOptions            Options to build select with `['foo', 'bar']`
+  #
+  @select = (resource, property, rawSelectOptions, options) ->
+    [parameters, attributes] = separateOptions(options, ['extendIds', 'value', 'includeBlank'])
+
+    if rawSelectOptions instanceof Array
+      selectOptions = rawSelectOptions
+    else
+      selectOptions = []
+      selectOptions.push [val, key] for key, val of rawSelectOptions
+
+    selectOptions.unshift ['', ''] if parameters.includeBlank
+    selectOptions = selectOptions.reduce (str, vals) =>
+      params = if (vals instanceof Array) then ['option', vals[0], { value: vals[1] }] else ['option', vals, {}]
+      if parameters.value == (if (vals instanceof Array) then vals[1] else vals)
+        params[2].selected = 'selected'
+      str += @contentTag.apply @, params
+    , ''
+
+    @contentTag 'select', selectOptions, domify(resource, property, parameters.extendIds, '', attributes)
+
+  #
+  # Generates a text area
+  #
+  # @param [String] resource               Name of resource
+  # @param [Object] resource               Instance of something that includes Joosy.Modules.Resources.Module
+  # @param [String] property               Attribute of a resource to use
+  # @param [Object] options
+  # @option options [Boolean] extendIds    Marks if DOM ids of fields should include primary key of resource (default: false)
+  # @option options [String] value         Value of the text area
+  #
+  @textArea = (resource, property, options={}) ->
+    [parameters, attributes] = separateOptions(options, ['extendIds', 'value'])
+    @contentTag 'textarea', parameters.value, domify(resource, property, parameters.extendIds, '', attributes)

data/source/joosy/helpers/index.coffee

@@ -0,0 +1,3 @@
+#= require ./routes
+#= require ./view
+#= require ./widgets

data/source/joosy/helpers/routes.coffee

@@ -7,7 +7,9 @@
 Joosy.helpers 'Routes', ->
 
   @linkTo = (name='', url='', tagOptions={}) ->
-    if Object.isFunction tagOptions
+
+    # (url, tagOptions, block) ->
+    if typeof(tagOptions) == 'function'
       block = tagOptions
       [url, tagOptions] = [name, url]
       name = block()

data/source/joosy/helpers/view.coffee

@@ -55,9 +55,9 @@ Joosy.helpers 'Application', ->
   #
   # Possible arguments variations:
   #   1. @contentTag 'name', 'content'
-  #   2. @contentTag 'name', {}, ->
-  #   3. @contentTag 'name', {}, false, ->
-  #   4. @contentTag 'name', ->
+  #   2. @contentTag 'name', ->
+  #   3. @contentTag 'name', {}, ->
+  #   4. @contentTag 'name', {}, false, ->
   #
   # Example
   #   != @contentTag 'div', {class: 'foo'}, =>
@@ -66,20 +66,20 @@ Joosy.helpers 'Application', ->
   @contentTag = (name, contentOrOptions=null, options=null, escape=true) ->
     # This is a bit painfull but this is
     # how we emulate Ruby block with lambda :(
-    if Object.isString(contentOrOptions)
+    if typeof(contentOrOptions) == 'string'
       options ||= {}
       content   = contentOrOptions
-    else if Object.isObject(contentOrOptions)
-      if Object.isFunction(options)
+    else if typeof(contentOrOptions) == 'function'
+      options = {}
+      content = contentOrOptions()
+    else
+      if typeof(options) == 'function'
         escape = true
         content = options()
       else
         escape = options
         content = escape()
       options = contentOrOptions
-    else
-      options = {}
-      content = contentOrOptions()
 
     element = document.createElement name
     temp    = document.createElement 'div'

data/source/joosy/joosy.coffee

@@ -139,17 +139,15 @@
   #
   buildUrl: (url, params) ->
     paramsString = []
-
-    Object.each params, (key, value) ->
-      paramsString.push "#{key}=#{value}"
+    paramsString.push "#{key}=#{value}" for key, value of params
 
     hash = url.match(/(\#.*)?$/)[0]
     url  = url.replace /\#.*$/, ''
-    if !paramsString.isEmpty() && !url.has(/\?/)
+    if paramsString.length != 0 && url.indexOf('?') == -1
       url  = url + "?"
 
     paramsString = paramsString.join '&'
-    if !paramsString.isBlank() && url.last() != '?'
+    if paramsString.length > 0 && url[url.length-1] != '?'
       paramsString = '&' + paramsString
 
     url + paramsString + hash

data/source/joosy/module.coffee

@@ -19,7 +19,7 @@ class Joosy.Module
   # @return [String]
   #
   @__className: (klass) ->
-    unless Object.isFunction(klass)
+    unless typeof(klass) == 'function'
       klass = klass.constructor
 
     if klass.name?
@@ -61,7 +61,7 @@ class Joosy.Module
     camelized = feature.charAt(0).toUpperCase() + feature.slice(1)
     chained = "#{method}Without#{camelized}"
 
-    action = @::[action] unless Object.isFunction(action)
+    action = @::[action] unless typeof(action) == 'function'
 
     @::[chained] = @::[method]
     @::[method] = action
@@ -91,14 +91,19 @@ class Joosy.Module
   # @param [Object] destination       Object to extend
   # @param [Object] source            Source of new properties
   # @param [Boolean] unsafe           Determines if we should rewrite destination properties
+  # @param [Boolean] deep             Whether merge should go down recursively into nested objects
   #
   # @return [Object]                  The new and mighty destination Object
   #
-  @merge: (destination, source, unsafe=true) ->
+  @merge: (destination, source, unsafe=true, deep=false) ->
     for key, value of source
       if source.hasOwnProperty(key)
         if unsafe || !destination.hasOwnProperty(key)
-          destination[key] = value
+          if deep && value.constructor == Object
+            destination[key] = {} unless destination[key]?.constructor == Object
+            Joosy.Module.merge destination[key], value
+          else
+            destination[key] = value
     destination
 
   #