nali 0.4.2 → 0.4.3

data/lib/client/javascripts/nali/nali.js.coffee

@@ -5,7 +5,7 @@ window.Nali =
 
   starting: ->
     for name, extension of @extensions
-      extension.runExtensions()
+      extension._runExtensions()
       extension.initialize() if extension.hasOwnProperty 'initialize'
       @starting.call extension
     @
@@ -13,19 +13,19 @@ window.Nali =
   extend: ( params ) ->
     for name, param of params
       param._name          = name
-      @[ name ]            = @extensions[ name ] = @child param
+      @[ name ]            = @extensions[ name ] = @_child param
       @[ name ].extensions = {}
 
   clone: ( params = {} ) ->
-    obj = @child params
-    obj.runCloning()
+    obj = @_child params
+    obj._runCloning()
     obj
 
-  child: ( params ) ->
+  _child: ( params ) ->
     obj         = Object.create @
     obj      :: = @
     obj[ name ] = value for name, value of params
-    obj.initObservation()
+    obj._initObservation()
     obj
 
   expand: ( obj ) ->
@@ -47,12 +47,12 @@ window.Nali =
       return true  if     @::_name is parent
     @::childOf parent
 
-  runExtensions: ( context = @ ) ->
-    @::?.runExtensions context
+  _runExtensions: ( context = @ ) ->
+    @::?._runExtensions context
     @extension.call context if @hasOwnProperty 'extension'
 
-  runCloning: ( context = @ ) ->
-    @::?.runCloning context
+  _runCloning: ( context = @ ) ->
+    @::?._runCloning context
     @cloning.call context if @hasOwnProperty 'cloning'
 
   getter: ( property, callback ) ->
@@ -70,9 +70,9 @@ window.Nali =
         @setter property, ( value ) -> obj[ property ] = value
     @
 
-  initObservation: ->
-    @observers   = []
-    @observables = []
+  _initObservation: ->
+    @_observers   = []
+    @_observables = []
     @
 
   destroyObservation: ->
@@ -80,19 +80,19 @@ window.Nali =
     @unsubscribeFromAll()
     @
 
-  addObservationItem: ( to, obj, event, callback ) ->
+  _addObservationItem: ( to, obj, event, callback ) ->
     return @ for item in @[ to ] when item[0] is obj and item[1] is event and item[2] in [ undefined, callback ]
     @[ to ].push if callback then [ obj, event, callback ] else [ obj, event ]
     @
 
-  removeObservationItem: ( from, obj, event ) ->
+  _removeObservationItem: ( from, obj, event ) ->
     for item in @[ from ][..] when item[0] is obj and ( item[1] is event or not event )
       @[ from ].splice @[ from ].indexOf( item ), 1
     @
 
   subscribe: ( observer, event, callback ) ->
-    @addObservationItem 'observers', observer, event, callback
-    observer.addObservationItem 'observables', @, event, callback
+    @_addObservationItem '_observers', observer, event, callback
+    observer._addObservationItem '_observables', @, event, callback
     @
 
   subscribeTo: ( observable, event, callback ) ->
@@ -111,8 +111,8 @@ window.Nali =
     @
 
   unsubscribe: ( observer, event ) ->
-    @removeObservationItem 'observers', observer, event
-    observer.removeObservationItem 'observables', @, event
+    @_removeObservationItem '_observers', observer, event
+    observer._removeObservationItem '_observables', @, event
     @
 
   unsubscribeFrom: ( observable, event ) ->
@@ -120,13 +120,13 @@ window.Nali =
     @
 
   unsubscribeAll: ( event ) ->
-    @unsubscribe item[0], event for item in @observers[..]
+    @unsubscribe item[0], event for item in @_observers[..]
     @
 
   unsubscribeFromAll: ( event ) ->
-    @unsubscribeFrom item[0], event for item in @observables[..]
+    @unsubscribeFrom item[0], event for item in @_observables[..]
     @
 
   trigger: ( event, args... ) ->
-    item[2].call item[0], args... for item in @observers[..] when item[1] is event
+    item[2].call item[0], args... for item in @_observers[..] when item[1] is event
     @

data/lib/client/javascripts/nali/notice.js.coffee

@@ -2,16 +2,17 @@ Nali.Model.extend Notice:
 
   initialize: ->
     @::::expand Notice: @
-    @addMethods()
+    @_addMethods()
 
-  prepare: ( params ) ->
+  _addMethods: ->
+    for name of @_views
+      do ( name ) =>
+        @[ name ] = ( params ) => @new( @_prepare params ).show name
+
+  _prepare: ( params ) ->
     params = message: params if typeof params is 'string'
     params
 
-  addMethods: ->
-    for name of @views
-      do ( name ) =>
-        @[ name ] = ( params ) => @new( @prepare params ).show name
 
 
 Nali.View.extend

data/lib/client/javascripts/nali/router.js.coffee

@@ -4,29 +4,29 @@ Nali.extend Router:
     @::expand redirect: ( args... ) => @redirect args...
     @
 
-  routes:      {}
+  _routes: {}
 
   start: ->
-    @scanRoutes()
+    @_scanRoutes()
     @_( window ).on 'popstate', ( event ) =>
       event.preventDefault()
       event.stopPropagation()
-      @saveHistory false
+      @_saveHistory = false
       @redirect event.target.location.pathname
     @
 
-  scanRoutes: ->
+  _scanRoutes: ->
     for name, controller of @Controller.extensions when controller.actions?
       route  = '^'
       route += name.lower().replace /s$/, 's*(\/|$)'
       route += '('
       route += Object.keys( controller._actions ).join '|'
       route += ')?'
-      @routes[ route ] = controller
+      @_routes[ route ] = controller
     @
 
   redirect: ( url = window.location.pathname, options = {} ) ->
-    if found = @findRoute @prepare( url ) or @prepare( @Application.defaultUrl )
+    if found = @_findRoute @_prepare( url ) or @_prepare( @Application.defaultUrl )
       { controller, action, filters, params } = found
       params[ name ] = value for name, value in options
       controller.run action, filters, params
@@ -35,14 +35,14 @@ Nali.extend Router:
     else console.warn "Not exists route to the address %s", url
     @
 
-  prepare: ( url ) ->
+  _prepare: ( url ) ->
     url = url.replace "http://#{ window.location.host }", ''
     url = url[ 1.. ]   or '' if url and url[ 0...1 ] is '/'
     url = url[ ...-1 ] or '' if url and url[ -1.. ]  is '/'
     url
 
-  findRoute: ( url ) ->
-    for route, controller of @routes when match = url.match new RegExp route, 'i'
+  _findRoute: ( url ) ->
+    for route, controller of @_routes when match = url.match new RegExp route, 'i'
       segments = ( @routedUrl = url ).split( '/' )[ 1... ]
       if segments[0] in Object.keys( controller._actions )
         action = segments.shift()
@@ -57,16 +57,9 @@ Nali.extend Router:
       return controller: controller, action: action, filters: filters, params: params
     false
 
-  saveHistory: ( value ) ->
-    @_saveHistory ?= true
-    if value in [ true, false ]
-      @_saveHistory = value
-      @
-    else @_saveHistory
-
   changeUrl: ( url = null ) ->
-    if @saveHistory()
+    if @_saveHistory
       @routedUrl = url if url?
       history.pushState null, null, '/' + ( @url = @routedUrl ) if @routedUrl isnt @url
-    else @saveHistory true
+    else @_saveHistory = true
     @

data/lib/client/javascripts/nali/view.js.coffee

@@ -3,19 +3,20 @@ Nali.extend View:
   extension: ->
     if @_name isnt 'View'
       @_shortName = @_name.underscore().split( '_' )[ 1.. ].join( '_' ).camel()
-      @parseTemplate()
-      @parseEvents()
+      @_parseTemplate()
+      @_parseEvents()
     @
 
   cloning: ->
     @my = @model
+    @_prepareElement()
     @
 
   layout: -> null
 
-  onSourceUpdated:   -> @draw()
+  _onSourceUpdated:   -> @_draw()
 
-  onSourceDestroyed: -> @hide()
+  _onSourceDestroyed: -> @hide()
 
   getOf: ( source, property ) ->
     @redrawOn source, "update.#{ property }"
@@ -25,80 +26,80 @@ Nali.extend View:
     @getOf @model, property
 
   redrawOn: ( source, event ) ->
-    @subscribeTo source, event, @onSourceUpdated
+    @subscribeTo source, event, @_onSourceUpdated
 
   insertTo: ->
     if ( layout = @layout() )?.childOf? 'View' then layout.show().yield
     else @Application.htmlContainer
 
-  draw: ->
-    @runAssistants 'draw'
+  _draw: ->
+    @_runAssistants 'draw'
     @onDraw?()
     @
 
   show: ( insertTo = @insertTo() ) ->
-    @prepareElement()
     unless @visible
-      @runModelCallback 'beforeShow'
-      @draw().bindEvents()
-      @runAssistants 'show'
-      @subscribeTo @model, 'destroy', @onSourceDestroyed
+      @_runModelCallback 'beforeShow'
+      @_draw()._bindEvents()
+      @_runAssistants 'show'
+      @subscribeTo @model, 'destroy', @_onSourceDestroyed
       @element.appendTo insertTo
       setTimeout ( => @onShow() ), 5 if @onShow?
       @trigger 'show'
       @visible = true
-      @runModelCallback 'afterShow'
+      @_runModelCallback 'afterShow'
     @
 
   hide: ( delay = 0 ) ->
     if @visible
-      @runModelCallback 'beforeHide'
+      @_runModelCallback 'beforeHide'
       @onHide?()
+      @_unbindEvents()
       @trigger 'hide'
-      @runAssistants 'hide'
-      @hideElement if delay and typeof( delay ) is 'number' then delay else @hideDelay
+      @_runAssistants 'hide'
+      @_hideElement if delay and typeof( delay ) is 'number' then delay else @hideDelay
       @destroyObservation()
       @visible = false
-      @runModelCallback 'afterHide'
+      @_runModelCallback 'afterHide'
     @
 
-  hideElement: ( delay ) ->
-    if delay then setTimeout ( => @removeElement() ), delay
-    else @removeElement()
+  _hideElement: ( delay ) ->
+    if delay then setTimeout ( => @_removeElement() ), delay
+    else @_removeElement()
     @
 
-  removeElement: ->
+  _removeElement: ->
     @element[0].parentNode.removeChild @element[0]
     @
 
-  runModelCallback: ( type ) ->
+  _runModelCallback: ( type ) ->
     @model[ type ]?[ @_shortName ]?.call @model
     @
 
-  runLink: ( event ) ->
+  _runLink: ( event ) ->
     event.preventDefault()
-    @runUrl event.currentTarget.getAttribute 'href'
+    @_runUrl event.currentTarget.getAttribute 'href'
     @
 
-  runForm: ( event ) ->
+  _runForm: ( event ) ->
     event.preventDefault()
-    @runUrl event.currentTarget.getAttribute( 'action' ), form2js event.currentTarget, '.', false
+    @_runUrl event.currentTarget.getAttribute( 'action' ), form2js event.currentTarget, '.', false
     @
 
-  runUrl: ( url, params ) ->
+  _runUrl: ( url, params ) ->
     if match = url.match /^(@@?)(.+)/
       [ chain, segments... ] = match[2].split '/'
-      if result = @analizeChain chain, ( if match[1].length is 1 then @ else @model )
+      if result = @_analizeChain chain, ( if match[1].length is 1 then @ else @model )
         [ source, method ] = result
         if method of source
-          args = @parseUrlSegments segments
+          args = @_parseUrlSegments segments
           args.unshift params if params
           source[ method ] args...
         else console.warn "Method %s not exists of %O", method, source
     else @redirect url, params
     @
 
