nali 0.2.2 → 0.2.3

data/lib/{assets → client}/javascripts/nali/nali.js.coffee

@@ -1,40 +1,40 @@
 window.__ = ( args... ) -> console.log args...
 
-window.Nali = 
-  
+window.Nali =
+
   _name:      'Nali'
-  extensions: {}    
-  
+  extensions: {}
+
   starting: ->
     for name, extension of @extensions
       extension.runExtensions()
       extension.initialize() if extension.hasOwnProperty 'initialize'
       @starting.call extension
     @
-  
+
   extend: ( params ) ->
     for name, param of params
       param._name          = name
       @[ name ]            = @extensions[ name ] = @child param
       @[ name ].extensions = {}
-    
+
   clone: ( params = {} ) ->
     obj = @child params
     obj.runCloning()
     obj
-    
+
   child: ( params ) ->
     obj         = Object.create @
     obj      :: = @
     obj[ name ] = value for name, value of params
     obj.initObservation()
     obj
-  
+
   expand: ( obj ) ->
     if obj instanceof Object then @[ key ] = value for own key, value of obj
     else console.error "Expand of %O error - argument is not Object", @
     @
-  
+
   copy: ( obj ) ->
     copy = {}
     copy[ property ] = value for own property, value of obj
@@ -43,29 +43,29 @@ window.Nali =
   childOf: ( parent ) ->
     if parent instanceof Object
       return false unless @::?
-      return true  if     @:: is parent
+      return true  if     ( @:: ) is parent
     else
       return false unless @::?._name?
       return true  if     @::_name is parent
     @::childOf parent
-    
+
   runExtensions: ( context = @ ) ->
-    @::?.runExtensions context     
+    @::?.runExtensions context
     @extension.call context if @hasOwnProperty 'extension'
-      
+
   runCloning: ( context = @ ) ->
-    @::?.runCloning context     
+    @::?.runCloning context
     @cloning.call context if @hasOwnProperty 'cloning'
-    
+
   getter: ( property, callback ) ->
     @__defineGetter__ property, callback
     @
-    
+
   setter: ( property, callback ) ->
     @__defineSetter__ property, callback
     @
 
-  access: ( obj, getter, setter ) ->
+  access: ( obj ) ->
     for own property of obj
       do( property ) =>
         @getter property,           -> obj[ property ]
@@ -76,31 +76,31 @@ window.Nali =
     @observers   = []
     @observables = []
     @
-    
+
   destroyObservation: ->
     @unsubscribeAll()
     @unsubscribeFromAll()
     @
-    
+
   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 ) ->
     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
     @
-  
+
   subscribeTo: ( observable, event, callback ) ->
     observable.subscribe @, event, callback
     @
-  
+
   subscribeOne: ( observer, event, callback ) ->
     callbackOne = ( args... ) =>
       callback.call observer, args...
@@ -111,24 +111,24 @@ window.Nali =
   subscribeOneTo: ( observable, event, callback ) ->
     observable.subscribeOne @, event, callback
     @
-  
+
   unsubscribe: ( observer, event ) ->
     @removeObservationItem 'observers', observer, event
     observer.removeObservationItem 'observables', @, event
     @
-  
-  unsubscribeTo: ( observable, event ) ->
+
+  unsubscribeFrom: ( observable, event ) ->
     observable.unsubscribe @, event
     @
-  
+
   unsubscribeAll: ( event ) ->
     @unsubscribe item[0], event for item in @observers[..]
     @
-  
+
   unsubscribeFromAll: ( event ) ->
-    @unsubscribeTo 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

@@ -0,0 +1,29 @@
+Nali.Model.extend Notice:
+
+  initialize: ->
+    @::::expand Notice: @
+
+  prepare: ( params ) ->
+    params = message: params if typeof params is 'string'
+    params
+
+  info: ( params ) ->
+    @new( @prepare params ).show 'info'
+
+  warning: ( params ) ->
+    @new( @prepare params ).show 'warning'
+
+  error:   ( params ) ->
+    @new( @prepare params ).show 'error'
+
+
+Nali.View.extend
+
+  NoticeInfo:
+    onShow: -> @hide 3000
+
+  NoticeWarning:
+    onShow: -> @hide 3000
+
+  NoticeError:
+    onShow: -> @hide 3000

data/lib/{assets → client}/javascripts/nali/router.js.coffee

@@ -1,12 +1,11 @@
 Nali.extend Router:
 
   initialize: ->
-    @subscribeTo @Connection, 'open', @start
-    @::redirect = ( args... ) => @go args... 
-    @    
-  
+    @::expand redirect: ( args... ) => @go args...
+    @
+
   routes:      {}
-    
+
   start: ->
     @scanRoutes()
     @_( window ).on 'popstate', ( event ) =>
@@ -14,19 +13,18 @@ Nali.extend Router:
       event.stopPropagation()
       @saveHistory false
       @go event.target.location.pathname
-    @go()
     @
 
   scanRoutes: ->
     for name, controller of @Controller.extensions when controller.actions?
       route  = '^'
-      route += name.lowercase().replace /s$/, 's*(\/|$)'
+      route += name.lower().replace /s$/, 's*(\/|$)'
       route += '('
-      route += Object.keys( controller._actions ).join '|' 
+      route += Object.keys( controller._actions ).join '|'
       route += ')?'
       @routes[ route ] = controller
     @
-    
+
   go: ( url = window.location.pathname, options = {} ) ->
     if found = @findRoute @prepare( url ) or @prepare( @Application.defaultUrl )
       { controller, action, filters, params } = found
@@ -36,39 +34,39 @@ Nali.extend Router:
       @go @Application.notFoundUrl
     else console.warn "Not exists route to the address %s", 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'
       segments = ( @routedUrl = url ).split( '/' )[ 1... ]
-      if segments[0] in Object.keys( controller._actions ) 
-        action = segments.shift() 
-      else unless action = controller.actions.default 
+      if segments[0] in Object.keys( controller._actions )
+        action = segments.shift()
+      else unless action = controller.actions.default
         console.error 'Unspecified controller action'
       filters = {}
       for name in controller._actions[ action ].filters when segments[0]?
-        filters[ name ] = segments.shift() 
+        filters[ name ] = segments.shift()
       params = {}
-      for name in controller._actions[ action ].params when segments[0]?
-        params[ name ] = segments.shift() 
+      for name in controller._actions[ action ].params
+        params[ name ] = if segments[0]? then segments.shift() else null
       return controller: controller, action: action, filters: filters, params: params
     false
-  
+
   saveHistory: ( value ) ->
     @_saveHistory ?= true
     if value in [ true, false ]
       @_saveHistory = value
       @
     else @_saveHistory
-    
-  setUrl: ( url = null ) ->
+
+  changeUrl: ( url = null ) ->
     if @saveHistory()
       @routedUrl = url if url?
-      history.pushState null, null, '/' + ( @url = @routedUrl ) if @routedUrl isnt @url 
+      history.pushState null, null, '/' + ( @url = @routedUrl ) if @routedUrl isnt @url
     else @saveHistory true
-    @
+    @

data/lib/{assets → client}/javascripts/nali/view.js.coffee

@@ -1,35 +1,38 @@
 Nali.extend View:
-  
+
   extension: ->
     if @_name isnt 'View'
-      @_shortName = @_name.underscore().split( '_' )[ 1.. ].join '_'
+      @_shortName = @_name.underscore().split( '_' )[ 1.. ].join( '_' ).camel()
       @parseTemplate()
-      @parseEvents() 
-    @ 
-    
+      @parseEvents()
+    @
+
   cloning: ->
     @my = @model
     @
-  
+
   layout: -> null
-  
+
   onSourceUpdated:   -> @draw()
-    
+
   onSourceDestroyed: -> @hide()
-  
+
   getOf: ( source, property ) ->
-    @subscribeTo source, "update.#{ property }", @onSourceUpdated
+    @redrawOn source, "update.#{ property }"
     source[ property ]
-    
+
+  redrawOn: ( source, event ) ->
+    @subscribeTo source, event, @onSourceUpdated
+
   insertTo: ->
     if ( layout = @layout() )?.childOf? 'View' then layout.show().element.find '.yield'
     else @Application.htmlContainer
