action_cable_notifications 0.1.18 → 0.1.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 3d3881c154e82ff694803dae629b00ef8110d979
-  data.tar.gz: be3fcb83d77cc590afbbc82982ef4eed706b304e
+  metadata.gz: 1dab7586f3ac550c6ac8b849b658c9b6298b13d4
+  data.tar.gz: 445cf42e5076f055d9c72cb83c71eb56a4fb87fe
 SHA512:
-  metadata.gz: 3f7ce84fcef2aea235649357959f5ffaeae93af487922a2e06fadf371419e996a454b3c4f7929f3f53e298ab2ef289828c5a0e3921bfd600a10b4101e0b2e63f
-  data.tar.gz: db6d782b49af060688c3bb53a8702ec421c6393f7ce50319da561405d5cb41ceeae6e67e2ae8615d3230db63d3b059c6a14f2e0501cd1114860ab81f6d9cf6ec
+  metadata.gz: e98437193f244b7b372fc090307cc6b386864d1b6adf7d3b32a9999ddaa7906c57a0b9dae3b15ba9e4ba2394fde4e695fb724a0f1bcb5bbfdbb8b6b7deeb1d62
+  data.tar.gz: eff1938cc3c84ca6fc76633109bc8e13d13de759956db8c89930c590752a099e1027c32c69204bccad5154c0d3e5857f67bcb03be5cf886bd7a7cb7d6e6ae1b4

data/app/assets/javascripts/action_cable_notifications/collection.coffee

@@ -28,6 +28,9 @@ class CableNotifications.Collection
       # Cleanup performed commands
       _.remove(@commandsCache, {performed: true})
 
+      # Fetch data from upstream server when connection is resumed
+      @fetch()
+
   # Public methods
   #######################################
 
@@ -40,11 +43,12 @@ class CableNotifications.Collection
     @sync = false
     # Stores upstream commands when there is no connection to the server
     @commandsCache = []
+    # Stores records that needs to be tracked when inserted into the collection
+    @trackedRecords = []
 
     # Bind private methods to class instance
     ########################################################
     upstream = upstream.bind(this)
-    connectionChanged = connectionChanged.bind(this)
 
   # Sync collection to ActionCable Channel
   syncToChannel: (@channel) ->
@@ -52,7 +56,7 @@ class CableNotifications.Collection
 
     Tracker.autorun () =>
       @channel.isConnected()
-      connectionChanged()
+      connectionChanged.call(this)
 
   # Fetch records from upstream
   fetch: (params) ->
@@ -63,21 +67,39 @@ class CableNotifications.Collection
     _.filter(@data, selector)
 
   # Find a record
-  find: (selector={}) ->
-    _.find(@data, selector)
+  find: (selector={}, options={}) ->
+    record = _.find(@data, selector)
+
+    if !record and options.track
+      if selector.id
+        trackedRecord = _.find(@trackedRecords, {id: selector.id})
+        if trackedRecord
+          trackedRecord
+        else
+          trackedRecord = {id: selector.id}
+          @trackedRecords.push trackedRecord
+          trackedRecord
+      else
+        console.warn("[find] Id must be specified to track records")
+    else
+      record
 
   # Creates a new record
   create: (fields={}) ->
     record = _.find(@data, {id: fields.id})
-    if( record )
+    if record
       console.warn("[create] Not expected to find an existing record with id #{fields.id}")
       return
 
+    # Search in tracked records
+    recordIndex = _.findIndex(@trackedRecords, {id: fields.id})
+    if recordIndex>=0
+      fields = _.merge( @trackedRecords[recordIndex], fields )
+      @trackedRecords.splice(recordIndex, 1)
+
     @data.push (fields) unless @sync
 
-    upstream("create",
-      fields: fields
-    )
+    upstream("create", {fields: fields})
     fields
 
   # Update an existing record

data/app/assets/javascripts/action_cable_notifications/store.coffee

@@ -96,9 +96,6 @@ class CableNotifications.Store
       else
         collection.syncToChannel(channel)
         channelInfo.collections.push collection
-
-        # Fetch data from uptream server
-        collection.fetch()
     else
       # Initialize channelInfo
       @channels[channelId] =
@@ -120,7 +117,4 @@ class CableNotifications.Store
       # Assigns channel to collection and turns on Sync
       collection.syncToChannel(channel)
 
-      # Fetch data from upstream server
-      collection.fetch()
-
     return true

data/lib/action_cable_notifications/channel.rb

@@ -1,4 +1,5 @@
 require 'action_cable_notifications/channel_actions.rb'
+require 'action_cable_notifications/channel_cache.rb'
 
 module ActionCableNotifications
   module Channel
@@ -71,6 +72,7 @@ module ActionCableNotifications
     private
 
     include ActionCableNotifications::Channel::Actions
