joosy 1.2.0.alpha.38 → 1.2.0.alpha.41

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

@@ -45,12 +45,11 @@ Joosy.Modules.WidgetsManager =
   # Intialize all widgets for current object
   #
   __setupWidgets: ->
-    widgets    = @__widgets
-    registered = Object.extended()
+    return unless @__widgets
 
-    return unless widgets
+    registered = Object.extended()
 
-    Object.each widgets, (selector, widget) =>
+    Object.each @__widgets, (selector, widget) =>
       if selector == '$container'
         activeSelector = @container
       else
@@ -65,14 +64,18 @@ Joosy.Modules.WidgetsManager =
         else
           instance = widget.call this, index
 
-        registered[selector][Joosy.Module.__className instance] ||= 0
-        registered[selector][Joosy.Module.__className instance]  += 1
+        if Joosy.Application.config.debug
+          registered[selector][Joosy.Module.__className instance] ||= 0
+          registered[selector][Joosy.Module.__className instance]  += 1
 
         @registerWidget $(elem), instance
 
-    registered.each (selector, value) =>
-      value.each (widget, count) =>
-        Joosy.Modules.Log.debugAs @, "Widget #{widget} registered at '#{selector}'. Elements: #{count}"
+    @__widgets = {}
+
+    if Joosy.Application.config.debug
+      registered.each (selector, value) =>
+        value.each (widget, count) =>
+          Joosy.Modules.Log.debugAs @, "Widget #{widget} registered at '#{selector}'. Elements: #{count}"
 
   #
   # Unregister all widgets for current object

data/src/joosy/core/page.coffee

@@ -215,7 +215,7 @@ class Joosy.Page extends Joosy.Module
     unless @halted = !@__runBeforeLoads(@params, @previous)
       Joosy.Application.loading = true
 
-      if !@previous?.layout?.uuid? || @previous?.__layoutClass != @__layoutClass
+      if !@previous?.layout?.uid? || @previous?.__layoutClass != @__layoutClass
         @__bootstrapLayout()
       else
         @__bootstrap()
@@ -324,20 +324,18 @@ class Joosy.Page extends Joosy.Module
       @previous?.__afterPaint?(callbacksParams)
       @__callSyncedThrough this, '__paint', callbacksParams, =>
         # Page HTML
-        @swapContainer @layout.content(), @__renderer(@data || {})
+        @swapContainer @layout.content(), @__renderDefault(@data || {})
         @container = @layout.content()
 
         # Loading
         @__load()
 
-        @layout.content()
-
     @__callSyncedThrough @previous, '__erase', callbacksParams, =>
       @previous?.__unload()
-      @__callSyncedThrough this, '__beforePaint', callbacksParams, =>
+      @__callSyncedThrough @, '__beforePaint', callbacksParams, =>
         @trigger 'stageClear'
 
-    @__callSyncedThrough this, '__fetch', [], =>
+    @__callSyncedThrough @, '__fetch', [], =>
       Joosy.Modules.Log.debugAs @, "Fetch complete"
       @trigger 'dataReceived'
 
@@ -363,21 +361,16 @@ class Joosy.Page extends Joosy.Module
     @wait "stageClear dataReceived", =>
       @__callSyncedThrough @layout, '__paint', callbacksParams, =>
         # Layout HTML
-        data = Joosy.Module.merge {}, @layout.data || {}
-        data = Joosy.Module.merge data, yield: => @layout.yield()
-
-        @swapContainer Joosy.Application.content(), @layout.__renderer data
+        @swapContainer Joosy.Application.content(), @layout.__renderDefault(@layout.data || {})
 
         # Page HTML
-        @swapContainer @layout.content(), @__renderer(@data || {})
+        @swapContainer @layout.content(), @__renderDefault(@data || {})
         @container = @layout.content()
 
         # Loading
         @layout.__load Joosy.Application.content()
         @__load()
 
-        Joosy.Application.content()
-
     @__callSyncedThrough @previous?.layout, '__erase', callbacksParams, =>
       @previous?.layout?.__unload?()
       @previous?.__unload()
@@ -385,6 +378,6 @@ class Joosy.Page extends Joosy.Module
         @trigger 'stageClear'
 
     @__callSyncedThrough @layout, '__fetch', [], =>
-      @__callSyncedThrough this, '__fetch', [], =>
+      @__callSyncedThrough @, '__fetch', [], =>
         Joosy.Modules.Log.debugAs @, "Fetch complete"
         @trigger 'dataReceived'

data/src/joosy/core/templaters/{rails_jst.coffee → jst.coffee}

@@ -1,10 +1,12 @@
 #= require joosy/core/joosy
 
 #
-# Rails JST template precompilation binding
+# JST template precompilation binding
 #
-class Joosy.Templaters.RailsJST
-  constructor: (@applicationName) ->
+class Joosy.Templaters.JST
+  constructor: (applicationName) ->
+    if Object.isString(applicationName) && applicationName.length > 0
+      @applicationName = applicationName
 
   #
   # Gets template lambda by its full name
@@ -13,22 +15,22 @@ class Joosy.Templaters.RailsJST
   #
   buildView: (name) ->
     template = false
-    haystack = [
-      "#{@applicationName}/templates/#{name}-#{I18n?.locale}",
-      "#{@applicationName}/templates/#{name}",
-      "templates/#{name}-#{I18n?.locale}",
-      "templates/#{name}"
-    ]
-
-    haystack.each (path) ->
-      if JST[path]
-        location = path
-        template = JST[path]
-
-    unless template
-      throw new Error "Template '#{name}' not found. Checked at: #{location}"
-
-    template
+
+    if @applicationName
+      haystack = [
+        "#{@applicationName}/templates/#{name}-#{I18n?.locale}",
+        "#{@applicationName}/templates/#{name}"
+      ]
+    else
+      haystack = [
+        "templates/#{name}-#{I18n?.locale}",
+        "templates/#{name}"
+      ]
+
+    for path in haystack 
+      return window.JST[path] if window.JST[path]
+
+    throw new Error "Template '#{name}' not found. Checked at: '#{haystack.join(', ')}'"
 
   #
   # Gets full name of template by several params

data/src/joosy/core/widget.coffee

@@ -33,7 +33,7 @@ class Joosy.Widget extends Joosy.Module
   #
   # By default widget will not render on load
   #
-  __renderer: false
+  __renderDefault: false
 
   #
   # Initial data that will be passed to view on load
@@ -66,8 +66,8 @@ class Joosy.Widget extends Joosy.Module
   #
   __load: (@parent, @container, render=true) ->
     @__runBeforeLoads()
-    if render && @__renderer
-      @swapContainer @container, @__renderer(@data || {})
+    if render && @__renderDefault
+      @swapContainer @container, @__renderDefault(@data || {})
     @__assignElements()
     @__delegateEvents()
     @__setupWidgets()

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

@@ -213,9 +213,11 @@ class Joosy.Resources.Base extends Joosy.Module
   # @return [mixed]
   #
   __get: (path) ->
-    target = @__callTarget path
+    target = @__callTarget path, true
 
-    if target[0] instanceof Joosy.Resources.Base
+    if !target
+      return undefined
+    else if target[0] instanceof Joosy.Resources.Base
       return target[0](target[1])
     else
       return target[0][target[1]]
@@ -241,15 +243,18 @@ class Joosy.Resources.Base extends Joosy.Module
   # Locates the actual instance of attribute path `foo.bar` from get/set
   #
   # @param [String] path    Path to the attribute (`foo.bar`)
+  # @param [Boolean] safe   Indicates whether nested hashes should not be automatically created when they don't exist
   # @return [Array]         Instance of object containing last step of path and keyword for required field
   #
-  __callTarget: (path) ->
+  __callTarget: (path, safe=false) ->
     if path.has(/\./) && !@data[path]?
       path    = path.split '.'
       keyword = path.pop()
       target  = @data
 
       for part in path
+        return false if safe && !target[part]?
+
         target[part] ||= {}
         if target instanceof Joosy.Resources.Base
           target = target(part)

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

@@ -111,6 +111,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # @param [Hash] options         Options to proxy to collectionPath
   # @param [Function] callback    Resulting callback
+  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
   #
   @get: (options, callback) ->
     if Object.isFunction(options)
