jason-rails 0.6.7 → 0.6.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 48abc57aac9f4529a93812d46422ac21d48e58432fc21e570f1801b84a3ac436
-  data.tar.gz: ac21dab5464e5dd254a1a223a80581c1410c928bab4c0fbc9fe32cdfedb7c474
+  metadata.gz: 64f8392cc200b54c7584534cedb35ccbb1675d8c15d1193152e4cbdec558a934
+  data.tar.gz: eb285b6c8660017fda735dee46802b9617f08c121c67ce0e9e68efb448e6765c
 SHA512:
-  metadata.gz: '09c42d2b035af32efdc006224e3e81fa398d2327199845640ff7c710c7cecbd0c5edd9d18e441b5b3fefb2a356f45159c77194ed72f866880171071fb302c422'
-  data.tar.gz: 1b5f4f16a5032ca96f8106dc4fff8c8a1a1d5792392b4ed28ad9f1c8974848dec5359e4bb0bc675463cc923e5f77552b6bcfda6c733bf72bb66f156648ce521c
+  metadata.gz: 7505f22ac0737faa51726c9ba5dbbaeab2b6634583e32e574f8e0c4ffc6ba8de4e14eb78f3184d3d9a961ac153cc396253d95ac225fc2f853ebaa6c805197d0f
+  data.tar.gz: 1f6b1f4472d04876566c0edb050a9890cc42b8a6ac083072de38c7d64f7f5780c9e14c1c16f7443eaf98e9ba2ef3b06f400542582c96d619bc0cb2f6645ce8e4

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## v0.6.7
+- Fix: Change names of controllers to be less likely to conflict with host app inflections
+- Added: Pusher now pushes asychronously via Sidekiq using the Pusher batch API
+
 ## v0.6.6
 - Fix: don't run the schema change detection and cache rebuild inside rake tasks or migrations
 

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jason-rails (0.6.6)
+    jason-rails (0.6.7)
       connection_pool (>= 2.2.3)
       jsondiff
       rails (>= 5)
@@ -93,7 +93,7 @@ GEM
     mini_mime (1.0.2)
     mini_portile2 (2.5.0)
     minitest (5.14.3)
-    nio4r (2.5.5)
+    nio4r (2.5.7)
     nokogiri (1.11.1)
       mini_portile2 (~> 2.5.0)
       racc (~> 1.4)

data/README.md

@@ -163,6 +163,7 @@ Similarly to authorizing subscriptions, you can do this by providing an class to
 ## Roadmap
 
 Development is primarily driven by the needs of projects we're using Jason in. In no particular order, being considered is:
+- Better detection of when subscriptions drop, delete subscription
 - Failure handling - rolling back local state in case of an error on the server
 - Authorization - more thorough authorization integration, with utility functions for common authorizations. Allowing authorization of access to particular fields such as restricting the fields of a user that are publicly broadcast.
 - Utilities for "Draft editing" - both storing client-side copies of model trees which can be committed or discarded, as well as persisting a shadow copy to the database (to allow resumable editing, or possibly collaborative editing features)

data/client/lib/useJason.js

@@ -73,9 +73,10 @@ function useJason({ reducers, middleware = [], extraActions }) {
                 };
             }
             function removeSubscription(config) {
+                var _a;
                 transportAdapter.removeSubscription(config);
                 const md5Hash = blueimp_md5_1.default(JSON.stringify(config));
-                payloadHandlers[md5Hash].tearDown();
+                (_a = payloadHandlers[md5Hash]) === null || _a === void 0 ? void 0 : _a.tearDown(); // Race condition where component mounts then unmounts quickly
                 delete payloadHandlers[md5Hash];
                 delete configs[md5Hash];
                 delete subOptions[md5Hash];

data/client/src/useJason.ts

@@ -90,7 +90,7 @@ export default function useJason({ reducers, middleware = [], extraActions }: {
       function removeSubscription(config) {
         transportAdapter.removeSubscription(config)
         const md5Hash = md5(JSON.stringify(config))
-        payloadHandlers[md5Hash].tearDown()
+        payloadHandlers[md5Hash]?.tearDown() // Race condition where component mounts then unmounts quickly
         delete payloadHandlers[md5Hash]
         delete configs[md5Hash]
         delete subOptions[md5Hash]

data/lib/jason/publisher.rb

@@ -5,6 +5,7 @@ module Jason::Publisher
   def self.cache_all
     Rails.application.eager_load!
     ActiveRecord::Base.descendants.each do |klass|
+      $redis_jason.del("jason:cache:#{klass.name.underscore}")
       klass.cache_all if klass.respond_to?(:cache_all)
     end
   end
@@ -117,7 +118,8 @@ module Jason::Publisher
       self.after_initialize -> {
         @api_model = Jason::ApiModel.new(self.class.name.underscore)
       }
-      self.after_commit :publish_json_if_changed
+      self.after_commit :force_publish_json, on: [:create, :destroy]
+      self.after_commit :publish_json_if_changed, on: [:update]
     end
 
     def find_or_create_by_id(params)

data/lib/jason/subscription.rb

@@ -48,12 +48,15 @@ class Jason::Subscription
     end
   end
 
+  def self.all_for_model(model_name)
+    $redis_jason.smembers("jason:models:#{model_name}:all:subscriptions")
+  end
+
   def self.for_instance(model_name, id, include_all = true)
     subs = $redis_jason.smembers("jason:models:#{model_name}:#{id}:subscriptions")
     if include_all
-      subs += $redis_jason.smembers("jason:models:#{model_name}:all:subscriptions")
+      subs += all_for_model(model_name)
     end
-
     subs
   end
 
@@ -176,6 +179,13 @@ class Jason::Subscription
         subscription.broadcast_id_changeset(id_changeset)
       end
     end
+
+    all_for_model(model_name).each do |sub_id|
+      subscription = find_by_id(sub_id)
+      ids.each do |id|
+        subscription.destroy(model_name, id)
+      end
+    end
   end
 
   # Add ID to any _all_ subscriptions
@@ -238,7 +248,6 @@ class Jason::Subscription
     all_models = includes_helper.all_models(model_name)
 
     relation = model_name.classify.constantize.all.eager_load(includes_tree)
-
     if model_name == model
       if conditions.blank?
         $redis_jason.sadd("jason:models:#{model_name}:all:subscriptions", id)
@@ -287,6 +296,7 @@ class Jason::Subscription
       end
       $redis_jason.del("jason:subscriptions:#{id}:ids:#{model_name}")
     end
+    $redis_jason.del("jason:subscriptions:#{id}:graph")
   end
 
   def ids(model_name = model)
@@ -381,7 +391,6 @@ class Jason::Subscription
     # Remove subscription state
     if hard
       clear_all_ids
-      $redis_jason.del("jason:subscriptions:#{id}:graph")
     end
 
     set_ids_for_sub_models(enforce: true)

data/lib/jason/version.rb

@@ -1,3 +1,3 @@
 module Jason
-  VERSION = "0.6.7"
+  VERSION = "0.6.8"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jason-rails
 version: !ruby/object:Gem::Version
-  version: 0.6.7
+  version: 0.6.8
 platform: ruby
 authors:
 - James Rees
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-24 00:00:00.000000000 Z
+date: 2021-03-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails