joosy 1.2.0.alpha.17 → 1.2.0.alpha.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 60ad1934f5ecfb16b68120d38b6d7e381c38909b
-  data.tar.gz: 27f4dfabed5e1332c732777754955a1d4d5d3ec6
+  metadata.gz: d232c00d880bc16f1347e116474c34f5ee7c3b69
+  data.tar.gz: c4a4c4517e783adfd098f86f37c70053150d63e1
 SHA512:
-  metadata.gz: 2477f0b941862289978f91f52fc9129be3f84d9a22352e029195946e8a078815a2c10f09e4f8456ffb474014c566a6abfaf44e191871f76a68d6f30111f4e6b7
-  data.tar.gz: 9f8e2434757d3c5bb05801b3a03647d04a8862a9cf4a683d60b2a742a8b7b299a614637ff333ec91b0bacda9d65f406a27213733f71feb82c25bc17c12c911f5
+  metadata.gz: 7a3c770e88bd3ee3014e09eb34f27a2003cd2b82aa554b1cd65fe4f59d5b48725192f075160e72d46624ea3cb87b254cec53553e5bd1ec1643ce2d9c2f9544b9
+  data.tar.gz: 8a78a3f51594c528eaa37e9a2058722b9ef6935a3cd18f085196181c58bbb94418ac49486cc1f61963e906a852d556c1137ce58a192ea1188dd649fafa87732b

data/Gruntfile.coffee

@@ -62,12 +62,12 @@ module.exports = (grunt) ->
     watch:
       source:
         files: [locations.source.path + '/**/*']
-        tasks: ['mince', 'jasmine']
+        tasks: ['mince']
       specs:
         options:
           nospawn: true
         files: [locations.specs.units.core, locations.specs.units.extensions, locations.specs.helpers]
-        tasks: ['coffee', 'jasmine']
+        tasks: ['coffee']
 
     coffee:
       specs:

data/bower.json

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

data/lib/joosy.js

