rbtree-ruby 0.3.0 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 28594e663eac8519467b09c0756a032b2ef887d69df9e9335d1d79c36744a134
-  data.tar.gz: 492d6896dd4a0644ecc8ad721214afe2827daf3acbde38dce938e6da54cac87f
+  metadata.gz: df8aaee3fedf309a0079082fa38c10e3748bc68873131800e13f30dee1202273
+  data.tar.gz: 5e6dd162b0ebb1b50929d9127c4ac57598c7391ecf63a7d1dca7e42107d4ca3a
 SHA512:
-  metadata.gz: 3aeeca5b0d3de1a8826fac660dc6b201c046cb193328ba75bcd20f679f682fbf65479179fcddebe63920522eaa9ede28a9f8a784c76387e86530105a7378c8cd
-  data.tar.gz: 1e960a2132c1c3bc8988e233ebfb249f121900ac6eabbbcce0aa86186ceb24caa3224d4e7ebb8ad2acda5b927976ec0d5a0437ec20ad5fe2162eda841d15f909
+  metadata.gz: c1df7b56cad01d4a0725668f415510a3e65fd6409a0271143504ec1223d64a7e395a93a1dbd43881ceb75e5a36ea9328f60e86e95cdfcde653ab075fab81cb7b
+  data.tar.gz: cecad1db1c9fba3eb4c91b20493dc849cfbf70f8d2e1fede1c09e8b22d59d925e724e26788e06627a02b620de42c655afef4a8be51d31fdeaff5fa5158a2d192

data/CHANGELOG.md

@@ -5,9 +5,16 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.3.1] - 2026-01-15
+
+### Added
+- **`to_h`**: Added `to_h` method to `RBTree` and `MultiRBTree` for efficient conversion to Hash.
+- **`merge!`**: Added `merge!` method to `RBTree` and `MultiRBTree`.
+  - `RBTree#merge!`: Supports `overwrite` option (default: `true`). Raises `ArgumentError` if merging a `MultiRBTree` (incompatible value structures).
+  - `MultiRBTree#merge!`: Always appends values from the source.
+
 ## [0.3.0] - 2026-01-15
 
-### Changed
 ### API Changes (Method Renaming & Deprecation)
 > [!WARNING]
 > The public API has been refactored to improve consistency. The following methods have been renamed.

data/README.ja.md

@@ -174,6 +174,25 @@ tree.lt(3).first                   # => [1, "one"] (遅延評価、配列は作
 tree.gt(0).lazy.take(2).to_a  # => [[1, "one"], [2, "two"]] (最初の2件のみ計算)
 ```
 
+### 変換と結合
+
+標準のRubyオブジェクトへの変換や、他のコレクションとの結合も簡単です:
+
+```ruby
+tree = RBTree.new({1 => 'one', 2 => 'two'})
+
+# 配列への変換（Enumerable経由）
+tree.to_a  # => [[1, "one"], [2, "two"]]
+
+# ハッシュへの変換
+tree.to_h  # => {1 => "one", 2 => "two"}
+
+# 他のツリー、ハッシュ、またはEnumerableの結合
+other = {3 => 'three'}
+tree.merge!(other)
+tree.size  # => 3
+```
+
 ### MultiRBTree 値配列アクセス
 
 複数の値を持つキーで、どの値にアクセスするか選択:

data/README.md

@@ -174,6 +174,25 @@ tree.lt(3).first                   # => [1, "one"] (lazy, no array created)
 tree.gt(0).lazy.take(2).to_a  # => [[1, "one"], [2, "two"]] (only computes first 2)
 ```
 
+### Conversion and Merging
+
+Seamlessly convert to standard Ruby objects or merge other collections:
+
+```ruby
+tree = RBTree.new({1 => 'one', 2 => 'two'})
+
+# Convert to Array (via Enumerable)
+tree.to_a  # => [[1, "one"], [2, "two"]]
+
+# Convert to Hash
+tree.to_h  # => {1 => "one", 2 => "two"}
+
+# Merge another tree, hash, or enumerable
+other = {3 => 'three'}
+tree.merge!(other)
+tree.size  # => 3
+```
+
 ### MultiRBTree Value Array Access
 
 For keys with multiple values, choose which value to access:

data/lib/rbtree/version.rb

@@ -2,5 +2,5 @@
 
 class RBTree
   # The version of the rbtree-ruby gem
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/lib/rbtree.rb

@@ -107,6 +107,11 @@ class RBTree
     end
   end
 
+  # Returns a Hash containing all key-value pairs from the tree.
+  #
+  # @return [Hash] a new Hash with the tree's contents
+  def to_h = @hash_index.transform_values(&:value)
+
   # Checks if the tree is empty.
   #
   # @return [Boolean] true if the tree contains no elements, false otherwise
@@ -335,6 +340,19 @@ class RBTree
     end
   end
   alias :[]= :insert
