persistent-dmnd 2.0.6 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5cd01e1f2ee6015265d1acbf6c39650d57550dba82e53c11fe2a0d4d3f91cf5a
-  data.tar.gz: bd0fa4583bfdb2918433219b470ca92257694a34fa0e7291fa19d98fc6c2a6ad
+  metadata.gz: f0960914486fd0d32657f0a2ac0bc39fac7939e6334a6fccddc0276643dc9872
+  data.tar.gz: beffd955c885fc84848b3ae6e712290773c62d1a7f88d852c78d26ddbe8f69ad
 SHA512:
-  metadata.gz: 0caf98c7fc4d381d6d0262063fb50ec899fa42e047aa7baf13eaf761440940fc8dfe995d3a1045ba8b06608d0039b5e58c7c465af080b3e7f219f3f94662f70c
-  data.tar.gz: d37814ecc14f80ad39e3bcbfd73f8b714b5da823614b6a26ff0e580db1299bc7ea591bd651aaafedd3db4bc019ceca00d2f2161446865d259aed06dcb1ddf84e
+  metadata.gz: 897d9bfc154865911c0be282ce3bb2cc19161b265e0c7244e39c52db5c1b40a92b188122233117404e636ef562509627366aabbbf54b8a55e206dccd8979d88f
+  data.tar.gz: 25aa9be4e63456038a288d6d6155c63306714102516d143d6f393a442778d164e01bc2ce8c40028de96eb919cf551f847d307cf8f893c3189207d745b47d4ef2

data/.gitlab-ci.yml

@@ -1,125 +1,3 @@
-# MRI Ruby version list:
-# https://hub.docker.com/r/library/ruby/tags/
-
-testruby_1_9_3:
-  image: "ruby:1.9.3"
-
-  cache:                                        # Cache gems in between builds
-    paths:
-      - vendor/ruby
-
-  before_script:
-    - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA8E81B4331F7F50 7638D0442B90D010 8B48AD6246925553
-    - echo "deb [trusted=yes] http://archive.debian.org/debian/ jessie main contrib non-free" | tee /etc/apt/sources.list
-    - apt-get update                            # Add UTF-8 support
-    - apt-get install -y locales >/dev/null     # |
-    - echo "en_US UTF-8" > /etc/locale.gen      # |
-    - locale-gen en_US.UTF-8                    # |
-    - export LANG=en_US.UTF-8                   # |
-    - export LANGUAGE=en_US:en                  # |
-    - export LC_ALL=en_US.UTF-8                 # v
-    - ruby -v                                   # Print out ruby version for debugging
-    - gem install bundler -v '< 2'              # Bundler is not installed with the image
-    - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
-
-  script:
-    - bin/rspec
-
-testruby_2_0:
-  image: "ruby:2.0"
-
-  cache:                                        # Cache gems in between builds
-    paths:
-      - vendor/ruby
-
-  before_script:
-    - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA8E81B4331F7F50 7638D0442B90D010 8B48AD6246925553
-    - echo "deb [trusted=yes] http://archive.debian.org/debian/ jessie main contrib non-free" | tee /etc/apt/sources.list
-    - apt-get update                            # Add UTF-8 support
-    - apt-get install -y locales >/dev/null     # |
-    - echo "en_US UTF-8" > /etc/locale.gen      # |
-    - locale-gen en_US.UTF-8                    # |
-    - export LANG=en_US.UTF-8                   # |
-    - export LANGUAGE=en_US:en                  # |
-    - export LC_ALL=en_US.UTF-8                 # v
-    - ruby -v                                   # Print out ruby version for debugging
-    - gem install bundler:'< 2'                 # Bundler is not installed with the image
-    - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
-
-  script:
-    - bin/rspec
-
-testruby_2_1:
-  image: "ruby:2.1"
-
-  cache:                                        # Cache gems in between builds
-    paths:
-      - vendor/ruby
-
-  before_script:
-    - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA8E81B4331F7F50 7638D0442B90D010 8B48AD6246925553
-    - echo "deb [trusted=yes] http://archive.debian.org/debian/ jessie main contrib non-free" | tee /etc/apt/sources.list
-    - apt-get update                            # Add UTF-8 support
-    - apt-get install -y locales >/dev/null     # |
-    - echo "en_US UTF-8" > /etc/locale.gen      # |
-    - locale-gen en_US.UTF-8                    # |
-    - export LANG=en_US.UTF-8                   # |
-    - export LANGUAGE=en_US:en                  # |
-    - export LC_ALL=en_US.UTF-8                 # v
-    - ruby -v                                   # Print out ruby version for debugging
-    - gem install bundler:'< 2'                 # Bundler is not installed with the image
-    - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
-
-  script:
-    - bin/rspec
-
-testruby_2_2:
-  image: "ruby:2.2"
-
-  cache:                                        # Cache gems in between builds
-    paths:
-      - vendor/ruby
-
-  before_script:
-    - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA8E81B4331F7F50 7638D0442B90D010 8B48AD6246925553
-    - echo "deb [trusted=yes] http://archive.debian.org/debian/ jessie main contrib non-free" | tee /etc/apt/sources.list
-    - apt-get update                            # Add UTF-8 support
-    - apt-get install -y locales >/dev/null     # |
-    - echo "en_US UTF-8" > /etc/locale.gen      # |
-    - locale-gen en_US.UTF-8                    # |
-    - export LANG=en_US.UTF-8                   # |
-    - export LANGUAGE=en_US:en                  # |
-    - export LC_ALL=en_US.UTF-8                 # v
-    - ruby -v                                   # Print out ruby version for debugging
-    - gem install bundler:'< 2'                 # Bundler is not installed with the image
-    - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
-
-  script:
-    - bin/rspec
-
-testruby_2_3:
-  image: "ruby:2.3"
-
-  cache:                                        # Cache gems in between builds
-    paths:
-      - vendor/ruby
-
-  before_script:
-    - echo "deb [trusted=yes] http://archive.debian.org/debian/ stretch main contrib non-free" | tee /etc/apt/sources.list
-    - apt-get update >/dev/null                 # Add UTF-8 support
-    - apt-get install -y locales >/dev/null     # |
-    - echo "en_US UTF-8" > /etc/locale.gen      # |
-    - locale-gen en_US.UTF-8                    # |
-    - export LANG=en_US.UTF-8                   # |
-    - export LANGUAGE=en_US:en                  # |
-    - export LC_ALL=en_US.UTF-8                 # v
-    - ruby -v                                   # Print out ruby version for debugging
-    - gem install bundler:'< 2'                 # Bundler is not installed with the image
-    - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
-
-  script:
-    - bin/rspec
-
 testruby_2_4:
   image: "ruby:2.4"
 
