persistent-dmnd 1.0.4 → 2.0.3

data/lib/persistent_dmnd/jruby_9_2_set_workaround.rb

@@ -1,7 +1,8 @@
 # encoding: UTF-8
+# typed: false
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017-2018 Ivo Anjo <ivo.anjo@ist.utl.pt>
+# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
 # This file is part of Persistent-💎, and parts were inspired by Ruby's set.rb
 # https://github.com/ruby/ruby/blob/v2_6_0_preview2/lib/set.rb
@@ -11,7 +12,7 @@
 
 # frozen_string_literal: true
 
-require 'set'
+require "set"
 
 module Persistent💎
   # Workaround for https://github.com/jruby/jruby/issues/5227
@@ -42,7 +43,7 @@ module Persistent💎
       end
     end
 
-    if RUBY_PLATFORM == 'java' && JRUBY_VERSION.start_with?('9.2.') && workaround_needed?
+    if RUBY_PLATFORM == "java" && (JRUBY_VERSION.start_with?("9.2.") || JRUBY_VERSION.start_with?("9.3.")) && workaround_needed?
       class ::Set
         # Save existing Set methods
 
@@ -107,13 +108,11 @@ module Persistent💎
           persistent_dmnd_workaround_original_disjoint?(set)
         rescue ArgumentError => e
           raise unless e.message == "value must be a set" && set.is_a?(::Set)
-          !(
-            if size < set.size
-              any? { |o| set.include?(o) }
-            else
-              set.any? { |o| include?(o) }
-            end
-          )
+          !(if size < set.size
+            any? { |o| set.include?(o) }
+          else
+            set.any? { |o| include?(o) }
+          end)
         end
 
         def flatten_merge(set, seen = ::Set.new)

data/lib/persistent_dmnd/jruby_workaround.rb

@@ -1,13 +1,14 @@
 # encoding: UTF-8
+# typed: false
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
+# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
 # This file is part of Persistent-💎.
 #
 # MIT License
 #
-# Copyright (c) 2017 Ivo Anjo
+# 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
@@ -31,11 +32,11 @@
 
 module Persistent💎
   module JRubyWorkaround
-    if RUBY_PLATFORM == 'java' && JRUBY_VERSION < "9.2.0.0" # Only supposed to do something on legacy JRuby versions
+    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')
+      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)
@@ -80,25 +81,25 @@ module Persistent💎
       def maybe_fix_broken_encoding(name, target = nil)
         name_string = name.to_s
 
