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

data/source/joosy/router.coffee

@@ -1,7 +1,6 @@
 #= require joosy/joosy
 #= require joosy/modules/events
 #= require joosy/page
-#= require joosy/helpers/routes
 
 #
 # Router. Reacts on URI change event and loads proper pages
@@ -25,21 +24,18 @@
 class Joosy.Router extends Joosy.Module
   @extend Joosy.Modules.Events
 
-  # We need to be constantly subscribed to popstate event to filter
-  # the first event that always happens on the initial load
   $(window).bind 'popstate', (event) =>
-    if window.history.loaded?
-      @trigger 'popstate', event
-    else
-      window.history.loaded = true
+    @trigger 'popstate', event
 
+  # Comfortable links for the views
   $(document).on 'click', 'a[data-joosy]', (event) ->
     event.preventDefault()
     Joosy.Router.navigate @getAttribute('href')
 
   #
   # Rails-like wrapper around internal raw routes representation
-  # @private
+  #
+  # @nodoc
   #
   class Drawer
     @run: (block, namespace='', alias='') ->
@@ -98,7 +94,15 @@ class Joosy.Router extends Joosy.Module
         block = options
         options = {}
 
-      Drawer.run block, @__namespace+name, options.as?.toString()
+      alias = if options.as
+        if @__alias
+          @__alias + options.as.charAt(0).toUpperCase() + options.as.slice(1)
+        else
+          options.as
+      else
+        @__alias
+
+      Drawer.run block, @__namespace+name, alias
 
   #
   # Registers a set of raw routes
@@ -142,14 +146,29 @@ class Joosy.Router extends Joosy.Module
       # Canonical form of HTML5 prefix is '/any/thing/'
       @config.prefix = ('/'+@config.prefix+'/').replace /\/{2,}/g, '/'
 
