model_updates 0.0.15 → 0.0.16

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: d2ef7eec5521090e20810959e11933397d67437b
-  data.tar.gz: a64f0e86c45759b5f6726f525b58bbd6489cd291
+SHA256:
+  metadata.gz: a8513d9318e6b82a9afeb358de054c89285c250a68ab6736672ab7bde9f171b0
+  data.tar.gz: 2615ddbb4b03e6f8e2134f02d5811e8c174119288ec7797d05c5e9950e3186db
 SHA512:
-  metadata.gz: 60bd543d8964f943486b63848b305cb9446da542e4f3ad00ae9feafefab50f35aa7a2fbf48e966d2c62d1d631091544212199b599227e60e504c32542a55a786
-  data.tar.gz: 2372927f6f20857ccd0c1180b54f88b481e2180d9fddcf496bde61f6bd4e48539921d9addd0d612a2bbe59db6a9a2f7c44632fd6906480c7923adc11ab3678fb
+  metadata.gz: 56505fcff06b39baed766b9edaf30c97c4ca4a06ca75ad68b176747ee9fbc022fa3b6cb02b1df5a435dc390e7e94002cc1c5a2cd8a5ad2ebd5fc04f8e8e491bd
+  data.tar.gz: 22eb70271b4ac53218ea39e0af4307e3454e72134c89f3c12e83cdcc65edc6a557d1109421e306c5fb735a6864d875ae2affc23045787749d8c6f9a5cb1be90f

data/README.md

@@ -132,9 +132,9 @@ You can also do a callback, once the value is changed.
 ```js
 function myCallback(data) {
   if (data.value == "something") {
-    data.element.text("Test: " + data.value)
+    data.element.innerText = "Test: " + data.value
   } else {
-    data.element.text(data.value)
+    data.element.innerText = data.value
   }
 }
 ```

data/Rakefile

@@ -14,7 +14,7 @@ RDoc::Task.new(:rdoc) do |rdoc|
   rdoc.rdoc_files.include("lib/**/*.rb")
 end
 
-APP_RAKEFILE = File.expand_path("../spec/dummy/Rakefile", __FILE__)
+APP_RAKEFILE = File.expand_path("spec/dummy/Rakefile", __dir__)
 load "rails/tasks/engine.rake"
 load "rails/tasks/statistics.rake"
 

data/app/assets/config/model_updates_manifest.js

@@ -1,2 +1 @@
 //= link_directory ../javascripts/model_updates .js
-//= link_directory ../stylesheets/model_updates .css

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