-  parseUrlSegments: ( segments ) ->
+  _parseUrlSegments: ( segments ) ->
     params = []
     for segment in segments when segment isnt ''
       [ name, value ] = segment.split ':'
@@ -109,8 +110,8 @@ Nali.extend View:
       else params.push name
     params
 
-  parseEvents: ->
-    @eventsMap = []
+  _parseEvents: ->
+    @_eventsMap = []
     if @events
       @events = [ @events ] if typeof @events is 'string'
       for event in @events
@@ -123,109 +124,117 @@ Nali.extend View:
         catch
           console.warn "Events parsing error: \"%s\" of %O", event, @
           error = true
-        if error then error = false else @eventsMap.push [ selector, type, events, handlers ]
+        if error then error = false else @_eventsMap.push [ selector, type, events, handlers ]
     @
 
-  bindEvents: ->
-    unless @_eventsBinded?
-      @element.find( 'a'    ).on 'click',  ( event ) => @runLink event
-      @element.find( 'form' ).on 'submit', ( event ) => @runForm event
-      @element.on 'click',  ( event ) => @runLink event if @element.is 'a'
-      @element.on 'submit', ( event ) => @runForm event if @element.is 'form'
-      for [ selector, type, events, handlers ] in @eventsMap
-        for handler in handlers
-          do ( selector, type, events, handler ) =>
-            @element[ type ] events, selector, ( event ) => @[ handler ] event
-      @_eventsBinded = true
+  _bindEvents: ->
+    @_bindRoutedElements 'a',    'href',   'click',  ( event ) => @_runLink event
+    @_bindRoutedElements 'form', 'action', 'submit', ( event ) => @_runForm event
+    for [ selector, type, events, handlers ] in @_eventsMap
+      for handler in handlers
+        do ( selector, type, events, handler ) =>
+          @element[ type ] events, selector, ( event ) => @[ handler ] event
     @
 
-  prepareElement: ->
+  _bindRoutedElements: ( selector, urlProp, event, callback ) ->
+    finded = ( el for el in @element.find( selector ) when el[ urlProp ].indexOf( window.location.origin ) >= 0 )
+    finded.push @element[0] if @element.is selector
+    ( @_routedElements ?= {} )[ selector ] = @_( finded ).on event, callback
+    @
+
+  _unbindEvents: ->
+    @element.off()
+    @_routedElements.a.off()
+    @_routedElements.form.off()
+    @
+
+  _prepareElement: ->
     unless @element
       @element         = @_ @template
       @element[0].view = @
-      @addAssistants()
+      @_addAssistants()
     @
 
-  getNode: ( path ) ->
+  _getNode: ( path ) ->
     node = @element[0]
     node = node[ sub ] for sub in path
     node
 
-  parseTemplate: ->
+  _parseTemplate: ->
     if container = document.querySelector '#' + @_name.underscore()
       @template = container.innerHTML.trim().replace( /\s+/g, ' ' )
         .replace( /({\s*\+.+?\s*})/g, ' <assist>$1</assist>' )
       unless RegExp( "^<[^>]+" + @_name ).test @template
         @template = "<div class=\"#{ @_name }\">#{ @template }</div>"
-      @parseAssistants()
+      @_parseAssistants()
       container.parentNode.removeChild container
     else console.warn 'Template %s not exists', @_name
     @
 
-  parseAssistants: ->
-    @assistantsMap = []
+  _parseAssistants: ->
+    @_assistantsMap = []
     if /{\s*.+?\s*}|bind=".+?"/.test @template
       tmp = document.createElement 'div'
       tmp.innerHTML = @template
-      @scanAssistants tmp.children[0]
+      @_scanAssistants tmp.children[0]
     @
 
-  scanAssistants: ( node, path = [] ) ->
+  _scanAssistants: ( node, path = [] ) ->
     if node.nodeType is 3
       if /{\s*yield\s*}/.test( node.textContent.trim() ) and node.parentNode.childNodes.length is 1
