y-rb 0.4.0-arm64-darwin → 0.4.2-arm64-darwin

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6e480dc9c968e97535397f50227065764b687a9bccdb2492cd5a10483bbc6744
-  data.tar.gz: 917f7d3da29665102cba8bf439fecf331cd77e52f29d3b702fa2e1a01f069374
+  metadata.gz: 471e24956dba5d6e52d09a4b8357a3d04f56bbc7d72736e21edb2f50bbd6f2dd
+  data.tar.gz: 7167ddc78214e95fa6eaefc7a9a6d45af1afeddcb88e1d1d66a0d19b5c569952
 SHA512:
-  metadata.gz: c3984e3e584bea49a2ed62a6fee7f9937b8337291aa8d195f1772b9ee8fa266279c4e73bed3e2b884863c85fd68dd7f09b9d1dd3e35d36203c09bacf6b54069a
-  data.tar.gz: f9954f8ac4ace34b29a5afec45230ee1b99d60017d65f8c933185d2d2193ed842b3d7b24937b3666de50713cf4b1b0bf66017d9bc2ccf68b91bf1b5164c456ac
+  metadata.gz: f521487258f7c89f6f9064c89d52e37c711ad8cace76efab7f4ef0cb95e2834ed9fa84e38af73c20075757d518269937de93677815955bca104cd4c36619b87f
+  data.tar.gz: 16b4921a1f563dd1310d11cb4a0f9a4f5768ec848e421a9ef586ccd630398d8faa1f327c644b8998774a440f74178cab1f3bd5baae7dabb2d719cd5c4b600bbf

data/ext/yrb/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "yrb"
-version = "0.4.0"
+version = "0.4.2"
 authors = ["Hannes Moser <box@hannesmoser.at>", "Hannes Moser <hmoser@gitlab.com>"]
 edition = "2021"
 homepage = "https://github.com/y-crdt/yrb"
@@ -8,12 +8,12 @@ repository = "https://github.com/y-crdt/yrb"
 
 [dependencies]
 lib0 = "0.14.1" # must match yrs version
-magnus = { version = "0.4.3" }
-thiserror = "1.0.37"
+magnus = { git = "https://github.com/matsadler/magnus", rev = "a51ccaf01d82e9e1a981e4f3fbaca35100513b08" }
+thiserror = "1.0.38"
 yrs = "0.14.1"
 
 [dev-dependencies]
-magnus = { version = "0.4.3", features = ["embed"] }
+magnus = { git = "https://github.com/matsadler/magnus", rev = "a51ccaf01d82e9e1a981e4f3fbaca35100513b08", features = ["embed"] }
 
 [lib]
 name = "yrb"

data/ext/yrb/src/lib.rs

@@ -116,6 +116,9 @@ fn init() -> Result<(), Error> {
     ydoc.define_private_method("ydoc_transact", method!(YDoc::ydoc_transact, 0))
         .expect("cannot define private method: ydoc_transact");
 
+    ydoc.define_private_method("ydoc_observe_update", method!(YDoc::ydoc_observe_update, 1))
+        .expect("cannot define private method: ydoc_observe_update");
+
     let ymap = module
         .define_class("Map", Default::default())
         .expect("cannot define class Y::Map");

data/ext/yrb/src/utils.rs

@@ -1,7 +1,7 @@
 use crate::yvalue::YValue;
 use lib0::any::Any;
 use magnus::r_hash::ForEach::Continue;
-use magnus::{Error, RHash, RString, Symbol, Value};
+use magnus::{exception, Error, RHash, RString, Symbol, Value};
 use std::rc::Rc;
 use yrs::types::Attrs;
 
@@ -27,7 +27,10 @@ pub(crate) fn map_rhash_to_attrs(hash: RHash) -> Result<Attrs, Error> {
     });
 
     if result.is_err() {
-        return Err(Error::runtime_error("could not map hash to attrs"));
+        return Err(Error::new(
+            exception::runtime_error(),
+            "could not map hash to attrs",
+        ));
     }
 
     Ok(a)

data/ext/yrb/src/yawareness.rs

@@ -1,6 +1,5 @@
 use crate::awareness::{Awareness, AwarenessUpdate, Event};
-use magnus::block::Proc;
-use magnus::{Error, Value};
+use magnus::{block::Proc, exception, Error, Value};
 use std::borrow::Borrow;
 use std::cell::RefCell;
 use std::collections::HashMap;
