sorted_set 1.0.2 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 68fcb999cddaa00ed34e33a59b341765b591fcf9857cdc43e5bd19cca6bd492f
-  data.tar.gz: 8342e64136084cbe36b6d88dfec25109800ba84fdef461e0c01fac3d567852bf
+  metadata.gz: 17f8b2af487ef500475c4f5672b5ae6b9e1b721d9e3a2ce50a517a762c3849ef
+  data.tar.gz: 4357d24f7a29756be8be22825d1ba19425203e5612faf5c425e4e5726a569627
 SHA512:
-  metadata.gz: 0b12d809099ca51e91d911ec83584abd82bb4cb7c213ce7ce479936983d180c41e0ebad82ef20da120c952e7d37ea0537f1a33b460f886e8dd6e1c3d3a04731c
-  data.tar.gz: 53a543b11b7aabdececd3dec96ec7a8cc17bb85b6a451b60ca88b4c09488d31b4ca15a5e783ae4f0f0525eba9d0d1328162d9061be1c38963a13efd1b9b8964f
+  metadata.gz: 6b22b97acc84ea89d70f8bd769af3faabde25f25731d48518a7762d60e7175ac565fae626334d802488fd65c5eef39b3f3a08618c85397a15f23c902570d2b1f
+  data.tar.gz: f682ed1e5ec304f3c8d94dc85053d1b9b29f54e67c4abb68b98f405dc34f606fd1e6a5697825e191a31403974b66a70587d81fa8412f27154fd67c271b3b2045

data/.github/workflows/test.yml

@@ -7,13 +7,13 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        ruby: [ 2.7, head, jruby ]
+        ruby: [ '2.7', '3.4', '4.0', head, jruby, jruby-head ]
         os: [ ubuntu ]
 
     name: >-
       ${{matrix.os}}-ruby-${{matrix.ruby}}
     runs-on: ${{matrix.os}}-latest
-    continue-on-error: ${{matrix.ruby == 'head'}}
+    continue-on-error: ${{matrix.ruby == 'head' || matrix.ruby == 'jruby-head'}}
 
     steps:
       - name: Check out

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # SortedSet Changelog
 
+## 1.1.0 (2026-03-05)
+
+* Enhancements
+  * Support Ruby 4.0, where Set is a built-in C class that no longer uses `@hash`.  SortedSet now overrides primitive methods and relies on `Set::SubclassCompatible` for composite operations.
+  * Support JRuby with Ruby 4.0 compatibility, using `java.util.TreeSet` as the backing store instead of rbtree.
+  * Remove the runtime dependency on the set gem, which is part of the standard library or built-in across all supported Ruby versions.
+
+## 1.0.3 (2021-02-13)
+
+* Enhancements
+  * Switch back to the original [rbtree](https://rubygems.org/gems/rbtree) gem, which added support for Ruby >=3.0.
+
 ## 1.0.2 (2020-12-24)
 
 * Enhancements

data/Gemfile

@@ -3,6 +3,5 @@ source "https://rubygems.org"
 # Specify your gem's dependencies in sorted_set.gemspec
 gemspec
 
-gem "rake", "~> 12.0"
-gem "minitest", "~> 5.0"
+gem "rake"
 gem "test-unit"

data/lib/sorted_set/jruby.rb

@@ -0,0 +1,93 @@
+# JRuby with Ruby >= 4.0 compat: Set is a built-in class and SortedSet
+# has been removed.  Subclassing Set auto-includes
+# Set::SubclassCompatible.  We use java.util.TreeSet as the backing
+# store instead of RBTree (a C extension unavailable on JRuby).
+
+require 'java'
+
+class SortedSet
+  def initialize(enum = nil, &block)
+    @tree = java.util.TreeSet.new
+    super
+  end
+
+  def add(o)
+    check_frozen
+    @tree.add(o)
+    self
+  end
+  alias << add
+
+  def delete(o)
+    check_frozen
+    @tree.remove(o)
+    self
+  end
+
+  def include?(o)
+    @tree.contains(o)
+  end
+  alias member? include?
+
+  def each(&block)
+    block or return enum_for(__method__) { size }
+    @tree.each(&block)
+    self
+  end
+
+  def size
+    @tree.size
+  end
+  alias length size
+
+  def empty?
+    @tree.is_empty
+  end
+
+  def clear
+    check_frozen
+    @tree.clear
+    self
+  end
+
+  def replace(enum)
+    check_frozen
+    if enum.instance_of?(self.class)
+      @tree = enum.instance_variable_get(:@tree).dup
+    else
+      @tree.clear
+      merge(enum)
+    end
+    self
+  end
+
+  def to_a
+    @tree.to_a
+  end
+
+  def hash
+    @tree.to_a.hash
+  end
+
+  def freeze
+    super
+  end
+
+  def initialize_dup(orig)
+    super
+    @tree = orig.instance_variable_get(:@tree).dup
+  end
+
+  def initialize_clone(orig, freeze: nil)
+    super
+    @tree = orig.instance_variable_get(:@tree).dup
+  end
+
+  private
+
+  # Java objects do not honor Ruby's freeze semantics, so we must
+  # guard mutation methods ourselves.
+  def check_frozen
+    raise FrozenError, "can't modify frozen #{self.class}: #{inspect}" if frozen?
+  end
+end

data/lib/sorted_set/ruby3.rb

@@ -0,0 +1,9 @@
+# Ruby < 4.0: Set uses @hash internally.  Replacing it with an
+# RBTree gives us sorted iteration for free.
+
+class SortedSet
+  def initialize(*args)
+    @hash = RBTree.new
+    super
+  end
+end

data/lib/sorted_set/ruby4.rb

@@ -0,0 +1,81 @@
+# Ruby >= 4.0: Set is a built-in class backed by C code and no longer
+# uses @hash.  Subclassing Set automatically includes
+# Set::SubclassCompatible, which delegates composite operations to
+# primitive methods.  We override those primitives to use RBTree.
+
+class SortedSet
+  def initialize(enum = nil, &block)
+    @tree = RBTree.new
+    super
+  end
+
+  def add(o)
+    @tree[o] = true
+    self
+  end
+  alias << add
+
+  def delete(o)
+    @tree.delete(o)
+    self
+  end
+
+  def include?(o)
+    @tree.has_key?(o)
+  end
+  alias member? include?
+
+  def each(&block)
+    block or return enum_for(__method__) { size }
+    @tree.each_key(&block)
+    self
+  end
+
+  def size
+    @tree.size
+  end
+  alias length size
+
+  def empty?
+    @tree.empty?
+  end
+
+  def clear
+    @tree.clear
+    self
+  end
+
+  def replace(enum)
+    if enum.instance_of?(self.class)
+      @tree = enum.instance_variable_get(:@tree).dup
+    else
+      clear
+      merge(enum)
+    end
+    self
+  end
+
+  def to_a
+    @tree.keys
+  end
+
+  def hash
+    @tree.keys.hash
+  end
+
+  def freeze
+    @tree.freeze
+    super
+  end
+
+  def initialize_dup(orig)
+    super
+    @tree = orig.instance_variable_get(:@tree).dup
+  end
+
+  def initialize_clone(orig, freeze: nil)
+    super
+    # When freeze is nil, clone preserves the frozen state of orig.
+    @tree = orig.instance_variable_get(:@tree).clone(freeze: freeze.nil? ? orig.frozen? : freeze)
+  end
+end

data/lib/sorted_set.rb

@@ -2,9 +2,12 @@
 
 require 'set'
 
-return if defined?(JRUBY_VERSION)
-
-require 'rbtree'
+if defined?(JRUBY_VERSION)
+  # JRuby has a built-in SortedSet (at least through JRuby 10).
+  return if defined?(::SortedSet)
+else
+  require 'rbtree'
+end
 
 Object.instance_exec do
   # Undefine SortedSet for two reasons.
@@ -49,9 +52,12 @@ end
 # ```
 
 class SortedSet < Set
-  # Creates a SortedSet.  See Set.new for details.
-  def initialize(*args)
-    @hash = RBTree.new
-    super
-  end
+end
+
+if defined?(JRUBY_VERSION)
+  require_relative 'sorted_set/jruby'
+elsif defined?(Set::CoreSet)
+  require_relative 'sorted_set/ruby4'
+else
+  require_relative 'sorted_set/ruby3'
 end

data/sorted_set.gemspec

@@ -1,6 +1,6 @@
 Gem::Specification.new do |spec|
   spec.name          = "sorted_set"
-  spec.version       = "1.0.2"
+  spec.version       = "1.1.0"
   spec.authors       = ["Akinori MUSHA"]
   spec.email         = ["knu@idaemons.org"]
 
@@ -26,7 +26,6 @@ Gem::Specification.new do |spec|
   if defined?(JRUBY_VERSION)
     spec.platform = "java"
   else
-    spec.add_runtime_dependency "set", "~> 1.0"
-    spec.add_runtime_dependency "rbtree3"
+    spec.add_runtime_dependency "rbtree"
   end
 end

metadata

@@ -1,31 +1,16 @@
 --- !ruby/object:Gem::Specification
 name: sorted_set
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.1.0
 platform: ruby
 authors:
 - Akinori MUSHA
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2020-12-23 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
-  name: set
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.0'
-- !ruby/object:Gem::Dependency
-  name: rbtree3
+  name: rbtree
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -55,6 +40,9 @@ files:
 - bin/console
 - bin/setup
 - lib/sorted_set.rb
+- lib/sorted_set/jruby.rb
+- lib/sorted_set/ruby3.rb
+- lib/sorted_set/ruby4.rb
 - sorted_set.gemspec
 homepage: https://github.com/knu/sorted_set
 licenses:
@@ -62,8 +50,7 @@ licenses:
 metadata:
   homepage_uri: https://github.com/knu/sorted_set
   source_code_uri: https://github.com/knu/sorted_set
-  changelog_uri: https://github.com/knu/sorted_set/blob/v1.0.2/CHANGELOG.md
-post_install_message:
+  changelog_uri: https://github.com/knu/sorted_set/blob/v1.1.0/CHANGELOG.md
 rdoc_options: []
 require_paths:
 - lib
@@ -78,8 +65,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.1
-signing_key:
+rubygems_version: 4.0.5
 specification_version: 4
 summary: Implements a variant of Set whose elements are sorted in ascending order
 test_files: []