-      @listener = @bind 'popstate pushstate', =>
+      @suppressPopstate = true
+      @initialPath = location.pathname
+
+      @popstateListener = @bind 'popstate', =>
+        isInitialPop = @suppressPopstate && location.pathname == @initialPath
+        @suppressPopstate = false
+        if isInitialPop
+          Joosy.Modules.Log.debug "Router> Suppressed initial popstate"
+        else
+          @respond @canonizeLocation()
+
+      @pushstateListener = @bind 'pushstate', =>
+        @suppressPopstate = false
         @respond @canonizeLocation()
     else
       # Canonical form of hash suffix is 'any/thing'
       @config.prefix = @config.prefix.replace(/^\#?\/?/, '').replace /\/?$/, ''
 
       $(window).bind 'hashchange.JoosyRouter', =>
-        @respond @canonizeLocation()
+        if @__skipHashChange? && @__skipHashChange > 0
+          @__skipHashChange -= 1
+        else
+          @respond @canonizeLocation()
 
     @respond @canonizeLocation() if respond
 
@@ -157,7 +176,12 @@ class Joosy.Router extends Joosy.Module
   # Clears current map of routes and deactivates bindings
   #
   @reset: ->
-    @unbind @listener
+    if Joosy.Helpers.Routes?
+      delete Joosy.Widget::[key] for key, method of Joosy.Helpers.Routes
+      Joosy.Helpers.Routes = {}
+
+    @unbind @popstateListener
+    @unbind @pushstateListener
     $(window).unbind '.JoosyRouter'
     @restriction = false
     @routes = {}
@@ -175,22 +199,31 @@ class Joosy.Router extends Joosy.Module
   # Changes current URI and therefore triggers route loading
   #
   # @param [String] to                       Route to navigate to
-  #
+  # @param [Object] options
   # @option options [Boolean] respond        If false just changes route without responding
-  # @option options [Boolean] replaceState   If true replaces history entry instead of adding. Works only in browsers supporting history.pushState
+  # @option options [Boolean] replace        If true replaces history entry instead of adding (HTML5 mode only)
   #
-  @navigate: (to, options={}) ->
-    path = to
+  @navigate: (path, options={}) ->
+    method  = if options.replace then 'replaceState' else 'pushState'
+    respond = options.respond ? true
 
     if @config.html5
       # omit html5 relative links
       if @config.prefix && path[0] == '/' && !path.match(RegExp("^#{@config.prefix.replace(/\/$/, '')}(/|$)"))
         path = path.replace /^\//, @config.prefix
-      history.pushState {}, '', path
-      @trigger 'pushstate'
+
+      history[method] {}, '', path
+
+      @trigger('pushstate') if respond
     else
+      # remove prefix
       if @config.prefix && !path.match(RegExp("^#?/?#{@config.prefix}(/|$)"))
         path = path.replace /^\#?\/?/, "#{@config.prefix}/"
+
+      unless respond
+        @__skipHashChange ?= 0
+        @__skipHashChange += 1
+
       location.hash = path
 
     return
@@ -224,13 +257,14 @@ class Joosy.Router extends Joosy.Module
     result  = {}
 
     # Full RegExp matcher for the route
-    matcher = matcher.replace(/\/:([^\/]+)/g, '/([^/]+)')   # Turning :params into regexp section
+    matcher = matcher.replace(/\/?:([^\/]+)/g, '/([^/]+)')  # Turning :params into regexp section
     matcher = matcher.replace(/^\/?/, '^/?')                # Making leading slash optional
     matcher = matcher.replace(/\/?$/, '/?$')                # Making trailing slash optional
 
     # Array of parameter names
-    params  = (path.match(/\/:[^\/]+/g) || []).map (str) ->
-      str.substr 2
+    params  = (path.match(/\/?:[^\/]+/g) || []).map (str) ->
+      str = str.substr(1) if str[0] == '/'
+      str.substr(1)
 
     @routes ||= {}
     @routes[matcher] =
@@ -297,6 +331,14 @@ class Joosy.Router extends Joosy.Module
         else
           "#{origin}#{location.pathname}#{helper(options)}"
 
+      Joosy.Widget::["#{as}Path"] = @["#{as}Path"]
+      Joosy.Widget::["#{as}Url"]  = @["#{as}Url"]
+
+  #
+  # Parses parameters from both, current URL and route placeholders
+  #
+  # @private
+  #
   @__grabParams: (query, route=null, match=[]) ->
     params = {}
 

data/source/joosy/templaters/jst.coffee

@@ -4,6 +4,9 @@
 # JST template precompilation binding
 #
 class Joosy.Templaters.JST
+  #
+  # Initializes JST templater
+  #
   constructor: (@config={}) ->
     @prefix = @config.prefix if @config.prefix? && @config.prefix.length > 0
 

data/source/joosy/widget.coffee

@@ -105,18 +105,18 @@
 #
 # @include Joosy.Modules.Log
 # @include Joosy.Modules.Events
-# @include Joosy.Modules.DOM
-# @include Joosy.Modules.Renderer
+# @concern Joosy.Modules.DOM
+# @concern Joosy.Modules.Renderer
 # @include Joosy.Modules.TimeManager
-# @include Joosy.Modules.Filters
+# @extend Joosy.Modules.Filters
 #
 class Joosy.Widget extends Joosy.Module
   @include Joosy.Modules.Log
   @include Joosy.Modules.Events
-  @include Joosy.Modules.DOM
-  @include Joosy.Modules.Renderer
+  @concern Joosy.Modules.DOM
+  @concern Joosy.Modules.Renderer
   @include Joosy.Modules.TimeManager
-  @include Joosy.Modules.Filters
+  @extend Joosy.Modules.Filters
 
   #
   # Extends widgets mapping
@@ -139,7 +139,7 @@ class Joosy.Widget extends Joosy.Module
   @independent: ->
     @::__independent = true
 
-  @registerPlainFilters 'beforeLoad', 'afterLoad', 'afterUnload'
+  @registerPlainFilters 'beforeLoad', 'beforeUnload', 'afterLoad', 'afterUnload'
 
   @registerSequencedFilters 'beforePaint', 'paint', 'erase', 'fetch'
 
@@ -172,6 +172,10 @@ class Joosy.Widget extends Joosy.Module
   unregisterWidget: (widget) ->
     widget.__unload()
 
+  #
+  # Unloads the previous widget and inject the new one inplace saving
+  # the continuity
+  #
   replaceWidget: (widget, replacement) ->
     replacement = @__normalizeWidget(replacement)
     replacement.previous = widget
@@ -286,8 +290,6 @@ class Joosy.Widget extends Joosy.Module
     @__nestedSections = []
     @$container.html @__renderDefault?(@data || {})
 
-    @__load()
-
     for selector, section of nestingMap
       do (selector, section) =>
         $container = @__normalizeSelector(selector)
@@ -297,6 +299,8 @@ class Joosy.Widget extends Joosy.Module
         else
           section.instance.__bootstrap @, section.nested, $container, false
 
+    @__load()
+
   #
   # Initializes section that was injected into DOM
   #
@@ -313,6 +317,8 @@ class Joosy.Widget extends Joosy.Module
   # Deinitializes section that is preparing to be removed from DOM
   #
   __unload: (modifyParent=true) ->
+    @__runBeforeUnloads()
+
     if @__nestedSections
       section.__unload(false) for section in @__nestedSections
       delete @__nestedSections
@@ -329,7 +335,7 @@ class Joosy.Widget extends Joosy.Module
     delete @parent
 
   #
-  # Normalizes selector and returns jQuery wrap
+  # Normalizes selector and returns jQuery wrap.
   #
   # Selector can be one of:
   #
@@ -344,7 +350,7 @@ class Joosy.Widget extends Joosy.Module
       $(@__extractSelector(selector), @$container)
 
   #
-  # Normalizes widget descrpition to its instance
+  # Normalizes widget descrpition to its instance.
   #
   # Besides already being instance it cann be either class or lambda
   #

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

@@ -12,3 +12,17 @@ describe "Joosy.Helpers.View", ->
       h.contentTag 'div', 'content', {id: 'id2'}
 
     expect(tag.toLowerCase()).toEqualHTML '<div id="id"><div id="id2">content</div></div>'
+
+  it "renders data-joosy links", ->
+    link = Joosy.Helpers.Application.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.Application.linkTo '/app/link', nice: true, -> 'test'
+    expect(link).toBeTag 'a', 'test',
+      'data-joosy': 'true'
+      nice: 'true'
+      href: '/app/link'

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

@@ -5,7 +5,7 @@ describe "Joosy.Modules.DOM", ->
     container = @$ground.find('#application')
 
     class @DOM extends Joosy.Module
-      @include Joosy.Modules.DOM
+      @concern Joosy.Modules.DOM
 
       @mapElements
         posts: '.post'

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

@@ -4,7 +4,7 @@ describe "Joosy.Modules.Filters", ->
 
     beforeEach ->
       class @Filters extends Joosy.Module
-        @include Joosy.Modules.Filters
+        @extend Joosy.Modules.Filters
         @registerPlainFilters 'beforeLoad', 'afterLoad', 'afterUnload'
 
       @filters = new @Filters
@@ -96,7 +96,7 @@ describe "Joosy.Modules.Filters", ->
 
     beforeEach ->
       class @Filters extends Joosy.Module
-        @include Joosy.Modules.Filters
+        @extend Joosy.Modules.Filters
         @registerSequencedFilters 'beforeLoad', 'afterLoad', 'afterUnload'
 
       @filters = new @Filters

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

@@ -19,7 +19,7 @@ describe "Joosy.Module", ->
   it "has minimal set of properties", ->
     class Klass extends Joosy.Module
 
-    expect(Object.keys Klass).toEqual ['__namespace__', '__className', 'hasAncestor', 'aliasMethodChain', 'aliasStaticMethodChain', 'merge', 'include', 'extend', '__super__']
+    expect(Object.keys Klass).toEqual ['__namespace__', '__className', 'hasAncestor', 'aliasMethodChain', 'aliasStaticMethodChain', 'merge', 'include', 'extend', 'concern', '__super__']
     expect(Object.keys Klass.prototype).toEqual ['constructor']
 
   it "includes", ->

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

@@ -2,7 +2,7 @@ describe "Joosy.Modules.Renderer", ->
 
   beforeEach ->
     class @Renderer extends Joosy.Module
-      @include Joosy.Modules.Renderer
+      @concern Joosy.Modules.Renderer
 
     @renderer = new @Renderer
 
@@ -66,6 +66,24 @@ describe "Joosy.Modules.Renderer", ->
       runs ->
         expect(@$ground.text()).toBe "new"
 
+    it "runs callback during update", ->
+      template = (locals) -> locals.entity.value
+      callback = sinon.spy()
+
+      runs ->
+        @$ground.html @renderer.renderDynamic(template, {entity: @entity}, callback)
+        expect(@$ground.text()).toBe "initial"
+        expect(callback.callCount).toEqual 0
+
+      runs ->
+        @entity.update "new"
+
+      waits 0
+
+      runs ->
+        expect(@$ground.text()).toBe "new"
+        expect(callback.callCount).toEqual 1
+
     it "does not update unloaded content", ->
       template = (locals) -> locals.entity.value
 

data/spec/joosy/core/router_spec.coffee

@@ -25,38 +25,65 @@ describe "Joosy.Router", ->
     afterEach ->
       Joosy.Router.reset()
 
-    it 'draws', ->
-      spies = @spies
-      Page  = @Page
-
-      Joosy.Router.draw ->
-        @root to: spies.root
-        @match '/base', to: spies.base
-        @match '/page',  to: Page
-        @namespace '/section', {as: 'section'}, ->
-          @match '/page/:id', to: spies.section, as: 'page'
-          @match '/page2/:more', to: Page
-        @notFound to: spies.wildcard
+    describe 'drawer', ->
+      beforeEach ->
+        spies = @spies
+        Page  = @Page
+
+        Joosy.Router.setup {html5: true}, (-> ), false
+
+        Joosy.Router.draw ->
+          @root to: spies.root
+          @match '/base', to: spies.base
+          @match '/page',  to: Page
+          @namespace '/test', ->
+            @match '/page', to: spies.section, as: 'test'
+          @namespace '/section', {as: 'section'}, ->
+            @match '/page/:id', to: spies.section, as: 'page'
+            @match '/page2/:more', to: Page
+          @notFound to: spies.wildcard
+
+      it 'registeres routes', ->
+        expect(Joosy.Router.routes).toEqual
+          '^/?/?$':
+            to: @spies.root
+            as: 'root'
+            capture: []
+          '^/?base/?$':
+            to: @spies.base
+            capture: []
+          '^/?page/?$':
+            to: @Page, capture : []
+          '^/?test/page/?$':
+            to: @spies.section
+            capture: []
+            as: 'test'
+          '^/?section/page/([^/]+)/?$':
+            to: @spies.section
+            as: 'sectionPage'
+            capture: ['id']
+          '^/?section/page2/([^/]+)/?$':
+            to: @Page
+            capture: ['more']
+
+        expect(Joosy.Router.wildcardAction).toEqual @spies.wildcard
 
-      expect(Joosy.Router.routes).toEqual
-        '^/?/?$':
-          to: spies.root
-          as: 'root'
-          capture: []
-        '^/?base/?$':
-          to: spies.base,
-          capture: [],
-        '^/?page/?$':
-          to: Page, capture : []
-        '^/?section/page/([^/]+)/?$':
-          to: spies.section,
-          as: 'sectionPage'
-          capture: ['id']
-        '^/?section/page2/([^/]+)/?$':
-          to: Page
-          capture: ['more']
+      it 'defines plain helper', ->
+        expect(Joosy.Helpers.Routes.rootPath()).toEqual '/'
+        expect(Joosy.Helpers.Routes.rootUrl()).toEqual "http://#{location.host}/"
+        expect(Joosy.Helpers.Routes.testPath()).toEqual '/test/page'
 
-      expect(Joosy.Router.wildcardAction).toEqual spies.wildcard
+      it 'defines namespaced parameterized helpers', ->
+        expect(Joosy.Helpers.Routes.sectionPagePath(id: 1)).toEqual '/section/page/1'
+        expect(Joosy.Helpers.Routes.sectionPageUrl(id: 1)).toEqual "http://#{location.host}/section/page/1"
+
+      it 'adds helper to widgets', ->
+        class A extends Joosy.Widget
+          test: ->
+            expect(@rootPath()).toEqual '/'
+            expect(@rootUrl()).toEqual "http://#{location.host}/"
+
+        (new A).test()
 
     it 'maps', ->
       Joosy.Router.map @map
@@ -179,16 +206,15 @@ describe "Joosy.Router", ->
         runs -> Joosy.Router.navigate '/base'
         waits 0
         runs ->
-          location.hash == '#/base'
+          expect(location.hash).toEqual '#/base'
           expect(@spies.responder.callCount).toEqual 1
 
-      it 'defines plain helper', ->
-        expect(Joosy.Helpers.Routes.rootPath()).toEqual '#'
-        expect(Joosy.Helpers.Routes.rootUrl()).toEqual "http://#{location.host}#{pathname}#"
-
-      it 'defines namespaced parameterized helpers', ->
-        expect(Joosy.Helpers.Routes.sectionPagePath(id: 1)).toEqual '#section/page/1'
-        expect(Joosy.Helpers.Routes.sectionPageUrl(id: 1)).toEqual "http://#{location.host}#{pathname}#section/page/1"
+      it 'stubs', ->
+        runs -> Joosy.Router.navigate '/base', respond: false
+        waits 0
+        runs ->
+          expect(location.hash).toEqual '#/base'
+          expect(@spies.responder.callCount).toEqual 0
 
     if history.pushState?
       describe 'html5 based', ->
@@ -270,13 +296,22 @@ describe "Joosy.Router", ->
             location.pathname == '/base'
             expect(@spies.responder.callCount).toEqual 1
 
-        it 'defines plain helper', ->
-          expect(Joosy.Helpers.Routes.rootPath()).toEqual '/'
-          expect(Joosy.Helpers.Routes.rootUrl()).toEqual "http://#{location.host}/"
+        it 'stubs', ->
+          runs -> Joosy.Router.navigate '/base', respond: false
+          waits 0
+          runs ->
+            location.pathname == '/base'
+            expect(@spies.responder.callCount).toEqual 0
+
+        it 'replaces', ->
+          length = history.length
 
-        it 'defines namespaced parameterized helpers', ->
-          expect(Joosy.Helpers.Routes.sectionPagePath(id: 1)).toEqual '/section/page/1'
-          expect(Joosy.Helpers.Routes.sectionPageUrl(id: 1)).toEqual "http://#{location.host}/section/page/1"
+          runs -> Joosy.Router.navigate '/base', replace: true
+          waits 0
+          runs ->
+            location.pathname == '/base'
+            expect(@spies.responder.callCount).toEqual 1
+            expect(history.length).toEqual length
 
   for name, val of { html5: true, hash: false }
     do (name, val) ->
@@ -315,7 +350,7 @@ describe "Joosy.Router", ->
 
   describe 'linker', ->
     it 'defines helper', ->
-      tag = Joosy.Helpers.Routes.linkTo 'test', '/base', class: 'zomg!'
+      tag = Joosy.Helpers.Application.linkTo 'test', '/base', class: 'zomg!'
 
       expect(tag).toBeTag 'a', 'test',
         'data-joosy': 'true'