@@ -240,86 +118,6 @@ testruby_3_3:
   script:
     - bin/rspec
 
-testjruby_1_7:
-  image: "jruby:1.7"
-
-  cache:                                        # Cache gems in between builds
-    paths:
-      - vendor/ruby
-
-  before_script:
-    - echo "deb [trusted=yes] http://archive.debian.org/debian/ stretch main contrib non-free" | tee /etc/apt/sources.list
-    - apt-get update >/dev/null                 # Add UTF-8 support
-    - apt-get install -y locales >/dev/null     # |
-    - echo "en_US UTF-8" > /etc/locale.gen      # |
-    - locale-gen en_US.UTF-8                    # |
-    - export LANG=en_US.UTF-8                   # |
-    - export LANGUAGE=en_US:en                  # |
-    - export LC_ALL=en_US.UTF-8                 # v
-    - apt-get install -y git >/dev/null         # Add git binary
-    - export JRUBY_OPTS=--dev                   # Faster test runs
-    - ruby -v                                   # Print out ruby version for debugging
-    - gem install bundler:'< 2'                 # Bundler is not installed with the image
-    - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
-
-  script:
-    - bin/rspec
-
-testjruby_9_0:
-  image: "jruby:9.0"
-
-  cache:                                        # Cache gems in between builds
-    paths:
-      - vendor/ruby
-
-  before_script:
-    - rm /etc/apt/sources.list.d/jessie-backports.list
-    - apt-key adv --keyserver keyserver.ubuntu.com --recv-keys AA8E81B4331F7F50 7638D0442B90D010 8B48AD6246925553
-    - echo "deb [trusted=yes] http://archive.debian.org/debian/ jessie main contrib non-free" | tee /etc/apt/sources.list
-    - apt-get update                            # Add UTF-8 support
-    - apt-get install -y locales >/dev/null     # |
-    - echo "en_US UTF-8" > /etc/locale.gen      # |
-    - locale-gen en_US.UTF-8                    # |
-    - export LANG=en_US.UTF-8                   # |
-    - export LANGUAGE=en_US:en                  # |
-    - export LC_ALL=en_US.UTF-8                 # v
-    - apt-get install -y git >/dev/null         # Add git binary
-    - export JRUBY_OPTS=--dev                   # Faster test runs
-    - ruby -v                                   # Print out ruby version for debugging
-    - wget https://rubygems.org/downloads/jruby-openssl-0.9.21-java.gem # Needed to support newer ciphers when connecting to rubygems.org (otherwise gem downloads fail)
-    - gem install jruby-openssl-0.9.21-java.gem                         # Install the newer gem
-    - gem uninstall -x -i /opt/jruby/lib/ruby/gems/shared bundler # Remove any pre-existing bundler
-    - gem install bundler:'< 2'                 # Install latest bundler 1.x
-    - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
-
-  script:
-    - bin/rspec
-
-testjruby_9_1:
-  image: "jruby:9.1"
-
-  cache:                                        # Cache gems in between builds
-    paths:
-      - vendor/ruby
-
-  before_script:
-    - apt-get update >/dev/null                 # Add UTF-8 support
-    - apt-get install -y locales >/dev/null     # |
-    - echo "en_US UTF-8" > /etc/locale.gen      # |
-    - locale-gen en_US.UTF-8                    # |
-    - export LANG=en_US.UTF-8                   # |
-    - export LANGUAGE=en_US:en                  # |
-    - export LC_ALL=en_US.UTF-8                 # v
-    - apt-get install -y git >/dev/null         # Add git binary
-    - export JRUBY_OPTS=--dev                   # Faster test runs
-    - ruby -v                                   # Print out ruby version for debugging
-    - gem uninstall -x -i /opt/jruby/lib/ruby/gems/shared bundler # Remove any pre-existing bundler
-    - gem install bundler:'< 2'                 # Bundler is not installed with the image
-    - bundle install -j $(nproc) --path vendor  # Install dependencies into ./vendor/ruby
-
-  script:
-    - bin/rspec
-
 # This is not repeated from the 9.2 below! 9.2.0.0 is a very specific version with a bug in the Set interoperability so
 # we'll want to check that our workaround is working with this one even after the 9.2 branch moves on.
 testjruby9_2_0_0:

