action_cable_notifications 0.1.19 → 0.1.24

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1dab7586f3ac550c6ac8b849b658c9b6298b13d4
-  data.tar.gz: 445cf42e5076f055d9c72cb83c71eb56a4fb87fe
+  metadata.gz: 778924ed40589e3d7653fa0fa7c7cc7409fbb115
+  data.tar.gz: dfa866c25e56b55845c2474167742fb4a76592d2
 SHA512:
-  metadata.gz: e98437193f244b7b372fc090307cc6b386864d1b6adf7d3b32a9999ddaa7906c57a0b9dae3b15ba9e4ba2394fde4e695fb724a0f1bcb5bbfdbb8b6b7deeb1d62
-  data.tar.gz: eff1938cc3c84ca6fc76633109bc8e13d13de759956db8c89930c590752a099e1027c32c69204bccad5154c0d3e5857f67bcb03be5cf886bd7a7cb7d6e6ae1b4
+  metadata.gz: 89bfc86631704c2b812b28f54a0f2238495b7512dc65e3a2432952b62738b4a3c34b348d8f5a286d0d9fdc3d7997f349d19014dee568fe1b8e93955860c0b9fb
+  data.tar.gz: 585982ecbff391e1edb27a5ebf72cd2d4dfb0c0333931bfa236cac377f494dcea5ea593d4d0d21f2da627ce7a836a4da84d427ecb88955d25331276fbb3e16c7

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

@@ -21,7 +21,7 @@ class CableNotifications.Collection
   connectionChanged = () ->
     if @channel.isConnected()
       _.each(@commandsCache, (cmd) ->
-        if upstream(cmd.command, cmd.params)
+        if upstream.call(this, cmd.command, cmd.params)
           cmd.performed = true
       )
 
@@ -31,10 +31,11 @@ class CableNotifications.Collection
       # Fetch data from upstream server when connection is resumed
       @fetch()
 
+    @callbacks?.connectionChanged?.call(this)
+
   # Public methods
   #######################################
-
-  constructor: (@store, @name, @tableName) ->
+  constructor: (@store, @name, @tableName, @callbacks) ->
     # Data storage array
     @data = []
     # Channel used to sync with upstream collection
@@ -46,9 +47,7 @@ class CableNotifications.Collection
     # Stores records that needs to be tracked when inserted into the collection
     @trackedRecords = []
 
-    # Bind private methods to class instance
-    ########################################################
-    upstream = upstream.bind(this)
+    @callbacks?.initialize?.call(this)
 
   # Sync collection to ActionCable Channel
   syncToChannel: (@channel) ->
@@ -60,11 +59,14 @@ class CableNotifications.Collection
 
   # Fetch records from upstream
   fetch: (params) ->
-    upstream("fetch", params)
+    upstream.call(this, "fetch", params)
 
   # Filter records from the current collection
   where: (selector={}) ->
-    _.filter(@data, selector)
+    if @callbacks?.where?
+      @callbacks.where.call(this, selector)
+    else
+      _.filter(@data, selector)
 
   # Find a record
   find: (selector={}, options={}) ->
@@ -76,7 +78,7 @@ class CableNotifications.Collection
         if trackedRecord
           trackedRecord
         else
-          trackedRecord = {id: selector.id}
+          trackedRecord = selector
           @trackedRecords.push trackedRecord
           trackedRecord
       else
@@ -94,12 +96,14 @@ class CableNotifications.Collection
     # Search in tracked records
     recordIndex = _.findIndex(@trackedRecords, {id: fields.id})
     if recordIndex>=0
-      fields = _.merge( @trackedRecords[recordIndex], fields )
+      fields = _.extend( @trackedRecords[recordIndex], fields )
       @trackedRecords.splice(recordIndex, 1)
 
-    @data.push (fields) unless @sync
+    if !@sync
+      @data.push (fields)
+      @callbacks?.create?.call(this, fields)
 
-    upstream("create", {fields: fields})
+    upstream.call(this, "create", {fields: fields})
     fields
 
   # Update an existing record
@@ -111,8 +115,11 @@ class CableNotifications.Collection
       else
         console.warn("[update] Couldn't find a matching record:", selector)
     else
-      _.extend(record, fields)
-      upstream("update", {id: record.id, fields: fields})
+      if !@sync
+        @callbacks?.update?.call(this, selector, fields, options)
+        _.extend(record, fields)
+
+      upstream.call(this, "update", {id: record.id, fields: fields})
       record
 
   # Update an existing record or inserts a new one if there is no match
@@ -126,6 +133,9 @@ class CableNotifications.Collection
       console.warn("[destroy] Couldn't find a matching record:", selector)
     else
       record = @data[index]
-      @data.splice(index, 1) unless @sync
-      upstream("destroy", {id: record.id})
+      if !@sync
+        @data.splice(index, 1)
+        @callbacks.destroy.call(this, selector)
+
+      upstream.call(this, "destroy", {id: record.id})
       record

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

@@ -26,4 +26,4 @@ class CableNotifications.Store.DefaultCallbacks
     collection.destroy({id: packet.id})
 
   error: (packet, collection) ->
-    console.error "[#{packet.cmd}]: #{packet.error}"
+    console.error "[#{packet.command}]: #{packet.error}"

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

@@ -56,12 +56,12 @@ class CableNotifications.Store
   #######################################
 
   # Register a new collection
