nali 0.2.2 → 0.2.3

data/README.md

@@ -1,26 +1,31 @@
-# Welcome to Nali
+# Добро пожаловать в Nali
 
-Nali is the framework for developing async web applications
+**Nali** - это фреймворк для разработки асинхронных веб приложений, включающий в себя веб-сервер и инструменты для создания как клиентской, так и серверной части. Серверная часть разрабатывается на языке **Ruby**, клиентская часть на **Coffeescript** (или Javascript), **Sass** (или less, scss, css) и **Html** (или erb, haml, slim)
 
-## Getting Started
+## Начало работы
 
-1. Install Nali at the command prompt if you haven't yet:
+1. Установите Nali с помощью командной строки:
 
-        gem install nali
+	***gem install nali***
 
-2. At the command prompt, create a new Nali application:
+2. Для создания нового приложения выполните команду:
 
-        nali new appName
+	***nali new appName***
 
-   where "appName" is the application name.
+  где "appName" - это имя вашего приложения
 
-3. Change directory to `appName` and run:
+3. Перейдите в директорию `appName`:
 
-        bundle install
+	***cd appName***
+  
+4. Выполните команду для установки зависимостей:
 
-4. Start the web server
+	***bundle install***
 
-        bundle exec thin start
+5. Запустите веб-сервер командой:
 
-5. Using a browser, go to `http://localhost:3000` and you'll see:
-"Welcome to Nali"
+	***bundle exec thin start***
+
+6. Откройте браузер и перейдите по адресу `http://localhost:3000`
+  
+ 	Вы увидите первую подготовленную страницу "Welcome to Nali" 

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

@@ -0,0 +1,59 @@
+Nali.extend Application:
+
+  domEngine:      jBone.noConflict()
+  useWebSockets:  true
+  wsServer:       'ws://' + window.location.host
+  defaultUrl:     'home'
+  notFoundUrl:    'home'
+  htmlContainer:  'body'
+  title:          'Application'
+  keepAliveDelay: 20
+
+  run: ( options ) ->
+    @::starting()
+    @[ key ] = value for key, value of options
+    @onReadyDOM ->
+      @::_           = @domEngine
+      @htmlContainer = @_ @htmlContainer
+      @setTitle @title
+      @Router.start()
+      @runConnection()
+
+  onReadyDOM: ( callback ) ->
+    document.addEventListener 'DOMContentLoaded', =>
+      document.removeEventListener 'DOMContentLoaded', arguments.callee, false
+      callback.call @
+    , false
+    @
+
+  runConnection: ->
+    if @useWebSockets
+      @Connection.subscribe @, 'open',  @onConnectionOpen
+      @Connection.subscribe @, 'close', @onConnectionClose
+      @Connection.subscribe @, 'error', @onConnectionError
+      @Connection.open()
+    else @redirect()
+    @
+
+  onConnectionOpen: ->
+    @redirect()
+
+  onConnectionClose: ->
+
+  onConnectionError: ->
+
+  setTitle: ( @title ) ->
+    @titleBox ?= if ( exists = @_ 'head title' ).lenght then exists else @_( '<title>' ).appendTo 'head'
+    @titleBox[0].innerText = @title
+    @trigger 'update.title'
+    @
+
+
+
+
+
+
+
+
+
+

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

