jason-rails 0.6.0 → 0.6.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 453e1a0d649445d973de2e3adf27f88f91c5bf983e65b3c2d993f090816db72b
-  data.tar.gz: ec2600988c60bcb6f661b8835cd3bcb7d3a4b740749ab0f21109e9b6a513b4ca
+  metadata.gz: 3dcf3cd2febb358e030ebe12ca382b463a8ca97dcdbb228d9a4354f2687b2cd1
+  data.tar.gz: fb385f90db387e2e4dfc1ce8016b1d800ac3ba6b78e3a54f59a1ec17d670aaef
 SHA512:
-  metadata.gz: cc2ba8529669a1fe4c48d2ee2ba595a7e3ae907a0d10234f12d68d797de63177143187c5c3767cf32ab35bd053c3c9f3bfa14461f8b6be71d8df437e3e997c7d
-  data.tar.gz: c93e0002f3a7e2379ed29483b6a8323b4b492a319ccc4f9948f0638c47e62a9eeb8b416fad2bbe2cc6b5c13f11a103eab462b7a35f5a36145037981e49c99cc6
+  metadata.gz: 17ff6a77e7076e887bc2730ae32607d5c7afcd272dbe535f66259a758867296a759580be3f4385bd878fd908d22e883b0047fbd0bee0134f443457422edf1975
+  data.tar.gz: 398111401a126b189398baff186284e11f580e653af6391be7a0576c9d1c4832ec6915400071fd66e4819b676deeeae52d35b75fe9499b480c73c5c88c135cfb

data/Gemfile.lock

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

data/README.md

@@ -1,6 +1,6 @@
 # Jason
 
-Jason is still in a highly experimental phase with a rapidly changing API. Production use not recommended - but please give it a try!
+Jason is still in an experimental phase with a rapidly changing API. It is being used in some production applications, however it is still in 0.x.x series versions, which means that any 0.x version bump could introduce breaking changes.
 
 ## The goal
 
@@ -14,6 +14,8 @@ I also wanted to avoid writing essentially the same code multiple times in diffe
 
 Jason attempts to minimize this repitition by auto-generating API endpoints, redux stores and actions from a single schema definition. Further it adds listeners to ActiveRecord models allowing the redux store to be subscribed to updates from a model or set of models.
 
+An alternative way of thinking about Jason is "what if we applied the Flux/Redux state update pattern to make the _database_ the store?".
+
 ## Installation
 
 Add the gem and the NPM package
