joosy 1.2.0.alpha.57 → 1.2.0.alpha.58

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 738fb1a1338734dc8f3c610080dc4dc493f54d11
-  data.tar.gz: 024f3bc99a0d6e4fa6ca359963986f7cf1478d41
+  metadata.gz: 877691f0d3fe49b4f115f111663aba62396a0421
+  data.tar.gz: 7996ed76d2bddc7349b6ec2d316ee0a7ab4c1883
 SHA512:
-  metadata.gz: acf0c72593d7633f50696582e09ecc567142ab7b88803c209c2746fe1ea2f7b35cfb76496c66a76792c080630cb8a5b99342eb9cb240e4dd5db04eb30be21d9f
-  data.tar.gz: b9ffc28b0933ff209712aa1241f6128aa2b1c08d91c2e4b6dce2ddae1e52b8e24adf8f6e504c64c79ca7d7e2b4a24ccb3a6c6113ecd389549e29da47d75e0111
+  metadata.gz: 5b169f311b2a03478e24b1be422843e2ceb4786c4389217029f04b10e7a8245a0b6b156295cd1cdfae2486cd17d0c5b26a3a99c307b09d6dd5d251c1072d36d6
+  data.tar.gz: 673c4f423886679626cf29d4255bba23aba634aeca135358243b9e9b7efacfb4c3d5d37a9c6b3882b67f8dc0454f69e03b596a1820e177c832764d5b23b1ccd6

data/bower.json

@@ -1,6 +1,6 @@
 {
   "name": "joosy",
-  "version": "1.2.0-alpha.57",
+  "version": "1.2.0-alpha.58",
   "main": "lib/joosy.js",
   "ignore": [
     "bin",

data/build/joosy.js

@@ -534,10 +534,7 @@
       });
     },
     __clearContainer: function() {
-      var _ref;
-      if ((_ref = this.$container) != null) {
-        _ref.unbind().off();
-      }
+      this.$container.unbind().off();
       return this.$container = $();
     }
   };
@@ -1351,21 +1348,19 @@
         $container = this.__normalizeSelector($container);
       }
       widget = this.__normalizeWidget(widget);
-      widget.__bootstrapDefault($container);
-      this.__nestedSections || (this.__nestedSections = []);
-      this.__nestedSections.push(widget);
+      widget.__bootstrapDefault(this, $container);
       return widget;
     };
 
     Widget.prototype.unregisterWidget = function(widget) {
-      widget.__unload();
-      return this.__nestedSections.splice(this.__nestedSections.indexOf(widget), 1);
+      return widget.__unload();
     };
 
     Widget.prototype.replaceWidget = function(widget, replacement) {
       replacement = this.__normalizeWidget(replacement);
       replacement.previous = widget;
-      return replacement.__bootstrapDefault(widget.$container);
+      replacement.__bootstrapDefault(this, widget.$container);
+      return replacement;
     };
 
     Widget.prototype.navigate = function() {
@@ -1392,11 +1387,11 @@
       return map;
     };
 
-    Widget.prototype.__bootstrapDefault = function($container) {
-      return this.__bootstrap(this.__nestingMap(), $container);
+    Widget.prototype.__bootstrapDefault = function(parent, $container) {
+      return this.__bootstrap(parent, this.__nestingMap(), $container);
     };
 
-    Widget.prototype.__bootstrap = function(nestingMap, $container, fetch) {
+    Widget.prototype.__bootstrap = function(parent, nestingMap, $container, fetch) {
       var _this = this;
       this.$container = $container;
       if (fetch == null) {
@@ -1404,7 +1399,7 @@
       }
       this.wait('section:fetched section:erased', function() {
         return _this.__runPaints([], function() {
-          return _this.__paint(nestingMap, _this.$container);
+          return _this.__paint(parent, nestingMap, _this.$container);
         });
       });
       this.__erase();
@@ -1437,7 +1432,7 @@
       });
     };
 
-    Widget.prototype.__erase = function() {
+    Widget.prototype.__erase = function(parent) {
       var _this = this;
       if (this.previous != null) {
         return this.previous.__runErases([], function() {
@@ -1459,43 +1454,57 @@
       }
     };
 
-    Widget.prototype.__paint = function(nestingMap, $container) {
+    Widget.prototype.__paint = function(parent, nestingMap, $container) {
       var _this = this;
+      this.parent = parent;
       this.$container = $container;
       this.__nestedSections = [];
       this.$container.html(typeof this.__renderDefault === "function" ? this.__renderDefault(this.data || {}) : void 0);
       this.__load();
       return Object.each(nestingMap, function(selector, section) {
         var _ref;
-        _this.__nestedSections.push(section.instance);
         $container = _this.__normalizeSelector(selector);
         if (!section.instance.__independent || ((_ref = section.instance.__triggeredEvents) != null ? _ref['section:fetched'] : void 0)) {
-          return section.instance.__paint(section.nested, $container);
+          return section.instance.__paint(_this, section.nested, $container);
         } else {
-          return section.instance.__bootstrap(section.nested, $container, false);
+          return section.instance.__bootstrap(_this, section.nested, $container, false);
         }
       });
     };
 
     Widget.prototype.__load = function() {
+      var _base;
+      if (this.parent) {
+        (_base = this.parent).__nestedSections || (_base.__nestedSections = []);
+        this.parent.__nestedSections.push(this);
+      }
       this.__assignElements();
       this.__delegateEvents();
       return this.__runAfterLoads();
     };
 
-    Widget.prototype.__unload = function() {
+    Widget.prototype.__unload = function(modifyParent) {
       var section, _i, _len, _ref;
-      _ref = this.__nestedSections;
-      for (_i = 0, _len = _ref.length; _i < _len; _i++) {
-        section = _ref[_i];
-        section.__unload();
+      if (modifyParent == null) {
+        modifyParent = true;
+      }
+      if (this.__nestedSections) {
+        _ref = this.__nestedSections;
+        for (_i = 0, _len = _ref.length; _i < _len; _i++) {
+          section = _ref[_i];
+          section.__unload(false);
+        }
+        delete this.__nestedSections;
       }
-      delete this.__nestedSections;
       this.__clearContainer();
       this.__clearTime();
       this.__removeMetamorphs();
       this.__runAfterUnloads();
-      return delete this.previous;
+      if (this.parent && modifyParent) {
+        this.parent.__nestedSections.splice(this.parent.__nestedSections.indexOf(this), 1);
+      }
+      delete this.previous;
+      return delete this.parent;
     };
 
     Widget.prototype.__normalizeSelector = function(selector) {
@@ -1661,7 +1670,7 @@
     };
 
     Layout.prototype.__bootstrapDefault = function(page, applicationContainer) {
-      return this.__bootstrap(this.__nestingMap(page), applicationContainer);
+      return this.__bootstrap(null, this.__nestingMap(page), applicationContainer);
     };
 
     return Layout;
@@ -1783,7 +1792,7 @@
 
     Page.prototype.__bootstrapDefault = function(applicationContainer) {
       var _ref;
-      return this.__bootstrap(this.__nestingMap(), ((_ref = this.layout) != null ? _ref.content() : void 0) || applicationContainer);
+      return this.__bootstrap(this.layout, this.__nestingMap(), ((_ref = this.layout) != null ? _ref.content() : void 0) || applicationContainer);
     };
 
     return Page;
@@ -1809,6 +1818,11 @@
       if (tagOptions == null) {
         tagOptions = {};
       }
+      if (Object.isFunction(tagOptions)) {
+        url = name;
+        tagOptions = url;
+        name = tagOptions();
+      }
       return Joosy.Helpers.Application.contentTag('a', name, Joosy.Module.merge(tagOptions, {
         'data-joosy': true,
         href: url
@@ -1844,8 +1858,8 @@
     });
 
     $(document).on('click', 'a[data-joosy]', function(event) {
-      Router.navigate(event.target.getAttribute('href'));
-      return false;
+      event.preventDefault();
+      return Joosy.Router.navigate(this.getAttribute('href'));
     });
 
     Drawer = (function() {

data/generators/project.coffee

@@ -4,6 +4,7 @@ Path       = require 'path'
 
 module.exports = class
   constructor: (@options) ->
+    @options.enableHTML5  = true
     @options.dependencies = """
                             #= require jquery/jquery.js
                             #= require jquery-form/jquery.form.js

data/generators/templates/application/standalone/Gruntfile.coffee

@@ -22,17 +22,18 @@ module.exports = (grunt) ->
 
       assets:
         application:
-          src: 'application.coffee'
+          src:  'application.coffee'
           dest: 'public/assets/application.js'
         styles:
-          src: 'application.styl'
+          src:  'application.styl'
           dest: 'public/assets/application.css'
       haml:
         application:
-          path: '/'
-          src: 'index.haml'
-          dest: 'public/index.html'
-          url: ['/', '/index.html']
+          path:  '/'
+          src:   'index.haml'
+          dest:  'public/index.html'
+          url:   '/'
+          greedy: true
 
     uglify:
       application:
@@ -50,7 +51,7 @@ module.exports = (grunt) ->
         options: 
           keepRunner: true
           outfile: 'spec/application.html'
-          specs: '.grunt/spec/*_spec.js'
+          specs:   '.grunt/spec/*_spec.js'
           helpers: '.grunt/spec/helpers/environment.js'
 
   #

data/package.json

@@ -4,7 +4,7 @@
   "keywords": [
     "joosy"
   ],
-  "version": "1.2.0-alpha.57",
+  "version": "1.2.0-alpha.58",
   "author": "Boris Staal <boris@staal.io>",
   "homepage": "http://joosy.ws/",
   "repository": {

data/source/joosy/helpers/routes.coffee

@@ -7,4 +7,9 @@
 Joosy.helpers 'Routes', ->
 
   @linkTo = (name='', url='', tagOptions={}) ->
+    if Object.isFunction tagOptions
+      url = name
+      tagOptions = url
+      name = tagOptions()
+
     Joosy.Helpers.Application.contentTag 'a', name, Joosy.Module.merge(tagOptions, 'data-joosy': true, href: url)

data/source/joosy/layout.coffee

@@ -66,7 +66,7 @@ class Joosy.Layout extends Joosy.Widget
   # @param [jQuery] applicationContainer      The base container for the application to paint at
   #
   __bootstrapDefault: (page, applicationContainer) ->
-    @__bootstrap @__nestingMap(page), applicationContainer
+    @__bootstrap null, @__nestingMap(page), applicationContainer
 
 # AMD wrapper
 if define?.amd?

data/source/joosy/modules/dom.coffee

@@ -131,7 +131,7 @@ Joosy.Modules.DOM =
 
   # @private
   __clearContainer: ->
-    @$container?.unbind().off()
+    @$container.unbind().off()
     @$container = $()
 
 

data/source/joosy/page.coffee

@@ -61,7 +61,7 @@ class Joosy.Page extends Joosy.Widget
   # as a fallback for cases when no Layout has been set
   #
   __bootstrapDefault: (applicationContainer) ->
-    @__bootstrap @__nestingMap(), @layout?.content() || applicationContainer
+    @__bootstrap @layout, @__nestingMap(), @layout?.content() || applicationContainer
 
 # AMD wrapper
 if define?.amd?

data/source/joosy/router.coffee

@@ -33,9 +33,9 @@ class Joosy.Router extends Joosy.Module
     else
       window.history.loaded = true
 
-  $(document).on 'click', 'a[data-joosy]', (event) =>
-    @navigate event.target.getAttribute('href')
-    false
+  $(document).on 'click', 'a[data-joosy]', (event) ->
+    event.preventDefault()
+    Joosy.Router.navigate @getAttribute('href')
 
   #
   # Rails-like wrapper around internal raw routes representation

data/source/joosy/widget.coffee

@@ -160,10 +160,7 @@ class Joosy.Widget extends Joosy.Module
       $container = @__normalizeSelector($container)
 
     widget = @__normalizeWidget(widget)
-    widget.__bootstrapDefault $container
-
-    @__nestedSections ||= []
-    @__nestedSections.push widget
+    widget.__bootstrapDefault @, $container
 
     widget
 
@@ -175,13 +172,12 @@ class Joosy.Widget extends Joosy.Module
   unregisterWidget: (widget) ->
     widget.__unload()
 
-    @__nestedSections.splice @__nestedSections.indexOf(widget), 1
-
   replaceWidget: (widget, replacement) ->
     replacement = @__normalizeWidget(replacement)
     replacement.previous = widget
 
-    replacement.__bootstrapDefault widget.$container
+    replacement.__bootstrapDefault @, widget.$container
+    replacement
 
   #
   # @see Joosy.Router.navigate
@@ -216,8 +212,8 @@ class Joosy.Widget extends Joosy.Module
   #
   # @param [jQuery] $container                 DOM container to inject to
   #
-  __bootstrapDefault: ($container) ->
-    @__bootstrap @__nestingMap(), $container
+  __bootstrapDefault: (parent, $container) ->
+    @__bootstrap parent, @__nestingMap(), $container
 
   #
   # Bootstraps the section with given nestings at given container
@@ -235,10 +231,10 @@ class Joosy.Widget extends Joosy.Module
   # @param [jQuery] $container              DOM container to inject into
   # @param [boolean] fetch                  Boolean flag used to avoid double fetch during recursion
   #
-  __bootstrap: (nestingMap, @$container, fetch=true) ->
+  __bootstrap: (parent, nestingMap, @$container, fetch=true) ->
     @wait 'section:fetched section:erased', =>
       @__runPaints [], =>
-        @__paint nestingMap, @$container
+        @__paint parent, nestingMap, @$container
 
     @__erase()
     @__fetch(nestingMap) if fetch
@@ -271,7 +267,7 @@ class Joosy.Widget extends Joosy.Module
   #
   # Runs erasing chain for the previous section and beforePaints for current
   #
-  __erase: ->
+  __erase: (parent) ->
     if @previous?
       @previous.__runErases [], =>
         @previous.__unload()
@@ -285,26 +281,28 @@ class Joosy.Widget extends Joosy.Module
   #
   # Builds HTML of section and its dependent nestings and injects it into DOM
   #
-  __paint: (nestingMap, @$container) ->
+  __paint: (@parent, nestingMap, @$container) ->
     @__nestedSections = []
     @$container.html @__renderDefault?(@data || {})
 
     @__load()
 
     Object.each nestingMap, (selector, section) =>
-      @__nestedSections.push section.instance
-
       $container = @__normalizeSelector(selector)
 
       if !section.instance.__independent || section.instance.__triggeredEvents?['section:fetched']
-        section.instance.__paint section.nested, $container
+        section.instance.__paint @, section.nested, $container
       else
-        section.instance.__bootstrap section.nested, $container, false
+        section.instance.__bootstrap @, section.nested, $container, false
 
   #
   # Initializes section that was injected into DOM
   #
   __load: ->
+    if @parent
+      @parent.__nestedSections ||= []
+      @parent.__nestedSections.push @
+
     @__assignElements()
     @__delegateEvents()
     @__runAfterLoads()
@@ -312,15 +310,21 @@ class Joosy.Widget extends Joosy.Module
   #
   # Deinitializes section that is preparing to be removed from DOM
   #
-  __unload: ->
-    section.__unload() for section in @__nestedSections
-    delete @__nestedSections
+  __unload: (modifyParent=true) ->
+    if @__nestedSections
+      section.__unload(false) for section in @__nestedSections
+      delete @__nestedSections
 
     @__clearContainer()
     @__clearTime()
     @__removeMetamorphs()
     @__runAfterUnloads()
+
+    if @parent && modifyParent
+      @parent.__nestedSections.splice @parent.__nestedSections.indexOf(@), 1
+
     delete @previous
+    delete @parent
 
   #
   # Normalizes selector and returns jQuery wrap

data/spec/joosy/core/widget_spec.coffee

@@ -62,7 +62,7 @@ describe "Joosy.Widget", ->
             '#subcontent': {instance: @d}
 
     it 'calls paint callbacks', ->
-      @a.__bootstrap @nestingMap, @$ground
+      @a.__bootstrap null, @nestingMap, @$ground
 
       expect(@spies["a/paint"].callCount).toEqual 1
       expect(@spies["b/paint"].callCount).toEqual 0
@@ -77,7 +77,7 @@ describe "Joosy.Widget", ->
       expect(@spies['b/erase'].callCount).toEqual 0
       expect(@spies['c/erase'].callCount).toEqual 0
 
-      @c.__bootstrap {}, $('#content', @$ground)
+      @c.__bootstrap null, {}, $('#content', @$ground)
 
       ['paint', 'beforePaint'].each (filter) =>
         expect(@spies["a/#{filter}"].callCount).toEqual 1
@@ -92,7 +92,7 @@ describe "Joosy.Widget", ->
       expect(@spies['c/erase'].callCount).toEqual 0
 
     it 'calls load/unload callbacks', ->
-      @a.__bootstrap @nestingMap, @$ground
+      @a.__bootstrap null, @nestingMap, @$ground
 
       expect(@a.__load.callCount).toEqual 1
       expect(@b.__load.callCount).toEqual 1
@@ -103,7 +103,7 @@ describe "Joosy.Widget", ->
       expect(@c.__unload.callCount).toEqual 0
       expect(@d.__unload.callCount).toEqual 0
 
-      @c.__bootstrap {}, $('#content', @$ground)
+      @c.__bootstrap @a, {}, $('#content', @$ground)
 
       expect(@a.__load.callCount).toEqual 1
       expect(@b.__load.callCount).toEqual 1
@@ -114,6 +114,16 @@ describe "Joosy.Widget", ->
       expect(@c.__unload.callCount).toEqual 0
       expect(@d.__unload.callCount).toEqual 1
 
+      @a.__unload()
+      expect(@a.__load.callCount).toEqual 1
+      expect(@b.__load.callCount).toEqual 1
+      expect(@c.__load.callCount).toEqual 1
+      expect(@d.__load.callCount).toEqual 1
+      expect(@a.__unload.callCount).toEqual 1
+      expect(@b.__unload.callCount).toEqual 1
+      expect(@c.__unload.callCount).toEqual 1
+      expect(@d.__unload.callCount).toEqual 1
+
   describe 'widgets manager', ->
 
     @beforeEach ->
@@ -141,7 +151,7 @@ describe "Joosy.Widget", ->
           '#b': B
 
     it 'bootstraps registered widgets', ->
-      (new @A).__bootstrapDefault @$ground
+      (new @A).__bootstrapDefault null, @$ground
       expect(@$ground.html()).toEqualHTML '<div id="b"><div id="c">C</div></div>'
 
     it 'bootstraps registered independent widgets', ->
@@ -149,7 +159,7 @@ describe "Joosy.Widget", ->
       @C.independent()
 
       runs ->
-        (new @A).__bootstrapDefault @$ground
+        (new @A).__bootstrapDefault null, @$ground
         expect(@$ground.html()).toEqualHTML '<div id="b"><div id="c"></div></div>'
 
       waits 0
@@ -159,22 +169,24 @@ describe "Joosy.Widget", ->
 
     it 'registeres widgets on the fly', ->
       a = new @A
-      a.__bootstrapDefault @$ground
+      a.__bootstrapDefault null, @$ground
       expect(@$ground.html()).toEqualHTML '<div id="b"><div id="c">C</div></div>'
 
-      a.registerWidget '#b', @D
+      d = a.registerWidget '#b', @D
+      expect(d.parent).toEqual a
 
       expect(@$ground.html()).toEqualHTML '<div id="b">D</div>'
 
     it 'replaces widget', ->
       a = new @A
-      a.__bootstrapDefault @$ground
+      a.__bootstrapDefault null, @$ground
       expect(@$ground.html()).toEqualHTML '<div id="b"><div id="c">C</div></div>'
 
       d = a.registerWidget '#b', @D
       sinon.spy d, '__unload'
 
-      a.replaceWidget d, @C
+      c = a.replaceWidget d, @C
+      expect(c.parent).toEqual a
       expect(@$ground.html()).toEqualHTML '<div id="b">C</div>'
       expect(d.__unload.callCount).toEqual 1
 
@@ -283,11 +295,11 @@ describe "Joosy.Widget", ->
       describe 'dependent', ->
 
         it 'loads when no nesting defined', ->
-          @f.__bootstrap @nestingMap, @$ground
+          @f.__bootstrap null, @nestingMap, @$ground
           expect(@$ground.html()).toEqual 'F'
 
         it 'loads whole dependency tree synchronously', ->
-          @a.__bootstrap @nestingMap, @$ground
+          @a.__bootstrap null, @nestingMap, @$ground
           expect(@$ground.html()).toEqualHTML '<div id="b"><div id="c"><div id="e">E</div><div id="f">F</div></div><div id="d">D</div></div>'
 
         it 'loads whole dependency tree asynchronously', ->
@@ -295,7 +307,7 @@ describe "Joosy.Widget", ->
           @B.fetch (complete) -> setTimeout complete, 100
 
           runs ->
-            @a.__bootstrap @nestingMap, @$ground
+            @a.__bootstrap null, @nestingMap, @$ground
             expect(@$ground.html()).toEqualHTML ''
 
           waits 0
@@ -312,7 +324,7 @@ describe "Joosy.Widget", ->
           @C.fetch (complete) -> setTimeout complete, 0
           @C.independent()
 
-          @a.__bootstrap @nestingMap, @$ground
+          @a.__bootstrap null, @nestingMap, @$ground
           expect(@$ground.html()).toEqualHTML '<div id="b"><div id="c"></div><div id="d">D</div></div>'
 
       describe 'independent', ->
@@ -324,7 +336,7 @@ describe "Joosy.Widget", ->
           @C.independent()          
 
           runs ->
-            @a.__bootstrap @nestingMap, @$ground
+            @a.__bootstrap null, @nestingMap, @$ground
 
           waits 100
 
@@ -339,7 +351,7 @@ describe "Joosy.Widget", ->
           @E.independent()
 
           runs ->
-            @a.__bootstrap @nestingMap, @$ground
+            @a.__bootstrap null, @nestingMap, @$ground
             expect(@$ground.html()).toEqualHTML '<div id="b"><div id="c"></div><div id="d">D</div></div>'
 
           waits 0
@@ -361,7 +373,7 @@ describe "Joosy.Widget", ->
           @E.fetch (complete) -> setTimeout complete, 100
 
           runs ->
-            @a.__bootstrap @nestingMap, @$ground
+            @a.__bootstrap null, @nestingMap, @$ground
             expect(@$ground.html()).toEqualHTML '<div id="b"></div>'
 
           waits 0

data/tasks/joosy.coffee

@@ -111,13 +111,13 @@ module.exports = (grunt) ->
         console.log "=> Serving assets from #{path}"
 
       serveHAML: (server, map) ->
-        serve = (urls, template, partials) ->
+        serve = (urls, greedy, template, partials) ->
           urls = [urls] unless Object.isArray(urls)
 
           for url in urls
             do (url) ->
               server.use url, (req, res, next) ->
-                if req.originalUrl == url
+                if greedy && req.originalUrl.startsWith(url) || req.originalUrl == url
                   res.end grunt.joosy.haml.compile(template, partials)
                   console.log "Served #{url} (#{template})"
                 else
@@ -127,13 +127,14 @@ module.exports = (grunt) ->
         for entry in map
           do (entry) ->
             unless entry.expand
-              serve(entry.url, Path.join(paths.haml, entry.src), entry.partials)
+              serve(entry.url, entry.greedy, Path.join(paths.haml, entry.src), entry.partials)
             else
               files = grunt.joosy.helpers.expandFiles(paths.haml, entry)
 
               for file in files.list
                 serve(
                   entry.url(file),
+                  entry.greedy,
                   Path.join(files.cwd, file.src),
                   entry.partials
                 )
@@ -198,9 +199,9 @@ module.exports = (grunt) ->
     
     grunt.joosy.server.start 4000, (server) ->
       grunt.joosy.server.serveAssets server
-      grunt.joosy.server.serveHAML server, grunt.joosy.helpers.normalizeFiles('joosy.haml')
       grunt.joosy.server.serveProxied server, grunt.config.get('joosy.server.proxy')
       grunt.joosy.server.serveStatic server
+      grunt.joosy.server.serveHAML server, grunt.joosy.helpers.normalizeFiles('joosy.haml')
 
   grunt.registerTask 'joosy:server:production', ->
     @async()

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.57
+  version: 1.2.0.alpha.58
 platform: ruby
 authors:
 - Boris Staal