-        if JRUBY_VERSION.start_with?('1.7.')
+        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) }
+                 ["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
+        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.')
+          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.')
+          alias_method(fixed_name_jruby_1_7, name) if JRUBY_VERSION.start_with?("1.7.")
         end
       end
     end

data/lib/persistent_dmnd/ruby_1_9_and_2_0_support.rb

@@ -1,13 +1,14 @@
 # encoding: UTF-8
+# typed: true
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
+# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
 # This file is part of Persistent-💎.
 #
 # MIT License
 #
-# Copyright (c) 2017 Ivo Anjo
+# 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
@@ -32,7 +33,7 @@
 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.')
+    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

data/lib/persistent_dmnd/self_conversion.rb

@@ -1,13 +1,14 @@
 # encoding: UTF-8
+# typed: true
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
+# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
 # This file is part of Persistent-💎.
 #
 # MIT License
 #
-# Copyright (c) 2017 Ivo Anjo
+# 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
@@ -29,7 +30,7 @@
 
 # frozen_string_literal: true
 
-require 'persistent_dmnd/jruby_workaround'
+require "persistent_dmnd/jruby_workaround"
 
 module Persistent💎
   # Implements trivial conversion to persistent data structures for our own classes

data/lib/persistent_dmnd/set.rb

@@ -1,13 +1,14 @@
 # encoding: UTF-8
+# typed: true
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
+# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
 # This file is part of Persistent-💎.
 #
 # MIT License
 #
-# Copyright (c) 2017 Ivo Anjo
+# 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
@@ -29,14 +30,14 @@
 
 # frozen_string_literal: true
 
-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 "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 'set'
+require "hamster"
+require "set"
 
 module Persistent💎
   class Set < Hamster::Set
@@ -64,9 +65,17 @@ module Persistent💎
       ::Set.new(self)
     end
 
-    # Default behavior from Kernel#<=>
+    # Note: Behavior changed from Ruby < 3 (returned 0/nil) to match Ruby 3.0 Set#<=> (returns 0/nil/-1/+1);
+    #       see also https://rubyreferences.github.io/rubychanges/3.0.html#standard-library for details
     def <=>(other)
-      self == other ? 0 : nil
+      case size <=> other.size
+      when (-1)
+        (-1) if self < other
+      when (+1)
+        (+1) if self > other
+      else
+        0 if self == other
+      end
     end
 
     def to_a💎

data/lib/persistent_dmnd/version.rb

@@ -1,13 +1,14 @@
 # encoding: UTF-8
+# typed: strong
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
+# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
 # This file is part of Persistent-💎.
 #
 # MIT License
 #
-# Copyright (c) 2017 Ivo Anjo
+# 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
@@ -30,5 +31,5 @@
 # frozen_string_literal: true
 
 module Persistent💎
-  VERSION = '1.0.4'
+  VERSION = "2.0.3"
 end

data/persistent-dmnd.gemspec

@@ -1,13 +1,13 @@
 # encoding: UTF-8
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
-# Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
+# Copyright (c) 2017-2021 Ivo Anjo <ivo@ivoanjo.me>
 #
 # This file is part of Persistent-💎.
 #
 # MIT License
 #
-# Copyright (c) 2017 Ivo Anjo
+# 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
@@ -29,37 +29,40 @@
 
 # frozen_string_literal: true
 
-lib = File.expand_path('../lib', __FILE__)
+lib = File.expand_path("../lib", __FILE__)
 $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
-require 'persistent_dmnd/version'
+require "persistent_dmnd/version"
 
 Gem::Specification.new do |spec|
-  spec.name          = 'persistent-dmnd'
-  spec.version       = Persistent💎::VERSION
-  spec.authors       = 'Ivo Anjo'
-  spec.email         = 'ivo.anjo@ist.utl.pt'
+  spec.name = "persistent-dmnd"
+  spec.version = Persistent💎::VERSION
+  spec.authors = "Ivo Anjo"
+  spec.email = "ivo@ivoanjo.me"
 
-  spec.summary       = 'Persistent-💎: Because Immutable Data Is Forever'
-  spec.description   = 'A tiny ruby gem that gives you a beautiful short-hand syntax for creating immutable arrays, hashes and sets'
-  spec.homepage      = 'https://gitlab.com/ivoanjo/persistent-dmnd/'
-  spec.license       = 'MIT'
+  spec.summary = "Persistent-💎: Because Immutable Data Is Forever"
+  spec.description = "A tiny ruby gem that gives you a beautiful short-hand syntax for creating immutable arrays, hashes and sets"
+  spec.homepage = "https://gitlab.com/ivoanjo/persistent-dmnd/"
+  spec.license = "MIT"
 
-  spec.files         = `git ls-files -z`.split("\x0").reject do |f|
+  spec.files = `git ls-files -z`.split("\x0").reject do |f|
     f.match(%r{^(test|spec|features)/})
   end
-  spec.require_paths = ['lib']
+  spec.require_paths = ["lib"]
 
-  spec.required_ruby_version = '>= 1.9.3'
+  spec.required_ruby_version = ">= 1.9.3"
 
-  spec.add_development_dependency 'bundler', '~> 1.16'
-  spec.add_development_dependency 'rake', '~> 12.2'
-  spec.add_development_dependency 'rspec', '~> 3.7'
-  spec.add_development_dependency 'concurrent-ruby', '~> 1.0' unless RUBY_ENGINE == 'truffleruby'
-  spec.add_development_dependency 'concurrent-ruby', '~> 1.1' if RUBY_ENGINE == 'truffleruby'
-  spec.add_development_dependency 'rufo', '~> 0.2'
-  spec.add_development_dependency 'pry'
-  spec.add_development_dependency 'pry-byebug' if RUBY_ENGINE == 'ruby' && !RUBY_VERSION.start_with?('1.9.')
-  spec.add_development_dependency 'pry-debugger-jruby' if RUBY_ENGINE == 'jruby' && !JRUBY_VERSION.start_with?('1.7.')
+  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 "concurrent-ruby", "~> 1.1"
+  spec.add_development_dependency "rufo", "~> 0.13" 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.")
+  unless RUBY_ENGINE == "truffleruby"
+    spec.add_development_dependency "sorbet"
+    spec.add_development_dependency "spoom", "~> 1.1" if RUBY_VERSION >= "2.3.7"
+  end
 
-  spec.add_dependency 'hamster', '~> 3.0'
+  spec.add_dependency "hamster", "~> 3.0"
 end

data/sorbet/config

@@ -0,0 +1,2 @@
+--dir
+.