+  
+  # Merges the contents of another tree, hash, or enumerable into this tree.
+  #
+  # @param other [RBTree, Hash, Enumerable] the source to merge from
+  # @param overwrite [Boolean] whether to overwrite existing keys (default: true)
+  # @return [RBTree] self
+  def merge!(other, overwrite: true)
+    if defined?(MultiRBTree) && other.is_a?(MultiRBTree)
+      raise ArgumentError, "Cannot merge MultiRBTree into RBTree"
+    end
+    insert(other, overwrite: overwrite)
+    self
+  end
 
   # Deletes the key-value pair with the specified key.
   #
@@ -1548,61 +1566,15 @@ class MultiRBTree < RBTree
   #   tree.succ(4)   # => [5, "five"]
   def succ(key, last: false) = (pair = super(key)) && [pair[0], pair[1].send(last ? :last : :first)]
 
-  # Inserts a value for the given key.
+  # Merges the contents of another tree, hash, or enumerable into this tree.
   #
-  # If the key already exists, the value is appended to its list.
-  # If the key doesn't exist, a new node is created.
+  # Appends values from the other source to the existing values for each key.
   #
-  # @param key [Object] the key (must implement <=>)
-  # @param value [Object] the value to insert
-  # @param overwrite [Boolean] ignored for MultiRBTree which always appends
-  # @return [Boolean] always returns true
-  # @example
-  #   tree = MultiRBTree.new
-  #   tree.insert(1, 'first')
-  #   tree.insert(1, 'second')  # adds another value for key 1
-  def insert_entry(key, value, **)
-    if (node = @hash_index[key])
-      node.value << value
-      @value_count += 1
-      return true
-    end
-    y = @nil_node
-    x = @root
-    while x != @nil_node
-      y = x
-      cmp = key <=> x.key
-      if cmp == 0
-        x.value << value
-        @value_count += 1
-        return true
-      elsif cmp < 0
-        x = x.left
-      else
-        x = x.right
-      end
-    end
-    z = allocate_node(key, [value], Node::RED, @nil_node, @nil_node, @nil_node)
-    z.parent = y
-    if y == @nil_node
-      @root = z
-    elsif (key <=> y.key) < 0
-      y.left = z
-    else
-      y.right = z
-    end
-    z.left = @nil_node
-    z.right = @nil_node
-    z.color = Node::RED
-    insert_fixup(z)
-    @value_count += 1
-    
-    if @min_node == @nil_node || (key <=> @min_node.key) < 0
-      @min_node = z
-    end
-    
-    @hash_index[key] = z  # Add to hash index
-    true
+  # @param other [RBTree, Hash, Enumerable] the source to merge from
+  # @return [MultiRBTree] self
+  def merge!(other)
+    insert(other)
+    self
   end
 
   # Deletes a single value for the specified key.
@@ -1692,6 +1664,63 @@ class MultiRBTree < RBTree
   # @!visibility private
   private
 
+  # Inserts a value for the given key.
+  #
+  # If the key already exists, the value is appended to its list.
+  # If the key doesn't exist, a new node is created.
+  #
+  # @param key [Object] the key (must implement <=>)
+  # @param value [Object] the value to insert
+  # @param overwrite [Boolean] ignored for MultiRBTree which always appends
+  # @return [Boolean] always returns true
+  # @example
+  #   tree = MultiRBTree.new
+  #   tree.insert(1, 'first')
+  #   tree.insert(1, 'second')  # adds another value for key 1
+  def insert_entry(key, value, **)
+    if (node = @hash_index[key])
+      node.value << value
+      @value_count += 1
+      return true
+    end
+    y = @nil_node
+    x = @root
+    while x != @nil_node
+      y = x
+      cmp = key <=> x.key
+      if cmp == 0
+        x.value << value
+        @value_count += 1
+        return true
+      elsif cmp < 0
+        x = x.left
+      else
+        x = x.right
+      end
+    end
+    z = allocate_node(key, [value], Node::RED, @nil_node, @nil_node, @nil_node)
+    z.parent = y
+    if y == @nil_node
+      @root = z
+    elsif (key <=> y.key) < 0
+      y.left = z
+    else
+      y.right = z
+    end
+    z.left = @nil_node
+    z.right = @nil_node
+    z.color = Node::RED
+    insert_fixup(z)
+    @value_count += 1
+    
+    if @min_node == @nil_node || (key <=> @min_node.key) < 0
+      @min_node = z
+    end
+    
+    @hash_index[key] = z  # Add to hash index
+    true
+  end
+
   # Traverses the tree in ascending order, yielding each key-value pair.
   #
   # @param range [Range] the range of keys to traverse

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rbtree-ruby
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
 platform: ruby
 authors:
 - Masahito Suzuki
@@ -25,7 +25,6 @@ files:
 - README.ja.md
 - README.md
 - Rakefile
-- lib/rbtree.old.rb
 - lib/rbtree.rb
 - lib/rbtree/version.rb
 - rbtree-ruby.gemspec