nomo 0.0.45 → 0.0.46

data/lib/nomo/version.rb

@@ -1,3 +1,3 @@
 module Nomo
-  VERSION = "0.0.45"
+  VERSION = "0.0.46"
 end

data/vendor/assets/javascripts/nomo.js.coffee.erb

@@ -5,37 +5,55 @@ $ ->
 
   nomoKey = null
   nomoLastModified = null
-  connection = new WebSocket('ws://<%= Nomo.server ? Nomo.server : request.host %>', 'nomo')
+  connection = null
+  connectionOpen = false
 
-  ##
-  # WebSocket Connection
+  connect = ->
+    connection = new WebSocket('ws://<%= Nomo.server ? Nomo.server : request.host %>', 'nomo')
 
-  connection.onopen = ->
+    ##
+    # WebSocket Connection
 
-    # If there's already a nomoKey there could be updates we haven't received
-    if nomoKey
-      msgToServer = JSON.stringify({ key: nomoKey, lastModified: nomoLastModified })
+    connection.onopen = ->
+      connectionOpen = true
 
-      console.log('(nomo) connected -- msg to server: ' + msgToServer)
-      connection.send(msgToServer)
+      # If there's already a nomoKey there could be updates we haven't received
+      if nomoKey
+        msgToServer = JSON.stringify({ key: nomoKey, lastModified: nomoLastModified })
 
-    # Else send a HEAD request so we can fetch the nomoKey
-    else
-      console.log('(nomo) connected')
-      $.ajax
-        type: 'HEAD',
-        dataType: 'html',
-        url: document.location.pathname
+        console.log('(nomo) connected -- msg to server: ' + msgToServer)
+        connection.send(msgToServer)
 
-  ##
-  # WebSocket Message
+      # Else send a HEAD request so we can fetch the nomoKey
+      else
+        console.log('(nomo) connected')
+        $.ajax
+          type: 'HEAD',
+          dataType: 'html',
+          url: document.location.pathname
+
+    ##
+    # WebSocket Message
+
+    connection.onmessage = (msg) ->
+      msg = JSON.parse(msg.data)
 
-  connection.onmessage = (msg) ->
-    msg = JSON.parse(msg.data)
+      if msg.event == 'update'
+        console.log('(nomo) nomo:update triggered')
+        $(document).trigger('nomo:update', [nomoKey, nomoLastModified])
 
-    if msg.event == 'update'
-      console.log('(nomo) nomo:update triggered')
-      $(document).trigger('nomo:update', [nomoKey, nomoLastModified])
+    ##
+    # On connection close
+
+    connection.onclose = ->
+      connectionOpen = false
+      console.log '(nomo) connection closed, retrying in 5 seconds...'
+
+      setTimeout ->
+        connect() unless connectionOpen
+      , 5000
+
+  connect()
 
   ##
   # ajaxComplete
@@ -47,7 +65,9 @@ $ ->
     if nomoKeyHeader && (nomoKey != nomoKeyHeader)
       nomoKey = nomoKeyHeader
       nomoLastModified = nomoLastModifiedHeader
-      msgToServer = JSON.stringify({ key: nomoKey })
 
-      console.log('(nomo) page changed -- msg to server: ' + msgToServer)
-      connection.send(msgToServer)
+      if connectionOpen
+        msgToServer = JSON.stringify({ key: nomoKey })
+
+        console.log('(nomo) page changed -- msg to server: ' + msgToServer)
+        connection.send(msgToServer)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: nomo
 version: !ruby/object:Gem::Version
-  version: 0.0.45
+  version: 0.0.46
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-30 00:00:00.000000000 Z
+date: 2012-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70271198519160 !ruby/object:Gem::Requirement
+  requirement: &70339260059220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70271198519160
+  version_requirements: *70339260059220
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70271198518740 !ruby/object:Gem::Requirement
+  requirement: &70339260058800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70271198518740
+  version_requirements: *70339260058800
 description: 304 Not Modified Headers made easy.
 email:
 - sausman@stackd.com