model_updates 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 119170b8e338b457db7b0d07526da4ecec937be0
-  data.tar.gz: 310de0c583969abcb04c3b9346ea82e6501e8570
+  metadata.gz: a5cb133f1b8f65abb2d507c21b386305040af2e0
+  data.tar.gz: c7d89af1f90f0a65637ba16cb070b71ff27eb422
 SHA512:
-  metadata.gz: cbeaac93bf5dbce1a1592815821a1fd3f33e1933f5396d0a39da76eeeefb29a4039364b6db013e6ff3196c634dfaf5a804c8f019b9d74334a67e4e29ff0de914
-  data.tar.gz: 923620988ae8f85bc021a60579821cb944e96894f0f07ca9e21718c1a9a9b0f60f5927ed6fe83ccabb231f6c0a2c682e74f4ce7cd273e6493e9b4358f8ad37f4
+  metadata.gz: ba0a40d206e4f5de631469bd8265b52c61ed5fbe4d149e2bbb0b0abb1eaa82bbc1d76768d63512d37f1715dcced6317aeadb9e05b717fd4ef17325405d3dac89
+  data.tar.gz: 9beab92f2e0173da0b9ae5c265199feb898265ab9e4d0f596cc9b5e1f657604ca62f5a260322b08d695f10ebb42f6de52dc8afde5dc439b245e029b8fb266084

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

@@ -3,7 +3,6 @@ ModelUpdates.Activator = class Activator {
     ModelUpdates.debug("Activator constructor")
 
     this.modelSubscriptions = {}
-    this.modelDestroys = {}
     this.connectedUpdates = {}
     this.connectedDestroyes = {}
   }
@@ -12,7 +11,6 @@ ModelUpdates.Activator = class Activator {
     ModelUpdates.debug("Update was called")
     this.updateFoundElements()
     this.updateSubscribedUpdates()
-    this.updateSubscribedDestroys()
   }
 
   updateFoundElements() {
@@ -31,15 +29,7 @@ ModelUpdates.Activator = class Activator {
       if (!that.modelSubscriptions[model])
         that.modelSubscriptions[model] = {}
 
-      if (element.data("model-updates-key"))
-        that.modelSubscriptions[model][id] = true
-
-      if (element.data("model-updates-remove-on-destroy")) {
-        if (!that.modelDestroys[model])
-          that.modelDestroys[model] = {}
-
-        that.modelDestroys[model][id] = true
-      }
+      that.modelSubscriptions[model][id] = true
     })
   }
 
@@ -65,27 +55,4 @@ ModelUpdates.Activator = class Activator {
     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
-          ids.push(id)
-        }
-      }
-    }
-
-    if (Object.keys(connectToModels).length > 0)
-      ModelUpdates.Destroy.connect({"ids": connectToModels})
-  }
 }

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