-  registerCollection: (name, channel, tableName) ->
+  registerCollection: (name, channel, tableName, actions) ->
     tableName = name unless tableName
     if @collections[name]
       console.warn "[registerCollection]: Collection '#{name}' already exists"
     else
-      @collections[name] = new CableNotifications.Collection(this, name, tableName)
+      @collections[name] = new CableNotifications.Collection(this, name, tableName, actions)
       if channel
         @syncToChannel(channel, @collections[name])
 
@@ -84,18 +84,25 @@ class CableNotifications.Store
       console.warn "[syncToChannel]: Channel specified doesn't have an identifier"
       return false
 
-    if @collections[collection.name] < 0
+    if !@collections[collection.name]
       console.warn "[syncToChannel]: Collection does not exists in the store"
       return false
 
+    if collection.channel == channel
+      console.warn "[syncToChannel]: Collection is already been synced with channel '#{channelId}'"
+      return false
+
+    channel.collections = [] unless channel.collections
+
+    existingCollection = _.find(channel.collections, {tableName: collection.tableName})
+    if existingCollection
+      console.warn "[syncToChannel]: Table '#{collection.tableName}' is already being synced with channel '#{channelId}' in collection '#{existingCollection.name}'"
+
+      # Copies data from existing collection to the new collection
+      collection.data = _.cloneDeep(existingCollection.data)
+
     if @channels[channelId]
-      channelInfo = @channels[channelId]
-      if _.find(channelInfo.collections, {name: collection.name})
-        console.warn "[syncToChannel]: Collection '#{collection.name}' is already being synced with channel '#{channelId}'"
-        return false
-      else
-        collection.syncToChannel(channel)
-        channelInfo.collections.push collection
+      @channels[channelId].collections.push collection
     else
       # Initialize channelInfo
       @channels[channelId] =
@@ -114,7 +121,8 @@ class CableNotifications.Store
       channel.disconnected = channelDisconnected(@channels[channelId]).bind(this)
       channel.isConnected = channelIsConnected(@channels[channelId]).bind(this)
 
-      # Assigns channel to collection and turns on Sync
-      collection.syncToChannel(channel)
+    # Assigns channel to collection and turns on Sync
+    collection.syncToChannel(channel)
+    channel.collections.push collection
 
     return true

data/lib/action_cable_notifications/channel.rb

@@ -29,25 +29,38 @@ module ActionCableNotifications
       data.deep_symbolize_keys!
 
       channel_options = self.ActionCableNotifications[data[:collection]]
-      model = channel_options[:model]
-      broadcasting = channel_options[:broadcasting]
-      model_options = model.ActionCableNotificationsOptions[broadcasting]
-
-      params = {
-        model: model,
-        model_options: model_options,
-        params: data[:params]
-      }
-
-      case data[:command]
-      when "fetch"
-        fetch(params)
-      when "create"
-        create(params)
-      when "update"
-        update(params)
-      when "destroy"
-        destroy(params)
+      if channel_options
+        model = channel_options[:model]
+        broadcasting = channel_options[:broadcasting]
+        model_options = model.ActionCableNotificationsOptions[broadcasting]
+
+        params = {
+          model: model,
+          model_options: model_options,
+          params: data[:params],
+          command: data[:command]
+        }
+
+        case data[:command]
+        when "fetch"
+          fetch(params)
+        when "create"
+          create(params)
+        when "update"
+          update(params)
+        when "destroy"
+          destroy(params)
+        end
+      else
+        response = {
+          collection: data[:collection],
+          msg: 'error',
+          command: data[:command],
+          error: "Collection '#{data[:collection]}' does not exist."
+        }
+
+        # Send error notification to the client
+        transmit response
       end
     end
 
@@ -83,15 +96,16 @@ module ActionCableNotifications
     def stream_notifications_for(model, options = {})
       # Default options
       options = {
+        broadcasting: model.model_name.collection
       }.merge(options)
 
       # These options cannot be overridden
       options[:model] = model
       options[:channel] = self
-      options[:broadcasting] = model.model_name.collection
+      model_name = model.model_name.collection
 
       # Sets channel options
-      self.ActionCableNotifications[options[:broadcasting]] = options
+      self.ActionCableNotifications[model_name] = options
 
       # Checks if model already includes notification callbacks
       if !model.respond_to? :ActionCableNotificationsOptions

data/lib/action_cable_notifications/channel_actions.rb

@@ -57,7 +57,7 @@ module ActionCableNotifications
           response = {
             collection: data[:model].model_name.collection,
             msg: 'error',
-            cmd: 'create',
+            command: data[:command],
             error: error || record.errors.full_messages
           }
 
@@ -94,7 +94,7 @@ module ActionCableNotifications
           response = {
             collection: data[:model].model_name.collection,
             msg: 'error',
-            cmd: 'update',
+            command: data[:command],
             error: error || record.errors.full_messages
           }
 
@@ -129,7 +129,7 @@ module ActionCableNotifications
         if error
           response = { collection: data[:model].model_name.collection,
             msg: 'error',
-            cmd: 'destroy',
+            command: data[:command],
             error: error || record.errors.full_messages
           }
 

data/lib/action_cable_notifications/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_cable_notifications
 version: !ruby/object:Gem::Version
-  version: 0.1.19
+  version: 0.1.24
 platform: ruby
 authors:
 - ByS Sistemas de Control
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-10-03 00:00:00.000000000 Z
+date: 2016-10-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails