jason-rails 0.8.3 → 0.8.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ff1433058a6e3161db56c679cadfcf087a128c0f0b935ee5ac8a1219848c44e
-  data.tar.gz: 1d8c542e14dbe8eab26540f8ca33a9e4dde6518cccc0e87b4350389fcbc9c4c0
+  metadata.gz: ff84a9e2b7cc044abeaa159eda7993a6296035403db2e86292f3919a1d462c6c
+  data.tar.gz: eda4dae9f235460e7566a18f178c3f569c76a03cc68762a79a2bbfa52ca51ba4
 SHA512:
-  metadata.gz: 914c935aa960e708a60c309412a503b11e61d6e6f3f0a6011d71021e2a3ed7dcdf5648ac2bfbd5e7bc6ca895005a1e59b38627ab82dc6e8307817f26d8aa908b
-  data.tar.gz: e342c97211c88fd28ad01bf79fadebfd498595f9d467438d90fb85e7589938e2d629eb624a50a7fbe2501e62f13706b72ea8c7a65b4021305c6ad66e6e7b4bbc
+  metadata.gz: fe0da2a182cabbff402b508f6155d97e6e4aad4985b52b1af294b45dbea43d0604659fa7018becd638134333bdab2b1b24ca9d5a67478e442770976d0275e225
+  data.tar.gz: fe1c7c4b0e068efacc6c3734a5fe545cbabeaa6d68f1f680ed2455ebb02832eaccaf5442f2d0315091d44b7d0aa2d62773245e6df6b9f66d1c36b4f36cbda53c

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## v0.8.6
+- Fix config usage, to allow changing websocket provider
+
+## v0.8.4
+- Fix implicit kwargs that fail in Ruby 3+
+
 ## v0.8.3
 - Fix lock bug on checking dupe schema
 
@@ -60,4 +66,4 @@ act.posts.add({ name: 'new post' })
 ## v0.6.5
 - Added `reset!` and `reset!(hard: true)` methods to `Subscription`. Reset will load the IDs that should be part of the subscription from the database, and ensure that the graph matches those. It then re-broadcasts the payloads to all connected clients. Hard reset will do the same, but also clear all cached IDs and subscription hooks on instances - this is equivalent from starting from scratch.
 - Added `enforce: boolean` option to GraphHelper
-- When subscriptions are re-activated they now set the IDs with `enforce: true`, as there could be conditions where updates that were made while a subscription was not active would not be properly registered.
+- When subscriptions are re-activated they now set the IDs with `enforce: true`, as there could be conditions where updates that were made while a subscription was not active would not be properly registered.

data/client/package.json

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

data/client/src/transportAdapters/pusherAdapter.ts