@@ -6,31 +6,40 @@ ModelUpdates.Update = class Update {
       {channel: "ModelUpdates::UpdateChannel", ids: args.ids},
       {
         received: function(json) {
-          ModelUpdates.debug("Received update for " + json.model + "(" + json.id + ")")
 
-          for(var key in json.changes) {
-            var elements = $(".model-updates[data-model-updates-model='" + json.model + "'][data-model-updates-id='" + json.id + "'][data-model-updates-key='" + key + "']")
-            elements.each(function() {
-              var element = $(this)
+          if (json.type == "destroy") {
+            var elements = $(".model-updates[data-model-updates-model='" + json.model + "'][data-model-updates-id='" + json.id + "'][data-model-updates-remove-on-destroy='true']")
+            elements.remove()
 
-              if (element.data("model-updates-callback")) {
-                var function_to_call = element.data("model-updates-callback")
+            if (args.onDestroyed)
+              args.onDestroyed(json)
+          } else if (json.type == "update") {
+            ModelUpdates.debug("Received update for " + json.model + "(" + json.id + ")")
 
-                window[function_to_call]({
-                  changes: json.changes,
-                  element: element,
-                  id: json.id,
-                  key: key,
-                  model: json.model,
-                  value: json.changes[key]
-                })
-              } else if(json.changes[key]) {
-                element.text(json.changes[key])
-              } else {
-                // Needs to check if it has a value, else it will print out "null" instead of nothing.
-                element.text("")
-              }
-            })
+            for(var key in json.changes) {
+              var elements = $(".model-updates[data-model-updates-model='" + json.model + "'][data-model-updates-id='" + json.id + "'][data-model-updates-key='" + key + "']")
+              elements.each(function() {
+                var element = $(this)
+
+                if (element.data("model-updates-callback")) {
+                  var function_to_call = element.data("model-updates-callback")
+
+                  window[function_to_call]({
+                    changes: json.changes,
+                    element: element,
+                    id: json.id,
+                    key: key,
+                    model: json.model,
+                    value: json.changes[key]
+                  })
+                } else if(json.changes[key]) {
+                  element.text(json.changes[key])
+                } else {
+                  // Needs to check if it has a value, else it will print out "null" instead of nothing.
+                  element.text("")
+                }
+              })
+            }
           }
         }
       }

data/app/assets/javascripts/model_updates.js

@@ -1,7 +1,6 @@
 //= require model_updates/model_updates_class
 //= require model_updates/activator
 //= require model_updates/create
-//= require model_updates/destroy
 //= require model_updates/formatters
 //= require model_updates/update
 

data/app/channels/model_updates/update_channel.rb

@@ -4,7 +4,7 @@ class ModelUpdates::UpdateChannel < ApplicationCable::Channel
       models = model_class.safe_constantize.accessible_by(current_ability).where(id: ids)
 
       ids_found = {}
-      models.each do |model|
+      models.find_each do |model|
         next if ids_found.key?(model.id)
         ids_found[model.id] = true
 

data/lib/model_updates/model_extensions.rb

@@ -33,7 +33,8 @@ module ModelUpdates::ModelExtensions
             model,
             id: id,
             model: model.class.name,
-            changes: attribute_changes
+            changes: attribute_changes,
+            type: :update
           )
         end
       end
@@ -63,11 +64,12 @@ module ModelUpdates::ModelExtensions
           attributes[attribute_name] = __send__(attribute_name)
         end
 
-        ModelUpdates::DestroyChannel.broadcast_to(
+        ModelUpdates::UpdateChannel.broadcast_to(
           model,
           id: id,
           model: model.class.name,
-          attributes: attributes
+          attributes: attributes,
+          type: :destroy
         )
       end
     end

data/lib/model_updates/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_updates
 version: !ruby/object:Gem::Version
-  version: 0.0.10
+  version: 0.0.11
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-01-04 00:00:00.000000000 Z
+date: 2018-01-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -52,13 +52,11 @@ files:
 - app/assets/javascripts/model_updates.js
 - app/assets/javascripts/model_updates/activator.es6
 - app/assets/javascripts/model_updates/create.es6
-- app/assets/javascripts/model_updates/destroy.es6
 - app/assets/javascripts/model_updates/formatters.js
 - app/assets/javascripts/model_updates/model_updates_class.es6
 - app/assets/javascripts/model_updates/update.es6
 - app/assets/stylesheets/model_updates/application.css
 - app/channels/model_updates/create_channel.rb
-- app/channels/model_updates/destroy_channel.rb
 - app/channels/model_updates/update_channel.rb
 - app/controllers/model_updates/application_controller.rb
 - app/helpers/model_updates/application_helper.rb

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

@@ -1,18 +0,0 @@
-ModelUpdates.Destroy = class Destroy {
-  static connect(args) {
-    ModelUpdates.debug("Connecting to destroy channel for " + JSON.stringify(args.ids))
-
-    App.cable.subscriptions.create(
-      {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']")
-          elements.remove()
-
-          if (args.onDestroyed)
-            args.onDestroyed(json)
-        }
-      }
-    )
-  }
-}

data/app/channels/model_updates/destroy_channel.rb

@@ -1,15 +0,0 @@
-class ModelUpdates::DestroyChannel < ApplicationCable::Channel
-  def subscribed
-    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