@@ -25,12 +24,11 @@ impl YAwareness {
 
     pub(crate) fn yawareness_apply_update(&self, update: Vec<u8>) -> Result<(), Error> {
         AwarenessUpdate::decode_v1(update.as_slice())
-            .map_err(|_error| Error::runtime_error("cannot decode update"))
+            .map_err(|_error| Error::new(exception::runtime_error(), "cannot decode update"))
             .and_then(|value| {
-                self.0
-                    .borrow_mut()
-                    .apply_update(value)
-                    .map_err(|_error| Error::runtime_error("cannot apply awareness update"))
+                self.0.borrow_mut().apply_update(value).map_err(|_error| {
+                    Error::new(exception::runtime_error(), "cannot apply awareness update")
+                })
             })
     }
 
@@ -83,7 +81,12 @@ impl YAwareness {
             .borrow_mut()
             .update()
             .map(|update| update.encode_v1())
-            .map_err(|_error| Error::runtime_error("cannot create update for current state"))
+            .map_err(|_error| {
+                Error::new(
+                    exception::runtime_error(),
+                    "cannot create update for current state",
+                )
+            })
     }
 
     pub(crate) fn yawareness_update_with_clients(
@@ -95,7 +98,10 @@ impl YAwareness {
             .update_with_clients(clients)
             .map(|update| update.encode_v1())
             .map_err(|_error| {
-                Error::runtime_error("cannot create update for current state and given clients")
+                Error::new(
+                    exception::runtime_error(),
+                    "cannot create update for current state and given clients",
+                )
             })
     }
 }

data/ext/yrb/src/ydoc.rs

@@ -5,11 +5,13 @@ use crate::yxml_element::YXmlElement;
 use crate::yxml_fragment::YXmlFragment;
 use crate::yxml_text::YXmlText;
 use crate::YTransaction;
-use magnus::{Error, Integer, Value};
+use magnus::block::Proc;
+use magnus::exception::runtime_error;
+use magnus::{exception, Error, Integer, RArray, Value};
 use std::borrow::Borrow;
 use std::cell::RefCell;
 use yrs::updates::decoder::Decode;
-use yrs::{Doc, OffsetKind, Options, ReadTxn, StateVector, Transact};
+use yrs::{Doc, OffsetKind, Options, ReadTxn, StateVector, SubscriptionId, Transact};
 
 #[magnus::wrap(class = "Y::Doc")]
 pub(crate) struct YDoc(pub(crate) RefCell<Doc>);
@@ -39,7 +41,7 @@ impl YDoc {
 
         StateVector::decode_v1(state_vector.borrow())
             .map(|sv| tx.encode_diff_v1(&sv))
-            .map_err(|_e| Error::runtime_error("cannot encode diff"))
+            .map_err(|_e| Error::new(exception::runtime_error(), "cannot encode diff"))
     }
 
     pub(crate) fn ydoc_get_or_insert_array(&self, name: String) -> YArray {
@@ -75,4 +77,20 @@ impl YDoc {
         let transaction = doc.transact_mut();
         YTransaction::from(transaction)
     }
+
+    pub(crate) fn ydoc_observe_update(&self, block: Proc) -> Result<SubscriptionId, Error> {
+        self.0
+            .borrow()
+            .observe_update_v1(move |_tx, update_event| {
+                let update = update_event.update.to_vec();
+                let update = RArray::from_vec(update);
+
+                let args: (RArray,) = (update,);
+                block
+                    .call::<(RArray,), Value>(args)
+                    .expect("cannot call update block");
+            })
+            .map(|v| v.into())
+            .map_err(|err| Error::new(runtime_error(), err.to_string()))
+    }
 }

data/ext/yrb/src/ymap.rs

@@ -3,7 +3,7 @@ use crate::yvalue::YValue;
 use crate::YTransaction;
 use lib0::any::Any;
 use magnus::block::Proc;
-use magnus::{Error, RArray, RHash, Symbol, Value};
+use magnus::{exception, Error, RArray, RHash, Symbol, Value};
 use std::cell::RefCell;
 use yrs::types::{EntryChange, Value as YrsValue};
 use yrs::{Map, MapRef, Observable};
@@ -60,7 +60,8 @@ impl YMap {
         let tx = tx.as_mut().unwrap();
 
         match indifferent_hash_key(key) {
-            None => Err(Error::runtime_error(
+            None => Err(Error::new(
+                exception::runtime_error(),
                 "invalid key type, make sure it is either of type Symbol or String",
             )),
             Some(k) => {

data/ext/yrb/src/ytransaction.rs

@@ -4,7 +4,7 @@ use crate::ytext::YText;
 use crate::yxml_element::YXmlElement;
 use crate::yxml_fragment::YXmlFragment;
 use crate::yxml_text::YXmlText;
-use magnus::Error;
+use magnus::{exception, Error};
 use std::cell::{RefCell, RefMut};
 use yrs::updates::decoder::Decode;
 use yrs::updates::encoder::Encode;
@@ -29,7 +29,12 @@ impl<'doc> From<TransactionMut<'doc>> for YTransaction {
 impl YTransaction {
     pub(crate) fn ytransaction_apply_update(&self, update: Vec<u8>) -> Result<(), Error> {
         Update::decode_v1(update.as_slice())
-            .map_err(|error| Error::runtime_error(format!("cannot decode update: {:?}", error)))
+            .map_err(|error| {
+                Error::new(
+                    exception::runtime_error(),
+                    format!("cannot decode update: {:?}", error),
+                )
+            })
             .map(|u| self.transaction().as_mut().unwrap().apply_update(u))
     }
 

data/lib/y/doc.rb

@@ -19,6 +19,22 @@ module Y
     ZERO_STATE = [0].freeze
     private_constant :ZERO_STATE
 
+    # Attach a listener to document changes. If one of the data structures is
+    # changes, the block is called with the update as its only argument.
+    #
+    # @yield [update] Called when document is updated
+    # @yieldparam [Array<Integer>] update The encoded document updates
+
+    # Example: Attach listener to document changes
+    #   doc = described_class.new
+    #   doc.attach { |update| pp update }
+    #
+    #   text = doc.get_text("my text")
+    #   text << "1"
+    def attach(&block)
+      ydoc_observe_update(block)
+    end
+
     # Commit current transaction
     #
     # This is a convenience method that invokes {Y::Transaction#commit} on the
@@ -222,5 +238,11 @@ module Y
     #
     # @return [Y::XMLText]
     # @!visibility private
+
+    # @!method ydoc_observe_update(block)
+    #   Creates a subscription to observe changes to the document
+    # @param [Proc] block
+    # @return [Integer]
+    # @!visibility private
   end
 end

data/lib/y/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Y
-  VERSION = "0.4.0"
+  VERSION = "0.4.2"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: y-rb
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.2
 platform: arm64-darwin
 authors:
 - Hannes Moser
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-12-14 00:00:00.000000000 Z
+date: 2023-01-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.50
+        version: 0.9.53
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.50
+        version: 0.9.53
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement