jason-rails 0.7.3 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2f1ff421bf5bed33c4d2cd6002c250100dd5b3af35ae8fa959afc0223a39c62d
-  data.tar.gz: 999697ba053f7192a26cd12de431a2574c06438494968108b6903538b8bc871e
+  metadata.gz: b901c6b15b2b4f00d307c0e86811d660a68be05ac8c43f3d48c41412a020b4e8
+  data.tar.gz: 3fbed93cb66f5acffe86a8254f0be3ed67979bf93d72ab8faed77a0ae552fff3
 SHA512:
-  metadata.gz: 5fcc8d66a00d598ee800cb873295a55200b5b0067cc0dc22277b5c850c7c336c730cb703156a753909a62b1c0af3287759054fbdc852cb8b8e3a171d356249b2
-  data.tar.gz: 1e66522e216c727c03c92b2537fd8a666ea527e6b41cf3866c6c48fed7114e43b529d145077d4598e268066f40a551f605d2180948a9940a8a3e3cf222c0afbd
+  metadata.gz: 6959b8b6e2b97547a9c596d4efe5332339deb240c31c3951eb10e017e54932e529c851303e38bdc347c8ed89b4a209974fe790f3377128b0fb4229d14c490f66
+  data.tar.gz: a9a17d52153d5580efcd2940437b1f5eac249f7611d38a152a4a043ea35803f1de6d2ce9e53ecd0e8dee923efd47df1be3c1b1d73e515095a4356875e25f0438

data/CHANGELOG.md

@@ -1,5 +1,5 @@
-## 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.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`.

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/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'
     }, {

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.3",
+  "version": "0.7.4",
   "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/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'
   }, {

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.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

data/lib/jason/version.rb

@@ -1,3 +1,3 @@
 module Jason
-  VERSION = "0.7.3"
+  VERSION = "0.7.5"
 end

metadata

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