set 1.1.0 → 1.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cef560e603f6d6413751c31bb94fddf3838a66af8e71cff73c74760ff479ff6a
-  data.tar.gz: 448e22e93eebe57b26200fc1c8be476d60494193136aabb09a50c68e878e96cf
+  metadata.gz: c589eb5330bd847b4d8c3dc01648971ccfba64b7c7e44bdf6fd8e982c7f8f1b2
+  data.tar.gz: 2c592861e01df2d0e3eab083c808694e01f9edaa649c593dcde4db29acbbc28b
 SHA512:
-  metadata.gz: 91fa3052d7f25eaf6c0066013a5bd2d0c58961fe330c8923853634bac908ae83323d01b26ec8f85c4ab1ae309a83cc8e30e0918802ebb6f96fc3fcb7b7bdd433
-  data.tar.gz: 07b57081279057d476e1fe7c07587db1de0243cb78d36bc04b5b3ed303643b54320f08e98ed3672e610df84c42f0d503c7fae7eba040d2cf260c84319e7f9745
+  metadata.gz: 9d9472b2ab8509ec1772d0c935ae0fc8bfa0df5a6ffd263cefc65b39e24a430aab43863d55393b95df61d83a6dea9943f2a50d1dfa6bafc7b0b672d66f3c4a4b
+  data.tar.gz: 11b76695b6ac8d0a362c350c7a6575c04ff72159fa9fcb6a4277fc5a9a7437a986cc4f9dcb0c728f500c6e68e6e5e09ed016cd9dbf0ab629d6e10bcddc4b8b37

data/.github/workflows/test.yml

@@ -3,11 +3,18 @@ name: test
 on: [push, pull_request]
 
 jobs:
+  ruby-versions:
+    uses: ruby/actions/.github/workflows/ruby_versions.yml@master
+    with:
+      engine: cruby
+      min_version: 3.0
+
   build:
+    needs: ruby-versions
     name: build (${{ matrix.ruby }} / ${{ matrix.os }})
     strategy:
       matrix:
-        ruby: [ 3.2, 3.1, "3.0", head ]
+        ruby: ${{ fromJson(needs.ruby-versions.outputs.versions) }}
         os: [ ubuntu-latest, macos-latest ]
     runs-on: ${{ matrix.os }}
     steps:

data/CHANGELOG.md

@@ -1,5 +1,11 @@
 # Set Changelog
 
+# 1.1.1 (2024-11-29)
+
+* Enhancements
+  * Fix Set#^ to respect subclasses [#38][] ([@kyanagi][])
+  * Speed up Set#flatten [#39][] ([@kyanagi][])
+
 # 1.1.0 (2023-12-23)
 
 * Optimize for and require Ruby >=3
@@ -48,6 +54,8 @@ This is the first release of set as a gem.  Here lists the changes since the ver
 [#20]: https://github.com/ruby/set/pull/20
 [#29]: https://github.com/ruby/set/pull/29
 [#30]: https://github.com/ruby/set/pull/30
+[#38]: https://github.com/ruby/set/pull/38
+[#39]: https://github.com/ruby/set/pull/39
 [Feature #17838]: https://bugs.ruby-lang.org/issues/17838
 [Feature #16989]: https://bugs.ruby-lang.org/issues/16989
 
@@ -56,4 +64,5 @@ This is the first release of set as a gem.  Here lists the changes since the ver
 [@jeremyevans]: https://github.com/jeremyevans
 [@k-tsj]: https://github.com/k-tsj
 [@knu]: https://github.com/knu
+[@kyanagi]: https://github.com/kyanagi
 [@marcandre]: https://github.com/marcandre

data/LICENSE.txt

@@ -1,4 +1,4 @@
-Copyright (c) 2002-2020 Akinori MUSHA
+Copyright (c) 2002-2024 Akinori MUSHA
 
 All rights reserved.
 

data/lib/set.rb

@@ -3,7 +3,7 @@
 #
 # set.rb - defines the Set class
 #
-# Copyright (c) 2002-2023 Akinori MUSHA <knu@iDaemons.org>
+# Copyright (c) 2002-2024 Akinori MUSHA <knu@iDaemons.org>
 #
 # Documentation by Akinori MUSHA and Gavin Sinclair.
 #
@@ -216,7 +216,7 @@
 #   has been modified while an element in the set.
 #
 class Set
-  VERSION = "1.1.0"
+  VERSION = "1.1.1"
 
   include Enumerable
 
@@ -335,7 +335,7 @@ class Set
     end
   end
 
-  # Converts the set to an array.  The order of elements is uncertain.
+  # Returns an array containing all elements in the set.
   #
   #     Set[1, 2].to_a                    #=> [1, 2]
   #     Set[1, 'c', :s].to_a              #=> [1, "c", :s]
@@ -353,16 +353,19 @@ class Set
     klass.new(self, *args, &block)
   end
 
-  def flatten_merge(set, seen = Set.new) # :nodoc:
+  def flatten_merge(set, seen = {}) # :nodoc:
     set.each { |e|
       if e.is_a?(Set)
-        if seen.include?(e_id = e.object_id)
+        case seen[e_id = e.object_id]
+        when true
           raise ArgumentError, "tried to flatten recursive Set"
+        when false
+          next
         end
 
-        seen.add(e_id)
+        seen[e_id] = true
         flatten_merge(e, seen)
-        seen.delete(e_id)
+        seen[e_id] = false
       else
         add(e)
       end
@@ -540,22 +543,22 @@ class Set
   # Deletes every element of the set for which block evaluates to
   # true, and returns self. Returns an enumerator if no block is
   # given.
-  def delete_if
+  def delete_if(&block)
     block_given? or return enum_for(__method__) { size }
-    # @hash.delete_if should be faster, but using it breaks the order
-    # of enumeration in subclasses.
-    select { |o| yield o }.each { |o| @hash.delete(o) }
+    # Instead of directly using @hash.delete_if, perform enumeration
+    # using self.each that subclasses may override.
+    select(&block).each { |o| @hash.delete(o) }
     self
   end
 
   # Deletes every element of the set for which block evaluates to
   # false, and returns self. Returns an enumerator if no block is
   # given.
-  def keep_if
+  def keep_if(&block)
     block_given? or return enum_for(__method__) { size }
-    # @hash.keep_if should be faster, but using it breaks the order of
-    # enumeration in subclasses.
-    reject { |o| yield o }.each { |o| @hash.delete(o) }
+    # Instead of directly using @hash.keep_if, perform enumeration
+    # using self.each that subclasses may override.
+    reject(&block).each { |o| @hash.delete(o) }
     self
   end
 
@@ -659,7 +662,7 @@ class Set
   #     Set[1, 2] ^ Set[2, 3]                   #=> #<Set: {3, 1}>
   #     Set[1, 'b', 'c'] ^ ['b', 'd']           #=> #<Set: {"d", 1, "c"}>
   def ^(enum)
-    n = Set.new(enum)
+    n = self.class.new(enum)
     each { |o| n.add(o) unless n.delete?(o) }
     n
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: set
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.1.1
 platform: ruby
 authors:
 - Akinori MUSHA
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-12-23 00:00:00.000000000 Z
+date: 2024-11-29 00:00:00.000000000 Z
 dependencies: []
 description: Provides a class to deal with collections of unordered, unique values
 email:
@@ -38,8 +38,8 @@ licenses:
 metadata:
   homepage_uri: https://github.com/ruby/set
   source_code_uri: https://github.com/ruby/set
-  changelog_uri: https://github.com/ruby/set/blob/v1.1.0/CHANGELOG.md
-post_install_message: 
+  changelog_uri: https://github.com/ruby/set/blob/v1.1.1/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -54,8 +54,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.10
-signing_key: 
+rubygems_version: 3.5.23
+signing_key:
 specification_version: 4
 summary: Provides a class to deal with collections of unordered, unique values
 test_files: []