model_updates 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f43d80cfa164be08bec5f099089518e873e4edb7
-  data.tar.gz: c7d5eeefdfab73846b9ae909bce65d32086d9058
+  metadata.gz: 119170b8e338b457db7b0d07526da4ecec937be0
+  data.tar.gz: 310de0c583969abcb04c3b9346ea82e6501e8570
 SHA512:
-  metadata.gz: f2a59b69019b2b9b75d4b9867d8039becab8c02f90b64dce8c675e188173e5e947d7a684d1f6e189d1e332f3c9dcc4fd088b12d1d23d6018e6e6c75f9c10e49b
-  data.tar.gz: e04a7d37da13e364fd1cb95c15735a58b20d7f11abe693becb4093e5bc0e5f1ecb3ab6de315b9752e6aec36d9b947e2c3982bb0d2af222f8255b33e76b1dc4ed
+  metadata.gz: cbeaac93bf5dbce1a1592815821a1fd3f33e1933f5396d0a39da76eeeefb29a4039364b6db013e6ff3196c634dfaf5a804c8f019b9d74334a67e4e29ff0de914
+  data.tar.gz: 923620988ae8f85bc021a60579821cb944e96894f0f07ca9e21718c1a9a9b0f60f5927ed6fe83ccabb231f6c0a2c682e74f4ce7cd273e6493e9b4358f8ad37f4

data/README.md

@@ -39,12 +39,12 @@ Add required CanCan access methods to your `ApplicationCable::Channel`:
 class ApplicationCable::Channel < ActionCable::Channel::Base
 private
 
-  delegate :authorize!, :can?, to: :current_ability
-
+  # Used to authorize which resources the user can read from (security)
   def current_ability
     @_current_ability ||= CanCanAbility.new(user: current_user)
   end
 
+  # Get user from Devise
   def current_user
     @_current_user ||= env["warden"].user
   end
@@ -60,8 +60,6 @@ Warden::Manager.after_set_user do |user, auth, opts|
 end
 ```
 
-You can define `authorize!(ability, model)` yourself, if you aren't using CanCan.
-
 Choose which attributes should be broadcasted automatically:
 
 ```ruby
@@ -172,6 +170,13 @@ You can refresh elements with a simple call like this:
 ModelUpdates.update()
 ```
 
+### Debugging
+
+In case you want to enable debug output from ModelUpdates from JavaScript:
+```js
+ModelUpdates.configuration.debug = true
+```
+
 ## Contributing
 
 Contribution directions go here.

data/app/assets/javascripts/model_updates/activator.es6

@@ -46,44 +46,46 @@ ModelUpdates.Activator = class Activator {
   updateSubscribedUpdates() {
     ModelUpdates.debug("Activator#updateSubscribedUpdates called")
 
+    var connectToModels = {}
     for(var model in this.modelSubscriptions) {
+      var ids = []
+      connectToModels[model] = ids
+
       for(var id in this.modelSubscriptions[model]) {
         if (!this.connectedUpdates[model])
           this.connectedUpdates[model] = {}
 
         if (!this.connectedUpdates[model][id]) {
           this.connectedUpdates[model][id] = true
-
-          ModelUpdates.debug("Add subscription for update of " + model + "(" + id + ")")
-
-          ModelUpdates.Update.connect({
-            "id": id,
-            "model": model
-          })
+          ids.push(id)
         }
       }
     }
+
+    if (Object.keys(connectToModels).length > 0)
+      ModelUpdates.Update.connect({"ids": connectToModels})
   }
 
   updateSubscribedDestroys() {
     ModelUpdates.debug("Activator#updateSubscribedDestroys called")
 
+    var connectToModels = {}
     for(var model in this.modelDestroys) {
+      var ids = []
+      connectToModels[model] = ids
+
       for(var id in this.modelDestroys[model]) {
         if (!this.connectedDestroyes[model])
           this.connectedDestroyes[model] = {}
 
         if (!this.connectedDestroyes[model][id]) {
           this.connectedDestroyes[model][id] = true
-
-          ModelUpdates.debug("Add subscription for destruction of " + model + "(" + id + ")")
-
-          ModelUpdates.Destroy.connect({
-            "id": id,
-            "model": model
-          })
+          ids.push(id)
         }
       }
     }
+
+    if (Object.keys(connectToModels).length > 0)
+      ModelUpdates.Destroy.connect({"ids": connectToModels})
   }
 }

data/app/assets/javascripts/model_updates/destroy.es6

@@ -1,9 +1,9 @@
 ModelUpdates.Destroy = class Destroy {
   static connect(args) {
-    ModelUpdates.debug("Connecting to destroy channel for " + args.model + "(" + args.id + ")")
+    ModelUpdates.debug("Connecting to destroy channel for " + JSON.stringify(args.ids))
 
     App.cable.subscriptions.create(
-      {channel: "ModelUpdates::DestroyChannel", id: args.id, model: args.model},
+      {channel: "ModelUpdates::DestroyChannel", ids: args.ids},
       {
         received: function(json) {
           var elements = $(".model-updates[data-model-updates-model='" + json.model + "'][data-model-updates-id='" + json.id + "'][data-model-updates-remove-on-destroy='true']")

data/app/assets/javascripts/model_updates/update.es6

@@ -1,9 +1,9 @@
 ModelUpdates.Update = class Update {
   static connect(args) {
-    ModelUpdates.debug("Connecting to update channel for " + args.model + "(" + args.id + ")")
+    ModelUpdates.debug("Connecting to update channel for " + JSON.stringify(args.ids))
 
     App.cable.subscriptions.create(
-      {channel: "ModelUpdates::UpdateChannel", id: args.id, model: args.model},
+      {channel: "ModelUpdates::UpdateChannel", ids: args.ids},
       {
         received: function(json) {
           ModelUpdates.debug("Received update for " + json.model + "(" + json.id + ")")

data/app/channels/model_updates/destroy_channel.rb

@@ -1,7 +1,15 @@
 class ModelUpdates::DestroyChannel < ApplicationCable::Channel
   def subscribed
-    model = params[:model].safe_constantize.find(params[:id])
-    authorize! :read, model
-    stream_for model
+    params[:ids].each do |model_class, ids|
+      models = model_class.safe_constantize.accessible_by(current_ability).where(id: ids)
+
+      ids_found = {}
+      models.each do |model|
+        next if ids_found.key?(model.id)
+        ids_found[model.id] = true
+
+        stream_for model
+      end
+    end
   end
 end

data/app/channels/model_updates/update_channel.rb

@@ -1,7 +1,15 @@
 class ModelUpdates::UpdateChannel < ApplicationCable::Channel
   def subscribed
-    model = params[:model].safe_constantize.find(params[:id])
-    authorize! :read, model
-    stream_for model
+    params[:ids].each do |model_class, ids|
+      models = model_class.safe_constantize.accessible_by(current_ability).where(id: ids)
+
+      ids_found = {}
+      models.each do |model|
+        next if ids_found.key?(model.id)
+        ids_found[model.id] = true
+
+        stream_for model
+      end
+    end
   end
 end

data/lib/model_updates/model_extensions.rb

@@ -11,26 +11,29 @@ module ModelUpdates::ModelExtensions
     def model_updates_broadcast_attributes(args)
       model_updates_data[:attributes] = args.fetch(:attributes)
 
-      after_commit on: :update do |model|
-        changes = {}
+      # Need to remember what changes before callbacks, since it might get changed by gems like AwesomeNestedSet before after_commit is called
+      before_save on: :update do
+        attribute_changes = {}
 
         args.fetch(:attributes).each do |attribute_name|
-          if Rails::VERSION::MAJOR >= 5 && Rails::VERSION::MINOR >= 1
-            method_changed = "saved_change_to_#{attribute_name}?"
-          else
-            method_changed = "#{attribute_name}_changed?"
-          end
-
+          method_changed = "#{attribute_name}_changed?"
           next if respond_to?(method_changed) && !__send__(method_changed)
-          changes[attribute_name] = __send__(attribute_name)
+          attribute_changes[attribute_name] = __send__(attribute_name)
         end
 
-        if changes.any?
+        @_model_updates_changes = attribute_changes
+      end
+
+      after_commit on: :update do |model|
+        attribute_changes = @_model_updates_changes
+        @_model_updates_changes = nil
+
+        if attribute_changes.any?
           ModelUpdates::UpdateChannel.broadcast_to(
             model,
             id: id,
             model: model.class.name,
-            changes: changes
+            changes: attribute_changes
           )
         end
       end

data/lib/model_updates/version.rb

@@ -1,3 +1,3 @@
 module ModelUpdates
-  VERSION = "0.0.9".freeze
+  VERSION = "0.0.10".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_updates
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-03 00:00:00.000000000 Z
+date: 2018-01-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails