nali 0.1.6 → 0.1.7

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

@@ -1,11 +1,12 @@
 Nali.extend Application:
   
-  domEngine:     jBone.noConflict()
-  wsServer:      'ws://' + window.location.host
-  defaultUrl:    ''
-  notFoundUrl:   ''
-  htmlContainer: 'body'
-  title:         'Application'
+  domEngine:      jBone.noConflict()
+  wsServer:       'ws://' + window.location.host
+  defaultUrl:     ''
+  notFoundUrl:    ''
+  htmlContainer:  'body'
+  title:          'Application'
+  keepAliveDelay: 20
   
   run: ( options ) ->
     @::starting()

data/lib/assets/javascripts/nali/connection.js.coffee

@@ -10,22 +10,42 @@ Nali.extend Connection:
     @dispatcher.onopen    = ( event ) => @onOpen    event
     @dispatcher.onclose   = ( event ) => @onClose   event
     @dispatcher.onmessage = ( event ) => @onMessage JSON.parse event.data
-
-  journal: []
+    @keepAlive()
+    @
+    
+  connected:      false
+  keepAliveTimer: null
+  journal:        []
     
   onOpen: ( event ) ->
+    @connected = true
     @trigger 'open'
     
   onMessage: ( message ) ->
     @[ message.action ] message
     
   onClose: ( event ) ->
+    @connected = false
     @trigger 'close'
   
   send: ( msg ) ->
+    @open() unless @connected
     @dispatcher.send JSON.stringify msg
     @
-  
+      
+  keepAlive: ->
+    clearTimeout @keepAliveTimer if @keepAliveTimer
+    if @Application.keepAliveDelay
+      @keepAliveTimer = setTimeout =>
+        @keepAliveTimer = null
+        @send ping: true
+      , @Application.keepAliveDelay * 1000
+    @
+    
+  pong: ->
+    @keepAlive()
+    @
+    
   sync: ( message ) ->
     @Model.sync message.params 
     @

data/lib/nali/clients.rb

@@ -12,13 +12,17 @@ module Nali
     end
     
     def self.on_received_message( client, message )
-      if controller = Object.const_get( message[ :controller ].capitalize + 'Controller' )
-        controller = controller.new( client, message )
-        if controller.methods.include?( action = message[ :action ].to_sym )
-          controller.send action
-        else puts "Action #{ action } not exists in #{ controller }" end
-      else puts "Controller #{ controller } not exists" end
-      on_message client, message
+      if message[ :ping ]
+        client.send_json action: :pong
+      else
+        if controller = Object.const_get( message[ :controller ].capitalize + 'Controller' )
+          controller = controller.new( client, message )
+          if controller.methods.include?( action = message[ :action ].to_sym )
+            controller.send action
+          else puts "Action #{ action } not exists in #{ controller }" end
+        else puts "Controller #{ controller } not exists" end
+        on_message client, message
+      end
     end
     
     def self.on_client_disconnected( client )

data/lib/nali/connection.rb

@@ -63,7 +63,7 @@ module EventMachine
         if not params.empty? and ( watch_time( model ) < model.updated_at.to_f or model.destroyed? )
           watch_time_up model
           relations.each { |relation| sync relation }
-          send_json action: 'sync', params: params 
+          send_json action: :sync, params: params 
         end
       end
         

data/lib/nali/version.rb

@@ -1,5 +1,5 @@
 module Nali
   
-  VERSION = '0.1.6'
+  VERSION = '0.1.7'
   
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nali
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
   prerelease: 
 platform: ruby
 authors: