joosy 1.2.0.beta.4 → 1.2.0.rc.1

data/spec/joosy/core/widget_spec.coffee

@@ -327,6 +327,15 @@ describe "Joosy.Widget", ->
           @a.__bootstrap null, @nestingMap, @$ground
           expect(@$ground.html()).toEqualHTML '<div id="b"><div id="c"></div><div id="d">D</div></div>'
 
+        it 'loads children before parent', ->
+          order = []
+          for instance in ['a', 'b', 'c', 'd', 'e', 'f']
+            do (instance) =>
+              @[instance].constructor.afterLoad ->
+                order.push(instance)
+          @a.__bootstrap null, @nestingMap, @$ground
+          expect(order).toEqual ['d', 'e', 'f', 'c', 'b', 'a']
+
       describe 'independent', ->
 
         it 'loads independent children synchronously if they managed to fetch', ->

data/spec/joosy/resources/modules/cacher_spec.coffee

@@ -12,7 +12,7 @@ describe 'Joosy.Modules.Resources.Cacher', ->
       spy = @spy
 
       class @Cacher extends Joosy.Resources.Scalar
-        @include Joosy.Modules.Resources.Cacher
+        @concern Joosy.Modules.Resources.Cacher
 
         @cache 'scalar'
         @fetcher (callback) ->
@@ -35,7 +35,7 @@ describe 'Joosy.Modules.Resources.Cacher', ->
       spy = @spy
 
       class @Cacher extends Joosy.Resources.Array
-        @include Joosy.Modules.Resources.Cacher
+        @concern Joosy.Modules.Resources.Cacher
 
         @cache 'array'
         @fetcher (callback) ->
@@ -63,7 +63,7 @@ describe 'Joosy.Modules.Resources.Cacher', ->
       spy = @spy
 
       class @Cacher extends Joosy.Resources.Hash
-        @include Joosy.Modules.Resources.Cacher
+        @concern Joosy.Modules.Resources.Cacher
 
         @cache 'hash'
         @fetcher (callback) ->

data/spec/joosy/resources/modules/function_spec.coffee

@@ -2,7 +2,7 @@ describe 'Joosy.Modules.Resources.Function', ->
 
   it 'works', ->
     class Generic extends Joosy.Module
-      @extend Joosy.Modules.Resources.Function
+      @concern Joosy.Modules.Resources.Function
 
       constructor: (@bar) ->
         @foo = 'bar'
@@ -19,7 +19,7 @@ describe 'Joosy.Modules.Resources.Function', ->
   describe 'Hash', ->
     it 'works', ->
       class Hash extends Joosy.Resources.Hash
-        @extend Joosy.Modules.Resources.Function
+        @concern Joosy.Modules.Resources.Function
 
         constructor: (data) ->
           data.bar = 'foo'

data/spec/joosy/resources/modules/identity_map_spec.coffee

@@ -1,8 +1,8 @@
 describe "Joosy.Modules.Resources.IdentityMap", ->
 
   class Model extends Joosy.Resources.Hash
-    @include Joosy.Modules.Resources.Model
-    @extend  Joosy.Modules.Resources.IdentityMap
+    @concern Joosy.Modules.Resources.Model
+    @concern Joosy.Modules.Resources.IdentityMap
 
   class TestInline extends Model
     @entity 'test_inline'

data/spec/joosy/resources/modules/model_spec.coffee

@@ -1,7 +1,7 @@
 describe "Joosy.Modules.Resources.Model", ->
 
   class Model extends Joosy.Resources.Hash
-    @include Joosy.Modules.Resources.Model
+    @concern Joosy.Modules.Resources.Model
 
   beforeEach ->
     @resource = Model.build @data =

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: joosy
 version: !ruby/object:Gem::Version
-  version: 1.2.0.beta.4
+  version: 1.2.0.rc.1
 platform: ruby
 authors:
 - Boris Staal
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-11 00:00:00.000000000 Z
+date: 2013-12-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: sprockets
@@ -63,7 +63,6 @@ files:
 - source/joosy/form.coffee
 - source/joosy/helpers/form.coffee
 - source/joosy/helpers/index.coffee
-- source/joosy/helpers/routes.coffee
 - source/joosy/helpers/view.coffee
 - source/joosy/helpers/widgets.coffee
 - source/joosy/joosy.coffee
@@ -83,7 +82,6 @@ files:
 - source/joosy/modules/resources/identity_map.coffee
 - source/joosy/modules/resources/model.coffee
 - source/joosy/modules/time_manager.coffee
-- source/joosy/modules/widgets_manager.coffee
 - source/joosy/page.coffee
 - source/joosy/resources/array.coffee
 - source/joosy/resources/hash.coffee
@@ -99,7 +97,6 @@ files:
 - spec/helpers/ground.coffee
 - spec/helpers/matchers.coffee
 - spec/joosy/core/application_spec.coffee
-- spec/joosy/core/helpers/routes_spec.coffee
 - spec/joosy/core/helpers/view_spec.coffee
 - spec/joosy/core/helpers/widgets_spec.coffee
 - spec/joosy/core/joosy_spec.coffee

data/source/joosy/helpers/routes.coffee

@@ -1,17 +0,0 @@
-#= require joosy/joosy
-#= require joosy/helpers/view
-
-#
-# Rendering and string representation helpers
-#
-Joosy.helpers 'Routes', ->
-
-  @linkTo = (name='', url='', tagOptions={}) ->
-
-    # (url, tagOptions, block) ->
-    if typeof(tagOptions) == 'function'
-      block = tagOptions
-      [url, tagOptions] = [name, url]
-      name = block()
-
-    Joosy.Helpers.Application.contentTag 'a', name, Joosy.Module.merge(tagOptions, 'data-joosy': true, href: url)

data/source/joosy/modules/widgets_manager.coffee

@@ -1,90 +0,0 @@
-#= require joosy/joosy
-
-#
-# Widgets management routines
-#
-# @mixin
-#
-Joosy.Modules.WidgetsManager =
-
-  included: ->
-    @mapWidgets = (map) ->
-      unless @::hasOwnProperty "__widgets"
-        @::__widgets = Joosy.Module.merge {}, @.__super__.widgets
-      Joosy.Module.merge @::__widgets, map
-
-  #
-  # Registeres and runs widget inside specified container
-  #
-  # @param [DOM] container              jQuery or direct dom node object
-  # @param [Joosy.Widget] widget        Class or object of Joosy.Widget to register
-  #
-  registerWidget: (container, widget) ->
-    if Joosy.Module.hasAncestor widget, Joosy.Widget
-      widget = new widget()
-
-    if typeof(widget) == 'function'
-      widget = widget()
-
-    @__activeWidgets ||= []
-    @__activeWidgets.push widget.__load(@, $(container))
-
-    widget
-
-  #
-  # Unregisteres and destroys widget
-  #
-  # @param [Joosy.Widget] widget          Object of Joosy.Widget to unregister
-  #
-  unregisterWidget: (widget) ->
-    widget.__unload()
-
-    @__activeWidgets.splice @__activeWidgets.indexOf(widget), 1
-
-  #
-  # Intialize all widgets for current object
-  #
-  __setupWidgets: ->
-    return unless @__widgets
-
-    registered = {}
-
-    for selector, widget of @__widgets
-      if selector == '$container'
-        activeSelector = @$container
-      else
-        selector = @__extractSelector(selector) if @__extractSelector?
-        activeSelector = $(selector, @$container)
-
-      registered[selector] = {}
-
-      activeSelector.each (index, elem) =>
-        if Joosy.Module.hasAncestor widget, Joosy.Widget
-          instance = new widget
-        else
-          instance = widget.call this, index
-
-        if Joosy.debug()
-          registered[selector][Joosy.Module.__className instance] ||= 0
-          registered[selector][Joosy.Module.__className instance]  += 1
-
-        @registerWidget $(elem), instance
-
-    @__widgets = {}
-
-    if Joosy.debug()
-      for selector, value of registered
-        for widget, count of value
-          Joosy.Modules.Log.debugAs @, "Widget #{widget} registered at '#{selector}'. Elements: #{count}"
-
-  #
-  # Unregister all widgets for current object
-  #
-  __unloadWidgets: ->
-    if @__activeWidgets
-      for widget in @__activeWidgets
-        widget.__unload()
-
-# AMD wrapper
-if define?.amd?
-  define 'joosy/modules/widgets_manager', -> Joosy.Modules.WidgetsManager

data/spec/joosy/core/helpers/routes_spec.coffee

@@ -1,15 +0,0 @@
-describe "Joosy.Helpers.Routes", ->
-
-  it "renders data-joosy links", ->
-    link = Joosy.Helpers.Routes.linkTo 'test', '/app/link', nice: true
-    expect(link).toBeTag 'a', 'test',
-      'data-joosy': 'true'
-      nice: 'true'
-      href: '/app/link'
-
-  it "renders data-joosy links yielding block", ->
-    link = Joosy.Helpers.Routes.linkTo '/app/link', nice: true, -> 'test'
-    expect(link).toBeTag 'a', 'test',
-      'data-joosy': 'true'
-      nice: 'true'
-      href: '/app/link'