y-rb 0.5.5 → 0.5.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: edc6866064725654c9601618a16913f88a63625a55afb8664f23195e86c6f7c2
-  data.tar.gz: e4455b991ca2fb4df071aca482524e8a94b625ca8a6a04740fcc28206b0548b2
+  metadata.gz: 3ba8a4ad198489874ed399d303ab720f4f86e6b9e85014ada856a874d6f23485
+  data.tar.gz: 82e9ac65ce9df4711cee24cfe176108b0871b183ec7e5b6981fb52533b594b4b
 SHA512:
-  metadata.gz: 9014b8a70ad8a95515610604a835b2778aec675f67ae2261a77978a62fceb41f63347921966b6dffabd2b1b7faee4c624ce6febacf3322354abf5215665d3666
-  data.tar.gz: b1463c32e13d3be83ff3b826df95078af8e485be9be3c9340744e2fb2ae46887819fcb9bb5da026b286548134c244c82d6c8dd25103263a9d78d532bdc571c34
+  metadata.gz: 9f4134c2cfaca9b0297055156d1521020d3d890c3740bb0f6a52fa241dfdb3b310a8913ea9069ee440e8e0d1760ca4395d3ac076b84497762c8ea2b2161f1fa7
+  data.tar.gz: 7ffc794a224a373eddd35c7d020e2517634b4e0bab65a4c8c9491ffca373122f7ff9b70e2282ef2634b48233ca8b36ccf5eafa16b65f0e220aac207173e3ea66

data/ext/yrb/Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "yrb"
-version = "0.5.5"
+version = "0.5.6"
 authors = ["Hannes Moser <box@hannesmoser.at>"]
 edition = "2021"
 homepage = "https://github.com/y-crdt/yrb"

data/ext/yrb/src/lib.rs

@@ -2,6 +2,7 @@ extern crate core;
 
 use crate::yarray::YArray;
 use crate::yawareness::{YAwareness, YAwarenessEvent};
+use crate::ydiff::YDiff;
 use crate::ydoc::YDoc;
 use crate::ymap::YMap;
 use crate::ytext::YText;
@@ -9,6 +10,7 @@ use crate::ytransaction::YTransaction;
 use crate::yxml_element::YXmlElement;
 use crate::yxml_fragment::YXmlFragment;
 use crate::yxml_text::YXmlText;
+
 use magnus::{class, define_module, function, method, Error, Module, Object};
 
 mod utils;
@@ -16,6 +18,7 @@ mod yany;
 mod yarray;
 mod yattrs;
 mod yawareness;
+mod ydiff;
 mod ydoc;
 mod ymap;
 mod ytext;
@@ -224,6 +227,9 @@ fn init() -> Result<(), Error> {
         .define_class("Text", class::object())
         .expect("cannot define class Y::Text");
 
+    ytext
+        .define_private_method("ytext_diff", method!(YText::ytext_diff, 1))
+        .expect("cannot define private method: ytext_diff");
     ytext
         .define_private_method("ytext_format", method!(YText::ytext_format, 4))
         .expect("cannot define private method: ytext_format");
@@ -618,7 +624,7 @@ fn init() -> Result<(), Error> {
 
     let yawareness_event = module
         .define_class("AwarenessEvent", class::object())
-        .expect("cannot define class Y:AwarenessEvent");
+        .expect("cannot define class Y::AwarenessEvent");
     yawareness_event
         .define_method("added", method!(YAwarenessEvent::added, 0))
         .expect("cannot define private method: added");
@@ -629,5 +635,15 @@ fn init() -> Result<(), Error> {
         .define_method("removed", method!(YAwarenessEvent::removed, 0))
         .expect("cannot define private method: removed");
 
+    let ydiff = module
+        .define_class("Diff", class::object())
+        .expect("cannot define class Y::Diff");
+    ydiff
+        .define_private_method("ydiff_insert", method!(YDiff::ydiff_insert, 0))
+        .expect("cannot define private method: insert");
+    ydiff
+        .define_private_method("ydiff_attrs", method!(YDiff::ydiff_attrs, 0))
+        .expect("cannot define private method: attrs");
+
     Ok(())
 }

data/ext/yrb/src/yattrs.rs

@@ -1,16 +1,21 @@
 use crate::yvalue::YValue;
 use magnus::r_hash::ForEach::Continue;
 use magnus::{RHash, Value};
-use std::ops::{Deref, DerefMut};
+use std::cell::RefCell;
 use std::sync::Arc;
 use yrs::types::Attrs;
 use yrs::Any;
 
-pub(crate) struct YAttrs(pub(crate) Attrs);
+#[magnus::wrap(class = "Y::Attrs")]
+#[derive(Clone)]
+pub(crate) struct YAttrs(pub(crate) RefCell<Attrs>);
+
+/// SAFETY: This is safe because we only access this data when the GVL is held.
+unsafe impl Send for YAttrs {}
 
 impl From<Attrs> for YAttrs {
     fn from(value: Attrs) -> Self {
-        YAttrs(value)
+        YAttrs(RefCell::from(value))
     }
 }
 
@@ -29,20 +34,6 @@ impl From<RHash> for YAttrs {
             })
             .expect("cannot iterate attributes hash");
 
-        YAttrs(attrs)
-    }
-}
-
-impl Deref for YAttrs {
-    type Target = Attrs;
-
-    fn deref(&self) -> &Self::Target {
-        &self.0
-    }
-}
-
-impl DerefMut for YAttrs {
-    fn deref_mut(&mut self) -> &mut Self::Target {
-        &mut self.0
+        YAttrs(RefCell::from(attrs))
     }
 }

data/ext/yrb/src/ydiff.rs

@@ -0,0 +1,19 @@
+use magnus::{IntoValue, RHash, Value};
+
+unsafe impl Send for YDiff {}
+
+#[magnus::wrap(class = "Y::Diff")]
+pub(crate) struct YDiff {
+    pub(crate) ydiff_insert: Value,
+    pub(crate) ydiff_attrs: Option<RHash>,
+}
+
+impl YDiff {
+    pub(crate) fn ydiff_insert(&self) -> Value {
+        self.ydiff_insert
+    }
+
+    pub(crate) fn ydiff_attrs(&self) -> Option<Value> {
+        self.ydiff_attrs.as_ref().map(|value| value.into_value())
+    }
+}

data/ext/yrb/src/ytext.rs

@@ -1,10 +1,13 @@
 use crate::yattrs::YAttrs;
+use crate::ydiff::YDiff;
 use crate::yvalue::YValue;
 use crate::YTransaction;
 use magnus::block::Proc;
 use magnus::value::Qnil;
-use magnus::{Error, RHash, Symbol, Value};
+use magnus::RArray;
+pub(crate) use magnus::{Error, IntoValue, RHash, Symbol, Value};
 use std::cell::RefCell;
+use yrs::types::text::YChange;
 use yrs::types::Delta;
 use yrs::{Any, GetString, Observable, Text, TextRef};
 
@@ -15,6 +18,38 @@ pub(crate) struct YText(pub(crate) RefCell<TextRef>);
 unsafe impl Send for YText {}
 
 impl YText {
+    pub(crate) fn ytext_diff(&self, transaction: &YTransaction) -> RArray {
+        let tx = transaction.transaction();
+        let tx = tx.as_ref().unwrap();
+
+        RArray::from_iter(
+            self.0
+                .borrow()
+                .diff(tx, YChange::identity)
+                .iter()
+                .map(move |diff| {
+                    let yvalue = YValue::from(diff.insert.clone());
+                    let insert = yvalue.0.into_inner();
+                    let attributes = diff.attributes.as_ref().map_or_else(
+                        || None,
+                        |boxed_attrs| {
+                            let attributes = RHash::new();
+                            for (key, value) in boxed_attrs.iter() {
+                                let key = key.to_string();
+                                let value = YValue::from(value.clone()).0.into_inner();
+                                attributes.aset(key, value).expect("cannot add value");
+                            }
+                            Some(attributes)
+                        },
+                    );
+                    YDiff {
+                        ydiff_insert: insert,
+                        ydiff_attrs: attributes,
+                    }
+                    .into_value()
+                }),
+        )
+    }
     pub(crate) fn ytext_format(
         &self,
         transaction: &YTransaction,
@@ -27,7 +62,9 @@ impl YText {
 
         let a = YAttrs::from(attrs);
 
-        self.0.borrow_mut().format(tx, index, length, a.0)
+        self.0
+            .borrow_mut()
+            .format(tx, index, length, a.0.into_inner())
     }
     pub(crate) fn ytext_insert(&self, transaction: &YTransaction, index: u32, chunk: String) {
         let mut tx = transaction.transaction();
@@ -66,7 +103,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.into_inner());
     }
     pub(crate) fn ytext_insert_with_attributes(
         &self,
@@ -82,7 +119,7 @@ impl YText {
 
         self.0
             .borrow_mut()
-            .insert_with_attributes(tx, index, chunk.as_str(), a.0)
+            .insert_with_attributes(tx, index, chunk.as_str(), a.0.into_inner())
     }
     pub(crate) fn ytext_length(&self, transaction: &YTransaction) -> u32 {
         let tx = transaction.transaction();

data/lib/y/array.rb

@@ -115,8 +115,8 @@ module Y
     end
 
     # @return [void]
-    def each(&block)
-      document.current_transaction { |tx| yarray_each(tx, &block) }
+    def each(...)
+      document.current_transaction { |tx| yarray_each(tx, ...) }
     end
 
     # Check if the array is empty

data/lib/y/diff.rb

@@ -0,0 +1,38 @@
+# frozen_string_literal: true
+
+module Y
+  # A representation of an uniformly-formatted chunk of rich context stored by
+  # Text or XmlText. It contains a value (which could be a string, embedded
+  # object or another shared type) with optional formatting attributes wrapping
+  # around this chunk.
+  class Diff
+    # @return [Object]
+    def insert
+      ydiff_insert
+    end
+
+    # @return [Hash]
+    def attrs
+      ydiff_attrs
+    end
+
+    # Convert the diff to a Hash representation
+    #
+    # @return [Hash]
+    def to_h
+      {
+        insert: ydiff_insert,
+        attrs: ydiff_attrs
+      }
+    end
+
+    # @!method ydiff_insert()
+    #   Returns string representation of text
+    #
+    # @return [Object]
+
+    # @!method ydiff_attrs()
+    #
+    # @return [Hash]
+  end
+end

data/lib/y/text.rb

@@ -80,6 +80,15 @@ module Y
       ytext_unobserve(subscription_id)
     end
 
+    # Diff
+    #
+    # @return[Array<YDiff>]
+    def diff
+      document.current_transaction do |tx|
+        ytext_diff(tx)
+      end
+    end
+
     # Checks if text is empty
     #
     # @example Check if text is empty
@@ -284,6 +293,12 @@ module Y
         value.is_a?(Hash)
     end
 
+    # @!method ytext_diff(tx)
+    #   Returns text changes as list of diffs
+    #
+    # @param transaction [Y::Transaction]
+    # @return [Array<YDiff>]
+
     # @!method ytext_insert(tx, index, chunk)
     #   Insert into text at position
     #

data/lib/y/version.rb

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

data/lib/y-rb.rb

@@ -11,6 +11,7 @@ end
 
 require_relative "y/array"
 require_relative "y/awareness"
+require_relative "y/diff"
 require_relative "y/doc"
 require_relative "y/map"
 require_relative "y/text"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: y-rb
 version: !ruby/object:Gem::Version
-  version: 0.5.5
+  version: 0.5.6
 platform: ruby
 authors:
 - Hannes Moser
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-03-08 00:00:00.000000000 Z
+date: 2024-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -83,6 +83,7 @@ files:
 - ext/yrb/src/yarray.rs
 - ext/yrb/src/yattrs.rs
 - ext/yrb/src/yawareness.rs
+- ext/yrb/src/ydiff.rs
 - ext/yrb/src/ydoc.rs
 - ext/yrb/src/ymap.rs
 - ext/yrb/src/ytext.rs
@@ -95,6 +96,7 @@ files:
 - lib/y.rb
 - lib/y/array.rb
 - lib/y/awareness.rb
+- lib/y/diff.rb
 - lib/y/doc.rb
 - lib/y/map.rb
 - lib/y/text.rb