@@ -1,4 +1,4 @@
-ModelUpdates.Activator = class Activator {
+ModelUpdates.Activator = class ModelUpdatesActivator {
   constructor() {
     ModelUpdates.debug("Activator constructor")
 

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

@@ -1,4 +1,4 @@
-ModelUpdates.Create = class Create {
+ModelUpdates.Create = class ModelUpdatesCreate {
   static connect(args) {
     App.cable.subscriptions.create(
       {channel: "ModelUpdates::CreateChannel", model: args.model},

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

@@ -1,4 +1,4 @@
-ModelUpdates.Events = class Events {
+ModelUpdates.Events = class ModelUpdatesEvents {
   constructor() {
     this.modelCallbacks = {}
     this.modelClassCallbacks = {}
@@ -10,13 +10,18 @@ ModelUpdates.Events = class Events {
       this.modelCallbacks[args.model] = {}
 
     if (!this.callbackData["connect_model"][args.model])
-      this.callbackData["connect_model"][args.model] = []
+      this.callbackData["connect_model"][args.model] = {}
 
-    if (!this.modelCallbacks[args.model][args.id]) {
+    if (!this.modelCallbacks[args.model][args.id])
       this.modelCallbacks[args.model][args.id] = []
-      this.callbackData["connect_model"][args.model].push(args.id)
-    }
 
+    if (!this.callbackData["connect_model"][args.model])
+      this.callbackData["connect_model"][args.model] = {}
+
+    if (!this.callbackData["connect_model"][args.model][args.name])
+      this.callbackData["connect_model"][args.model][args.name] = []
+
+    this.callbackData["connect_model"][args.model][args.name].push(args.id)
     this.modelCallbacks[args.model][args.id].push(args)
   }
 

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

@@ -1,4 +1,4 @@
-ModelUpdates.Update = class Update {
+ModelUpdates.Update = class ModelUpdatesUpdate {
   static connect(args) {
     ModelUpdates.debug("Connecting to update channel for " + JSON.stringify(args.ids))
 

data/app/channels/model_updates/create_channel.rb

@@ -6,6 +6,7 @@ class ModelUpdates::CreateChannel < ApplicationCable::Channel
     stream_from(channel_name, coder: ActiveSupport::JSON) do |data|
       model = model_class.accessible_by(current_ability).find(data.fetch("id"))
       next unless model
+
       transmit data
     end
   end

data/app/channels/model_updates/events_channel.rb

@@ -7,10 +7,12 @@ class ModelUpdates::EventsChannel < ApplicationCable::Channel
 private
 
   def connect_models
-    params[:callback_data][:connect_model].each do |model_class_name, ids|
-      models = model_class_name.safe_constantize.accessible_by(current_ability).where(id: ids).distinct.fix
-      models.find_each do |model|
-        stream_model(model: model)
+    params[:callback_data][:connect_model].each do |model_class_name, events|
+      events.each do |event_name, ids|
+        models = model_class_name.safe_constantize.accessible_by(current_ability).where(id: ids).distinct.fix
+        models.find_each do |model|
+          stream_model(event: event_name, model: model)
+        end
       end
     end
   end
@@ -21,8 +23,8 @@ private
     end
   end
 
-  def stream_model(model:)
-    channel_name = "model_updates_events_model_#{model.class.name}_model_#{model.id}"
+  def stream_model(event:, model:)
+    channel_name = "model_updates_events_model_#{model.class.name}_model_#{model.id}_event_#{event}"
     stream_from(channel_name, coder: ActiveSupport::JSON) do |data|
       transmit data
     end

data/app/channels/model_updates/update_channel.rb

@@ -6,6 +6,7 @@ class ModelUpdates::UpdateChannel < ApplicationCable::Channel
       ids_found = {}
       models.find_each do |model|
         next if ids_found.key?(model.id)
+
         ids_found[model.id] = true
 
         stream_for model

data/lib/model_updates/model_extensions.rb

@@ -5,19 +5,20 @@ module ModelUpdates::ModelExtensions
 
   module ClassMethods
     def model_updates_data
-      @_model_updates ||= {}
+      @model_updates_data ||= {}
     end
 
     def model_updates_broadcast_attributes(args)
       model_updates_data[:attributes] = args.fetch(:attributes)
 
       # 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
+      before_update do
         attribute_changes = {}
 
         args.fetch(:attributes).each do |attribute_name|
           method_changed = "saved_changed_to_#{attribute_name}?"
           next if respond_to?(method_changed) && !__send__(method_changed)
+
           attribute_changes[attribute_name] = __send__(attribute_name)
         end
 
@@ -87,7 +88,7 @@ module ModelUpdates::ModelExtensions
 
   def model_updates_call(event_name, args = {})
     ActionCable.server.broadcast(
-      "model_updates_events_model_#{self.class.name}_model_#{id}",
+      "model_updates_events_model_#{self.class.name}_model_#{id}_event_#{event_name}",
       event_name: event_name,
       id: id,
       model: self.class.name,

data/lib/model_updates/version.rb

@@ -1,3 +1,3 @@
 module ModelUpdates
-  VERSION = "0.0.15".freeze
+  VERSION = "0.0.16".freeze
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: model_updates
 version: !ruby/object:Gem::Version
-  version: 0.0.15
+  version: 0.0.16
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-06-07 00:00:00.000000000 Z
+date: 2020-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: rails
+  name: active_record_query_fixer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 0.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 5.1.0
+        version: 0.0.3
 - !ruby/object:Gem::Dependency
-  name: active_record_query_fixer
+  name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 5.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.0.3
+        version: 5.1.0
 - !ruby/object:Gem::Dependency
   name: sprockets-es6
   requirement: !ruby/object:Gem::Requirement
@@ -99,8 +99,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.13
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Rails gem to push updates to models into the frontend through ActionCable