+    include ActionCableNotifications::Channel::Cache
 
     #
     # Streams notification for ActiveRecord model changes
@@ -120,73 +122,5 @@ module ActionCableNotifications
       end
     end
 
-    #
-    # Updates server side cache of client side collections
-    # XXX compute cache diff before sending to clients
-    #
-    def update_cache(packet)
-      updated = false
-
-      # Check if collection already exists
-      new_collection = false
-      if @collections[packet[:collection]].nil?
-        @collections[packet[:collection]] = []
-        new_collection = true
-      end
-
-      collection = @collections[packet[:collection]]
-
-      case packet[:msg]
-      when 'upsert_many'
-        if new_collection
-          packet[:data].each do |record|
-            collection.push record
-          end
-          updated = true
-        else
-          packet[:data].each do |record|
-            current_record = collection.find{|c| c[:id]==record[:id]}
-            if current_record
-              new_record = current_record.merge(record)
-              if new_record != current_record
-                current_record.merge!(record)
-                updated = true
-              end
-            else
-              collection.push record
-              updated = true
-            end
-          end
-        end
-
-      when 'create'
-        record = collection.find{|c| c[:id]==packet[:id]}
-        if !record
-          @collections[packet[:collection]].push packet[:data]
-          updated = true
-        end
-
-      when 'update'
-        record = @collections[packet[:collection]].find{|c| c[:id]==packet[:id]}
-        if record
-          record.merge!(packet[:data])
-          updated = true
-        end
-
-      when 'destroy'
-        index = @collections[packet[:collection]].find_index{|c| c.id==packet[:id]}
-        if index
-          @collections[packet[:collection]].delete_at(index)
-          updated = true
-        end
-
-      else
-        updated = true
-      end
-
-      updated
-
-    end
-
   end
 end

data/lib/action_cable_notifications/channel_cache.rb

@@ -0,0 +1,88 @@
+module ActionCableNotifications
+  module Channel
+    module Cache
+
+      #
+      # Updates server side cache of client side collections
+      # XXX compute cache diff before sending to clients
+      #
+      def update_cache(packet)
+        updated = false
+
+        # Check if collection already exists
+        new_collection = false
+        if @collections[packet[:collection]].nil?
+          @collections[packet[:collection]] = []
+          new_collection = true
+        end
+
+        collection = @collections[packet[:collection]]
+
+        case packet[:msg]
+        when 'update_many'
+          if !new_collection
+            packet[:data].each do |record|
+              current_record = collection.find{|c| c[:id]==record[:id]}
+              if current_record
+                new_record = current_record.merge(record)
+                if new_record != current_record
+                  current_record.merge!(record)
+                  updated = true
+                end
+              end
+            end
+          end
+
+        when 'upsert_many'
+          if new_collection
+            packet[:data].each do |record|
+              collection.push record
+            end
+            updated = true
+          else
+            packet[:data].each do |record|
+              current_record = collection.find{|c| c[:id]==record[:id]}
+              if current_record
+                new_record = current_record.merge(record)
+                if new_record != current_record
+                  current_record.merge!(record)
+                  updated = true
+                end
+              else
+                collection.push record
+                updated = true
+              end
+            end
+          end
+
+        when 'create'
+          record = collection.find{|c| c[:id]==packet[:id]}
+          if !record
+            @collections[packet[:collection]].push packet[:data]
+            updated = true
+          end
+
+        when 'update'
+          record = @collections[packet[:collection]].find{|c| c[:id]==packet[:id]}
+          if record
+            record.merge!(packet[:data])
+            updated = true
+          end
+
+        when 'destroy'
+          index = @collections[packet[:collection]].find_index{|c| c.id==packet[:id]}
+          if index
+            @collections[packet[:collection]].delete_at(index)
+            updated = true
+          end
+
+        else
+          updated = true
+        end
+
+        updated
+      end
+
+    end
+  end
+end

data/lib/action_cable_notifications/version.rb

@@ -1,3 +1,3 @@
 module ActionCableNotifications
-  VERSION = '0.1.18'
+  VERSION = '0.1.19'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: action_cable_notifications
 version: !ruby/object:Gem::Version
-  version: 0.1.18
+  version: 0.1.19
 platform: ruby
 authors:
 - ByS Sistemas de Control
@@ -116,6 +116,7 @@ files:
 - lib/action_cable_notifications.rb
 - lib/action_cable_notifications/channel.rb
 - lib/action_cable_notifications/channel_actions.rb
+- lib/action_cable_notifications/channel_cache.rb
 - lib/action_cable_notifications/engine.rb
 - lib/action_cable_notifications/model.rb
 - lib/action_cable_notifications/version.rb