@@ -543,9 +543,7 @@ Joosy.Modules.Container = {
   },
   refreshElements: function() {
     var _this = this;
-    this.__collectElements().each(function(key, value) {
-      return _this['$' + key] = _this.$(value);
-    });
+    this.__assignElements(this, this.__collectElements());
     if (this.hasOwnProperty("__onRefreshes")) {
       this.__onRefreshes.each(function(callback) {
         return callback.apply(_this);
@@ -553,6 +551,18 @@ Joosy.Modules.Container = {
       return this.__onRefreshes = [];
     }
   },
+  __assignElements: function(root, entries) {
+    var _this = this;
+    return Object.each(entries, function(key, value) {
+      if (Object.isObject(value)) {
+        return _this.__assignElements(root['$' + key] = {}, value);
+      } else {
+        value = _this.__extractSelector(value);
+        root['$' + key] = _this.$(value);
+        return root['$' + key].selector = value;
+      }
+    });
+  },
   reloadContainer: function(htmlCallback) {
     if (typeof this.__removeMetamorphs === "function") {
       this.__removeMetamorphs();
@@ -584,11 +594,19 @@ Joosy.Modules.Container = {
     return events;
   },
   __extractSelector: function(selector) {
-    var r;
-    if (r = selector.match(/\$([A-z]+)/)) {
-      selector = this.__collectElements()[r[1]];
-    }
-    return selector;
+    var _this = this;
+    selector = selector.replace(/(\$[A-z0-9\.\$]+)/g, function(path) {
+      var keyword, part, target, _i, _len, _ref;
+      path = path.split('.');
+      keyword = path.pop();
+      target = _this;
+      for (_i = 0, _len = path.length; _i < _len; _i++) {
+        part = path[_i];
+        target = target != null ? target[part] : void 0;
+      }
+      return target != null ? (_ref = target[keyword]) != null ? _ref.selector : void 0 : void 0;
+    });
+    return selector.trim();
   },
   __delegateEvents: function() {
     var events, module,

data/package.json

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

data/spec/joosy/core/modules/container_spec.coffee

@@ -5,12 +5,18 @@ describe "Joosy.Modules.Container", ->
     class @TestContainer extends Joosy.Module
       @include Joosy.Modules.Container
       elements:
+        content:
+          post1: '#post1'
+          post2: '#post2'
         footer: '.footer'
       events:
         'test': 'onContainerTest'
       container: $('#application', @ground)
     @box = new @TestContainer()
 
+  it "assigns nested elements", ->
+    @box.refreshElements()
+    expect(@box.$content.$post1.get 0).toBe $('#post1').get 0
 
   it "should have property named per declared element in container", ->
     @ground.prepend('<div class="footer" />')  # out of container
@@ -44,17 +50,35 @@ describe "Joosy.Modules.Container", ->
     subBox = new SubContainerB()
     target = subBox.__collectElements()
     expect(target).toEqual Object.extended
+      content: 
+        post1: '#post1'
+        post2: '#post2'
       first: 'overrided'
       second: 'second'
       third: 'third'
       footer: '.footer'
     target = (new @TestContainer()).__collectElements()
-    expect(target).toEqual Object.extended(footer: '.footer')
+    expect(target).toEqual Object.extended
+      footer: '.footer'
+      content: 
+        post1: '#post1'
+        post2: '#post2'
 
   it "should resolve element selector", ->
+    @box.refreshElements()
+
     target = @box.__extractSelector '$footer'
     expect(target).toEqual '.footer'
 
+    target = @box.__extractSelector '$content.$post1'
+    expect(target).toEqual '#post1'
+
+    target = @box.__extractSelector '$footer tr'
+    expect(target).toEqual '.footer tr'
+
+    target = @box.__extractSelector '$footer $content.$post1'
+    expect(target).toEqual '.footer #post1'
+
   it "should inherit event declarations", ->
     class SubContainerA extends @TestContainer
       events:
@@ -75,6 +99,7 @@ describe "Joosy.Modules.Container", ->
     expect(target).toEqual Object.extended('test': 'onContainerTest')
 
   it "should delegate events", ->
+    @box.refreshElements()
     callback = 1.upto(3).map -> sinon.spy()
     @box.events = Object.extended(@box.events).merge
       'test .post': callback[2]

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

@@ -27,14 +27,21 @@ Joosy.Modules.Container =
   #     bar: '.bar'
   #
   refreshElements: ->
-    @__collectElements().each (key, value) =>
-      # TODO: Check for possible collisions?
-      @['$'+key] = @$(value)
+    @__assignElements @, @__collectElements()
 
     if @hasOwnProperty "__onRefreshes"
       @__onRefreshes.each (callback) => callback.apply @
       @__onRefreshes = []
 
+  __assignElements: (root, entries) ->
+    Object.each entries, (key, value) =>
+      if Object.isObject(value)
+        @__assignElements root['$'+key]={}, value
+      else
+        value = @__extractSelector value
+        root['$'+key] = @$(value)
+        root['$'+key].selector = value
+
   #
   # Clears old HTML links, set the new HTML from the callback and refreshes elements
   #
@@ -86,10 +93,16 @@ Joosy.Modules.Container =
   # @param [String] selector            Selector to convert
   #
   __extractSelector: (selector) ->
-    if r = selector.match /\$([A-z]+)/
-      selector = @__collectElements()[r[1]]
+    selector = selector.replace /(\$[A-z0-9\.\$]+)/g, (path) =>
+      path    = path.split('.')
+      keyword = path.pop()
+
+      target = @
+      target = target?[part] for part in path
+
+      target?[keyword]?.selector
 
-    selector
+    selector.trim()
 
   #
   # Bings events defined in 'events' to container
@@ -101,7 +114,7 @@ Joosy.Modules.Container =
   #     'click $foo': -> #this will search for selector of foo element
   #
   __delegateEvents: ->
-    module = this
+    module = @
     events = @__collectEvents()
 
     events.each (key, method) =>

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.17
+  version: 1.2.0.alpha.18
 platform: ruby
 authors:
 - Boris Staal
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-06-29 00:00:00.000000000 Z
+date: 2013-06-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets