joosy 1.2.0.alpha.37 → 1.2.0.alpha.38

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 549827698e3e4993be65d4e7812f0642b9d027ef
-  data.tar.gz: 8702782b2c47d61cd875a8a4794564da766c1308
+  metadata.gz: d4b561d444a57bfd3a4d64ff5b106e663122563b
+  data.tar.gz: 0a51e8ca9ea31faae650610fe23612f3d963c69c
 SHA512:
-  metadata.gz: d428e3b79b5937a6b65bb75867b8396a7bd03c46546ba275393bb15c0e9adc8bf43cb302d68763af5a743249e77eafb0dc03093218167aa938dd1ec34e88430b
-  data.tar.gz: d17202664d7eb43b4615251ade745467a73ff38c0812293d8eaf9bd2631c7a84340cb17527dd5dfb5a1b6745efeb4aa3ca80b13dca3c3cf1af1c4c1f53700517
+  metadata.gz: 3290124949732e0c8c94c1e9df8346fd90443bf093546fe0e1276a177702ebfb6a9c5e3c12c10ddf06303774265e590f9179173911467137678504236b9ab693
+  data.tar.gz: 33466aae0b6c8a9efd02d9692b7f6d23a2786301b430800277e27320f382b52818b520a432a3ef0d65de28b3820bc93e9c640568c936b35321b2006b1c654716

data/.travis.yml

@@ -4,4 +4,9 @@ node_js:
 before_script:
   - npm install -g grunt-cli
   - ./node_modules/.bin/bower install
-script: "grunt test"
+script: "grunt test"
+branches:
+  except:
+    - 1.0
+    - 1.1
+    - gh-pages

data/Gruntfile.coffee

@@ -112,9 +112,6 @@ module.exports = (grunt) ->
         src: [locations.source.build].include ['preloaders', 'resources', 'resources-form'].map (x) ->
           locations.source.extensions(x).build
 
-  grunt.event.on 'watch', (action, filepath) ->
-    grunt.config ['coffee', 'specs', 'src'], filepath
-
   #
   # Tasks
   #

data/README.md

@@ -93,13 +93,14 @@ You assets are at `public/` directory, enjoy!
 While current repository is at the same time NPM package, Ruby gem and Bower component, – the main Core
 environment is Node.js.
 
-## Credits
+## Maintainers
 