data/.standard.yml

@@ -1,4 +1,4 @@
 # For available configuration options, see:
 #   https://github.com/testdouble/standard
 fix: true
-ruby_version: 1.9
+ruby_version: 2.4

data/README.adoc

@@ -94,10 +94,10 @@ Beyond being immutable, these data structures are thread-safe, and can be effici
 
 It also (_optionally!_) interoperates with the https://github.com/ruby-concurrency/concurrent-ruby[concurrent-ruby gem], for when you need that extra Oomph (or just thread-safe mutability). See <<concurrent-ruby-interoperability,below>> for more details.
 
-Underneath the covers, persistent-💎 mostly builds atop the awesome https://github.com/hamstergem/hamster[hamster gem].
+Underneath the covers, persistent-💎 mostly builds atop the awesome https://github.com/immutable-ruby/immutable-ruby[immutable-ruby gem].
 Big thanks to its equally-awesome authors!
 
-Persistent-💎 is fully supported and tested on Ruby versions 1.9.3 to 3.3, JRuby 1.7 to 9.4, and TruffleRuby 🎉.
+Persistent-💎 is fully supported and tested on Ruby versions 2.4 to 3.3, JRuby 9.2 to 9.4, and TruffleRuby 🎉.
 If we don't support your Ruby, it's probably a Python binary instead (or a potato?).
 Keep calm and 💎 away!
 
@@ -258,11 +258,11 @@ my_set = Set.new([:regular, :ruby, :set])
 => Persistent💎::Set[:regular, :ruby, :set]
 ----
 
-And it works for https://github.com/hamstergem/hamster[hamster gem] (`Hamster::Vector`, `Hamster::Hash`, `Hamster::Set`) and https://github.com/ruby-concurrency/concurrent-ruby[concurrent-ruby gem] (`Concurrent::Array`, `Concurrent::Tuple`, `Concurrent::Hash`, `Concurrent::Map`) data structures:
+And it works for https://github.com/hamstergem/hamster[hamster gem] (`Hamster::Vector`, `Hamster::Hash`, `Hamster::Set`), https://github.com/immutable-ruby/immutable-ruby[immutable-ruby gem] (`Immutable::Vector`, `Immutable::Hash`, `Immutable::Set`) and https://github.com/ruby-concurrency/concurrent-ruby[concurrent-ruby gem] (`Concurrent::Array`, `Concurrent::Tuple`, `Concurrent::Hash`, `Concurrent::Map`) data structures:
 
 [source,ruby]
 ----
-my_vector = Hamster::Vector[1, 2, 3]
+my_vector = Immutable::Vector[1, 2, 3]
 💎ify[my_vector]
 # => Persistent💎::Array[1, 2, 3]
 
@@ -275,7 +275,7 @@ my_tuple.set(0, :hello)
 💎ify[my_tuple]
 # => Persistent💎::Array[:hello]
 
-my_hash = Hamster::Hash[hello: :world]
+my_hash = Immutable::Hash[hello: :world]
 💎ify[my_hash]
 # => Persistent💎::Hash[:hello => :world]
 
@@ -288,7 +288,7 @@ my_map[:hello] = :world
 💎ify[my_map]
 # => Persistent💎::Hash[:hello => :world]
 
-my_set = Hamster::Set[:hello, :world]
+my_set = Immutable::Set[:hello, :world]
 💎ify[my_set]
 # => Persistent💎::Set[:hello, :world]
 ----
@@ -418,28 +418,28 @@ my_concurrent_map = my_hash.to_concurrent_map
 
 === API documentation for the persistent structures
 
-Because the persistent structures are provided by the awesome https://github.com/hamstergem/hamster[hamster gem], you can refer back to Hamster's API docs for details on the operations provided by each data structure.
+Because the persistent structures are provided by the awesome https://github.com/immutable-ruby/immutable-ruby[immutable-ruby gem], you can refer back to immutable-ruby's API docs for details on the operations provided by each data structure.
 
 ==== Array
 
-Built on top of `Hamster::Vector`
+Built on top of `Immutable::Vector`
 
-* https://github.com/hamstergem/hamster#vector-api-documentation[Example usage]
-* http://rubydoc.info/github/hamstergem/hamster/master/Hamster/Vector[API docs]
+* https://github.com/immutable-ruby/immutable-ruby#vector-api-documentation[Example usage]
+* https://rubydoc.info/github/immutable-ruby/immutable-ruby/master/Immutable/Vector[API docs]
 
 ==== Hash
 
-Built on top of `Hamster::Hash`
+Built on top of `Immutable::Hash`
 
-* https://github.com/hamstergem/hamster#hash-api-documentation[Example usage]
-* http://rubydoc.info/github/hamstergem/hamster/master/Hamster/Hash[API docs]
+* https://github.com/immutable-ruby/immutable-ruby#hash-api-documentation[Example usage]
+* http://rubydoc.info/github/immutable-ruby/immutable-ruby/master/Immutable/Hash[API docs]
 
 ==== Set
 
-Built on top of `Hamster::Set`
+Built on top of `Immutable::Set`
 
-* https://github.com/hamstergem/hamster#set-api-documentation[Example usage]
-* http://www.rubydoc.info/github/hamstergem/hamster/master/Hamster/Set[API docs]
+* https://github.com/immutable-ruby/immutable-ruby#set-api-documentation[Example usage]
+* http://rubydoc.info/github/immutable-ruby/immutable-ruby/master/Immutable/Set[API docs]
 
 == AAARGH YOU FIEND WHY IS THERE AN EMOJI ON MY CODEBASE?
 
@@ -504,6 +504,6 @@ Everyone interacting in the Persistent-💎 project’s codebases, issue tracker
 
 Interested in immutable/persistent data structures? Here are some interesting resources for your exploration:
 
-* https://github.com/hamstergem/hamster[hamster gem]
 * https://github.com/immutable-ruby/immutable-ruby[immmutable-ruby gem]
+* https://github.com/hamstergem/hamster[hamster gem]
 * https://gitlab.com/ivoanjo/persistent-dmnd/issues[Your suggestion here]

data/UPSTREAM_TODO.adoc

@@ -120,13 +120,3 @@ def <=>(other)
   self == other ? 0 : nil
 end
 ----
-
-=== Fix `Hash` comparison with Ruby hashes using `<`/`+++<=+++` breaks on Ruby 2.2 or older
-
-Because the default implementation of this methods is `other > self` or `other >= self`, this breaks on older rubies as Hash does not implement these methods.
-
-By relying supplying our own comparison code (similar to `>`/`>=`) we can workaround this.
-
-=== Fix unneeded complex comparison in `Hash#>`
-
-Instead of implementing it as `self != other && self >= other` and thus requiring twice the iterations/comparisons, this can just be `self.size > other.size`.

data/gems.rb

@@ -1,6 +1,3 @@
-# encoding: UTF-8
-# typed: false
-
 source "https://rubygems.org"
 
 gemspec
@@ -8,4 +5,4 @@ gemspec
 # Specify ffi version to avoid dependency issues when switching between MRI
 # and JRuby with the same gems.lock
 # Only used in development
-gem "ffi", "~> 1.9.18"
+gem "ffi", "~> 1.15.5"

data/lib/persistent-dmnd.rb

@@ -1,6 +1,3 @@
-# encoding: UTF-8
-# typed: strong
-
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #

data/lib/persistent-/360/237/222/216.rb

@@ -1,6 +1,3 @@
-# encoding: UTF-8
-# typed: true
-
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
@@ -35,11 +32,8 @@ require "persistent_dmnd/array"
 require "persistent_dmnd/hash"
 require "persistent_dmnd/set"
 require "persistent_dmnd/dmndifier"
-require "persistent_dmnd/jruby_workaround"
 
 module Persistent💎
-  include JRubyWorkaround
-
   def self.included(klass)
     # Make methods on this module also available inside classes (e.g. not just in instances)
     klass.extend(self)
@@ -103,7 +97,7 @@ module Persistent💎
   # * Converts strings into immutable Strings (without modifying the original String)
   # * Converts objects that answer to #to_str into frozen Strings
   # * Converts sets (e.g. something that #is_a?(::Set) or answers to #to_set) into persistent sets
-  # * Converts Hamster and Concurrent (from concurrent-ruby) data structures to their persistent counterparts
+  # * Converts Hamster (from hamster), Immutable and Concurrent (from concurrent-ruby) data structures to their persistent counterparts
   #
   def 💎ify
     Persistent💎::Dmndifier

data/lib/persistent_dmnd/array.rb

@@ -1,6 +1,3 @@
-# encoding: UTF-8
-# typed: false
-
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
@@ -33,16 +30,14 @@
 require "persistent_dmnd/self_conversion"
 require "persistent_dmnd/is_persistent"
 require "persistent_dmnd/concurrent_ruby_support"
-require "persistent_dmnd/jruby_workaround"
 
-require "hamster"
+require "immutable"
 require "set"
 
 module Persistent💎
-  class Array < Hamster::Vector
+  class Array < Immutable::Vector
     include SelfConversion
     include IsPersistent
-    include JRubyWorkaround
     include Persistent💎
 
     def self.[](*items)

data/lib/persistent_dmnd/concurrent_ruby_support.rb

@@ -1,6 +1,3 @@
-# encoding: UTF-8
-# typed: true
-
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
@@ -30,8 +27,6 @@
 
 # frozen_string_literal: true
 
-require "thread"
-
 module Persistent💎
   # Simple module that attempts to load concurrent-ruby, and then stores the result for quick lookup
   # This way we take care of loading concurrent-ruby ONLY when the library client asks us to, thus not bloating

data/lib/persistent_dmnd/dmndifier.rb

@@ -1,6 +1,3 @@
-# encoding: UTF-8
-# typed: true
-
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
@@ -30,9 +27,7 @@
 
 # frozen_string_literal: true
 
-require "persistent_dmnd/ruby_1_9_and_2_0_support"
-
-require "hamster"
+require "immutable"
 
 module Persistent💎
   class Dmndifier
@@ -54,7 +49,11 @@ module Persistent💎
         arg.to_dmnd
       elsif arg.respond_to?(:to_hash)
         h💎[arg.to_hash]
-      elsif arg.is_a?(Hamster::Set) || arg.is_a?(Hamster::SortedSet)
+      elsif arg.is_a?(Immutable::Set) || arg.is_a?(Immutable::SortedSet)
+        s💎[*arg.to_a]
+      elsif defined?(Hamster::Set) && arg.is_a?(Hamster::Set)
+        s💎[*arg.to_a]
+      elsif defined?(Hamster::SortedSet) && arg.is_a?(Hamster::SortedSet)
         s💎[*arg.to_a]
       elsif arg.respond_to?(:to_ary)
         a💎[*arg.to_ary]