@@ -6,12 +6,20 @@ import _ from 'lodash'
 export default function pusherAdapter(jasonConfig, handlePayload, dispatch) {
   const consumerId = uuidv4()
 
-  const { pusherKey, pusherRegion, pusherChannelPrefix } = jasonConfig
-  const pusher = new Pusher(pusherKey, {
-    cluster: 'eu',
+  const { pusherHost, pusherKey, pusherRegion, pusherChannelPrefix } = jasonConfig
+  let config = {
+    cluster: pusherRegion,
     forceTLS: true,
     authEndpoint: '/jason/api/pusher/auth'
-  })
+  }
+  if (pusherHost) {
+    config = {
+      ...config,
+      wsHost: pusherHost,
+      httpHost: pusherHost,
+    }
+  }
+  const pusher = new Pusher(pusherKey, config)
   pusher.connection.bind('state_change', ({ current }) => {
     if (current === 'connected') {
       dispatch({ type: 'jason/upsert', payload: { connected: true } })

data/lib/jason/subscription.rb

@@ -106,13 +106,13 @@ class Jason::Subscription
         subscription.load_ids_for_sub_models(foreign_model_name, new_foreign_id)
       ] : nil
 
-      id_changeset = subscription.graph_helper.apply_update({
+      id_changeset = subscription.graph_helper.apply_update(
         remove: [{
           model_names: [changed_model_name, foreign_model_name],
           instance_ids: [[changed_model_id, old_foreign_id]]
         }],
         add: add
-      })
+      )
 
       subscription.apply_id_changeset(id_changeset)
       subscription.broadcast_id_changeset(id_changeset)
@@ -127,7 +127,7 @@ class Jason::Subscription
     # this is simple, only the edges need to change - no IDs can be changed
     (old_sub_ids & new_sub_ids).each do |sub_id|
       subscription = find_by_id(sub_id)
-      subscription.graph_helper.apply_update({
+      subscription.graph_helper.apply_update(
         remove: [{
           model_names: [changed_model_name, foreign_model_name],
           instance_ids: [[changed_model_id, old_foreign_id]]
@@ -136,7 +136,7 @@ class Jason::Subscription
           model_names: [changed_model_name, foreign_model_name],
           instance_ids: [[changed_model_id, new_foreign_id]]
         }]
-      })
+      )
     end
 
     #########
@@ -146,7 +146,7 @@ class Jason::Subscription
     # No edges are removed, just added
     (new_sub_ids - old_sub_ids).each do |sub_id|
       subscription = find_by_id(sub_id)
-      id_changeset = subscription.graph_helper.apply_update({
+      id_changeset = subscription.graph_helper.apply_update(
         add: [
           {
             model_names: [changed_model_name, foreign_model_name],
@@ -155,7 +155,7 @@ class Jason::Subscription
           # Add IDs of child models
           subscription.load_ids_for_sub_models(changed_model_name, changed_model_id)
         ]
-      })
+      )
 
       subscription.apply_id_changeset(id_changeset)
       subscription.broadcast_id_changeset(id_changeset)
@@ -168,14 +168,14 @@ class Jason::Subscription
     # Just need to remove the link, orphan detection will do the rest
     (old_sub_ids - new_sub_ids).each do |sub_id|
       subscription = find_by_id(sub_id)
-      id_changeset = subscription.graph_helper.apply_update({
+      id_changeset = subscription.graph_helper.apply_update(
         remove: [
           {
             model_names: [changed_model_name, foreign_model_name],
             instance_ids: [[changed_model_id, old_foreign_id]]
           }
         ]
-      })
+      )
       subscription.apply_id_changeset(id_changeset)
       subscription.broadcast_id_changeset(id_changeset)
     end
@@ -232,7 +232,7 @@ class Jason::Subscription
   end
 
   def add_id(model_name, id)
-    id_changeset = graph_helper.apply_update({
+    id_changeset = graph_helper.apply_update(
       add: [
         {
           model_names: [model_name],
@@ -241,7 +241,7 @@ class Jason::Subscription
         # Add IDs of child models
         load_ids_for_sub_models(model_name, id)
       ]
-    })
+    )
 
     apply_id_changeset(id_changeset)
     broadcast_id_changeset(id_changeset)
@@ -316,10 +316,10 @@ class Jason::Subscription
   def set_ids_for_sub_models(model_name = model, ids = nil, enforce: false)
     edge_set = load_ids_for_sub_models(model_name, ids)
     # Build the tree
-    id_changeset = graph_helper.apply_update({
+    id_changeset = graph_helper.apply_update(
       add: [edge_set],
       enforce: enforce
-    })
+    )
 
     apply_id_changeset(id_changeset)
   end

data/lib/jason/version.rb

@@ -1,3 +1,3 @@
 module Jason
-  VERSION = "0.8.3"
+  VERSION = "0.8.6"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: jason-rails
 version: !ruby/object:Gem::Version
-  version: 0.8.3
+  version: 0.8.6
 platform: ruby
 authors:
 - James Rees
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-18 00:00:00.000000000 Z
+date: 2023-11-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -262,7 +262,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: Reactive user interfaces with minimal boilerplate, using Rails + Redux