-  
+
   draw: ->
     @runAssistants 'draw'
     @onDraw?()
     @
-    
+
   show: ( insertTo = @insertTo() ) ->
     @prepareElement().draw().bindEvents()
     unless @visible
@@ -43,7 +46,7 @@ Nali.extend View:
       @visible = true
       @runModelCallback 'afterShow'
     @
-          
+
   hide: ( delay = 0 ) ->
     if @visible
       @runModelCallback 'beforeHide'
@@ -56,32 +59,32 @@ Nali.extend View:
       @visible = false
       @runModelCallback 'afterHide'
     @
-    
+
   hideElement: ->
     if @hideDelay? then setTimeout ( => @removeElement() ), @hideDelay else @removeElement()
     @
-  
+
   removeElement: ->
     @element[0].parentNode.removeChild @element[0]
     @
-    
+
   runModelCallback: ( type ) ->
     @model[ type ]?[ @_shortName ]?.call @model
     @
-    
+
   showRelations: ->
     for { selector, name, view } in @relationsMap
-      if ( relation = @model[ name ] )? 
+      if ( relation = @model[ name ] )?
         insertTo = @element.find selector
         if relation.childOf 'Collection'
           relation.show view, insertTo, true
-          relation.subscribeTo @, 'hide', relation.reset 
+          relation.subscribeTo @, 'hide', relation.reset
         else
           view = relation.show view, insertTo
           view.subscribeTo @, 'hide', view.hide
       else console.warn "Relation %s does not exist of model %O", name, @model
     @
-    
+
   runLink: ( event ) ->
     event.preventDefault()
     @runUrl event.currentTarget.getAttribute 'href'
@@ -89,9 +92,9 @@ Nali.extend View:
 
   runForm: ( event ) ->
     event.preventDefault()
-    @runUrl event.currentTarget.getAttribute( 'action' ), @formToHash event.currentTarget 
+    @runUrl event.currentTarget.getAttribute( 'action' ), @formToHash event.currentTarget
     @
-    
+
   runUrl: ( url, params = {} ) ->
     if match = url.match /^(@@?)(.+)/
       [ method, data ] = match[2].split '?'
@@ -104,7 +107,7 @@ Nali.extend View:
       else console.warn "Method %s not exists", method
     else @Router.go url, params
     @
-  
+
   formToHash: ( form ) ->
     params = {}
     for element in form.elements
@@ -115,51 +118,51 @@ Nali.extend View:
           target = if target[ key ] instanceof Object then target[ key ] else target[ key ] = {}
         target[ property ] = element.value
     params
-    
+
   parseEvents: ->
     @eventsMap = []
     if @events
       @events = [ @events ] if typeof @events is 'string'
       for event in @events
         try
-          [ handlers, type, other ] = event.split /\s+(on|one)\s+/ 
-          [ events, selector ]      = other.split /\s+at\s+/ 
+          [ handlers, type, other ] = event.split /\s+(on|one)\s+/
+          [ events, selector ]      = other.split /\s+at\s+/
           handlers = handlers.split /\s*,\s*/
           events   = events.replace /\s*,\s*/, ' '
           throw true unless type and events.length and handlers.length
-        catch 
+        catch
           console.warn "Events parsing error: \"%s\" of %O", event, @
           error = true
         if error then error = false else @eventsMap.push [ selector, type, events, handlers ]
     @
 
   bindEvents: ->
-    unless @binded?
+    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' 
+      @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 
-      @binded = true
+            @element[ type ] events, selector, ( event ) => @[ handler ] event
+      @_eventsBinded = true
     @
-  
+
   prepareElement: ->
     unless @element
       @element         = @_ @template
       @element[0].view = @
       @addAssistants()
     @
-    
+
   getNode: ( path ) ->
     node = @element[0]
     node = node[ sub ] for sub in path
-    node  
-    
+    node
+
   parseTemplate: ->
-    if container = document.querySelector '#' + @_name.underscore() 
+    if container = document.querySelector '#' + @_name.underscore()
       @template = container.innerHTML.trim().replace( /\s+/g, ' ' )
         .replace( /({\s*\+.+?\s*})/g, ' <assist>$1</assist>' )
         .replace( /{\s*yield\s*}/g, '<div class="yield"></div>' )
@@ -169,16 +172,16 @@ Nali.extend View:
       container.parentNode.removeChild container
     else console.warn 'Template %s not exists', @_name
     @
-  
+
   parseRelations: ->
     @relationsMap = []
-    @template = @template.replace  /{\s*(\w+) of @(\w+)\s*}/g, ( match, view, relation ) => 
+    @template = @template.replace  /{\s*(\w+) of @(\w+)\s*}/g, ( match, view, relation ) =>
       className =  relation.capitalize() + view.capitalize() + 'Relation'
       @relationsMap.push selector: '.' + className, name: relation, view: view
       "<div class=\"#{ className }\"></div>"
     @parseAssistants()
     @
-    
+
   parseAssistants: ->
     @assistantsMap = []
     if /{\s*.+?\s*}|bind=".+?"/.test @template
@@ -186,41 +189,41 @@ Nali.extend View:
       tmp.innerHTML = @template
       @scanAssistants tmp.children[0]
     @
-  
+
   scanAssistants: ( node, path = [] ) ->
     if node.nodeType is 3 and /{\s*.+?\s*}/.test node.textContent
       @assistantsMap.push nodepath: path, type: 'Text'
     else if node.nodeName is 'ASSIST'
       @assistantsMap.push nodepath: path, type: 'Html'
-    else 
+    else
       if node.attributes
-        for attribute, index in node.attributes 
+        for attribute, index in node.attributes
           if attribute.name is 'bind'
             @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
     @
-  
+
   addAssistants: ->
     @assistants = show: [], draw: [], hide: []
     @[ "add#{ type }Assistant" ] @getNode nodepath for { nodepath, type } in @assistantsMap
     @
-    
+
   runAssistants: ( type ) ->
     assistant.call @ for assistant in @assistants[ type ]
     @
-      
+
   addTextAssistant: ( node ) ->
     initialValue = node.textContent
     @assistants[ 'draw' ].push -> node.textContent = @analize initialValue
     @
-    
+
   addAttrAssistant: ( node ) ->
     initialValue = node.value
     @assistants[ 'draw' ].push -> node.value = @analize initialValue
     @
-    
+
   addHtmlAssistant: ( node ) ->
     parent       = node.parentNode
     initialValue = node.innerHTML
@@ -233,17 +236,17 @@ Nali.extend View:
       parent.removeChild node for node in Array::slice.call( parent.childNodes, start, end )
       parent.insertBefore element, before for element in @_( @analize initialValue )
     @
-    
+
   addFormAssistant: ( node ) ->
     if bind = @analizeChain node.attributes.removeNamedItem( 'bind' ).value
       [ source, property ] = bind
       _node = @_ node
-      
+
       updateSource = ->
         ( params = {} )[ property ] = node.value
         source.update params
         source.save() unless node.form?
-      
+
       [ setValue, bindChange ] = switch
         when node.type in [ 'text', 'textarea']
           [
@@ -253,14 +256,14 @@ Nali.extend View:
         when node.type in [ 'checkbox', 'radio' ]
           [
             -> node.checked = source[ property ] + '' is node.value
-            -> _node.on 'change', => updateSource.call @ if node.checked is true 
+            -> _node.on 'change', => updateSource.call @ if 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 @
           ]
-          
+
       @assistants[ 'show' ].push ->
         setValue.call @
         bindChange.call @
@@ -269,17 +272,17 @@ Nali.extend View:
       @assistants[ 'hide' ].push ->
         _node.off 'change'
     @
-        
+
   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]
         [ source, property ] = result
         source.subscribe? @, "update.#{ property }", @onSourceUpdated if source isnt @model
-        if match[2] is '?' 
-          if source[ property ] then property else ''  
+        if match[2] is '?'
+          if source[ property ] then property else ''
         else source[ property ]
       else ''
     else if match = sub.match /^[=|\+](\w+)$/
@@ -296,4 +299,4 @@ Nali.extend View:
     unless property of source
       console.warn "%s: chain \"%s\" is invalid, \"%s\" is not Object", @_name, chain, segment
       return null
-    [ source, property ]
+    [ source, property ]