@@ -63,9 +62,9 @@ module Persistent💎
       elsif arg.respond_to?(:to_set)
         s💎[*arg.to_set.to_a]
       elsif defined?(Concurrent::Map) && arg.is_a?(Concurrent::Map)
-        h💎[Persistent💎::Ruby19And20Support.enumerable_to_h(arg.enum_for(:each_pair))]
+        h💎[arg.enum_for(:each_pair).to_h]
       elsif arg.respond_to?(:each_pair)
-        h💎[Persistent💎::Ruby19And20Support.enumerable_to_h(arg.each_pair)]
+        h💎[arg.each_pair.to_h]
       else
         options.fetch(:on_unknown).call(arg)
       end

data/lib/persistent_dmnd/everywhere.rb

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-# typed: strict
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #

data/lib/persistent_dmnd/hash.rb

@@ -1,6 +1,3 @@
-# encoding: UTF-8
-# typed: false
-
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
@@ -33,16 +30,14 @@
 require "persistent_dmnd/self_conversion"
 require "persistent_dmnd/is_persistent"
 require "persistent_dmnd/concurrent_ruby_support"
-require "persistent_dmnd/jruby_workaround"
 
-require "hamster"
+require "immutable"
 require "set"
 
 module Persistent💎
-  class Hash < Hamster::Hash
+  class Hash < Immutable::Hash
     include SelfConversion
     include IsPersistent
-    include JRubyWorkaround
     include Persistent💎
 
     # Hashes are not arrays and thus should not implement :to_ary
@@ -79,26 +74,6 @@ module Persistent💎
       ::Set.new(self)
     end
 
-    def <(other)
-      if size >= other.size
-        false
-      else
-        self <= other
-      end
-    end
-
-    def <=(other)
-      if size > other.size
-        false
-      else
-        each do |key, value|
-          return false if other[key] != value
-        end
-
-        true
-      end
-    end
-
     # Return each entry as a key, value pair inside an immutable array
     def each💎
       if block_given?

data/lib/persistent_dmnd/is_persistent.rb

@@ -1,6 +1,3 @@
-# encoding: UTF-8
-# typed: true
-
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #

data/lib/persistent_dmnd/jruby_9_2_set_workaround.rb

@@ -1,6 +1,3 @@
-# encoding: UTF-8
-# typed: false
-
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
@@ -43,7 +40,7 @@ module Persistent💎
       end
     end
 
-    if RUBY_PLATFORM == "java" && (JRUBY_VERSION.start_with?("9.2.") || JRUBY_VERSION.start_with?("9.3.") || JRUBY_VERSION.start_with?("9.4.")) && workaround_needed?
+    if RUBY_PLATFORM == "java" && JRUBY_VERSION.start_with?("9.2.", "9.3.", "9.4.") && workaround_needed?
       class ::Set
         # Save existing Set methods
 

data/lib/persistent_dmnd/self_conversion.rb

@@ -1,6 +1,3 @@
-# encoding: UTF-8
-# typed: true
-
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
@@ -30,13 +27,9 @@
 
 # frozen_string_literal: true
 
-require "persistent_dmnd/jruby_workaround"
-
 module Persistent💎
   # Implements trivial conversion to persistent data structures for our own classes
   module SelfConversion
-    include JRubyWorkaround
-
     def to_💎
       self
     end

data/lib/persistent_dmnd/set.rb

@@ -1,6 +1,3 @@
-# encoding: UTF-8
-# typed: true
-
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
@@ -33,17 +30,15 @@
 require "persistent_dmnd/self_conversion"
 require "persistent_dmnd/is_persistent"
 require "persistent_dmnd/concurrent_ruby_support"
-require "persistent_dmnd/jruby_workaround"
 require "persistent_dmnd/jruby_9_2_set_workaround"
 
-require "hamster"
+require "immutable"
 require "set"
 
 module Persistent💎
-  class Set < Hamster::Set
+  class Set < Immutable::Set
     include SelfConversion
     include IsPersistent
-    include JRubyWorkaround
     include Persistent💎
 
     def self.from_set(set)

data/lib/persistent_dmnd/version.rb

@@ -1,6 +1,3 @@
-# encoding: UTF-8
-# typed: strong
-
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
@@ -31,5 +28,5 @@
 # frozen_string_literal: true
 
 module Persistent💎
-  VERSION = "2.0.6"
+  VERSION = "3.0.0"
 end

data/persistent-dmnd.gemspec

@@ -1,5 +1,3 @@
-# encoding: UTF-8
-
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
@@ -49,16 +47,18 @@ Gem::Specification.new do |spec|
   end
   spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = ">= 1.9.3"
+  spec.required_ruby_version = ">= 2.4.0"
 
-  spec.add_development_dependency "bundler", "~> 1.16" if RUBY_VERSION < "2.6"
-  spec.add_development_dependency "rake", "~> 12.2" # Note: Rake 12.2 is the last that supports Ruby 1.9
-  spec.add_development_dependency "rspec", "~> 3.8"
+  spec.add_development_dependency "bundler", "~> 1.17" if RUBY_VERSION < "2.6"
+  spec.add_development_dependency "rake", "~> 13.1"
+  spec.add_development_dependency "rspec", "~> 3.13"
   spec.add_development_dependency "concurrent-ruby", "~> 1.1"
   spec.add_development_dependency "standard" if RUBY_VERSION >= "2.6.0"
-  spec.add_development_dependency "pry" if RUBY_VERSION >= "2.0.0"
-  spec.add_development_dependency "pry-byebug" if RUBY_ENGINE == "ruby" && RUBY_VERSION >= "2.4"
-  spec.add_development_dependency "pry-debugger-jruby" if RUBY_ENGINE == "jruby" && !JRUBY_VERSION.start_with?("1.7.")
+  spec.add_development_dependency "pry"
+  spec.add_development_dependency "pry-byebug" if RUBY_ENGINE == "ruby"
+  spec.add_development_dependency "pry-debugger-jruby" if RUBY_ENGINE == "jruby"
+  spec.add_development_dependency "hamster", ">= 3.0.0"
+  spec.add_development_dependency "warning", "~> 1.3.0"
 
-  spec.add_dependency "hamster", "~> 3.0"
+  spec.add_dependency "immutable-ruby", ">= 0.1.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: persistent-dmnd
 version: !ruby/object:Gem::Version
-  version: 2.0.6
+  version: 3.0.0
 platform: ruby
 authors:
 - Ivo Anjo
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.2'
+        version: '13.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.2'
+        version: '13.1'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.8'
+        version: '3.13'
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
   requirement: !ruby/object:Gem::Requirement
@@ -96,18 +96,46 @@ dependencies:
         version: '0'
 - !ruby/object:Gem::Dependency
   name: hamster
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 3.0.0
+- !ruby/object:Gem::Dependency
+  name: warning
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
-  type: :runtime
+        version: 1.3.0
+  type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: 1.3.0
+- !ruby/object:Gem::Dependency
+  name: immutable-ruby
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.1.0
 description: A tiny ruby gem that gives you a beautiful short-hand syntax for creating
   immutable arrays, hashes and sets
 email: ivo@ivoanjo.me
@@ -137,8 +165,6 @@ files:
 - lib/persistent_dmnd/hash.rb
 - lib/persistent_dmnd/is_persistent.rb
 - lib/persistent_dmnd/jruby_9_2_set_workaround.rb
-- lib/persistent_dmnd/jruby_workaround.rb
-- lib/persistent_dmnd/ruby_1_9_and_2_0_support.rb
 - lib/persistent_dmnd/self_conversion.rb
 - lib/persistent_dmnd/set.rb
 - lib/persistent_dmnd/version.rb
@@ -155,14 +181,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 1.9.3
+      version: 2.4.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.5.3
 signing_key: 
 specification_version: 4
 summary: "Persistent-\U0001F48E: Because Immutable Data Is Forever"

data/lib/persistent_dmnd/jruby_workaround.rb

@@ -1,107 +0,0 @@
-# encoding: UTF-8
-# typed: false
-
-# Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
-#
-# This file is part of Persistent-💎.
-#
-# MIT License
-#
-# Copyright (c) 2017-2021 Ivo Anjo
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# frozen_string_literal: true
-
-module Persistent💎
-  module JRubyWorkaround
-    if RUBY_PLATFORM == "java" && JRUBY_VERSION < "9.2.0.0" # Only supposed to do something on legacy JRuby versions
-      BROKEN_ENCODING = "\x00"
-      private_constant :BROKEN_ENCODING
-
-      BROKEN_ENCODING_JRUBY_1_7 = [239, 146, 142].pack("c*").force_encoding("UTF-8")
-      private_constant :BROKEN_ENCODING_JRUBY_1_7
-
-      def self.included(klass)
-        # Make methods on this module also available inside classes (e.g. not just in instances)
-        klass.extend(self)
-      end
-
-      def method_added(name)
-        super
-        maybe_fix_broken_encoding(name)
-      end
-
-      def singleton_method_added(name)
-        super
-        maybe_fix_broken_encoding(name, singleton_class)
-      end
-
-      private
-
-      # Workaround JRuby encoding bug
-      # See https://github.com/jruby/jruby/issues/4878
-      # and https://gitlab.com/ivoanjo/persistent-dmnd/issues/5
-      #
-      # The trick here is that on JRuby, methods with emojis in the name are defined, but the resulting name is mangled
-      # so instead of for instance #to_💎 the result is #to_?\x00. (Or #💎ify will become #?ify\x00.) This behavior is
-      # consistent between def and calling a method, so def will register a method #to_?\x00, and a normal method call
-      # will do the same mangling and thus look for a method **WITH** the mangled name.
-      #
-      # But there are still other places in the code that rely on the correct name, such as alias and public_send/send,
-      # so we additionally use this module to define the correct name as an alias for the broken name.
-      #
-      # Thus, it all works on JRuby, albeit in a very roundabout way!
-      #
-      # FOR JRUBY 1.7:
-      # On JRuby 1.7 it seems that the mangling is different, and the emoji just gets replaced with ?, so for
-      # instance #to_💎 becomes #to_?. But then, to make things interesting, on symbols created without quotes, it
-      # gets mangled with the BROKEN_ENCODING_JRUBY_1_7, e.g :to_💎 becomes :to_BROKEN_ENCODING_JRUBY_1_7 (but
-      # :"to_💎" is still correct).
-      # To support both of these, we add an extra alias on JRuby, so that everything else seems to work even if it is
-      # actually using the name with the mangled encoding.
-      #
-      def maybe_fix_broken_encoding(name, target = nil)
-        name_string = name.to_s
-
-        if JRUBY_VERSION.start_with?("1.7.")
-          unless name_string.match(/\?.+/) ||
-              ["a?", "h?", "s?", "each?"].include?(name_string) ||
-              ["_?", "_a?", "_h?", "_s?"].any? { |suffix| name_string.end_with?(suffix) }
-            return
-          end
-        else
-          return unless name_string.end_with?(BROKEN_ENCODING)
-        end
-
-        fixed_name = name_string.sub("?", "💎").delete(BROKEN_ENCODING).to_sym
-        fixed_name_jruby_1_7 = name_string.sub("?", BROKEN_ENCODING_JRUBY_1_7).to_sym
-
-        if target
-          target.instance_eval { alias_method(fixed_name, name) }
-          target.instance_eval { alias_method(fixed_name_jruby_1_7, name) } if JRUBY_VERSION.start_with?("1.7.")
-        else
-          alias_method(fixed_name, name)
-          alias_method(fixed_name_jruby_1_7, name) if JRUBY_VERSION.start_with?("1.7.")
-        end
-      end
-    end
-  end
-end

data/lib/persistent_dmnd/ruby_1_9_and_2_0_support.rb

@@ -1,48 +0,0 @@
-# encoding: UTF-8
-# typed: true
-
-# Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
-#
-# This file is part of Persistent-💎.
-#
-# MIT License
-#
-# Copyright (c) 2017-2021 Ivo Anjo
-#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in all
-# copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
-# SOFTWARE.
-
-# frozen_string_literal: true
-
-module Persistent💎
-  module Ruby19And20Support
-    # Enumerable#to_h was only introduced in Ruby 2.1 so we have to do it by hand on 2.0/1.9
-    if RUBY_VERSION.start_with?("2.0.") || RUBY_VERSION.start_with?("1.9.")
-      def self.enumerable_to_h(enumerable)
-        enumerable.each_with_object({}) do |(key, value), result|
-          result[key] = value
-        end
-      end
-    else
-      def self.enumerable_to_h(enumerable)
-        enumerable.to_h
-      end
-    end
-  end
-end