@@ -124,6 +125,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # @param [Hash] options         Options to proxy to collectionPath
   # @param [Function] callback    Resulting callback
+  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
   #
   @post: (options, callback) ->
     if Object.isFunction(options)
@@ -137,6 +139,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # @param [Hash] options         Options to proxy to collectionPath
   # @param [Function] callback    Resulting callback
+  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
   #
   @put: (options, callback) ->
     if Object.isFunction(options)
@@ -150,6 +153,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # @param [Hash] options         Options to proxy to collectionPath
   # @param [Function] callback    Resulting callback
+  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
   #
   @delete: (options, callback) ->
     if Object.isFunction(options)
@@ -163,6 +167,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # @param [Hash] options         Options to proxy to memberPath
   # @param [Function] callback    Resulting callback
+  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
   #
   get: (options, callback) ->
     if Object.isFunction(options)
@@ -176,6 +181,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # @param [Hash] options         Options to proxy to memberPath
   # @param [Function] callback    Resulting callback
+  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
   #
   post: (options, callback) ->
     if Object.isFunction(options)
@@ -189,6 +195,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # @param [Hash] options         Options to proxy to memberPath
   # @param [Function] callback    Resulting callback
+  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
   #
   put: (options, callback) ->
     if Object.isFunction(options)
@@ -266,6 +273,7 @@ class Joosy.Resources.REST extends Joosy.Resources.Base
   #
   # @param [Hash] options         See {Joosy.Resources.REST.find} for possible options
   # @param [Function] callback    Resulting callback
+  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
   #
   reload: (options={}, callback=false) ->
     if Object.isFunction(options)

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

@@ -15,6 +15,7 @@ class Joosy.Resources.RESTCollection extends Joosy.Resources.Collection
   #
   # @param [Hash] options         See {Joosy.Resources.REST.find} for possible options
   # @param [Function] callback    Resulting callback
+  # @param [Object]   callback    Success and Error callbacks to run `{ success: () ->, error: () -> }`
   #
   reload: (options={}, callback=false) ->
     if Object.isFunction(options)

data/tasks/joosy.coffee

@@ -150,24 +150,51 @@ module.exports = (grunt) ->
 
         console.log "=> Serving static from /#{paths.public}"
 
-    bower: -> require('bower')
+    bower:
+      install: (complete) ->
+        if grunt.file.exists('bower.json')
+          require('bower').commands.install()
+            .on('data', (msg) -> grunt.log.ok msg)
+            .on('error', (error) ->
+              if error.code == 'ECONFLICT'
+                grunt.joosy.bower.resolve complete, error
+              else
+                grunt.log.subhead "Bower has errored"
+                grunt.log.warn error
+                grunt.log.warn error.details if error.details?
+            )
+            .on('end', complete)
+        else
+          complete()
+
+      resolve: (complete, error) ->
+        grunt.log.subhead "Bower conflict for '#{error.name}'"
+
+        error.picks.each (p) ->
+          dependencies = p.dependants.map((x) -> x.endpoint.name).join(',')
+          grunt.log.warn "#{p.endpoint.target} (#{dependencies.yellow}: resolves to #{p.pkgMeta._release.yellow})"
+
+        resolutions = error.picks.map((x) -> x.pkgMeta._release).unique()
+
+        unless process.env['NODE_ENV'] == 'production'
+          grunt.log.subhead "Pick a resolution from the list:"
+          require('commander').choose resolutions, (i) ->
+            bowerConfig = JSON.parse grunt.file.read('./bower.json')
+            bowerConfig.resolutions ||= {}
+            bowerConfig.resolutions[error.name] = resolutions[i]
+
+            grunt.file.write './bower.json', JSON.stringify(bowerConfig, null, 2)
+
+            grunt.joosy.bower.install complete
+        else
+          grunt.log.subhead "Possible resolutions:"
+          resolutions.unique().each (r) -> grunt.log.warn r
+          grunt.fatal "Bower has errored"
+
 
   # Tasks