-        @assistantsMap.push nodepath: path, type: 'Yield'
+        @_assistantsMap.push nodepath: path, type: 'Yield'
       else if /^{\s*\w+ of @\w*\s*}$/.test( node.textContent.trim() ) and node.parentNode.childNodes.length is 1
-        @assistantsMap.push nodepath: path, type: 'Relation'
+        @_assistantsMap.push nodepath: path, type: 'Relation'
       else if /{\s*.+?\s*}/.test node.textContent
-        @assistantsMap.push nodepath: path, type: 'Text'
+        @_assistantsMap.push nodepath: path, type: 'Text'
     else if node.nodeName is 'ASSIST'
-      @assistantsMap.push nodepath: path, type: 'Html'
+      @_assistantsMap.push nodepath: path, type: 'Html'
     else
       if node.attributes
         for attribute, index in node.attributes
           if attribute.name is 'bind'
-            @assistantsMap.push nodepath: path, type: 'Form'
+            @_assistantsMap.push nodepath: path, type: 'Form'
           else if /{\s*.+?\s*}/.test attribute.value
-            @assistantsMap.push nodepath: path.concat( 'attributes', index ), type: 'Attr'
-      @scanAssistants child, path.concat 'childNodes', index for child, index in node.childNodes
+            @_assistantsMap.push nodepath: path.concat( 'attributes', index ), type: 'Attr'
+      @_scanAssistants child, path.concat 'childNodes', index for child, index in node.childNodes
     @
 
-  addAssistants: ->
-    @assistants = show: [], draw: [], hide: []
-    @[ "add#{ type }Assistant" ] @getNode nodepath for { nodepath, type } in @assistantsMap
+  _addAssistants: ->
+    @_assistants = show: [], draw: [], hide: []
+    @[ "_add#{ type }Assistant" ] @_getNode nodepath for { nodepath, type } in @_assistantsMap
     @
 
-  runAssistants: ( type ) ->
-    assistant.call @ for assistant in @assistants[ type ]
+  _runAssistants: ( type ) ->
+    assistant.call @ for assistant in @_assistants[ type ]
     @
 
-  addTextAssistant: ( node ) ->
+  _addTextAssistant: ( node ) ->
     initialValue = node.textContent
-    @assistants[ 'draw' ].push -> node.textContent = @analize initialValue
+    @_assistants[ 'draw' ].push -> node.textContent = @_analize initialValue
     @
 
-  addAttrAssistant: ( node ) ->
+  _addAttrAssistant: ( node ) ->
     initialValue = node.value
-    @assistants[ 'draw' ].push -> node.value = @analize initialValue
+    @_assistants[ 'draw' ].push -> node.value = @_analize initialValue
     @
 
-  addHtmlAssistant: ( node ) ->
+  _addHtmlAssistant: ( node ) ->
     parent       = node.parentNode
     initialValue = node.innerHTML
     index        = Array::indexOf.call parent.childNodes, node
     after        = parent.childNodes[ index - 1 ] or null
     before       = parent.childNodes[ index + 1 ] or null
-    @assistants[ 'draw' ].push ->
+    @_assistants[ 'draw' ].push ->
       start = if after  then Array::indexOf.call( parent.childNodes, after ) + 1 else 0
       end   = if before then Array::indexOf.call parent.childNodes, before  else parent.childNodes.length
       parent.removeChild node for node in Array::slice.call( parent.childNodes, start, end )
-      parent.insertBefore element, before for element in @_( @analize initialValue )
+      parent.insertBefore element, before for element in @_( @_analize initialValue )
     @
 
-  addFormAssistant: ( node ) ->
-    if bind = @analizeChain node.attributes.removeNamedItem( 'bind' ).value
+  _addFormAssistant: ( node ) ->
+    if bind = @_analizeChain node.attributes.removeNamedItem( 'bind' ).value
       [ source, property ] = bind
