action_cable_notifications 0.1.30 → 0.1.35

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 64f6e0167fd97bc6b64dc43e1292c331cf7baff7
-  data.tar.gz: bf24e8703a9953a7be75a3d80f73deb27a118508
+SHA256:
+  metadata.gz: 791d0cda5f750319e778b0f7e0c9c656721d4ad4a3b2dcc6bf7377a88e7d10d8
+  data.tar.gz: '085b106ff16bde873da19f9c0d800cb5dfcdb184c4bf6607c60872d156fdf0a2'
 SHA512:
-  metadata.gz: 624a3425d47cd3ea0291abdc706a7b3bc5c12c5d19715775012c364b70d4b00d30907399b3c161357012bca7b33ca4f9afd48ab6f09b4fd95f21c048444b8d1b
-  data.tar.gz: 2848f179da19c2af48b313e07ae81638e481beac62cef85734d9c888e86c10622ffda3230bc2aa091f3589a9434624eebffd805a8d76a9fec6cbc5bfc7c7cb03
+  metadata.gz: 0d4270f9e8441719683eda7d7874b8f984c108999bcefa5ecf3df371a753c4172f53ea91ba441aa8147cf530126aeef5677d1168b675cd40a8e18e37ec1bcc66
+  data.tar.gz: 8f4c6acbecb415cd2e9f018ccc0fc17d1187a99ddd9cb77b00fe9aa5645378d693bda60a666707e21c5c6a3e538d5b4752d4f25df2f451b5663d7a5b07f13188

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

@@ -28,9 +28,6 @@ class CableNotifications.Collection
       # Cleanup performed commands
       _.remove(@commandsCache, {performed: true})
 
-      # Clears the data array before fetching data
-      @data.splice(0,@data.length)
-
       # Fetch data from upstream server when connection is resumed
       @fetch()
 
@@ -122,8 +119,8 @@ class CableNotifications.Collection
       @data.push (fields)
       @callbacks?.create?.call(this, fields)
       @callbacks?.changed?.call(this, @data) unless options.batching
-
-    upstream.call(this, "create", {fields: fields})
+    else
+      upstream.call(this, "create", {fields: fields})
     fields
 
   # Update an existing record
@@ -139,8 +136,8 @@ class CableNotifications.Collection
         @callbacks?.update?.call(this, selector, fields, options)
         _.extend(record, fields)
         @callbacks?.changed?.call(this, @data) unless options.batching
-
-      upstream.call(this, "update", {id: record.id, fields: fields})
+      else
+        upstream.call(this, "update", {id: record.id, fields: fields})
       record
 
   # Update an existing record or inserts a new one if there is no match
@@ -148,7 +145,7 @@ class CableNotifications.Collection
     @update(selector, fields, _.extend(options, {upsert: true}))
 
   # Destroy an existing record
-  destroy: (selector={}) ->
+  destroy: (selector={}, options={}) ->
     index = _.findIndex(@data, selector)
     if index < 0
       console.warn("[destroy] Couldn't find a matching record:", selector)
@@ -158,6 +155,6 @@ class CableNotifications.Collection
         @data.splice(index, 1)
         @callbacks?.destroy?.call(this, selector)
         @callbacks?.changed?.call(this, @data) unless options.batching
-
-      upstream.call(this, "destroy", {id: record.id})
+      else
+        upstream.call(this, "destroy", {id: record.id})
       record

data/lib/action_cable_notifications/channel_actions.rb

@@ -13,11 +13,16 @@ module ActionCableNotifications
 
         # Get results using provided parameters and model configured scope
         begin
+          temp_scope = data[:model_options][:scope].deep_dup || {}
+          if (data[:model_options][:scope].is_a? Hash) && (data[:model_options][:scope][:where].is_a? Hash)
+            #temp_scope = temp_scope.merge(params)
+            temp_scope[:where].each{|k,v| v.is_a?(Proc) ? temp_scope[:where][k]=v.call() : nil }
+          end
           results = data[:model].
                     select(params[:select] || []).
                     limit(params[:limit]).
                     where(params[:where] || {}).
-                    scoped_collection(data[:model_options][:scope]).
+                    scoped_collection(temp_scope).
                     to_a() rescue []
 
           response = {

data/lib/action_cable_notifications/model.rb

@@ -13,6 +13,16 @@ module ActionCableNotifications
       after_create :notify_create
       after_destroy :notify_destroy
 
+      def record_within_scope records
+        if records.respond_to?(:where)
+          found_record = records.where(id: self.id).first
+        elsif records.respond_to?(:detect) and (found_record = records.detect{|e| e["id"]==self.id})
+          found_record
+        else
+          nil
+        end
+      end
+
     end
 
     class_methods do
@@ -74,8 +84,10 @@ module ActionCableNotifications
     def notify_create
       self.ChannelPublications.each do |publication, options|
         if options[:actions].include? :create
-          # Checks if record is within scope before broadcasting
-          if options[:scope]==:all or self.class.scoped_collection(options[:scope]).where(id: self.id).present?
+          # Checks if records is within scope before broadcasting
+          records = self.class.scoped_collection(options[:scope])
+
+          if options[:scope]==:all or record_within_scope(records)
             ActionCable.server.broadcast publication,
               msg: 'create',
               id: self.id,
@@ -91,9 +103,9 @@ module ActionCableNotifications
           if options[:scope]==:all
             options[:records].push self
           else
-            record = self.class.scoped_collection(options[:scope]).where(id: self.id)
+            record = record_within_scope(self.class.scoped_collection(options[:scope]))
             if record.present?
-              options[:records].push record.first
+              options[:records].push record
             end
           end
         end
@@ -117,8 +129,9 @@ module ActionCableNotifications
         self.ChannelPublications.each do |publication, options|
           if options[:actions].include? :update
             # Checks if previous record was within scope
-            record = options[:records].detect{|r| r.id==self.id}
+            record = record_within_scope(options[:records])
             was_in_scope = record.present?
+
             options[:records].delete(record) if was_in_scope
 
             # Checks if current record is within scope
@@ -128,9 +141,8 @@ module ActionCableNotifications
                 record = self
                 is_in_scope = true
               else
-                record = self.class.scoped_collection(options[:scope]).where(id: self.id)
+                record = record_within_scope(self.class.scoped_collection(options[:scope]))
                 if record.present?
-                  record = record.first
                   is_in_scope = true
                 end
               end
@@ -173,7 +185,7 @@ module ActionCableNotifications
       self.ChannelPublications.each do |publication, options|
         if options[:scope]==:all or options[:actions].include? :destroy
           # Checks if record is within scope before broadcasting
-          if options[:scope]==:all or self.class.scoped_collection(options[:scope]).where(id: self.id).present?
+          if options[:scope]==:all or record_within_scope(self.class.scoped_collection(options[:scope])).present?
             ActionCable.server.broadcast publication,
               msg: 'destroy',
               id: self.id

data/lib/action_cable_notifications/version.rb

@@ -1,3 +1,3 @@
 module ActionCableNotifications
-  VERSION = '0.1.30'
+  VERSION = '0.1.35'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: action_cable_notifications
 version: !ruby/object:Gem::Version
-  version: 0.1.30
+  version: 0.1.35
 platform: ruby
 authors:
 - ByS Sistemas de Control
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-19 00:00:00.000000000 Z
+date: 2022-05-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -149,8 +149,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Automatic realtime notification broadcast for ActiveRecord models changes