@@ -0,0 +1,188 @@
+Nali.extend Collection:
+
+  toShowViews:  []
+  visibleViews: []
+  length:       0
+
+  cloning: ->
+    @subscribeTo @Model, "create.#{ @model._name.lower() }", @onModelCreated
+    @subscribeTo @Model, "update.#{ @model._name.lower() }", @onModelUpdated
+    @adaptations = apply: [], cancel: []
+    @ordering    = {}
+    @adaptCollection()
+    @
+
+  new: ( model, filters ) ->
+    @clone model: model, filters: filters
+
+  onModelCreated: ( extModel, model ) ->
+    @add model if not @freezed and model.isCorrect @filters
+    @
+
+  onModelUpdated: ( extModel, model ) ->
+    if model.written()
+      if model in @
+        if @freezed or model.isCorrect @filters
+          @reorder()
+          @trigger 'update.model', model
+        else @remove model
+      else if not @freezed and model.isCorrect @filters
+        @add model
+    @
+
+  onModelDestroyed: ( model ) ->
+    @remove model unless @freezed
+    @
+
+  adaptCollection: ->
+    for name, method of @model when /^_\w+$/.test( name ) and typeof method is 'function'
+      do ( name, method ) =>
+        @[ name = name[ 1.. ] ] = ( args... ) =>
+          @each ( model ) -> model[ name ] args...
+          @
+    @
+
+  adaptModel: ( model, type = 'apply' ) ->
+    adaptation.call @, model for adaptation in @adaptations[ type ]
+    @
+
+  adaptation: ( apply, cancel ) ->
+    @each ( model ) -> apply.call @, model
+    @adaptations.apply.push apply
+    @adaptations.cancel.unshift cancel if cancel
+    @
+
+  add: ( models... ) ->
+    for model in [].concat models...
+      Array::push.call @, model
+      @adaptModel  model
+      @subscribeTo model, 'destroy', @onModelDestroyed
+      @reorder()
+      @trigger 'update.length.add', model
+      @trigger 'update.length', 'add', model
+    @
+
+  remove: ( model ) ->
+    @adaptModel model, 'cancel'
+    Array::splice.call @, @indexOf( model ), 1
+    @unsubscribeFrom model
+    @reorder()
+    @trigger 'update.length.remove', model
+    @trigger 'update.length', 'remove', model
+    @
+
+  removeAll: ->
+    @each ( model ) -> @remove model
+    @length = 0
+    @
+
+  each: ( callback ) ->
+    callback.call @, model, index for model, index in @
+    @
+
+  pluck: ( property ) ->
+    model[ property ] for model in @
+
+  indexOf: ( model ) ->
+    Array::indexOf.call @, model
+
+  sort: ( sorter ) ->
+    Array::sort.call @, sorter
+    @
+
+  toArray: ->
+    Array::slice.call @, 0
+
+  freeze: ->
+    @freezed = true
+    @
+
+  unfreeze: ->
+    @freezed = false
+    @
+
+  where: ( filters ) ->
+    result = []
+    result.push model for model in @ when model.isCorrect filters
+    result
+
+  order: ( @ordering ) ->
+    @reorder()
+    @
+
+  reorder: ->
+    if @ordering.by?
+      clearTimeout @ordering.timer if @ordering.timer?
+      @ordering.timer = setTimeout =>
+        if typeof @ordering.by is 'function'
+          @sort @ordering.by
+        else
+          @sort ( one, two ) =>
+            one = one[ @ordering.by ]
+            two = two[ @ordering.by ]
+            if @ordering.as is 'number'
+              one = + one
+              two = + two
+            if @ordering.as is 'string'
+              one = '' + one
+              two = '' + two
+            ( if one > two then 1 else if one < two then -1 else 0 ) * ( if @ordering.desc then -1 else 1 )
+        @orderViews()
+        delete @ordering.timer
+      , 5
+    @
+
+  orderViews: ->
+    if @inside
+      children = Array::slice.call @inside.children
+      children.sort ( one, two ) => @indexOf( one.view.model ) - @indexOf( two.view.model )
+      @inside.appendChild child for child in children
+    @
+
+  show: ( viewName, insertTo, isRelation = false ) ->
+    @adaptation ( model ) ->
+        view = model.view viewName
+        if isRelation
+          view.subscribeTo @, 'reset', view.hide
+        else unless @visible
+          @visible = true
+          @prepareViewToShow view
+          @hideVisibleViews()
+        else
+          @::visibleViews.push view
+        view.show insertTo
+        @inside ?= view.element[0].parentNode
+      , ( model ) ->
+        model.hide viewName
+    @
+
+  prepareViewToShow: ( view ) ->
+    unless view in @::toShowViews
+      @::toShowViews.push view
+      @prepareViewToShow layout if ( layout = view.layout() )?.childOf? 'View'
+    @
+
+  hideVisibleViews: ->
+    view.hide() for view in @::visibleViews when not( view in @::toShowViews )
+    @::visibleViews = @::toShowViews
+    @::toShowViews  = []
+    @
+
+  first: ->
+    @[0]
+
+  last: ->
+    @[ @length - 1 ]
+
+  reset: ->
+    @inside             = null
+    @adaptations.length = 0
+    @trigger 'reset'
+    @
+
+  destroy: ->
+    @trigger 'destroy'
+    @destroyObservation()
+    @removeAll()
+    @reset()
+    @

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

@@ -1,10 +1,9 @@
 Nali.extend Connection:
 
   initialize: ->
-    @subscribeTo @Application, 'start', @open
-    @::query = ( args... ) => @query args... 
+    @::expand query: ( args... ) => @query args...
     @
-    
+
   open: ->
     @dispatcher = new WebSocket @Application.wsServer
     @dispatcher.onopen    = ( event ) => @onOpen    event
@@ -13,30 +12,30 @@ Nali.extend Connection:
     @dispatcher.onmessage = ( event ) => @onMessage JSON.parse event.data
     @keepAlive()
     @
-    
-  connected:      false
+
   keepAliveTimer: null
   journal:        []
-    
+  reconnectDelay: 0
+
   onOpen: ( event ) ->
-    @connected = true
+    @reconnectDelay = 0
     @trigger 'open'
-    
-  onMessage: ( message ) ->
-    @[ message.action ] message
-    
-  onClose: ( event ) ->
-    @connected = false
-    @trigger 'close'
-    
+
   onError: ( event ) ->
     console.warn 'Connection error %O', event
-  
+
+  onClose: ( event ) ->
+    @trigger 'close'
+    setTimeout ( => @open() ), @reconnectDelay * 100
+    @reconnectDelay += 1
+
+  onMessage: ( message ) ->
+    @[ message.action ] message
+
   send: ( msg ) ->
-    @open() unless @connected
     @dispatcher.send JSON.stringify msg
     @
-      
+
   keepAlive: ->
     clearTimeout @keepAliveTimer if @keepAliveTimer
     if @Application.keepAliveDelay
@@ -45,38 +44,39 @@ Nali.extend Connection:
         @send ping: true
       , @Application.keepAliveDelay * 1000
     @
-    
+
   pong: ->
     @keepAlive()
     @
-    
+
   sync: ( message ) ->
-    @Model.sync message.params 
+    @Model.sync message.params
     @
-    
+
   notice: ( { model, notice, params } ) ->
     if model?
       [ model, id ] = model.split '.'
       @Model.notice model: model, id: id, notice: notice, params: params
-    else @Notice[ notice ] params 
-    @          
-  
+    else @Notice[ notice ] params
+    @
+
   success: ( message ) ->
     @journal[ message.journal_id ].success? message.params
-    delete @journal[ message.journal_id ] 
+    delete @journal[ message.journal_id ]
     @
-    
+
   failure: ( message ) ->
     @journal[ message.journal_id ].failure? message.params
-    delete @journal[ message.journal_id ] 
+    delete @journal[ message.journal_id ]
     @
-    
+
   query: ( to, params, success, failure ) ->
+    return success?() unless @Application.useWebSockets
     [ controller, action ] = to.split '.'
     @journal.push callbacks = success: success, failure: failure
-    @send 
+    @send
       controller: controller
       action:     action
-      params:     params 
+      params:     params
       journal_id: @journal.indexOf callbacks
-    @
+    @

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

@@ -2,12 +2,13 @@ Nali.extend Controller:
 
   extension: ->
     if @_name isnt 'Controller'
-      @prepareActions() 
-      @modelSysname = @_name.replace /s$/, '' 
+      @prepareActions()
+      @modelName = @_name.replace /s$/, ''
     @
-  
-  actions: {}
-  
+
+  new: ( collection, filters, params ) ->
+    @clone collection: collection, filters: filters, params: params
+
   prepareActions: ->
     @_actions = {}
     for name, action of @actions when not ( name in [ 'default', 'before', 'after' ] )
@@ -19,20 +20,20 @@ Nali.extend Controller:
       @_actions[ name ] = filters: filters, params: params, methods: [ action ]
     @prepareBefores()
     @prepareAfters()
-    @ 
-    
+    @
+
   prepareBefores: ->
-    if @actions.before?
-      list = @analizeFilters 'before'  
+    if @actions?.before?
+      list = @analizeFilters 'before'
       @_actions[ name ].methods = actions.concat @_actions[ name ].methods for name, actions of list
     @
-    
+
   prepareAfters: ->
-    if @actions.after?
-      list = @analizeFilters 'after'  
+    if @actions?.after?
+      list = @analizeFilters 'after'
       @_actions[ name ].methods = @_actions[ name ].methods.concat actions for name, actions of list
     @
-    
+
   analizeFilters: ( type ) ->
     list = {}
     for names, action of @actions[ type ]
@@ -41,30 +42,27 @@ Nali.extend Controller:
         when names is '*'       then [ true,  [] ]
         else                         [ false, names.split /\s*,\s*/ ]
       for name of @_actions when ( invert and not ( name in names ) ) or ( not invert and name in names )
-        ( list[ name ] ?= [] ).push action  
+        ( list[ name ] ?= [] ).push action
     list
-    
+
   run: ( action, filters, params ) ->
-    controller = @clone 
-      collection: @Model.extensions[ @modelSysname ].where filters 
-      params:     params
-    controller.runAction action
-    if controller.stopped
-      controller.collection.destroy()
-    else
-      controller.collection.show action
-      @Router.setUrl()
+    collection = @Model.extensions[ @modelName ].where filters
+    @new( collection, filters, params ).runAction action
     @
-    
+
   runAction: ( name ) ->
-    method.call @ for method in @_actions[ name ].methods when not @stopped  
+    method.call @ for method in @_actions[ name ].methods when not @stopped
+    if @stopped then @collection.destroy()
+    else
+      @collection.show name
+      @Router.changeUrl()
     @
-    
+
   stop: ->
     @stopped = true
-    @ 
-      
+    @
+
   redirect: ( args... ) ->
     @Router.go args...
     @stop()
-    @
+    @