@@ -81,7 +83,7 @@ function extraActions(dispatch, store, restClient, act) {
 - `middleware` - Passed directly to `configureStore` with additional Jason middleware
 
 ## Usage
-Jason provides two custom hooks to access functionality.
+Jason provides three custom hooks to access functionality.
 
 ### useAct
 This returns an object which allows you to access actions which both update models on the server, and perform an optimistic update to the Redux store.
@@ -126,6 +128,28 @@ export default function PostsList() {
 }
 ```
 
+### useEager
+Jason stores all the data in a normalized form - one redux slice per model. Often you might want to get nested data from several slices for use in components. The `useEager` hook provides an API for doing that. Under the hood it's just a wrapper around useSelector, which aims to mimic the behaviour of Rails eager loading.
+
+Example
+This will fetch the comment as well as the post and user linked to it.
+
+```jsx
+import React from 'react'
+import { useSelector } from 'react-redux'
+import { useEager } from '@jamesr2323/jason'
+import _ from 'lodash'
+
+export default function Comment({ id }) {
+  const comment = useEager('comments', id, ['post', 'user'])
+
+  return <div>
+    <p>{ comment.body }</p>
+    <p>Made on post { comment.post.name } by { comment.user.name }</p>
+  </div>
+}
+```
+
 ## Authorization
 
 By default all models can be subscribed to and updated without authentication or authorization. Probably you want to lock down access.
@@ -142,6 +166,7 @@ Development is primarily driven by the needs of projects we're using Jason in. I
 - 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)
+- Benchmark and migrate if necessary ConnectionPool::Wrapper vs ConnectionPool
 
 ## Development
 

data/app/controllers/jason/api_controller.rb

@@ -35,10 +35,10 @@ class Jason::ApiController < ::ApplicationController
       all_instance_ids.insert(priority.to_i, instance.id)
 
       all_instance_ids.each_with_index do |id, i|
-        model.find(id).update!(priority: i, skip_publish_json: true)
+        model.find(id).update!(priority: i)
       end
 
-      model.publish_all(model.find(all_instance_ids))
+      model.find(all_instance_ids).each(&:force_publish_json)
     elsif action == 'upsert' || action == 'add'
       payload = api_model.permit(params)
       return render json: model.find_or_create_by_id!(payload).as_json(api_model.as_json_config)

data/client/lib/JasonContext.d.ts

@@ -2,6 +2,6 @@
 declare const context: import("react").Context<{
     actions: any;
     subscribe: null;
-    eager: null;
+    eager: (entity: any, id: any, relations: any) => void;
 }>;
 export default context;

data/client/lib/JasonContext.js

@@ -1,5 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const react_1 = require("react");
-const context = react_1.createContext({ actions: {}, subscribe: null, eager: null });
+const eager = function (entity, id, relations) {
+    console.error("Eager called but is not implemented");
+};
+const context = react_1.createContext({ actions: {}, subscribe: null, eager });
 exports.default = context;

data/client/lib/createJasonReducers.js

@@ -42,18 +42,17 @@ function generateJasonSlices(models) {
             setSubscriptionIds(s, a) {
                 const { payload } = a;
                 const { subscriptionId, model, ids } = payload;
-                console.log({ initialState });
-                s[model][subscriptionId] = ids;
+                s[model][subscriptionId] = ids.map(id => String(id));
             },
             addSubscriptionId(s, a) {
                 const { payload } = a;
                 const { subscriptionId, model, id } = payload;
-                s[model][subscriptionId] = lodash_1.default.union(s[model][subscriptionId] || [], [id]);
+                s[model][subscriptionId] = lodash_1.default.union(s[model][subscriptionId] || [], [String(id)]);
             },
             removeSubscriptionId(s, a) {
                 const { payload } = a;
                 const { subscriptionId, model, id } = payload;
-                s[model][subscriptionId] = lodash_1.default.remove(s[model][subscriptionId] || [], id);
+                s[model][subscriptionId] = lodash_1.default.difference(s[model][subscriptionId] || [], [String(id)]);
             },
             removeSubscription(s, a) {
                 const { payload: { subscriptionId } } = a;

data/client/lib/createPayloadHandler.js

@@ -36,7 +36,7 @@ function createPayloadHandler({ dispatch, serverActionQueue, transportAdapter, c
             }
             const { payload, destroy, id, type } = patchQueue[model][idx[model]];
             if (type === 'payload') {
-                dispatch({ type: `${pluralize_1.default(model)}/upsertMany`, payload });
+                dispatch({ type: `${pluralize_1.default(model)}/upsertMany`, payload: payload.map(m => (Object.assign(Object.assign({}, m), { id: String(m.id) }))) });
                 const ids = payload.map(instance => instance.id);
                 dispatch({ type: `jasonModels/setSubscriptionIds`, payload: { model, subscriptionId, ids } });
             }
@@ -45,7 +45,7 @@ function createPayloadHandler({ dispatch, serverActionQueue, transportAdapter, c
                 dispatch({ type: `jasonModels/removeSubscriptionId`, payload: { model, subscriptionId, id } });
             }
             else {
-                dispatch({ type: `${pluralize_1.default(model)}/upsert`, payload });
+                dispatch({ type: `${pluralize_1.default(model)}/upsert`, payload: Object.assign(Object.assign({}, payload), { id: String(payload.id) }) });
                 dispatch({ type: `jasonModels/addSubscriptionId`, payload: { model, subscriptionId, id } });
             }
             delete patchQueue[model][idx[model]];

data/client/lib/index.d.ts

@@ -1,6 +1,7 @@
 /// <reference types="react" />
 import _useAct from './useAct';
 import _useSub from './useSub';
+import _useEager from './useEager';
 export declare const JasonProvider: ({ reducers, middleware, extraActions, children }: {
     reducers?: any;
     middleware?: any;
@@ -9,3 +10,4 @@ export declare const JasonProvider: ({ reducers, middleware, extraActions, child
 }) => JSX.Element;
 export declare const useAct: typeof _useAct;
 export declare const useSub: typeof _useSub;
+export declare const useEager: typeof _useEager;

data/client/lib/index.js

@@ -3,10 +3,12 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
     return (mod && mod.__esModule) ? mod : { "default": mod };
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.useSub = exports.useAct = exports.JasonProvider = void 0;
+exports.useEager = exports.useSub = exports.useAct = exports.JasonProvider = void 0;
 const JasonProvider_1 = __importDefault(require("./JasonProvider"));
 const useAct_1 = __importDefault(require("./useAct"));
 const useSub_1 = __importDefault(require("./useSub"));
+const useEager_1 = __importDefault(require("./useEager"));
 exports.JasonProvider = JasonProvider_1.default;
 exports.useAct = useAct_1.default;
 exports.useSub = useSub_1.default;
+exports.useEager = useEager_1.default;

data/client/lib/makeEager.js

@@ -40,10 +40,10 @@ function default_1(schema) {
     }
     function useEager(entity, id = null, relations = []) {
         if (id) {
-            return react_redux_1.useSelector(s => addRelations(s, Object.assign({}, s[entity].entities[String(id)]), entity, relations));
+            return react_redux_1.useSelector(s => addRelations(s, Object.assign({}, s[entity].entities[String(id)]), entity, relations), lodash_1.default.isEqual);
         }
         else {
-            return react_redux_1.useSelector(s => addRelations(s, lodash_1.default.values(s[entity].entities), entity, relations));
+            return react_redux_1.useSelector(s => addRelations(s, lodash_1.default.values(s[entity].entities), entity, relations), lodash_1.default.isEqual);
         }
     }
     return useEager;

data/client/lib/pruneIdsMiddleware.js

@@ -9,7 +9,7 @@ const pruneIdsMiddleware = schema => store => next => action => {
     const { type, payload } = action;
     const result = next(action);
     const state = store.getState();
-    if (type === 'jasonModels/setSubscriptionIds' || type === 'jasonModels/removeSubscriptionIds') {
+    if (type === 'jasonModels/setSubscriptionIds' || type === 'jasonModels/removeSubscriptionId') {
         const { model, ids } = payload;
         let idsInSubs = [];
         lodash_1.default.map(state.jasonModels[model], (subscribedIds, k) => {

data/client/lib/useEager.d.ts

@@ -0,0 +1 @@
+export default function useEager(entity: any, id?: null, relations?: never[]): void;

data/client/lib/useEager.js

@@ -0,0 +1,12 @@
+"use strict";
+var __importDefault = (this && this.__importDefault) || function (mod) {
+    return (mod && mod.__esModule) ? mod : { "default": mod };
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const JasonContext_1 = __importDefault(require("./JasonContext"));
+const react_1 = require("react");
+function useEager(entity, id = null, relations = []) {
+    const { eager } = react_1.useContext(JasonContext_1.default);
+    return eager(entity, id, relations);
+}
+exports.default = useEager;

data/client/lib/useJason.test.js

@@ -81,5 +81,37 @@ test('pruning IDs', () => __awaiter(void 0, void 0, void 0, function* () {
         idx: 2
     });
     // The ID 4 should have been pruned
-    expect(store.getState().posts.ids).toStrictEqual([5]);
+    expect(store.getState().posts.ids).toStrictEqual(['5']);
+}));
+test('pruning IDs by destroy', () => __awaiter(void 0, void 0, void 0, function* () {
+    const resp = { data: {
+            schema: { post: {} },
+            transportService: 'action_cable'
+        } };
+    // @ts-ignore
+    restClient_1.default.get.mockResolvedValue(resp);
+    const { result, waitForNextUpdate } = react_hooks_1.renderHook(() => useJason_1.default({ reducers: {
+            test: (s, a) => s || {}
+        } }));
+    yield waitForNextUpdate();
+    const [store, value, connected] = result.current;
+    const { handlePayload, subscribe } = value;
+    const subscription = subscribe({ post: {} });
+    handlePayload({
+        type: 'payload',
+        model: 'post',
+        payload: [{ id: 4, name: 'test' }, { id: 5, name: 'test it out' }],
+        md5Hash: subscription.md5Hash,
+        idx: 1
+    });
+    expect(store.getState().posts.ids).toStrictEqual(['4', '5']);
+    handlePayload({
+        destroy: true,
+        model: 'post',
+        id: 5,
+        md5Hash: subscription.md5Hash,
+        idx: 2
+    });
+    // The ID 4 should have been pruned
+    expect(store.getState().posts.ids).toStrictEqual(['4']);
 }));

data/client/package.json

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

data/client/src/JasonContext.ts

@@ -1,5 +1,8 @@
 import { createContext } from 'react'
+const eager = function(entity, id, relations) {
+  console.error("Eager called but is not implemented")
+}
 
-const context = createContext({ actions: {} as any, subscribe: null, eager: null })
+const context = createContext({ actions: {} as any, subscribe: null, eager })
 
 export default context

data/client/src/createJasonReducers.ts

@@ -42,18 +42,17 @@ function generateJasonSlices(models) {
       setSubscriptionIds(s,a) {
         const { payload } = a
         const { subscriptionId, model, ids } = payload
-        console.log({ initialState })
-        s[model][subscriptionId] = ids
+        s[model][subscriptionId] = ids.map(id => String(id))
       },
       addSubscriptionId(s,a) {
         const { payload } = a
         const { subscriptionId, model, id } = payload
-        s[model][subscriptionId] = _.union(s[model][subscriptionId] || [], [id])
+        s[model][subscriptionId] = _.union(s[model][subscriptionId] || [], [String(id)])
       },
       removeSubscriptionId(s,a) {
         const { payload } = a
         const { subscriptionId, model, id } = payload
-        s[model][subscriptionId] = _.remove(s[model][subscriptionId] || [], id)
+        s[model][subscriptionId] = _.difference(s[model][subscriptionId] || [], [String(id)])
       },
       removeSubscription(s, a) {
         const { payload: { subscriptionId } } = a

data/client/src/createPayloadHandler.ts

@@ -42,14 +42,14 @@ export default function createPayloadHandler({ dispatch, serverActionQueue, tran
       const { payload, destroy, id, type } = patchQueue[model][idx[model]]
 
       if (type === 'payload') {
-        dispatch({ type: `${pluralize(model)}/upsertMany`, payload })
+        dispatch({ type: `${pluralize(model)}/upsertMany`, payload: payload.map(m => ({ ...m, id: String(m.id) })) })
         const ids = payload.map(instance => instance.id)
         dispatch({ type: `jasonModels/setSubscriptionIds`, payload: { model, subscriptionId, ids }})
       } else if (destroy) {
         // Middleware will determine if this model should be removed if it isn't in any other subscriptions
         dispatch({ type: `jasonModels/removeSubscriptionId`, payload: { model, subscriptionId, id }})
       } else {
-        dispatch({ type: `${pluralize(model)}/upsert`, payload })
+        dispatch({ type: `${pluralize(model)}/upsert`, payload: { ...payload, id: String(payload.id) } })
         dispatch({ type: `jasonModels/addSubscriptionId`, payload: { model, subscriptionId, id }})
       }
 

data/client/src/index.ts

@@ -1,7 +1,9 @@
 import _JasonProvider from './JasonProvider'
 import _useAct from './useAct'
 import _useSub from './useSub'
+import _useEager from './useEager'
 
 export const JasonProvider = _JasonProvider
 export const useAct = _useAct
-export const useSub = _useSub
+export const useSub = _useSub
+export const useEager = _useEager

data/client/src/makeEager.ts

@@ -36,9 +36,9 @@ export default function (schema) {
 
   function useEager(entity, id = null, relations = []) {
     if (id) {
-      return useSelector(s => addRelations(s, { ...s[entity].entities[String(id)] }, entity, relations))
+      return useSelector(s => addRelations(s, { ...s[entity].entities[String(id)] }, entity, relations), _.isEqual)
     } else {
-      return useSelector(s => addRelations(s, _.values(s[entity].entities), entity, relations))
+      return useSelector(s => addRelations(s, _.values(s[entity].entities), entity, relations), _.isEqual)
     }
   }
 

data/client/src/pruneIdsMiddleware.ts

@@ -6,13 +6,14 @@ const pruneIdsMiddleware = schema => store => next => action => {
   const result = next(action)
 
   const state = store.getState()
-  if (type === 'jasonModels/setSubscriptionIds' || type === 'jasonModels/removeSubscriptionIds') {
+  if (type === 'jasonModels/setSubscriptionIds' || type === 'jasonModels/removeSubscriptionId') {
     const { model, ids } = payload
 
     let idsInSubs = []
     _.map(state.jasonModels[model], (subscribedIds, k) => {
       idsInSubs = _.union(idsInSubs, subscribedIds)
     })
+
     // Find IDs currently in Redux that aren't in any subscription
     const idsToRemove = _.difference(state[pluralize(model)].ids, idsInSubs)
     store.dispatch({ type: `${pluralize(model)}/removeMany`, payload: idsToRemove })

data/client/src/useEager.ts

@@ -0,0 +1,9 @@
+import JasonContext from './JasonContext'
+import { useContext } from 'react'
+
+export default function useEager(entity, id = null, relations = []) {
+  const { eager } = useContext(JasonContext)
+
+  return eager(entity, id, relations)
+}
+

data/client/src/useJason.test.ts

@@ -83,5 +83,45 @@ test('pruning IDs', async () => {
   })
 
   // The ID 4 should have been pruned
-  expect(store.getState().posts.ids).toStrictEqual([5])
+  expect(store.getState().posts.ids).toStrictEqual(['5'])
+})
+
+test('pruning IDs by destroy', async () => {
+  const resp = { data: {
+    schema: { post: {} },
+    transportService: 'action_cable'
+  } };
+
+  // @ts-ignore
+  restClient.get.mockResolvedValue(resp);
+
+  const { result, waitForNextUpdate } = renderHook(() => useJason({ reducers: {
+    test: (s,a) => s || {}
+  }}));
+
+  await waitForNextUpdate()
+  const [store, value, connected] = result.current
+  const { handlePayload, subscribe } = value
+
+  const subscription = subscribe({ post: {} })
+
+  handlePayload({
+    type: 'payload',
+    model: 'post',
+    payload: [{ id: 4, name: 'test' }, { id: 5, name: 'test it out' }],
+    md5Hash: subscription.md5Hash,
+    idx: 1
+  })
+  expect(store.getState().posts.ids).toStrictEqual(['4', '5'])
+
+  handlePayload({
+    destroy: true,
+    model: 'post',
+    id: 5,
+    md5Hash: subscription.md5Hash,
+    idx: 2
+  })
+
+  // The ID 4 should have been pruned
+  expect(store.getState().posts.ids).toStrictEqual(['4'])
 })

data/lib/jason.rb

@@ -30,20 +30,46 @@ module Jason
   self.pusher_region = 'eu'
   self.pusher_channel_prefix = 'jason'
 
-  # add default values of more config vars here
+  def self.init
+    # Check if the schema has changed since last time app was started. If so, do some work to ensure cache contains the correct data
+    got_lock = $redis_jason.set('jason:schema:lock', nx: true, ex: 3600) # Basic lock mechanism for multi-process environments
+    return if !got_lock
+
+    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 }
+    current_schema.each do |model, config|
+      if config != previous_schema[model]
+        puts "Config changed for #{model}"
+        puts "Old config was #{previous_schema[model]}"
+        puts "New config is #{config}"
+        puts "Rebuilding cache for #{model}"
+        model.classify.constantize.cache_all
+        puts "Done"
+      end
+    end
+
+    $redis_jason.set('jason:last_schema', current_schema.to_json)
+  ensure
+    $redis_jason.del('jason:schema:lock')
+
+    previous_config = 'test'
+  end
+
 
   # this function maps the vars from your app into your engine
   def self.setup(&block)
     yield self
-  end
 
-  $redis_jason = self.redis || ::ConnectionPool::Wrapper.new(size: 5, timeout: 3) { ::Redis.new(url: ENV['REDIS_URL']) }
+    $redis_jason = self.redis || ::ConnectionPool::Wrapper.new(size: 5, timeout: 3) { ::Redis.new(url: ENV['REDIS_URL']) }
 
-  if ![:action_cable, :pusher].include?(self.transport_service)
-    raise "Unknown transport service '#{self.transport_service}' specified"
-  end
+    if ![:action_cable, :pusher].include?(self.transport_service)
+      raise "Unknown transport service '#{self.transport_service}' specified"
+    end
+
+    if self.transport_service == :pusher && self.pusher.blank?
+      raise "Pusher specified as transport service but no Pusher client provided. Please configure with config.pusher = Pusher::Client.new(...)"
+    end
 
-  if self.transport_service == :pusher && self.pusher.blank?
-    raise "Pusher specified as transport service but no Pusher client provided. Please configure with config.pusher = Pusher::Client.new(...)"
+    init
   end
 end

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/publisher.rb

@@ -91,6 +91,10 @@ module Jason::Publisher
     Jason::Subscription.for_instance(self.class.name.underscore, id)
   end
 
+  def jason_cached_value
+    JSON.parse($redis_jason.hget("jason:cache:#{self.class.name.underscore}", id) || '{}')
+  end
+
   class_methods do
     def cache_all
       all.each(&:cache_json)

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
 
@@ -362,8 +363,6 @@ class Jason::Subscription
       instance_jsons, idx = Jason::LuaGenerator.new.get_payload(model_name, id)
     end
 
-    return if instance_jsons.blank?
-
     payload = instance_jsons.map do |instance_json|
       instance_json ? JSON.parse(instance_json) : {}
     end
@@ -377,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.0"
+  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.0
+  version: 0.6.5
 platform: ruby
 authors:
 - James Rees
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-02-13 00:00:00.000000000 Z
+date: 2021-02-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -168,6 +168,8 @@ files:
 - client/lib/transportAdapters/pusherAdapter.js
 - client/lib/useAct.d.ts
 - client/lib/useAct.js
+- client/lib/useEager.d.ts
+- client/lib/useEager.js
 - client/lib/useJason.d.ts
 - client/lib/useJason.js
 - client/lib/useJason.test.d.ts
@@ -194,6 +196,7 @@ files:
 - client/src/transportAdapters/actionCableAdapter.ts
 - client/src/transportAdapters/pusherAdapter.ts
 - client/src/useAct.ts
+- client/src/useEager.ts
 - client/src/useJason.test.ts
 - client/src/useJason.ts
 - client/src/useSub.ts