-  grunt.registerTask 'joosy:postinstall', ->
-    complete  = @async()
-    bowerized = ->
-      if process.env['NODE_ENV'] == 'production'
-        grunt.task.run 'compile'
-
-      complete()
-
-    if grunt.file.exists('bower.json')
-      grunt.joosy.bower().commands.install()
-        .on('data', (msg) -> grunt.log.ok msg)
-        .on('error', (error) -> grunt.fail.fatal(error))
-        .on('end', bowerized)
-    else
-      bowerized()
+  grunt.registerTask 'joosy:bower', ->
+    grunt.joosy.bower.install @async()
 
   grunt.registerTask 'joosy:server', ->
     @async()
@@ -186,6 +213,9 @@ module.exports = (grunt) ->
 
   grunt.registerTask 'joosy:compile', ['joosy:assets', 'joosy:haml']
 
+  grunt.registerTask 'joosy:compile:production', ->
+    grunt.task.run 'compile' if process.env['NODE_ENV'] == 'production'
+
   grunt.registerTask 'joosy:assets', (target) ->
     complete = @async()
     assets   = grunt.joosy.helpers.normalizeFiles('joosy.assets', target)
@@ -219,7 +249,6 @@ module.exports = (grunt) ->
 
           grunt.log.ok "Compiled #{destination}"
 
-
   grunt.registerTask 'joosy:clean', ->
     trash = []
 

data/templates/application/base/pages/welcome/index.coffee

@@ -4,11 +4,6 @@ Joosy.namespace 'Welcome', ->
     @layout ApplicationLayout
     @view   'index'
 
-    @afterLoad ->
-      @startHeartbeat()
-      @$content().css
-        'padding-top': "#{$(window).height() / 2 - 80}px"
-
     @mapElements
       content: '#content'
       joosy:   '.joosy'
@@ -17,6 +12,11 @@ Joosy.namespace 'Welcome', ->
       'mouseover $joosy': -> clearInterval @heartbeat
       'mouseout $joosy': 'startHeartbeat'
 
+    @afterLoad ->
+      @startHeartbeat()
+      @$content().css
+        'padding-top': "#{$(window).height() / 2 - 80}px"
+
     startHeartbeat: ->
       @heartbeat = @setInterval 1500, =>
         @$joosy().animate({opacity: 0.8}, 300).animate({opacity: 1}, 300)

data/templates/application/base/templates/layouts/application.jst.hamlc

@@ -1,2 +1,2 @@
-#page{:style => 'text-align: center'}
-  .content{:id => @yield()}
+#page{style: 'text-align: center'}
+  != @page 'div', class: 'content'

data/templates/application/base/templates/pages/welcome/index.jst.hamlc

@@ -1,6 +1,6 @@
 #wrapper
   #content
     %h1 Welcome aboard
-    .joosy{:style => 'background: #F71; border-radius: 10px; width: 250px; display: inline-block'}
-      %div{:style => 'color: #FFF; padding: 10px;'}
+    .joosy{style: 'background: #F71; border-radius: 10px; width: 250px; display: inline-block'}
+      %div{style: 'color: #FFF; padding: 10px;'}
         It's Joosy time!

data/templates/application/standalone/Gruntfile.coffee

@@ -38,4 +38,6 @@ module.exports = (grunt) ->
   # Tasks
   #
   grunt.registerTask 'compile', ['joosy:compile', 'uglify', 'cssmin']
-  grunt.registerTask 'server',  ['joosy:server']
+  grunt.registerTask 'server',  ['joosy:server']
+
+  grunt.registerTask 'joosy:postinstall', ['joosy:bower', 'joosy:compile:production']

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.38
+  version: 1.2.0.alpha.41
 platform: ruby
 authors:
 - Boris Staal
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-16 00:00:00.000000000 Z
+date: 2013-07-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -60,7 +60,8 @@ files:
 - lib/joosy.js
 - lib/joosy.rb
 - package.json
-- spec/helpers/helper.coffee
+- spec/helpers/ground.coffee
+- spec/helpers/matchers.coffee
 - spec/joosy/core/application_spec.coffee
 - spec/joosy/core/helpers/view_spec.coffee
 - spec/joosy/core/helpers/widgets_spec.coffee
@@ -76,7 +77,7 @@ files:
 - spec/joosy/core/modules/widget_manager_spec.coffee
 - spec/joosy/core/page_spec.coffee
 - spec/joosy/core/router_spec.coffee
-- spec/joosy/core/templaters/rails_jst_spec.coffee
+- spec/joosy/core/templaters/jst_spec.coffee
 - spec/joosy/core/widget_spec.coffee
 - spec/joosy/extensions/form/form_spec.coffee
 - spec/joosy/extensions/form/helpers/forms_spec.coffee
@@ -104,7 +105,7 @@ files:
 - src/joosy/core/page.coffee
 - src/joosy/core/resources/watcher.coffee
 - src/joosy/core/router.coffee
-- src/joosy/core/templaters/rails_jst.coffee
+- src/joosy/core/templaters/jst.coffee
 - src/joosy/core/widget.coffee
 - src/joosy/extensions/preloaders/caching.coffee
 - src/joosy/extensions/preloaders/index.coffee

data/spec/helpers/helper.coffee

@@ -1,68 +0,0 @@
-beforeEach ->
-  Joosy.Resources.Base?.resetIdentity()
-
-  window.JST = {}
-  $('body').append('<div id="ground">')
-
-  @ground = $('body #ground')
-
-  @seedGround = ->
-    @ground.html('
-      <div id="application" class="application">
-        <div id="header" class="header" />
-        <div id="wrapper" class="wrapper">
-          <div id="content" class="content">
-            <div id="post1" class="post" />
-            <div id="post2" class="post" />
-            <div id="post3" class="post" />
-          </div>
-          <div id="sidebar" class="sidebar">
-            <div id="widget1" class="widget" />
-            <div id="widget2" class="widget" />
-          </div>
-        </div>
-        <div id="footer" class="footer" />
-      </div>
-    ')
-
-  @addMatchers
-    toBeSequenced: () ->
-      if !Object.isArray(@actual) || @actual.length == 0
-        console.log 'toBeSequenced: not array or empty array given'
-        return false
-      i = 0
-      for spy in @actual
-        unless spy.callCount == 1
-          console.log "toBeSequenced: spy ##{i} was called #{spy.callCount} times"
-          return false
-        i++
-      if @actual.length > 1
-        for spy in @actual.from(1)
-          i = @actual.indexOf spy
-          previous = @actual[i - 1]
-          unless spy.calledAfter previous
-            console.log "toBeSequenced: spy ##{i} wasn't called after spy ##{i - 1}"
-            return false
-      return true
-
-    toBeTag: (tagName, content, attrs) ->
-      @message = =>
-        "Expected #{@actual} to be a tag #{tagName} with attributes #{JSON.stringify attrs} and content #{content}"
-
-      tag = $ @actual
-      flag = true
-
-      flag = flag && tag.length == 1
-      flag = flag && tag[0].nodeName == tagName.toUpperCase()
-      if content != false
-        flag = flag && tag.html() == content
-
-      for name, val of attrs
-        flag = flag && !!(if val.constructor == RegExp then tag.attr(name).match(val) else tag.attr(name) == val)
-
-      flag = flag && tag[0].attributes.length == Object.keys(attrs).length
-
-      flag
-
-afterEach ->
-  @ground.remove() unless @polluteGround

data/spec/joosy/core/templaters/rails_jst_spec.coffee

@@ -1,25 +0,0 @@
-describe "Joosy.Templaters.RailsJST", ->
-
-  beforeEach ->
-    @templater = new Joosy.Templaters.RailsJST()
-
-    class @Klass extends Joosy.Module
-
-    Joosy.namespace 'British.Cities', ->
-      class @Klass extends Joosy.Module
-
-  it "should resolve templates correctly", ->
-    expect(@templater.resolveTemplate(undefined, "/absolute", undefined)).
-        toEqual "absolute"
-
-    expect(@templater.resolveTemplate('widgets', 'fuga', {})).
-        toEqual 'widgets/fuga'
-
-    expect(@templater.resolveTemplate('widgets', 'fuga', new @Klass)).
-        toEqual 'widgets/fuga'
-
-    expect(@templater.resolveTemplate('widgets', 'fuga', new British.Cities.Klass)).
-        toEqual 'widgets/british/cities/fuga'
-
-    expect(@templater.resolveTemplate('widgets', 'hoge/fuga', new British.Cities.Klass)).
-        toEqual 'widgets/british/cities/hoge/fuga'