y-rb 0.4.1-x86_64-linux → 0.4.3-x86_64-linux

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 625ee4d664574fa20124c4b7da2d69bb40a38775241e7321b55f64d18fac155f
-  data.tar.gz: 58fee255060b68927efbc2776216ed5c37845dc1261ff2b09a8814c39b108583
+  metadata.gz: 61073f9f43e7b8167ae899a61d7876f76f6dd88962a5f3e8bbb9352317575d06
+  data.tar.gz: 8648119b4b33348546741ed2d3c19ea059bdfc91798cbe099bab6f79a92bf371
 SHA512:
-  metadata.gz: 8c384f11abcc6b08cc5ad0bb3d2080782e0412f3a3d66b36ffb38d38cb44de2454d940078a7628219af54207e261f3dc57a8b100595073433c6d1bfecb02dbd4
-  data.tar.gz: b3817ae413528d04716edc3f86942974012a42400541b0466555d0d475ac04d27b4e95d40f204cbf61e919d2c36732c1b9237302ed687aa782d5d70e38606f0b
+  metadata.gz: 4a1e70f12a62302d34d7f05912fdd636a66bdc6f03d3046702d06fb63c28a041591939d27723b3b42c8daa382f6f86045a11906b87ae99dc7cd961842ad4097c
+  data.tar.gz: a7102aa1360f57d8012492c53e8f0564ee4db08492ec725e81ede03d2447cbd540a3d3020ddbd29a0921dcebfbf842cef482dc07291e9660b6a6dee1457ee14b

data/ext/yrb/Cargo.toml

@@ -1,19 +1,19 @@
 [package]
 name = "yrb"
-version = "0.4.1"
+version = "0.4.3"
 authors = ["Hannes Moser <box@hannesmoser.at>", "Hannes Moser <hmoser@gitlab.com>"]
 edition = "2021"
 homepage = "https://github.com/y-crdt/yrb"
 repository = "https://github.com/y-crdt/yrb"
 
 [dependencies]
-lib0 = "0.14.1" # must match yrs version
-magnus = { git = "https://github.com/matsadler/magnus", rev = "a51ccaf01d82e9e1a981e4f3fbaca35100513b08" }
+lib0 = "0.15.0" # must match yrs version
+magnus = { git = "https://github.com/matsadler/magnus", rev = "ab982c3643421b38f3293f1fe014aa373abfd6dc" }
 thiserror = "1.0.38"
-yrs = "0.14.1"
+yrs = "0.15.0"
 
 [dev-dependencies]
-magnus = { git = "https://github.com/matsadler/magnus", rev = "a51ccaf01d82e9e1a981e4f3fbaca35100513b08", features = ["embed"] }
+magnus = { git = "https://github.com/matsadler/magnus", rev = "ab982c3643421b38f3293f1fe014aa373abfd6dc", 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/yany.rs

@@ -1,4 +1,5 @@
 use lib0::any::Any;
+use magnus::r_string::IntoRString;
 use magnus::{RArray, RHash, RString, Value, QNIL};
 use std::borrow::Borrow;
 use std::ops::{Deref, DerefMut};
@@ -37,7 +38,7 @@ impl TryInto<Value> for YAny {
             Any::Bool(v) => Ok(Value::from(v)),
             Any::Number(v) => Ok(Value::from(v)),
             Any::BigInt(v) => Ok(Value::from(v)),
-            Any::String(v) => Ok(Value::from(RString::from(v.borrow()))),
+            Any::String(v) => Ok(Value::from(RString::from(v.into_r_string()))),
             Any::Buffer(v) => Ok(Value::from(RString::from_slice(v.borrow()))),
         };
     }

data/ext/yrb/src/yarray.rs

@@ -4,6 +4,7 @@ use lib0::any::Any;
 use magnus::block::Proc;
 use magnus::value::Qnil;
 use magnus::{Error, RArray, RHash, Symbol, Value};
+use std::borrow::Borrow;
 use std::cell::RefCell;
 use yrs::types::Change;
 use yrs::{Array, ArrayRef, Observable};