-      _node = @_ node
+      $node = @_ node
 
       updateSource = ->
         ( params = {} )[ property ] = if node.type is 'checkbox' and !node.checked then null else if node.value is '' then null else node.value
@@ -236,37 +245,37 @@ Nali.extend View:
         when node.type in [ 'text', 'textarea', 'color', 'date', 'datetime', 'datetime-local', 'email', 'number', 'range', 'search', 'tel', 'time', 'url', 'month', 'week' ]
           [
             -> node.value = source[ property ] or ''
-            -> _node.on 'change', => updateSource.call @
+            -> $node.on 'change', => updateSource.call @
           ]
         when node.type in [ 'checkbox', 'radio' ]
           [
             -> node.checked = source[ property ] + '' is node.value
-            -> _node.on 'change', => updateSource.call @ if node.type is 'checkbox' or node.checked is true
+            -> $node.on 'change', => updateSource.call @ if node.type is 'checkbox' or node.checked is true
           ]
         when node.type is 'select-one'
           [
             -> option.selected = true for option in node when source[ property ] + '' is option.value
-            -> _node.on 'change', => updateSource.call @
+            -> $node.on 'change', => updateSource.call @
           ]
 
-      @assistants[ 'show' ].push ->
+      @_assistants[ 'show' ].push ->
         setValue.call @
         bindChange.call @
         source.subscribe @, "update.#{ property }", => setValue.call @
 
-      @assistants[ 'hide' ].push ->
-        _node.off 'change'
+      @_assistants[ 'hide' ].push ->
+        $node.off 'change'
     @
 
-  addYieldAssistant: ( node ) ->
+  _addYieldAssistant: ( node ) ->
     ( @yield = @_ node.parentNode )[0].removeChild node
 
-  addRelationAssistant: ( node ) ->
+  _addRelationAssistant: ( node ) ->
     [ match, name, chain ] = node.textContent.match /{\s*(\w+) of @(\w*)\s*}/
     ( insertTo = node.parentNode ).removeChild node
     segments = if chain.length then chain.split '.' else []
-    @assistants[ 'show' ].push ->
-      if relation = @getSource segments
+    @_assistants[ 'show' ].push ->
+      if relation = @_getSource segments
         if relation.childOf 'Collection'
           relation.show name, insertTo, true
           relation.subscribeTo @, 'hide', relation.reset
@@ -274,14 +283,14 @@ Nali.extend View:
           view = relation.show name, insertTo
           view.subscribeTo @, 'hide', view.hide
 
-  analize: ( value ) ->
-    value.replace /{\s*(.+?)\s*}/g, ( match, sub ) => @analizeMatch sub
+  _analize: ( value ) ->
+    value.replace /{\s*(.+?)\s*}/g, ( match, sub ) => @_analizeMatch sub
 
-  analizeMatch: ( sub ) ->
+  _analizeMatch: ( sub ) ->
     if match = sub.match /^@([\w\.]+)(\?)?$/
-      if result = @analizeChain match[1]
+      if result = @_analizeChain match[1]
         [ source, property ] = result
-        source.subscribe? @, "update.#{ property }", @onSourceUpdated
+        source.subscribe? @, "update.#{ property }", @_onSourceUpdated
         if match[2] is '?'
           if source[ property ] then property else ''
         else if source[ property ]? then source[ property ] else ''
@@ -290,7 +299,7 @@ Nali.extend View:
       @helpers?[ match[1] ]?.call @
     else sub
 
-  getSource: ( segments, source = @model ) ->
+  _getSource: ( segments, source = @model ) ->
     for segment in segments
       if segment of source then source = source[ segment ]
       else
@@ -298,8 +307,8 @@ Nali.extend View:
         return null
     source
 
-  analizeChain: ( chain, source = @model ) ->
+  _analizeChain: ( chain, source = @model ) ->
     segments = chain.split '.'
     property = segments.pop()
-    return null unless source = @getSource segments, source
+    return null unless source = @_getSource segments, source
     [ source, property ]