-* Boris Staal ([@_inossidabile](http://twitter.com/#!/_inossidabile)) [![endorse](http://api.coderwall.com/inossidabile/endorsecount.png)](http://coderwall.com/inossidabile)
-* Andrew Shaydurov ([@ImGearHead](http://twitter.com/#!/ImGearHead))
-* Alexander Pavlenko ([@alerticus](http://twitter.com/#!/alerticus))
-* Peter Zotov ([@whitequark](http://twitter.com/#!/whitequark))
+* Boris Staal, [@inossidabile](http://staal.io)
+* Andrew Shaydurov, [@ImGearHead](http://twitter.com/ImGearHead)
+* Alexander Pavlenko, [@alerticus](http://twitter.com/alerticus)
 
-## LICENSE
+## License
+
+Copyright 2011-2013 [Boris Staal](http://staal.io)
 
 It is free software, and may be redistributed under the terms of MIT license.

data/bower.json

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

data/joosy.gemspec

@@ -1,18 +1,19 @@
 require File.expand_path("../lib/joosy.rb", __FILE__)
 
 Gem::Specification.new do |s|
-  s.name        = "joosy"
+  s.name        = 'joosy'
   s.version     = Joosy::VERSION
   s.platform    = Gem::Platform::RUBY
-  s.summary     = "Joosy Framework"
-  s.email       = "boris@staal.io"
-  s.homepage    = "http://github.com/joosy/joosy"
-  s.description = "A gem wrapper to include Joosy via the asset pipeline"
-  s.authors     = ['Boris Staal', 'Andrew Shaydurov', 'Peter Zotov', 'Alexander Pavlenko']
+  s.summary     = 'Joosy Framework'
+  s.email       = 'boris@staal.io'
+  s.homepage    = 'http://github.com/joosy/joosy'
+  s.description = 'A gem wrapper to include Joosy via the asset pipeline'
+  s.authors     = ['Boris Staal', 'Andrew Shaydurov', 'Alexander Pavlenko']
+  s.license     = 'MIT'
 
   s.files = `git ls-files`.split("\n")
-  s.require_paths = ["lib"]
+  s.require_paths = ['lib']
 
   s.add_dependency 'sprockets'
   s.add_dependency 'haml_coffee_assets', '>= 1.12.0'
-end
+end

data/lib/extensions/resources-form.js

@@ -18,9 +18,9 @@ Joosy.Form = (function(_super) {
 
   Form.prototype.substitutions = {};
 
-  Form.prototype.elements = {
+  Form.mapElements({
     'fields': 'input,select,textarea'
-  };
+  });
 
   Form.submit = function(form, options) {
     if (options == null) {
@@ -57,7 +57,7 @@ Joosy.Form = (function(_super) {
     if (this.container.length === 0) {
       return;
     }
-    this.refreshElements();
+    this.__assignElements();
     this.__delegateEvents();
     method = (_ref = this.container.get(0).getAttribute('method')) != null ? _ref.toLowerCase() : void 0;
     if (method && !['get', 'post'].any(method)) {
@@ -135,7 +135,7 @@ Joosy.Form = (function(_super) {
       Object.each(data, function(property, val) {
         var entity, i, input, key, _i, _len, _ref, _results;
         key = _this.concatFieldName(scope, property);
-        input = _this.$fields.filter("[name='" + key + "']:not(:file),[name='" + (key.underscore()) + "']:not(:file),[name='" + (key.camelize(false)) + "']:not(:file)");
+        input = _this.$fields("[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) {
@@ -206,7 +206,7 @@ Joosy.Form = (function(_super) {
 
   Form.prototype.__before = function(xhr, settings) {
     if ((this.before == null) || this.before.apply(this, arguments) === true) {
-      return this.$fields.removeClass(this.invalidationClass);
+      return this.$fields().removeClass(this.invalidationClass);
     }
   };
 
@@ -250,7 +250,7 @@ Joosy.Form = (function(_super) {
   };
 
   Form.prototype.findField = function(field) {
-    return this.$fields.filter("[name='" + field + "']");
+    return this.$fields("[name='" + field + "']");
   };
 
   Form.prototype.__markMethod = function(method) {

data/lib/joosy.js

@@ -44,6 +44,10 @@ this.Joosy = {
       return (_ref = Joosy.Modules.Events).synchronize.apply(_ref, arguments);
     }
   },
+  uid: function() {
+    this.__uid || (this.__uid = 0);
+    return "__joosy" + (this.__uid++);
+  },
   uuid: function() {
     return 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, function(c) {
       var r, v;
@@ -217,10 +221,7 @@ Joosy.Application = {
     }
     this.mergeConfig(options);
     this.templater = new Joosy.Templaters.RailsJST(this.name);
-    Joosy.Router.__setupRoutes();
-    this.sandboxSelector = Joosy.uuid();
-    this.content().after("<div id='" + this.sandboxSelector + "' style='display:none'></div>");
-    return this.sandboxSelector = '#' + this.sandboxSelector;
+    return Joosy.Router.__setupRoutes();
   },
   content: function() {
     return $(this.selector);
@@ -524,9 +525,21 @@ Joosy.Events.SynchronizationContext = (function() {
 /***  src/joosy/core/modules/container  ***/
 
 Joosy.Modules.Container = {
-  events: false,
-  elements: false,
   eventSplitter: /^(\S+)\s*(.*)$/,
+  included: function() {
+    this.mapElements = function(map) {
+      if (!this.prototype.hasOwnProperty("__elements")) {
+        this.prototype.__elements = Object.clone(this.__super__.__elements) || {};
+      }
+      return Object.merge(this.prototype.__elements, map);
+    };
+    return this.mapEvents = function(map) {
+      if (!this.prototype.hasOwnProperty("__events")) {
+        this.prototype.__events = Object.clone(this.__super__.__events) || {};
+      }
+      return Object.merge(this.prototype.__events, map);
+    };
+  },
   onRefresh: function(callback) {
     if (!this.hasOwnProperty("__onRefreshes")) {
       this.__onRefreshes = [];
@@ -538,7 +551,6 @@ Joosy.Modules.Container = {
   },
   refreshElements: function() {
     var _this = this;
-    this.__assignElements();
     if (this.hasOwnProperty("__onRefreshes")) {
       this.__onRefreshes.each(function(callback) {
         return callback.apply(_this);
@@ -558,24 +570,6 @@ Joosy.Modules.Container = {
     container.html(data);
     return container;
   },
-  __collectElements: function() {
-    var elements, klass;
-    elements = Object.extended(this.elements || {});
-    klass = this;
-    while (klass = klass.constructor.__super__) {
-      Joosy.Module.merge(elements, klass.elements, false);
-    }
-    return elements;
-  },
-  __collectEvents: function() {
-    var events, klass;
-    events = Object.extended(this.events || {});
-    klass = this;
-    while (klass = klass.constructor.__super__) {
-      Joosy.Module.merge(events, klass.events, false);
-    }
-    return events;
-  },
   __extractSelector: function(selector) {
     var _this = this;
     selector = selector.replace(/(\$[A-z0-9\.\$]+)/g, function(path) {
@@ -594,13 +588,21 @@ Joosy.Modules.Container = {
   __assignElements: function(root, entries) {
     var _this = this;
     root || (root = this);
-    entries || (entries = this.__collectElements());
+    entries || (entries = this.__elements);
+    if (!entries) {
+      return;
+    }
     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);
+        root['$' + key] = function(filter) {
+          if (!filter) {
+            return _this.$(value);
+          }
+          return _this.$(value).filter(filter);
+        };
         return root['$' + key].selector = value;
       }
     });
@@ -609,14 +611,17 @@ Joosy.Modules.Container = {
     var events, module,
       _this = this;
     module = this;
-    events = this.__collectEvents();
-    return events.each(function(key, method) {
+    events = this.__events;
+    if (!events) {
+      return;
+    }
+    return Object.each(events, function(key, method) {
       var callback, eventName, match, selector;
       if (!Object.isFunction(method)) {
         method = _this[method];
       }
       callback = function(event) {
-        return method.call(module, this, event);
+        return method.call(module, $(this), event);
       };
       match = key.match(_this.eventSplitter);
       eventName = match[1];
@@ -1361,6 +1366,14 @@ Joosy.Modules.TimeManager = {
 /***  src/joosy/core/modules/widgets_manager  ***/
 
 Joosy.Modules.WidgetsManager = {
+  included: function() {
+    return this.mapWidgets = function(map) {
+      if (!this.prototype.hasOwnProperty("__widgets")) {
+        this.prototype.__widgets = Object.clone(this.__super__.__widgets) || {};
+      }
+      return Object.merge(this.prototype.__widgets, map);
+    };
+  },
   registerWidget: function(container, widget) {
     if (Joosy.Module.hasAncestor(widget, Joosy.Widget)) {
       widget = new widget();
@@ -1376,27 +1389,21 @@ Joosy.Modules.WidgetsManager = {
     widget.__unload();
     return this.__activeWidgets.splice(this.__activeWidgets.indexOf(widget), 1);
   },
-  __collectWidgets: function() {
-    var klass, widgets;
-    widgets = Object.extended(this.widgets || {});
-    klass = this;
-    while (klass = klass.constructor.__super__) {
-      Joosy.Module.merge(widgets, klass.widgets, false);
-    }
-    return widgets;
-  },
   __setupWidgets: function() {
     var registered, widgets,
       _this = this;
-    widgets = this.__collectWidgets();
+    widgets = this.__widgets;
     registered = Object.extended();
-    widgets.each(function(selector, widget) {
-      var activeSelector, r;
+    if (!widgets) {
+      return;
+    }
+    Object.each(widgets, function(selector, widget) {
+      var activeSelector;
       if (selector === '$container') {
         activeSelector = _this.container;
       } else {
-        if (r = selector.match(/\$([A-z_]+)/)) {
-          selector = _this.elements[r[1]];
+        if (_this.__extractSelector != null) {
+          selector = _this.__extractSelector(selector);
         }
         activeSelector = $(selector, _this.container);
       }
@@ -1539,7 +1546,7 @@ Joosy.Layout = (function(_super) {
 
   Layout.prototype.__load = function(container) {
     this.container = container;
-    this.refreshElements();
+    this.__assignElements();
     this.__delegateEvents();
     this.__setupWidgets();
     return this.__runAfterLoads();
@@ -1717,7 +1724,7 @@ Joosy.Page = (function(_super) {
   };
 
   Page.prototype.__load = function() {
-    this.refreshElements();
+    this.__assignElements();
     this.__delegateEvents();
     this.__setupWidgets();
     this.__runAfterLoads(this.params, this.previous);
@@ -2232,7 +2239,7 @@ Joosy.Widget = (function(_super) {
     if (render && this.__renderer) {
       this.swapContainer(this.container, this.__renderer(this.data || {}));
     }
-    this.refreshElements();
+    this.__assignElements();
     this.__delegateEvents();
     this.__setupWidgets();
     this.__runAfterLoads();

data/package.json

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

data/spec/joosy/core/application_spec.coffee

@@ -11,8 +11,6 @@ describe "Joosy.Application", ->
     Joosy.Application.initialize 'app', '#application', router: {foo: 'bar'}
     expect(Joosy.Application.page).toBeUndefined()
     expect(Joosy.Application.selector).toEqual '#application'
-    expect(Joosy.Application.sandboxSelector).toMatch /#[0-9A-F]{8}-[0-9A-F]{4}-4[0-9A-F]{3}-[0-9A-F]{4}-[0-9A-F]{12}/
-    expect($(Joosy.Application.sandboxSelector).length).toEqual 1
     expect(Joosy.Router.__setupRoutes.callCount).toEqual 1
     expect(Joosy.Application.name).toEqual 'app'
     expect(Joosy.Application.config.router.foo).toEqual 'bar'

data/spec/joosy/core/layout_spec.coffee

@@ -23,7 +23,7 @@ describe "Joosy.Layout", ->
 
   it "should load itself", ->
     spies = []
-    spies.push sinon.spy(@box, 'refreshElements')
+    spies.push sinon.spy(@box, '__assignElements')
     spies.push sinon.spy(@box, '__delegateEvents')
     spies.push sinon.spy(@box, '__setupWidgets')
     spies.push sinon.spy(@box, '__runAfterLoads')

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

@@ -2,123 +2,149 @@ describe "Joosy.Modules.Container", ->
 
   beforeEach ->
     @seedGround()
+
     class @TestContainer extends Joosy.Module
       @include Joosy.Modules.Container
-      elements:
+      @mapElements
+        posts: '.post'
         content:
           post1: '#post1'
           post2: '#post2'
         footer: '.footer'
-      events:
+      @mapEvents
         '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 "reinitializes container", ->
+    oldContainer = @box.container
+    parent       = oldContainer.parent()
+    callback     = sinon.spy()
 
-  it "should have property named per declared element in container", ->
-    @ground.prepend('<div class="footer" />')  # out of container
-    @box.refreshElements()
-    target = @box.$footer.get 0
-    expect(target).toBeTruthy()
-    expect(target).toBe $('.footer', @box.container).get 0
-    expect(target).toBe @box.$('.footer').get 0
-
-  it "should reinitialize container", ->
-    old_container = @box.container
-    parent = old_container.parent()
+    oldContainer.bind 'test', callback
+    oldContainer.trigger 'test'
+    expect(callback.callCount).toEqual 1
+
+    newContainer = Joosy.Modules.Container.swapContainer oldContainer, 'new content'
+    newContainer.trigger 'test'
+    expect(newContainer.html()).toEqual 'new content'
+    expect(newContainer.parent().get(0)).toBe parent.get 0
+    expect(callback.callCount).toEqual 1
+
+  it "calls afterRefreshes", ->
     callback = sinon.spy()
-    old_container.bind 'test', callback
-    old_container.trigger 'test'
-    new_container = Joosy.Modules.Container.swapContainer old_container, 'new content'
-    new_container.trigger 'test'
-    expect(new_container.html()).toEqual 'new content'
-    expect(new_container.parent().get(0)).toBe parent.get 0
+    @box.onRefresh -> callback()
+
+    @box.refreshElements()
+    @box.refreshElements()
     expect(callback.callCount).toEqual 1
 
-  it "should inherit element declarations", ->
-    class SubContainerA extends @TestContainer
-      elements:
-        first: 'first'
-        second: 'second'
-    class SubContainerB extends SubContainerA
-      elements:
+  describe "elements", ->
+    it "declares", ->
+      class SubContainerA extends @TestContainer
+        @mapElements
+          first: 'first'
+          second: 'second'
+      class SubContainerB extends SubContainerA
+        @mapElements
+          first: 'overrided'
+          third: 'third'
+
+      expect((new SubContainerB()).__elements).toEqual Object.extended
+        posts: '.post'
+        content: 
+          post1: '#post1'
+          post2: '#post2'
         first: 'overrided'
+        second: 'second'
         third: 'third'
-    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'
-      content: 
-        post1: '#post1'
-        post2: '#post2'
-
-  it "should resolve element selector", ->
-    @box.refreshElements()
+        footer: '.footer'
 
-    target = @box.__extractSelector '$footer'
-    expect(target).toEqual '.footer'
+      expect((new @TestContainer()).__elements).toEqual Object.extended
+        posts: '.post'
+        footer: '.footer'
+        content: 
+          post1: '#post1'
+          post2: '#post2'
+
+      console.log (new @TestContainer)
+
+    it "resolve selector", ->
+      @box.__assignElements()
+
+      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 "nesteds get assigned", ->
+      @box.__assignElements()
+      expect(@box.$content.$post1().get 0).toBe $('#post1').get 0
+
+    it "get assigned", ->
+      @box.__assignElements()
 
-    target = @box.__extractSelector '$content.$post1'
-    expect(target).toEqual '#post1'
+      target = @box.$footer().get 0
+      expect(target).toBeTruthy()
+      expect(target).toBe $('.footer', @box.container).get 0
+      expect(target).toBe @box.$('.footer').get 0
 
-    target = @box.__extractSelector '$footer tr'
-    expect(target).toEqual '.footer tr'
+    it "allow to filter", ->
+      @box.__assignElements()
 
-    target = @box.__extractSelector '$footer $content.$post1'
-    expect(target).toEqual '.footer #post1'
+      target = @box.$posts('#post1').get 0
+      expect(target).toBeTruthy()
+      expect(target).toBe $('#post1', @box.container).get 0
 
-  it "should inherit event declarations", ->
-    class SubContainerA extends @TestContainer
-      events:
+    it "respect container boundaries", ->
+      @box.__assignElements()
+
+      @ground.prepend('<div class="footer" />')  # out of container
+      target = @box.$footer().get 0
+      expect(target).toBeTruthy()
+      expect(target).toBe $('.footer', @box.container).get 0
+      expect(target).toBe @box.$('.footer').get 0
+
+  describe "events", ->
+    it "declares", ->
+      class SubContainerA extends @TestContainer
+        @mapEvents
+          'test .post': 'callback2'
+          'custom' : 'method'
+      class SubContainerB extends SubContainerA
+        @mapEvents
+          'test $footer': 'onFooterTest'
+          'custom' : 'overrided'
+      target = (new SubContainerB()).__events
+      expect(target).toEqual Object.extended
+        'test': 'onContainerTest'
         'test .post': 'callback2'
-        'custom' : 'method'
-    class SubContainerB extends SubContainerA
-      events:
         'test $footer': 'onFooterTest'
         'custom' : 'overrided'
-    subBox = new SubContainerB()
-    target = subBox.__collectEvents()
-    expect(target).toEqual Object.extended
-      'test': 'onContainerTest'
-      'test .post': 'callback2'
-      'test $footer': 'onFooterTest'
-      'custom' : 'overrided'
-    target = (new @TestContainer()).__collectEvents()
-    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]
-      'test $footer': 'onFooterTest'
-
-    @box.onContainerTest = callback[0]
-    @box.onFooterTest = callback[1]
-    @box.__delegateEvents()
-    @box.container.trigger 'test'
-    $('.footer', @box.container).trigger 'test'
-    $('.post', @box.container).trigger 'test'
-    expect(callback[0].callCount).toEqual 5
-    expect(callback[1].callCount).toEqual 1
-    expect(callback[2].callCount).toEqual 3
+      target = (new @TestContainer()).__events
+      expect(target).toEqual Object.extended('test': 'onContainerTest')
 
-  it "calls afterRefreshes", ->
-    callback = sinon.spy()
-    @box.onRefresh -> callback()
+    it "delegate", ->
+      @box.__assignElements()
+      callbacks = 1.upto(3).map -> sinon.spy()
+      @box.__events = Object.extended(@box.__events).merge
+        'test .post': callbacks[2]
+        'test $footer': 'onFooterTest'
 
-    @box.refreshElements()
-    @box.refreshElements()
-    expect(callback.callCount).toEqual 1
+      @box.onContainerTest = callbacks[0]
+      @box.onFooterTest = callbacks[1]
+      @box.__delegateEvents()
+      @box.container.trigger 'test'
+      $('.footer', @box.container).trigger 'test'
+      $('.post', @box.container).trigger 'test'
+      expect(callbacks[0].callCount).toEqual 5
+      expect(callbacks[1].callCount).toEqual 1
+      expect(callbacks[2].callCount).toEqual 3

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

@@ -3,6 +3,8 @@ describe "Joosy.Modules.WidgetsManager", ->
   beforeEach ->
     class @TestWidgetManager extends Joosy.Module
       @include Joosy.Modules.WidgetsManager
+      @include Joosy.Modules.Container
+
     @box = new @TestWidgetManager()
     @widgetMock = Object.extended(
       __load: sinon.stub()
@@ -27,17 +29,17 @@ describe "Joosy.Modules.WidgetsManager", ->
 
   it "should inherit widget declarations", ->
     @box.container = @ground
-    @TestWidgetManager::widgets =
+    @TestWidgetManager::__widgets =
       'test': 'widget'
     class SubWidgetManagerA extends @TestWidgetManager
-      widgets:
+      @mapWidgets
         'selector': 'widget'
     class SubWidgetManagerB extends SubWidgetManagerA
-      widgets:
+      @mapWidgets
         'widgets': 'widget'
         'selector': 'overriden'
     subBox = new SubWidgetManagerB()
-    target = subBox.__collectWidgets()
+    target = subBox.__widgets
     expect(target).toEqual Object.extended
       'test': 'widget'
       'widgets':  'widget'
@@ -46,16 +48,17 @@ describe "Joosy.Modules.WidgetsManager", ->
   it "should register widgets per declaration", ->
     @seedGround()
     @box.container = $('#application')
-    @box.elements = {footer: '.footer'}
-    @box.widgets =
+    @box.__elements = {footer: '.footer'}
+    @box.__widgets =
       '$container': Joosy.Widget
       '$footer': Joosy.Widget
       '.post': sinon.stub()
-    @box.widgets['.post'].returns @widgetMock
+    @box.__widgets['.post'].returns @widgetMock
+    @box.__assignElements()
     @box.__setupWidgets()
     expect(@box.__activeWidgets.length).toEqual 5
-    expect(@box.widgets['.post'].callCount).toEqual 3
-    expect(@box.widgets['.post'].getCall(0).calledOn @box).toBeTruthy()
+    expect(@box.__widgets['.post'].callCount).toEqual 3
+    expect(@box.__widgets['.post'].getCall(0).calledOn @box).toBeTruthy()
 
   it "should bootstrap widget properly", ->
     class TextWidget extends Joosy.Widget
@@ -64,7 +67,7 @@ describe "Joosy.Modules.WidgetsManager", ->
 
     @seedGround()
     @box.container = $('#application')
-    @box.widgets =
+    @box.__widgets =
       '.post:first': TextWidget
       '.widget:first': (i) -> new TextWidget i
     @box.__setupWidgets()

data/spec/joosy/core/page_spec.coffee

@@ -65,7 +65,7 @@ describe "Joosy.Page", ->
 
     it "should load itself", ->
       spies = []
-      spies.push sinon.spy(@box, 'refreshElements')
+      spies.push sinon.spy(@box, '__assignElements')
       spies.push sinon.spy(@box, '__delegateEvents')
       spies.push sinon.spy(@box, '__setupWidgets')
       spies.push sinon.spy(@box, '__runAfterLoads')

data/spec/joosy/core/widget_spec.coffee

@@ -23,7 +23,7 @@ describe "Joosy.Widget", ->
     spies = [sinon.spy()]
     @TestWidget.view spies[0]
     @parent = new Joosy.Layout()
-    spies.push sinon.spy(@box, 'refreshElements')
+    spies.push sinon.spy(@box, '__assignElements')
     spies.push sinon.spy(@box, '__delegateEvents')
     spies.push sinon.spy(@box, '__runAfterLoads')
     target = @box.__load @parent, @ground

data/spec/joosy/extensions/form/form_spec.coffee

@@ -54,7 +54,7 @@ describe "Joosy.Form", ->
       formWithProperties = new Joosy.Form @nudeForm, invalidationClass: 'fluffy'
       expect(formWithProperties.container).toEqual @nudeForm
       expect(formWithProperties.invalidationClass).toEqual 'fluffy'
-      expect(formWithProperties.$fields.length).toEqual 5
+      expect(formWithProperties.$fields().length).toEqual 5
 
       expect(@spy.callCount).toEqual 1
 
@@ -63,7 +63,7 @@ describe "Joosy.Form", ->
       expect(formWithCallback.container).toEqual @putForm
       expect(formWithCallback.invalidationClass).toEqual 'field_with_errors'
       expect(formWithCallback.success).toBe callback
-      expect(formWithCallback.$fields.length).toEqual 1
+      expect(formWithCallback.$fields().length).toEqual 2
 
       expect(@spy.callCount).toEqual 1
 
@@ -97,40 +97,40 @@ describe "Joosy.Form", ->
 
     it "should fill form, set proper action and method and store resource", ->
       @nudeForm.fill @resource
-      expect(@nudeForm.$fields[0].value).toEqual 'foo'
-      expect(@nudeForm.$fields[1].value).toEqual 'bar'
-      expect(@nudeForm.$fields[2].checked).toEqual true
-      expect(@nudeForm.$fields[2].value).toEqual '1'
-      expect(@nudeForm.$fields[3].value).toEqual 'qwe'
-      expect(@nudeForm.$fields[3].checked).toEqual false
-      expect(@nudeForm.$fields[4].value).toEqual 'zxc'
-      expect(@nudeForm.$fields[4].checked).toEqual true
+      expect(@nudeForm.$fields()[0].value).toEqual 'foo'
+      expect(@nudeForm.$fields()[1].value).toEqual 'bar'
+      expect(@nudeForm.$fields()[2].checked).toEqual true
+      expect(@nudeForm.$fields()[2].value).toEqual '1'
+      expect(@nudeForm.$fields()[3].value).toEqual 'qwe'
+      expect(@nudeForm.$fields()[3].checked).toEqual false
+      expect(@nudeForm.$fields()[4].value).toEqual 'zxc'
+      expect(@nudeForm.$fields()[4].checked).toEqual true
       expect(@nudeForm.container.attr('method').toLowerCase()).toEqual 'post'
       expect(@nudeForm.container.attr 'action').toEqual '/tests/1'
       expect(@nudeForm.__resource).toEqual @resource
 
     it "should fill form with camelized properties", ->
       @putForm.fill @resource
-      expect(@putForm.$fields[0].value).toEqual 'baz'
+      expect(@putForm.$fields()[0].value).toEqual 'baz'
       expect(@putForm.container.attr('method').toLowerCase()).toEqual 'post'
       expect(@putForm.container.attr 'action').toEqual '/tests/1'
 
     it "should fill form with any properties", ->
       @exactForm.fill @resource
-      expect(@exactForm.$fields[0].value).toEqual 'works'
+      expect(@exactForm.$fields()[0].value).toEqual 'works'
 
     it "should fill form with decorator", ->
       @moreForm.fill @resource,
         decorator: (e) ->
           e.ololo = e.camelBaz
           e
-      expect(@moreForm.$fields[0].value).toEqual 'baz'
+      expect(@moreForm.$fields()[0].value).toEqual 'baz'
 
     it "should fill form with extended action", ->
       @nudeForm.fill @resource,
         action: @resource.memberPath(from: 'calculate')
-      expect(@nudeForm.$fields[0].value).toEqual 'foo'
-      expect(@nudeForm.$fields[1].value).toEqual 'bar'
+      expect(@nudeForm.$fields()[0].value).toEqual 'foo'
+      expect(@nudeForm.$fields()[1].value).toEqual 'bar'
       expect(@nudeForm.container.attr 'action').toEqual '/tests/1/calculate'
 
       resource = @Test.build 'someId'
@@ -156,14 +156,14 @@ describe "Joosy.Form", ->
 
     it "should fill nested attributes and resources", ->
       @nestedForm.fill @resource
-      expect(@nestedForm.$fields[0].value).toEqual 'test'
-      expect(@nestedForm.$fields[1].value).toEqual 'one'
-      expect(@nestedForm.$fields[2].value).toEqual 'two'
-      expect(@nestedForm.$fields[3].value).toEqual 'sin'
+      expect(@nestedForm.$fields()[0].value).toEqual 'test'
+      expect(@nestedForm.$fields()[1].value).toEqual 'one'
+      expect(@nestedForm.$fields()[2].value).toEqual 'two'
+      expect(@nestedForm.$fields()[3].value).toEqual 'sin'
 
     it 'should fill array-like attributes', ->
       @arrayForm.fill @resource
-      expect(@arrayForm.$fields[0].value).toEqual 'here'
+      expect(@arrayForm.$fields()[0].value).toEqual 'here'
 
     it "should break cross-references", ->
       @resource('single')('trololo', @resource)
@@ -237,13 +237,13 @@ describe "Joosy.Form", ->
 
     it "should fill class for invalidated fields by default", ->
       @target.respond 422, 'Content-Type': 'application/json', '{"foo": "error!"}'
-      expect($(@nudeForm.$fields[0]).attr 'class').toEqual 'field_with_errors'
+      expect($(@nudeForm.$fields()[0]).attr 'class').toEqual 'field_with_errors'
 
     it "should trigger 'error' and complete default action if it returned true", ->
       @nudeForm.error = sinon.spy ->
         true
       @target.respond 422, 'Content-Type': 'application/json', '{"foo": "error!"}'
-      expect($(@nudeForm.$fields[0]).attr 'class').toEqual 'field_with_errors'
+      expect($(@nudeForm.$fields()[0]).attr 'class').toEqual 'field_with_errors'
       expect(@nudeForm.error.callCount).toEqual 1
       expect(@nudeForm.error.args[0][0]).toEqual
         "foo": "error!"
@@ -252,31 +252,31 @@ describe "Joosy.Form", ->
       @nudeForm.error = sinon.spy ->
         false
       @target.respond 422, 'Content-Type': 'application/json', '{"foo": "error!"}'
-      expect($(@nudeForm.$fields[0]).attr 'class').toNotEqual 'field_with_errors'
+      expect($(@nudeForm.$fields()[0]).attr 'class').toNotEqual 'field_with_errors'
       expect(@nudeForm.error.callCount).toEqual 1
 
     it "should clear fields before another submit", ->
       @target.respond 422, 'Content-Type': 'application/json', '{"foo": "error!"}'
-      expect($(@nudeForm.$fields[0]).attr 'class').toEqual 'field_with_errors'
+      expect($(@nudeForm.$fields()[0]).attr 'class').toEqual 'field_with_errors'
       @nudeForm.container.submit()
-      expect($(@nudeForm.$fields[0]).attr 'class').toNotEqual 'field_with_errors'
+      expect($(@nudeForm.$fields()[0]).attr 'class').toNotEqual 'field_with_errors'
 
     it "should trigger 'before' and do default action if it returns true", ->
       @target.respond 422, 'Content-Type': 'application/json', '{"foo": "error!"}'
-      expect($(@nudeForm.$fields[0]).attr 'class').toEqual 'field_with_errors'
+      expect($(@nudeForm.$fields()[0]).attr 'class').toEqual 'field_with_errors'
       @nudeForm.before = sinon.spy ->
         true
       @nudeForm.container.submit()
-      expect($(@nudeForm.$fields[0]).attr 'class').toNotEqual 'field_with_errors'
+      expect($(@nudeForm.$fields()[0]).attr 'class').toNotEqual 'field_with_errors'
       expect(@nudeForm.before.callCount).toEqual 1
 
     it "should trigger 'before' and skip default action if it returns false", ->
       @target.respond 422, 'Content-Type': 'application/json', '{"foo": "error!"}'
-      expect($(@nudeForm.$fields[0]).attr 'class').toEqual 'field_with_errors'
+      expect($(@nudeForm.$fields()[0]).attr 'class').toEqual 'field_with_errors'
       @nudeForm.before = sinon.spy ->
         false
       @nudeForm.container.submit()
-      expect($(@nudeForm.$fields[0]).attr 'class').toEqual 'field_with_errors'
+      expect($(@nudeForm.$fields()[0]).attr 'class').toEqual 'field_with_errors'
       expect(@nudeForm.before.callCount).toEqual 1
 
   describe "Error response handling", ->

data/src/joosy/core/application.coffee

@@ -35,10 +35,6 @@ Joosy.Application =
 
     Joosy.Router.__setupRoutes()
 
-    @sandboxSelector = Joosy.uuid()
-    @content().after "<div id='#{@sandboxSelector}' style='display:none'></div>"
-    @sandboxSelector = '#' + @sandboxSelector
-
   #
   # Gets current application root node
   #

data/src/joosy/core/joosy.coffee

@@ -74,6 +74,13 @@
     else
       Joosy.Modules.Events.synchronize arguments...
 
+  #
+  # Generates ID unique within current run
+  #
+  uid: ->
+    @__uid ||= 0
+    "__joosy#{@__uid++}"
+
   #
   # Generates UUID
   #

data/src/joosy/core/layout.coffee

@@ -133,12 +133,12 @@ class Joosy.Layout extends Joosy.Module
   #
   # Layout bootstrap proccess.
   #
-  #   * {Joosy.Modules.Container.refreshElements}
+  #   * {Joosy.Modules.Container.__assignElements}
   #   * {Joosy.Modules.Container.__delegateEvents}
   #   * {Joosy.Modules.WidgetsManager.__setupWidgets}
   #
   __load: (@container) ->
-    @refreshElements()
+    @__assignElements()
     @__delegateEvents()
     @__setupWidgets()
     @__runAfterLoads()

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

@@ -8,11 +8,19 @@
 # @mixin
 #
 Joosy.Modules.Container =
-  events: false
-  elements: false
-
   eventSplitter: /^(\S+)\s*(.*)$/
 
+  included: ->
+    @mapElements = (map) ->
+      unless @::hasOwnProperty "__elements"
+        @::__elements = Object.clone(@.__super__.__elements) || {}
+      Object.merge @::__elements, map
+
+    @mapEvents = (map) ->
+      unless @::hasOwnProperty "__events"
+        @::__events = Object.clone(@.__super__.__events) || {}
+      Object.merge @::__events, map
+
   onRefresh: (callback) ->
     @__onRefreshes = [] unless @hasOwnProperty "__onRefreshes"
     @__onRefreshes.push callback
@@ -24,8 +32,6 @@ Joosy.Modules.Container =
   # Rebinds selectors defined in 'elements' hash to object properties
   #
   refreshElements: ->
-    @__assignElements()
-
     if @hasOwnProperty "__onRefreshes"
       @__onRefreshes.each (callback) => callback.apply @
       @__onRefreshes = []
@@ -51,30 +57,6 @@ Joosy.Modules.Container =
     container.html data
     container
 
-  #
-  # Gathers 'elements' from current and super classes
-  #
-  __collectElements: ->
-    elements = Object.extended @elements || {}
-
-    klass = this
-    while klass = klass.constructor.__super__
-      Joosy.Module.merge elements, klass.elements, false
-
-    elements
-
-  #
-  # Gathers 'events' from current and super classes
-  #
-  __collectEvents: ->
-    events = Object.extended @events || {}
-
-    klass = this
-    while klass = klass.constructor.__super__
-      Joosy.Module.merge events, klass.events, false
-
-    events
-
   #
   # Converts '$...' notation to selector from 'elements'
   #
@@ -96,40 +78,48 @@ Joosy.Modules.Container =
   # Assigns elements defined in 'elements'
   #
   # @example Sample elements
-  #   elements:
+  #   @mapElements
   #     foo: '.foo'
   #     bar: '.bar'
   #
   __assignElements: (root, entries) ->
     root    ||= @
-    entries ||= @__collectElements()
+    entries ||= @__elements
+
+    return unless entries
 
     Object.each entries, (key, value) =>
       if Object.isObject(value)
         @__assignElements root['$'+key]={}, value
       else
         value = @__extractSelector value
-        root['$'+key] = @$(value)
+
+        root['$'+key] = (filter) =>
+          return @$(value) unless filter
+          return @$(value).filter(filter)
+
         root['$'+key].selector = value
 
   #
   # Binds events defined in 'events' to container
   #
   # @example Sample events
-  #   events:
+  #   @mapEvents
   #     'click': -> # this will raise on container click
   #     'click .foo': -> # this will raise on .foo click
   #     'click $foo': -> #this will search for selector of foo element
   #
   __delegateEvents: ->
     module = @
-    events = @__collectEvents()
+    events = @__events
+
+    return unless events
 
-    events.each (key, method) =>
+    Object.each events, (key, method) =>
       unless Object.isFunction method
         method = @[method]
       callback = (event) ->
-        method.call module, this, event
+        method.call module, $(this), event
 
       match      = key.match @eventSplitter
       eventName  = match[1]

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

@@ -7,6 +7,12 @@
 #
 Joosy.Modules.WidgetsManager =
 
+  included: ->
+    @mapWidgets = (map) ->
+      unless @::hasOwnProperty "__widgets"
+        @::__widgets = Object.clone(@.__super__.__widgets) || {}
+      Object.merge @::__widgets, map
+
   #
   # Registeres and runs widget inside specified container
   #
@@ -21,7 +27,7 @@ Joosy.Modules.WidgetsManager =
       widget = widget()
 
     @__activeWidgets ||= []
-    @__activeWidgets.push widget.__load(this, $(container))
+    @__activeWidgets.push widget.__load(@, $(container))
 
     widget
 
@@ -35,32 +41,20 @@ Joosy.Modules.WidgetsManager =
 
     @__activeWidgets.splice @__activeWidgets.indexOf(widget), 1
 
-  #
-  # Gathers widgets definitions from current and super classes
-  #
-  __collectWidgets: ->
-    widgets = Object.extended @widgets || {}
-
-    klass = this
-    while klass = klass.constructor.__super__
-      Joosy.Module.merge widgets, klass.widgets, false
-
-    widgets
-
   #
   # Intialize all widgets for current object
   #
   __setupWidgets: ->
-    widgets    = @__collectWidgets()
+    widgets    = @__widgets
     registered = Object.extended()
 
-    widgets.each (selector, widget) =>
+    return unless widgets
+
+    Object.each widgets, (selector, widget) =>
       if selector == '$container'
         activeSelector = @container
       else
-        if r = selector.match /\$([A-z_]+)/
-          selector = @elements[r[1]]
-
+        selector = @__extractSelector(selector) if @__extractSelector?
         activeSelector = $(selector, @container)
 
       registered[selector] = Object.extended()

data/src/joosy/core/page.coffee

@@ -250,13 +250,13 @@ class Joosy.Page extends Joosy.Module
   #
   # Page bootstrap proccess
   #
-  #   * {Joosy.Modules.Container.refreshElements}
+  #   * {Joosy.Modules.Container.__assignElements}
   #   * {Joosy.Modules.Container.__delegateEvents}
   #   * {Joosy.Modules.WidgetsManager.__setupWidgets}
   #   * Scrolling
   #
   __load: ->
-    @refreshElements()
+    @__assignElements()
     @__delegateEvents()
     @__setupWidgets()
     @__runAfterLoads @params, @previous

data/src/joosy/core/widget.coffee

@@ -58,7 +58,7 @@ class Joosy.Widget extends Joosy.Module
   # Widget bootstrap proccess
   #
   #   * Rendering (if required)
-  #   * {Joosy.Modules.Container.refreshElements}
+  #   * {Joosy.Modules.Container.__assignElements}
   #   * {Joosy.Modules.Container.__delegateEvents}
   #
   # @param [Joosy.Page, Joosy.Layout]     Page or Layout to attach to
@@ -68,7 +68,7 @@ class Joosy.Widget extends Joosy.Module
     @__runBeforeLoads()
     if render && @__renderer
       @swapContainer @container, @__renderer(@data || {})
-    @refreshElements()
+    @__assignElements()
     @__delegateEvents()
     @__setupWidgets()
     @__runAfterLoads()

data/src/joosy/extensions/resources-form/form.coffee

@@ -40,7 +40,7 @@ class Joosy.Form extends Joosy.Module
   #
   # List of elements for internal usage
   #
-  elements:
+  @mapElements
     'fields': 'input,select,textarea'
 
   #
@@ -104,7 +104,7 @@ class Joosy.Form extends Joosy.Module
     @container = $(form)
     return if @container.length == 0
 
-    @refreshElements()
+    @__assignElements()
     @__delegateEvents()
 
     method = @container.get(0).getAttribute('method')?.toLowerCase()
@@ -179,7 +179,7 @@ class Joosy.Form extends Joosy.Module
       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)")
+        input = @$fields("[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
@@ -246,7 +246,7 @@ class Joosy.Form extends Joosy.Module
   #
   __before: (xhr, settings) ->
     if !@before? || @before(arguments...) is true
-      @$fields.removeClass @invalidationClass
+      @$fields().removeClass @invalidationClass
 
   #
   # Inner error callback.
@@ -292,7 +292,7 @@ class Joosy.Form extends Joosy.Module
   # @param [String] field         Name of field to find
   #
   findField: (field) ->
-    @$fields.filter("[name='#{field}']")
+    @$fields("[name='#{field}']")
 
   #
   # Simulates REST methods by adding hidden _method input with real method

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

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

metadata

@@ -1,17 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.alpha.37
+  version: 1.2.0.alpha.38
 platform: ruby
 authors:
 - Boris Staal
 - Andrew Shaydurov
-- Peter Zotov
 - Alexander Pavlenko
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-07-10 00:00:00.000000000 Z
+date: 2013-07-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -150,7 +149,8 @@ files:
 - templates/widget/basic.coffee
 - templates/widget/namespaced.coffee
 homepage: http://github.com/joosy/joosy
-licenses: []
+licenses:
+- MIT
 metadata: {}
 post_install_message: 
 rdoc_options: []