nomo 0.0.44 → 0.0.45

data/lib/nomo/conditional_get.rb

@@ -9,7 +9,10 @@ module Nomo
         record_or_options = { etag: [nomo_page.cache_key, *(layout_factors rescue nil)],
                               last_modified: nomo_page.last_modified }
 
-        response.headers['Nomo-Key'] = nomo_page.key if nomo_page.realtime?
+        if nomo_page.realtime?
+          response.headers['Nomo-Key'] = nomo_page.key
+          response.headers['Nomo-LastModified'] = nomo_page.last_modified.to_f
+        end
       end
 
       super

data/lib/nomo/version.rb

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

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

@@ -4,30 +4,50 @@ $ ->
   # Vars
 
   nomoKey = null
+  nomoLastModified = null
   connection = new WebSocket('ws://<%= Nomo.server ? Nomo.server : request.host %>', 'nomo')
 
   ##
   # WebSocket Connection
 
   connection.onopen = ->
+
+    # If there's already a nomoKey there could be updates we haven't received
     if nomoKey
-      connection.send(nomoKey)
+      msgToServer = JSON.stringify({ key: nomoKey, lastModified: nomoLastModified })
+
+      console.log('(nomo) connected -- msg to server: ' + msgToServer)
+      connection.send(msgToServer)
+
+    # 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) ->
-    if msg.data == nomoKey
-      $(document).trigger('nomo:update', [nomoKey])
+    msg = JSON.parse(msg.data)
+
+    if msg.event == 'update'
+      console.log('(nomo) nomo:update triggered')
+      $(document).trigger('nomo:update', [nomoKey, nomoLastModified])
 
   ##
   # ajaxComplete
 
   $(document).bind 'ajaxComplete', (event, xhr, options) ->
     nomoKeyHeader = xhr.getResponseHeader('Nomo-Key')
+    nomoLastModifiedHeader = xhr.getResponseHeader('Nomo-LastModified')
 
-    if nomoKeyHeader && nomoKeyHeader != nomoKey
+    if nomoKeyHeader && (nomoKey != nomoKeyHeader)
       nomoKey = nomoKeyHeader
-      connection.send(nomoKey)
+      nomoLastModified = nomoLastModifiedHeader
+      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.44
+  version: 0.0.45
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-21 00:00:00.000000000 Z
+date: 2012-07-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: redis
-  requirement: &70290983063440 !ruby/object:Gem::Requirement
+  requirement: &70271198519160 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290983063440
+  version_requirements: *70271198519160
 - !ruby/object:Gem::Dependency
   name: redis-namespace
-  requirement: &70290986344160 !ruby/object:Gem::Requirement
+  requirement: &70271198518740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,7 +32,7 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70290986344160
+  version_requirements: *70271198518740
 description: 304 Not Modified Headers made easy.
 email:
 - sausman@stackd.com