From 2e715e57dbc36cd62e4cc16e75bf567aa9484124 Mon Sep 17 00:00:00 2001
From: Bas Hintemann <bas@feedbackfruits.com>
Date: Fri, 24 Jan 2025 15:56:41 +0100
Subject: [PATCH 1/2] Upgrade to Ruby 3.4.1

---
 .github/workflows/tests.yml |  1 +
 .gitignore                  |  1 -
 .ruby-version               |  1 -
 Gemfile.lock                | 74 +++++++++++++++++++++++++++++++++++++
 rich-text.gemspec           |  2 +-
 5 files changed, 76 insertions(+), 3 deletions(-)
 delete mode 100644 .ruby-version
 create mode 100644 Gemfile.lock

diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
index 4c9d32b..ccaf599 100644
--- a/.github/workflows/tests.yml
+++ b/.github/workflows/tests.yml
@@ -12,6 +12,7 @@ jobs:
     - name: Setup Ruby
       uses: ruby/setup-ruby@v1
       with:
+        ruby-version: '3.4'
         bundler-cache: true
     - name: Build and test
       run: |
diff --git a/.gitignore b/.gitignore
index 0cb6eeb..9106b2a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,5 @@
 /.bundle/
 /.yardoc
-/Gemfile.lock
 /_yardoc/
 /coverage/
 /doc/
diff --git a/.ruby-version b/.ruby-version
deleted file mode 100644
index 9c25013..0000000
--- a/.ruby-version
+++ /dev/null
@@ -1 +0,0 @@
-3.3.6
diff --git a/Gemfile.lock b/Gemfile.lock
new file mode 100644
index 0000000..1453125
--- /dev/null
+++ b/Gemfile.lock
@@ -0,0 +1,74 @@
+PATH
+  remote: .
+  specs:
+    rich-text (0.6.0)
+      activesupport (~> 8.0)
+      diff-lcs (~> 1.5)
+      nokogiri (~> 1.16)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (8.0.1)
+      base64
+      benchmark (>= 0.3)
+      bigdecimal
+      concurrent-ruby (~> 1.0, >= 1.3.1)
+      connection_pool (>= 2.2.5)
+      drb
+      i18n (>= 1.6, < 2)
+      logger (>= 1.4.2)
+      minitest (>= 5.1)
+      securerandom (>= 0.3)
+      tzinfo (~> 2.0, >= 2.0.5)
+      uri (>= 0.13.1)
+    base64 (0.2.0)
+    benchmark (0.4.0)
+    bigdecimal (3.1.9)
+    concurrent-ruby (1.3.5)
+    connection_pool (2.5.0)
+    diff-lcs (1.5.1)
+    drb (2.2.1)
+    i18n (1.14.7)
+      concurrent-ruby (~> 1.0)
+    logger (1.6.5)
+    mini_portile2 (2.8.8)
+    minitest (5.25.4)
+    nokogiri (1.18.2)
+      mini_portile2 (~> 2.8.2)
+      racc (~> 1.4)
+    nokogiri (1.18.2-aarch64-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.2-arm-linux-gnu)
+      racc (~> 1.4)
+    nokogiri (1.18.2-arm64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.2-x86_64-darwin)
+      racc (~> 1.4)
+    nokogiri (1.18.2-x86_64-linux-gnu)
+      racc (~> 1.4)
+    racc (1.8.1)
+    rake (13.2.1)
+    securerandom (0.4.1)
+    tzinfo (2.0.6)
+      concurrent-ruby (~> 1.0)
+    uri (1.0.2)
+    yard (0.9.37)
+
+PLATFORMS
+  aarch64-linux
+  arm-linux
+  arm64-darwin
+  x86-linux
+  x86_64-darwin
+  x86_64-linux
+
+DEPENDENCIES
+  bundler (~> 2.5)
+  minitest (~> 5.22)
+  rake (~> 13.1)
+  rich-text!
+  yard (~> 0.9)
+
+BUNDLED WITH
+   2.6.3
diff --git a/rich-text.gemspec b/rich-text.gemspec
index 0b531fb..7010920 100644
--- a/rich-text.gemspec
+++ b/rich-text.gemspec
@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
-  spec.required_ruby_version = '~> 3.3.6'
+  spec.required_ruby_version = '~> 3.4.1'
 
   spec.add_dependency 'activesupport', '~> 8.0'
   spec.add_dependency 'diff-lcs', '~> 1.5'

From 42821aee1b838eba39aa815d9497f038781d6853 Mon Sep 17 00:00:00 2001
From: Bas Hintemann <bas@feedbackfruits.com>
Date: Fri, 24 Jan 2025 16:08:12 +0100
Subject: [PATCH 2/2] Fix old syntax from inspect breaking tests

---
 lib/rich-text/op.rb | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/rich-text/op.rb b/lib/rich-text/op.rb
index 7992ff0..6b2b20e 100644
--- a/lib/rich-text/op.rb
+++ b/lib/rich-text/op.rb
@@ -135,7 +135,10 @@ def to_json(*args)
     #   RichText::Op.new(:insert, 'abc', { bold: true }).inspect(false) => 'insert="abc" {:bold=>true}'
     def inspect(wrap = true)
       str = "#{type}=#{value.inspect}"
-      str << " #{attributes.inspect}" if attributes?
+      if attributes?
+        formatted_attrs = attributes.map { |k,v| "#{k.inspect}=>#{v.inspect}" }.join(', ')
+        str << " {#{formatted_attrs}}"
+      end
       wrap ? "#<#{self.class.name} #{str}>" : str
     end