@@ -112,9 +113,15 @@ impl YArray {
                     .partition(Result::is_ok);
 
                 if errors.is_empty() {
-                    let args = (RArray::from_vec(
-                        changes.into_iter().map(Result::unwrap).collect(),
-                    ),);
+                    let args_changes = RArray::new();
+                    for change in changes.iter() {
+                        let c = *change.borrow().as_ref().unwrap();
+                        args_changes
+                            .push(c)
+                            .expect("cannot push change event to args");
+                    }
+
+                    let args = (args_changes,);
                     let _ = block.call::<(RArray,), Qnil>(args);
                     // todo: make sure we respect the result and bubble up the
                     //  error so that we can return as part of the Result
@@ -143,7 +150,7 @@ impl YArray {
         let tx = tx.as_mut().unwrap();
 
         let arr = self.0.borrow_mut();
-        arr.push_front(tx, avalue)
+        arr.push_front(tx, avalue);
     }
     pub(crate) fn yarray_remove(&self, transaction: &YTransaction, index: u32) {
         let mut tx = transaction.transaction();
@@ -164,12 +171,13 @@ impl YArray {
         let tx = transaction.transaction();
         let tx = tx.as_ref().unwrap();
 
-        let arr = arr
-            .iter(tx)
-            .map(|v| YValue::from(v).into())
-            .collect::<Vec<Value>>();
-
-        RArray::from_vec(arr)
+        let r_arr = RArray::new();
+        for item in arr.iter(tx) {
+            let r_val = YValue::from(item);
+            let r_val = r_val.0.borrow().clone();
+            r_arr.push(r_val).expect("cannot push item event to array");
+        }
+        r_arr
     }
     pub(crate) fn yarray_unobserve(&self, subscription_id: u32) {
         self.0.borrow_mut().unobserve(subscription_id);

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::{exception, 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>);
@@ -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

@@ -27,7 +27,7 @@ impl YMap {
 
         match indifferent_hash_key(key) {
             None => false,
-            Some(k) => self.0.borrow().contains(tx, k.as_str()),
+            Some(k) => self.0.borrow().contains_key(tx, k.as_str()),
         }
     }
     pub(crate) fn ymap_each(&self, transaction: &YTransaction, proc: Proc) {

data/ext/yrb/src/ytext.rs

@@ -48,7 +48,7 @@ impl YText {
         let yvalue = YValue::from(content);
         let avalue = Any::from(yvalue);
 
-        self.0.borrow_mut().insert_embed(tx, index, avalue)
+        self.0.borrow_mut().insert_embed(tx, index, avalue);
     }
     pub(crate) fn ytext_insert_embed_with_attributes(
         &self,
@@ -67,7 +67,7 @@ impl YText {
 
         self.0
             .borrow_mut()
-            .insert_embed_with_attributes(tx, index, avalue, a.0)
+            .insert_embed_with_attributes(tx, index, avalue, a.0);
     }
     pub(crate) fn ytext_insert_with_attributes(
         &self,

data/ext/yrb/src/yvalue.rs

@@ -116,12 +116,13 @@ impl From<Any> for YValue {
             Any::String(v) => YValue::from(v.into_string()),
             Any::Buffer(v) => YValue::from(Value::from(v.into_vec())),
             Any::Array(v) => {
-                let arr = v
-                    .iter()
-                    .map(|i| YValue::from(i.clone()))
-                    .map(|value| *value.0.borrow())
-                    .collect::<Vec<Value>>();
-                YValue::from(RArray::from_vec(arr))
+                let arr = RArray::new();
+                for item in v.iter() {
+                    let val = YValue::from(item.clone());
+                    let val = val.0.borrow().clone();
+                    arr.push(val).expect("cannot push item event to array");
+                }
+                YValue::from(arr)
             }
             Any::Map(v) => {
                 let map = v
@@ -146,14 +147,12 @@ impl From<YrsValue> for YValue {
             YrsValue::YXmlText(text) => YValue::from(text),
             YrsValue::YArray(val) => {
                 let tx = val.transact();
-                let arr = RArray::from_vec(
-                    val.iter(&tx)
-                        .map(|item| {
-                            let yvalue = YValue::from(item);
-                            yvalue.0.into_inner()
-                        })
-                        .collect(),
-                );
+                let arr = RArray::new();
+                for item in val.iter(&tx) {
+                    let val = YValue::from(item.clone());
+                    let val = val.0.borrow().clone();
+                    arr.push(val).expect("cannot push item event to array");
+                }
                 YValue::from(arr)
             }
             YrsValue::YMap(val) => {

data/ext/yrb/src/yxml_element.rs

@@ -107,15 +107,16 @@ impl YXmlElement {
                 for change in delta {
                     match change {
                         Change::Added(v) => {
-                            let values = v
-                                .iter()
-                                .map(|o| YValue::from(o.clone()))
-                                .map(|o| *o.0.borrow())
-                                .collect::<Vec<_>>();
+                            let values = RArray::new();
+                            for value in v.iter() {
+                                let value = YValue::from(value.clone());
+                                let value = value.0.borrow().clone();
+                                values.push(value).expect("cannot push value to array");
+                            }
 
                             let payload = RHash::new();
                             payload
-                                .aset(change_added, RArray::from_vec(values))
+                                .aset(change_added, values)
                                 .expect("cannot create change::added payload");
 
                             changes

data/ext/yrb/src/yxml_text.rs

@@ -72,11 +72,13 @@ impl YXmlText {
         let yvalue = YValue::from(content);
         let avalue = Any::from(yvalue);
 
-        map_rhash_to_attrs(attrs).map(|a| {
-            self.0
-                .borrow_mut()
-                .insert_embed_with_attributes(tx, index, avalue, a)
-        })
+        map_rhash_to_attrs(attrs)
+            .map(|a| {
+                self.0
+                    .borrow_mut()
+                    .insert_embed_with_attributes(tx, index, avalue, a)
+            })
+            .map(|_| ())
     }
     pub(crate) fn yxml_text_insert_embed(
         &self,
@@ -89,7 +91,7 @@ impl YXmlText {
 
         self.0
             .borrow_mut()
-            .insert_embed(tx, index, Any::from(YValue::from(embed)))
+            .insert_embed(tx, index, Any::from(YValue::from(embed)));
     }
     pub(crate) fn yxml_text_insert_with_attributes(
         &self,

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.1"
+  VERSION = "0.4.3"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: y-rb
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.3
 platform: x86_64-linux
 authors:
 - Hannes Moser
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2023-01-13 00:00:00.000000000 Z
+date: 2023-01-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -30,42 +30,42 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.53
+        version: 0.9.56
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.9.53
+        version: 0.9.56
 - !ruby/object:Gem::Dependency
   name: rake-compiler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.0
+        version: 1.2.1
 - !ruby/object:Gem::Dependency
   name: rake-compiler-dock
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.2.2
+        version: 1.3.0
 description: Ruby bindings for yrs. Yrs "wires" is a Rust port of the Yjs framework.
 email:
 - hmoser@gitlab.com