jason-rails 0.6.4 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2788ecafe67bc475346d83681912063b1081610e06b685405d4f3b332a665695
-  data.tar.gz: 6647cc3a7815a914b98a9477330c32a642fec64c809aa4195fa5c192a4b4b003
+  metadata.gz: 3dcf3cd2febb358e030ebe12ca382b463a8ca97dcdbb228d9a4354f2687b2cd1
+  data.tar.gz: fb385f90db387e2e4dfc1ce8016b1d800ac3ba6b78e3a54f59a1ec17d670aaef
 SHA512:
-  metadata.gz: cf1b1ed464f9ef46cd5b3aa2dd7e8ebb982a3d6d3ebe68a3f92f2ad8b5ab31ea8476817fd16666346d358e9d5a635b4af792bba16e41105eefb7a789082567f1
-  data.tar.gz: a06afb2c5db05447d7eda5a6f17020a14fd1d486b50f17e14c155738e7166534a52c418f5463742c0956102d744429198ee0101569cef156366586eee3e7c058
+  metadata.gz: 17ff6a77e7076e887bc2730ae32607d5c7afcd272dbe535f66259a758867296a759580be3f4385bd878fd908d22e883b0047fbd0bee0134f443457422edf1975
+  data.tar.gz: 398111401a126b189398baff186284e11f580e653af6391be7a0576c9d1c4832ec6915400071fd66e4819b676deeeae52d35b75fe9499b480c73c5c88c135cfb

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    jason-rails (0.6.0)
+    jason-rails (0.6.4)
       connection_pool (>= 2.2.3)
       jsondiff
       rails (>= 5)

data/client/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@jamesr2323/jason",
-  "version": "0.6.4",
+  "version": "0.6.5",
   "module": "./lib/index.js",
   "types": "./lib/index.d.ts",
   "scripts": {

data/lib/jason.rb

@@ -37,7 +37,6 @@ module Jason
 
     previous_schema = JSON.parse($redis_jason.get('jason:last_schema') || '{}')
     current_schema = Jason.schema.deep_stringify_keys.deep_transform_values { |v| v.is_a?(Symbol) ? v.to_s : v }
-    pp current_schema
     current_schema.each do |model, config|
       if config != previous_schema[model]
         puts "Config changed for #{model}"

data/lib/jason/graph_helper.rb

@@ -33,7 +33,8 @@ class Jason::GraphHelper
   end
 
   # Add and remove edges, return graph before and after
-  def apply_update(add: nil, remove: nil)
+  # Enforce means make the graph contain only the add_edges
+  def apply_update(add: nil, remove: nil, enforce: false)
     add_edges = []
     remove_edges = []
 
@@ -48,11 +49,21 @@ class Jason::GraphHelper
         remove_edges += build_edges(edge_set[:model_names], edge_set[:instance_ids], include_root: false)
       end
     end
-    diff_edges_from_graph(add_edges: add_edges, remove_edges: remove_edges)
+
+    diff_edges_from_graph(add_edges: add_edges, remove_edges: remove_edges, enforce: enforce)
   end
 
-  def diff_edges_from_graph(add_edges: [], remove_edges: [])
-    old_edges, new_edges = Jason::LuaGenerator.new.update_set_with_diff("jason:subscriptions:#{id}:graph", add_edges.flatten, remove_edges.flatten)
+  def diff_edges_from_graph(add_edges: [], remove_edges: [], enforce: false)
+    if enforce
+      old_edges = $redis_jason.multi do |r|
+        r.smembers("jason:subscriptions:#{id}:graph")
+        r.del("jason:subscriptions:#{id}:graph")
+        r.sadd("jason:subscriptions:#{id}:graph", add_edges) if add_edges.present?
+      end[0]
+      new_edges = add_edges
+    else
+      old_edges, new_edges = Jason::LuaGenerator.new.update_set_with_diff("jason:subscriptions:#{id}:graph", add_edges.flatten, remove_edges.flatten)
+    end
 
     old_graph = build_graph_from_edges(old_edges)
     new_graph = build_graph_from_edges(new_edges)

data/lib/jason/subscription.rb

@@ -269,7 +269,8 @@ class Jason::Subscription
 
     # Build the tree
     id_changeset = graph_helper.apply_update({
-      add: [edge_set]
+      add: [edge_set],
+      enforce: enforce
     })
     apply_id_changeset(id_changeset)
   end
@@ -320,7 +321,7 @@ class Jason::Subscription
     $redis_jason.hset("jason:consumers", consumer_id, Time.now.utc)
 
     if before_consumer_count == 0
-      set_ids_for_sub_models
+      set_ids_for_sub_models(enforce: true)
     end
   end
 
@@ -375,6 +376,20 @@ class Jason::Subscription
     }
   end
 
+  # To be used as a fallback when some corruption of the subscription has taken place
+  def reset!(hard: false)
+    # Remove subscription state
+    if hard
+      clear_all_ids
+      $redis_jason.del("jason:subscriptions:#{id}:graph")
+    end
+
+    set_ids_for_sub_models(enforce: true)
+    includes_helper.all_models.each do |model_name|
+      broadcaster.broadcast(get_for_model(model_name))
+    end
+  end
+
   def add(model_name, instance_id)
     idx = $redis_jason.incr("jason:subscription:#{id}:#{model_name}:idx")
     payload = JSON.parse($redis_jason.hget("jason:cache:#{model_name}", instance_id) || '{}')

data/lib/jason/version.rb

@@ -1,3 +1,3 @@
 module Jason
-  VERSION = "0.6.4"
+  VERSION = "0.6.5"
 end

metadata

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