model_updates 0.0.7 → 0.0.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6e5c02e29a478245a15cbca2daf7238ef762f83
-  data.tar.gz: 0c4c00c9c6404c72a3ea21b3168ddc5a19be18b9
+  metadata.gz: f43d80cfa164be08bec5f099089518e873e4edb7
+  data.tar.gz: c7d5eeefdfab73846b9ae909bce65d32086d9058
 SHA512:
-  metadata.gz: c686af4abd42d5f9a6ca9f895c6c08f62fa461c060b419d282625b38e7ee9597653fbe55dff27b5a841822c9733614936728d49a61d37d777e2decacdf10a158
-  data.tar.gz: ea03a51dd7f1468e0950af0ffe6fb5ea6b3eee76e816d49c9d58fb5e2ac6eea8e3fc7780e7fd96394401c87ebac960ec7b583e0c07cfc914e0e8dd3b710a084e
+  metadata.gz: f2a59b69019b2b9b75d4b9867d8039becab8c02f90b64dce8c675e188173e5e947d7a684d1f6e189d1e332f3c9dcc4fd088b12d1d23d6018e6e6c75f9c10e49b
+  data.tar.gz: e04a7d37da13e364fd1cb95c15735a58b20d7f11abe693becb4093e5bc0e5f1ecb3ab6de315b9752e6aec36d9b947e2c3982bb0d2af222f8255b33e76b1dc4ed

data/README.md

@@ -42,7 +42,7 @@ private
   delegate :authorize!, :can?, to: :current_ability
 
   def current_ability
-    @_current_ability ||= PeakFlowAbility.new(user: current_user)
+    @_current_ability ||= CanCanAbility.new(user: current_user)
   end
 
   def current_user
@@ -51,6 +51,15 @@ private
 end
 ```
 
+In order to get the current user with Devise, you also have to add the following `config/initializers/warden_hooks.rb`:
+```ruby
+Warden::Manager.after_set_user do |user, auth, opts|
+  scope = opts[:scope]
+  auth.cookies.signed["#{scope}.id"] = user.id
+  auth.cookies.signed["#{scope}.expires_at"] = 70.minutes.from_now
+end
+```
+
 You can define `authorize!(ability, model)` yourself, if you aren't using CanCan.
 
 Choose which attributes should be broadcasted automatically:
@@ -79,6 +88,7 @@ end
 
 ## Usage
 
+Update content on page live automatically
 
 Do like this in your views if you are using HAML to receive automatic updates:
 
@@ -154,6 +164,14 @@ ModelUpdates.Destroy.connect({
 })
 ```
 
+### Live updating new elements added dynamically after page load
+
+You can refresh elements with a simple call like this:
+
+```js
+ModelUpdates.update()
+```
+
 ## Contributing
 
 Contribution directions go here.

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

@@ -0,0 +1,89 @@
+ModelUpdates.Activator = class Activator {
+  constructor() {
+    ModelUpdates.debug("Activator constructor")
+
+    this.modelSubscriptions = {}
+    this.modelDestroys = {}
+    this.connectedUpdates = {}
+    this.connectedDestroyes = {}
+  }
+
+  update() {
+    ModelUpdates.debug("Update was called")
+    this.updateFoundElements()
+    this.updateSubscribedUpdates()
+    this.updateSubscribedDestroys()
+  }
+
+  updateFoundElements() {
+    ModelUpdates.debug("Activator#updateFoundElements called")
+
+    // Find all models that should be subscribed to
+    var that = this
+    $(".model-updates").each(function() {
+      var element = $(this)
+
+      var model = element.data("model-updates-model")
+      var id = element.data("model-updates-id")
+
+      ModelUpdates.debug("Model found: " + model + "(" + id + ")")
+
+      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
+      }
+    })
+  }
+
+  updateSubscribedUpdates() {
+    ModelUpdates.debug("Activator#updateSubscribedUpdates called")
+
+    for(var model in this.modelSubscriptions) {
+      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
+          })
+        }
+      }
+    }
+  }
+
+  updateSubscribedDestroys() {
+    ModelUpdates.debug("Activator#updateSubscribedDestroys called")
+
+    for(var model in this.modelDestroys) {
+      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
+          })
+        }
+      }
+    }
+  }
+}

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

@@ -4,6 +4,30 @@ class ModelUpdates {
       console.log("ModelUpdates: " + message)
     }
   }
+
+  static current() {
+    if (!this.currentElement)
+      this.currentElement = new ModelUpdates()
+
+    return this.currentElement
+  }
+
+  static update() {
+    ModelUpdates.debug("Static update called")
+    ModelUpdates.current().update()
+  }
+
+  activator() {
+    if (!this.activatorElement)
+      this.activatorElement = new ModelUpdates.Activator()
+
+    return this.activatorElement
+  }
+
+  update() {
+    ModelUpdates.debug("Instance method update called")
+    this.activator().update()
+  }
 }
 
 ModelUpdates.configuration = {

data/app/assets/javascripts/model_updates.js

@@ -1,6 +1,10 @@
 //= require model_updates/model_updates_class
-//= require model_updates/activate_elements
+//= require model_updates/activator
 //= require model_updates/create
 //= require model_updates/destroy
 //= require model_updates/formatters
 //= require model_updates/update
+
+$(document).ready(function() {
+  ModelUpdates.update()
+})

data/lib/model_updates/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: model_updates
 version: !ruby/object:Gem::Version
-  version: 0.0.7
+  version: 0.0.9
 platform: ruby
 authors:
 - kaspernj
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-10 00:00:00.000000000 Z
+date: 2018-01-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -50,7 +50,7 @@ files:
 - Rakefile
 - app/assets/config/model_updates_manifest.js
 - app/assets/javascripts/model_updates.js
-- app/assets/javascripts/model_updates/activate_elements.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
@@ -93,7 +93,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.8
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Rails gem to push updates to models into the frontend through ActionCable

data/app/assets/javascripts/model_updates/activate_elements.js

@@ -1,44 +0,0 @@
-$(document).ready(function() {
-  // Find all models that should be subscribed to
-  modelSubscriptions = {}
-  modelDestroys = {}
-
-  $(".model-updates").each(function() {
-    element = $(this)
-
-    model = element.data("model-updates-model")
-    id = element.data("model-updates-id")
-
-    if (!modelSubscriptions[model])
-      modelSubscriptions[model] = {}
-
-    if (element.data("model-updates-key"))
-      modelSubscriptions[model][id] = true
-
-    if (element.data("model-updates-remove-on-destroy")) {
-      if (!modelDestroys[model])
-        modelDestroys[model] = {}
-
-      modelDestroys[model][id] = true
-    }
-  })
-
-  // Subscribe to the found models
-  for(var model in modelSubscriptions) {
-    for(var id in modelSubscriptions[model]) {
-      ModelUpdates.Update.connect({
-        "id": id,
-        "model": model
-      })
-    }
-  }
-
-  for(var model in modelDestroys) {
-    for(var id in modelDestroys[model]) {
-      ModelUpdates.Destroy.connect({
-        "id": id,
-        "model": model
-      })
-    }
-  }
-})