y-rb_actioncable 0.1.2 → 0.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9aee5ffece065c56362b59a6f7514bbe4e6177d0ea2d782ec1e3bb485cd05a53
-  data.tar.gz: 709e1c51409f66f3134049dbf555db7c6c94bab0f1a66a629d3174051c186f0b
+  metadata.gz: 6f06116e8fced707775ecdbc580d8b46b7ae6f0a0e2e55042b94785da6765516
+  data.tar.gz: e6a8acf34ac91161f2b270459a9155bafeed09398c578d08c344051ee173573a
 SHA512:
-  metadata.gz: b16e36125a01866c74585b92580a6391c86f264f44a8cfbd308da0edf48f9d9855f2e464b494c6286eed47a67f7f3655c405b5bd728304e5c6653948e5f03dfb
-  data.tar.gz: d6463f08ecefb4ddfcb629e58cf6e385df9f090eefdf3a9bf1928327bb3bbaf67de8a90650e41e93a98fcaa483e0a75f05938d4f593f1a855e36123c58044ff2
+  metadata.gz: bb45227353a4f55e880908a59abf2ca9e8afd1f61eb011eed431bc4a64db4acae033bea610b230691134eceaa981015a6fddac7ba34e83eaaf20f64065431092
+  data.tar.gz: b35bfce523b71dd05af4f714707e5a13623b95332021dbab705b4bd27703e747324bbfd7051ccdea868415f7048cc6c87c62db1779c09bb04272d83a88dac9eb

data/README.md

@@ -60,13 +60,8 @@ class SyncChannel < ApplicationCable::Channel
   include Y::Actioncable::Sync
 
   def subscribed
-    stream_from("document-1", coder: ActiveSupport::JSON) do |message|
-      # integrate updates in the y-rb document
-      integrate(message)
-    end
-
-    # negotiate initial state with client
-    initiate
+    # initiate sync & subscribe to updates, with optional persistence mechanism
+    sync_from("document-1")
   end
 
   def receive(message)

data/lib/y/actioncable/sync.rb

@@ -87,7 +87,10 @@ module Y
 
         # do not transmit message back to current connection if the connection
         # is the origin of the message
-        transmit(message) if origin != connection.connection_identifier
+        connection_identifier = connection.connection_identifier
+        return if connection_identifier.present? && origin == connection_identifier
+
+        transmit(message)
       end
 
       # Sync for given model. This is a utility method that simplifies the setup
@@ -150,7 +153,7 @@ module Y
         # we broadcast to all connected clients, but provide the
         # connection_identifier as origin so that the [#integrate] method is
         # able to filter sending back the update to its origin.
-        self.class.broadcast(
+        ActionCable.server.broadcast(
           broadcasting,
           { update: update, origin: connection.connection_identifier }
         )
@@ -197,8 +200,7 @@ module Y
       #   "issue_channel:id:1"
       def canonical_channel_key
         @canonical_channel_key ||= begin
-          pairs = JSON.parse!(identifier)
-          params_part = pairs.map do |k, v|
+          params_part = channel_identifier.map do |k, v|
             "#{k.to_s.parameterize}-#{v.to_s.parameterize}"
           end
 
@@ -257,6 +259,14 @@ module Y
       def doc
         @doc ||= Y::Doc.new
       end
+
+      private
+
+      def channel_identifier
+        return ["test", identifier] if Rails.env.test?
+
+        JSON.parse(identifier)
+      end
     end
   end
 end

data/lib/y/actioncable/version.rb

@@ -2,6 +2,6 @@
 
 module Y
   module Actioncable
-    VERSION = "0.1.2"
+    VERSION = "0.1.4"
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: y-rb_actioncable
 version: !ruby/object:Gem::Version
-  version: 0.1.2
+  version: 0.1.4
 platform: ruby
 authors:
 - Hannes Moser
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-01-25 00:00:00.000000000 Z
+date: 2023-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -96,7 +96,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.4
+rubygems_version: 3.4.5
 signing_key:
 specification_version: 4
 summary: An ActionCable companion for Y.js clients.