jason-rails 0.7.2 → 0.7.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e7f9c248374aaa06055ef47cfaed1c131b9341bee90708d215986e551ac4d9cc
-  data.tar.gz: 6e414392f9658ddcfe77b299c2edcd352977652d07f046d8d707d6d9b3b37d8b
+  metadata.gz: c0ca4e6c931fdf041e8bd13a516e11d89699396691ff6328c73a0241f5672cc9
+  data.tar.gz: a0a6680af3dc06b0a5f96ee4f96513c172e12cf84cccc70339c0d46f7f0b742a
 SHA512:
-  metadata.gz: 34c5b26b7b909e8f4a24ce47b5c74ca584f9aca49d379c70972bdea1899c74a333acce67c4afdb21b86ef7c9ee31fb5cadfe4cbc91528380c37f5482d6f4ec1c
-  data.tar.gz: d6c760e610ddac664d3a95a60fce8c535b6485e745d3f58701bf67489f8a50f8b05d487af555e1ea392c8efaacaed8d8ca0f3fae36607d0bc90df129860398f9
+  metadata.gz: f39c46227135319c3c9bfe81fce8cbda84769bd9de3d14103604c95cb4106dc0ff00a362a340c2f9a981f412947116848b569d64d33c879b094c2bdd8a24a990
+  data.tar.gz: c9cd5cf85a36769697b50f7d68c4204b6d61db2169a3378000bab6b8f1a6c05f3ecc42322c6480ea22a3dced1cbcd4625c8b64eb554ed21b3611a92f203c92fc

data/CHANGELOG.md

@@ -1,5 +1,12 @@
-## v0.7.2
-- Add JasonContext to exports, for use in scenarios where you need to forward the context into some other React reconciler (e.g. `react-three-fiber`)
+## v0.7.5.1
+- Fix bug where axios errors get swallowed
+
+## v0.7.5
+- Fixed JS errors when payloads arrive on websockets after the subscription has been unmounted
+- Fixed errors during initialization due to calling `cache_all` on a Rails model before it had fully initialized.
+
+## v0.7.3
+- Added: Add JasonContext to exports, for use in scenarios where you need to forward the context into some other React reconciler (e.g. `react-three-fiber`)
 - Fixed: Unneeded `reload` in Publisher resulting in extra database calls
 
 ## v0.7.1

data/README.md

@@ -52,6 +52,11 @@ Jason.setup do |config|
 end
 ```
 
+Mount the Jason engine in `routes.rb`
+```ruby
+mount Jason::Engine => "/jason"
+```
+
 ### In your frontend code
 
 First you need to wrap your root component in a `JasonProvider`.
@@ -173,6 +178,15 @@ Development is primarily driven by the needs of projects we're using Jason in. I
 - Assess using RedisGraph for the graph diffing functionality, to see if this would provide a performance boost
 - Improve the Typescript definitions (ie remove the abundant `any` typing currently used)
 
+## Publishing a new version
+- Update `version.rb`
+- Update CHANGELOG
+- `gem build`
+- `gem push`
+- `npm version [major/minor/patch]`
+- `npm publish`
+- Push new version to Github
+
 ## License
 
 The gem, npm package and source code in the git repository are available as open source under the terms of the [MIT License](https://opensource.org/licenses/MIT).

data/client/lib/JasonProvider.d.ts

@@ -1,9 +1,10 @@
 import React from 'react';
-declare const JasonProvider: ({ reducers, middleware, enhancers, extraActions, children }: {
+declare const JasonProvider: ({ reducers, middleware, enhancers, extraActions, transportOptions, children }: {
     reducers?: any;
     middleware?: any;
     enhancers?: any;
     extraActions?: any;
+    transportOptions?: any;
     children?: React.FC<{}> | undefined;
 }) => JSX.Element;
 export default JasonProvider;

data/client/lib/JasonProvider.js

@@ -7,8 +7,8 @@ const react_1 = __importDefault(require("react"));
 const useJason_1 = __importDefault(require("./useJason"));
 const react_redux_1 = require("react-redux");
 const JasonContext_1 = __importDefault(require("./JasonContext"));
-const JasonProvider = ({ reducers, middleware, enhancers, extraActions, children }) => {
-    const [store, value] = useJason_1.default({ reducers, middleware, enhancers, extraActions });
+const JasonProvider = ({ reducers, middleware, enhancers, extraActions, transportOptions = {}, children }) => {
+    const [store, value] = useJason_1.default({ reducers, middleware, enhancers, extraActions, transportOptions });
     if (!(store && value))
         return react_1.default.createElement("div", null); // Wait for async fetch of schema to complete
     return react_1.default.createElement(react_redux_1.Provider, { store: store },

data/client/lib/createOptDis.js

@@ -29,6 +29,7 @@ function createOptDis(schema, dispatch, restClient, serverActionQueue) {
             .catch(error => {
             dispatch({ type: 'jason/upsert', payload: { error } });
             serverActionQueue.itemFailed(id, error);
+            Promise.reject(error);
         });
     }
     setInterval(dispatchServerAction, 10);

data/client/lib/createTransportAdapter.d.ts

@@ -1,4 +1,4 @@
-export default function createTransportAdapter(jasonConfig: any, handlePayload: any, dispatch: any, onConnect: any): {
+export default function createTransportAdapter(jasonConfig: any, handlePayload: any, dispatch: any, onConnect: any, transportOptions: any): {
     getPayload: (config: any, options: any) => void;
     createSubscription: (config: any) => void;
     removeSubscription: (config: any) => void;

data/client/lib/createTransportAdapter.js

@@ -5,10 +5,10 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 Object.defineProperty(exports, "__esModule", { value: true });
 const actionCableAdapter_1 = __importDefault(require("./transportAdapters/actionCableAdapter"));
 const pusherAdapter_1 = __importDefault(require("./transportAdapters/pusherAdapter"));
-function createTransportAdapter(jasonConfig, handlePayload, dispatch, onConnect) {
+function createTransportAdapter(jasonConfig, handlePayload, dispatch, onConnect, transportOptions) {
     const { transportService } = jasonConfig;
     if (transportService === 'action_cable') {
-        return actionCableAdapter_1.default(jasonConfig, handlePayload, dispatch, onConnect);
+        return actionCableAdapter_1.default(jasonConfig, handlePayload, dispatch, onConnect, transportOptions);
     }
     else if (transportService === 'pusher') {
         return pusherAdapter_1.default(jasonConfig, handlePayload, dispatch);

data/client/lib/index.d.ts

@@ -7,11 +7,12 @@ export declare const JasonContext: import("react").Context<{
     subscribe: null;
     eager: (entity: any, id: any, relations: any) => void;
 }>;
-export declare const JasonProvider: ({ reducers, middleware, enhancers, extraActions, children }: {
+export declare const JasonProvider: ({ reducers, middleware, enhancers, extraActions, transportOptions, children }: {
     reducers?: any;
     middleware?: any;
     enhancers?: any;
     extraActions?: any;
+    transportOptions?: any;
     children?: import("react").FC<{}> | undefined;
 }) => JSX.Element;
 export declare const useAct: typeof _useAct;

data/client/lib/transportAdapters/actionCableAdapter.d.ts

@@ -1,4 +1,4 @@
-export default function actionCableAdapter(jasonConfig: any, handlePayload: any, dispatch: any, onConnected: any): {
+export default function actionCableAdapter(jasonConfig: any, handlePayload: any, dispatch: any, onConnected: any, transportOptions: any): {
     getPayload: (config: any, options: any) => void;
     createSubscription: (config: any) => void;
     removeSubscription: (config: any) => void;

data/client/lib/transportAdapters/actionCableAdapter.js

@@ -7,9 +7,10 @@ const actioncable_1 = require("@rails/actioncable");
 const restClient_1 = __importDefault(require("../restClient"));
 const uuid_1 = require("uuid");
 const lodash_1 = __importDefault(require("lodash"));
-function actionCableAdapter(jasonConfig, handlePayload, dispatch, onConnected) {
+function actionCableAdapter(jasonConfig, handlePayload, dispatch, onConnected, transportOptions) {
     const consumerId = uuid_1.v4();
-    const consumer = actioncable_1.createConsumer();
+    const { cableUrl } = transportOptions;
+    const consumer = cableUrl ? actioncable_1.createConsumer(cableUrl) : actioncable_1.createConsumer();
     const subscription = (consumer.subscriptions.create({
         channel: 'Jason::Channel'
     }, {
@@ -33,7 +34,10 @@ function actionCableAdapter(jasonConfig, handlePayload, dispatch, onConnected) {
     }
     function removeSubscription(config) {
         restClient_1.default.post('/jason/api/remove_subscription', { config, consumerId })
-            .catch(e => console.error(e));
+            .catch(e => {
+            console.error(e);
+            Promise.reject(e);
+        });
     }
     function getPayload(config, options) {
         restClient_1.default.post('/jason/api/get_payload', {
@@ -45,7 +49,10 @@ function actionCableAdapter(jasonConfig, handlePayload, dispatch, onConnected) {
                 handlePayload(payload);
             });
         })
-            .catch(e => console.error(e));
+            .catch(e => {
+            console.error(e);
+            Promise.reject(e);
+        });
     }
     function fullChannelName(channelName) {
         return channelName;

data/client/lib/transportAdapters/pusherAdapter.js

@@ -33,13 +33,19 @@ function pusherAdapter(jasonConfig, handlePayload, dispatch) {
             configToChannel[JSON.stringify(config)] = channelName;
             subscribeToChannel(channelName);
         })
-            .catch(e => console.error(e));
+            .catch(e => {
+            console.error(e);
+            Promise.reject(e);
+        });
     }
     function removeSubscription(config) {
         const channelName = configToChannel[JSON.stringify(config)];
         unsubscribeFromChannel(fullChannelName(channelName));
         restClient_1.default.post('/jason/api/remove_subscription', { config, consumerId })
-            .catch(e => console.error(e));
+            .catch(e => {
+            console.error(e);
+            Promise.reject(e);
+        });
     }
     function getPayload(config, options) {
         restClient_1.default.post('/jason/api/get_payload', {
@@ -51,7 +57,10 @@ function pusherAdapter(jasonConfig, handlePayload, dispatch) {
                 handlePayload(payload);
             });
         })
-            .catch(e => console.error(e));
+            .catch(e => {
+            console.error(e);
+            Promise.reject(e);
+        });
     }
     function subscribeToChannel(channelName) {
         const channel = pusher.subscribe(fullChannelName(channelName));

data/client/lib/useJason.d.ts

@@ -1,6 +1,7 @@
-export default function useJason({ reducers, middleware, enhancers, extraActions }: {
+export default function useJason({ reducers, middleware, enhancers, transportOptions, extraActions }: {
     reducers?: any;
     middleware?: any[];
     enhancers?: any[];
     extraActions?: any;
+    transportOptions?: any;
 }): any[];

data/client/lib/useJason.js

@@ -16,7 +16,7 @@ const humps_1 = require("humps");
 const blueimp_md5_1 = __importDefault(require("blueimp-md5"));
 const lodash_1 = __importDefault(require("lodash"));
 const react_1 = require("react");
-function useJason({ reducers, middleware = [], enhancers = [], extraActions }) {
+function useJason({ reducers, middleware = [], enhancers = [], transportOptions = {}, extraActions }) {
     const [store, setStore] = react_1.useState(null);
     const [value, setValue] = react_1.useState(null);
     react_1.useEffect(() => {
@@ -37,7 +37,7 @@ function useJason({ reducers, middleware = [], enhancers = [], extraActions }) {
             let subOptions = {};
             function handlePayload(payload) {
                 const { md5Hash } = payload;
-                const { handlePayload } = payloadHandlers[md5Hash];
+                const { handlePayload } = payloadHandlers[md5Hash] || {};
                 if (handlePayload) {
                     handlePayload(payload);
                 }
@@ -45,7 +45,7 @@ function useJason({ reducers, middleware = [], enhancers = [], extraActions }) {
                     console.warn("Payload arrived with no handler", payload, payloadHandlers);
                 }
             }
-            const transportAdapter = createTransportAdapter_1.default(jasonConfig, handlePayload, dispatch, () => lodash_1.default.keys(configs).forEach(md5Hash => createSubscription(configs[md5Hash], subOptions[md5Hash])));
+            const transportAdapter = createTransportAdapter_1.default(jasonConfig, handlePayload, dispatch, () => lodash_1.default.keys(configs).forEach(md5Hash => createSubscription(configs[md5Hash], subOptions[md5Hash])), transportOptions);
             function createSubscription(config, options = {}) {
                 // We need the hash to be consistent in Ruby / Javascript
                 const hashableConfig = lodash_1.default(Object.assign({ conditions: {}, includes: {} }, config)).toPairs().sortBy(0).fromPairs().value();

data/client/package.json

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

data/client/src/JasonProvider.tsx

@@ -3,8 +3,8 @@ import useJason from './useJason'
 import { Provider } from 'react-redux'
 import JasonContext from './JasonContext'
 
-const JasonProvider = ({ reducers, middleware, enhancers, extraActions, children }: { reducers?: any, middleware?: any, enhancers?: any, extraActions?: any, children?: React.FC }) => {
-  const [store, value] = useJason({ reducers, middleware, enhancers, extraActions })
+const JasonProvider = ({ reducers, middleware, enhancers, extraActions, transportOptions = {}, children }: { reducers?: any, middleware?: any, enhancers?: any, extraActions?: any, transportOptions?: any, children?: React.FC }) => {
+  const [store, value] = useJason({ reducers, middleware, enhancers, extraActions, transportOptions })
 
   if(!(store && value)) return <div /> // Wait for async fetch of schema to complete
 

data/client/src/createOptDis.ts

@@ -29,6 +29,8 @@ export default function createOptDis(schema, dispatch, restClient, serverActionQ
     .catch(error => {
       dispatch({ type: 'jason/upsert', payload: { error } })
       serverActionQueue.itemFailed(id, error)
+
+      Promise.reject(error)
     })
   }
 

data/client/src/createTransportAdapter.ts

@@ -1,10 +1,10 @@
 import actionCableAdapter from './transportAdapters/actionCableAdapter'
 import pusherAdapter from './transportAdapters/pusherAdapter'
 
-export default function createTransportAdapter(jasonConfig, handlePayload, dispatch, onConnect) {
+export default function createTransportAdapter(jasonConfig, handlePayload, dispatch, onConnect, transportOptions) {
   const { transportService } = jasonConfig
   if (transportService === 'action_cable') {
-    return actionCableAdapter(jasonConfig, handlePayload, dispatch, onConnect)
+    return actionCableAdapter(jasonConfig, handlePayload, dispatch, onConnect, transportOptions)
   } else if (transportService === 'pusher') {
     return pusherAdapter(jasonConfig, handlePayload, dispatch)
   } else {

data/client/src/transportAdapters/actionCableAdapter.ts

@@ -3,10 +3,12 @@ import restClient from '../restClient'
 import { v4 as uuidv4 } from 'uuid'
 import _ from 'lodash'
 
-export default function actionCableAdapter(jasonConfig, handlePayload, dispatch, onConnected) {
+export default function actionCableAdapter(jasonConfig, handlePayload, dispatch, onConnected, transportOptions) {
   const consumerId = uuidv4()
 
-  const consumer = createConsumer()
+  const { cableUrl } = transportOptions
+  const consumer = cableUrl ? createConsumer(cableUrl) : createConsumer()
+
   const subscription = (consumer.subscriptions.create({
     channel: 'Jason::Channel'
   }, {
@@ -33,7 +35,10 @@ export default function actionCableAdapter(jasonConfig, handlePayload, dispatch,
 
   function removeSubscription(config) {
     restClient.post('/jason/api/remove_subscription', { config, consumerId })
-    .catch(e => console.error(e))
+    .catch(e => {
+      console.error(e)
+      Promise.reject(e)
+    })
   }
 
   function getPayload(config, options) {
@@ -46,7 +51,10 @@ export default function actionCableAdapter(jasonConfig, handlePayload, dispatch,
         handlePayload(payload)
       })
     })
-    .catch(e => console.error(e))
+    .catch(e => {
+      console.error(e)
+      Promise.reject(e)
+    })
   }
 
   function fullChannelName(channelName) {

data/client/src/transportAdapters/pusherAdapter.ts

@@ -31,14 +31,20 @@ export default function pusherAdapter(jasonConfig, handlePayload, dispatch) {
       configToChannel[JSON.stringify(config)] = channelName
       subscribeToChannel(channelName)
     })
-    .catch(e => console.error(e))
+    .catch(e => {
+      console.error(e)
+      Promise.reject(e)
+    })
   }
 
   function removeSubscription(config) {
     const channelName = configToChannel[JSON.stringify(config)]
     unsubscribeFromChannel(fullChannelName(channelName))
     restClient.post('/jason/api/remove_subscription', { config, consumerId })
-    .catch(e => console.error(e))
+    .catch(e => {
+      console.error(e)
+      Promise.reject(e)
+    })
   }
 
   function getPayload(config, options) {
@@ -51,7 +57,10 @@ export default function pusherAdapter(jasonConfig, handlePayload, dispatch) {
         handlePayload(payload)
       })
     })
-    .catch(e => console.error(e))
+    .catch(e => {
+      console.error(e)
+      Promise.reject(e)
+    })
   }
 
   function subscribeToChannel(channelName) {

data/client/src/useJason.ts

@@ -14,7 +14,7 @@ import md5 from 'blueimp-md5'
 import _ from 'lodash'
 import React, { useState, useEffect } from 'react'
 
-export default function useJason({ reducers, middleware = [], enhancers = [], extraActions }: { reducers?: any, middleware?: any[], enhancers?: any[], extraActions?: any }) {
+export default function useJason({ reducers, middleware = [], enhancers = [], transportOptions = {}, extraActions }: { reducers?: any, middleware?: any[], enhancers?: any[], extraActions?: any, transportOptions?: any }) {
   const [store, setStore] = useState(null as any)
   const [value, setValue] = useState(null as any)
 
@@ -48,7 +48,7 @@ export default function useJason({ reducers, middleware = [], enhancers = [], ex
       function handlePayload(payload) {
         const { md5Hash } = payload
 
-        const { handlePayload } = payloadHandlers[md5Hash]
+        const { handlePayload } = payloadHandlers[md5Hash] || {}
         if (handlePayload) {
           handlePayload(payload)
         } else {
@@ -56,7 +56,13 @@ export default function useJason({ reducers, middleware = [], enhancers = [], ex
         }
       }
 
-      const transportAdapter = createTransportAdapater(jasonConfig, handlePayload, dispatch, () => _.keys(configs).forEach(md5Hash => createSubscription(configs[md5Hash], subOptions[md5Hash])))
+      const transportAdapter = createTransportAdapater(
+        jasonConfig,
+        handlePayload,
+        dispatch,
+        () => _.keys(configs).forEach(md5Hash => createSubscription(configs[md5Hash], subOptions[md5Hash])),
+        transportOptions
+      )
 
       function createSubscription(config, options = {}) {
         // We need the hash to be consistent in Ruby / Javascript

data/lib/jason/version.rb

@@ -1,3 +1,3 @@
 module Jason
-  VERSION = "0.7.2"
+  VERSION = "0.7.5.1"
 end

data/lib/jason.rb

@@ -51,7 +51,11 @@ module Jason
         puts "Old config was #{previous_schema[model]}"
         puts "New config is #{config}"
         puts "Rebuilding cache for #{model}"
-        model.classify.constantize.cache_all
+
+        # This is necessary to ensure all Rails methods have been added to model before we attempt to cache.
+        Rails.configuration.after_initialize do
+           model.classify.constantize.cache_all
+        end
         puts "Done"
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jason-rails
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.5.1
 platform: ruby
 authors:
 - James Rees
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-04-18 00:00:00.000000000 Z
+date: 2022-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails