persistent-dmnd 1.0.1 → 2.0.1

data/bin/bundle

@@ -0,0 +1,105 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+#
+# This file was generated by Bundler.
+#
+# The application 'bundle' is installed as part of a gem, and
+# this file is here to facilitate running it.
+#
+
+require "rubygems"
+
+m = Module.new do
+    module_function
+
+  def invoked_as_script?
+    File.expand_path($0) == File.expand_path(__FILE__)
+  end
+
+  def env_var_version
+    ENV["BUNDLER_VERSION"]
+  end
+
+  def cli_arg_version
+    return unless invoked_as_script? # don't want to hijack other binstubs
+    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+    bundler_version = nil
+    update_index = nil
+    ARGV.each_with_index do |a, i|
+      if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
+        bundler_version = a
+      end
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+      bundler_version = $1 || ">= 0.a"
+      update_index = i
+    end
+    bundler_version
+  end
+
+  def gemfile
+    gemfile = ENV["BUNDLE_GEMFILE"]
+    return gemfile if gemfile && !gemfile.empty?
+
+    File.expand_path("../../gems.rb", __FILE__)
+  end
+
+  def lockfile
+    lockfile =
+      case File.basename(gemfile)
+      when "gems.rb" then gemfile.sub(/\.rb$/, gemfile)
+      else "#{gemfile}.lock"
+      end
+    File.expand_path(lockfile)
+  end
+
+  def lockfile_version
+    return unless File.file?(lockfile)
+    lockfile_contents = File.read(lockfile)
+    return unless lockfile_contents =~ /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+    Regexp.last_match(1)
+  end
+
+  def bundler_version
+    @bundler_version ||= begin
+      env_var_version || cli_arg_version ||
+        lockfile_version || "#{Gem::Requirement.default}.a"
+    end
+  end
+
+  def load_bundler!
+    ENV["BUNDLE_GEMFILE"] ||= gemfile
+
+    # must dup string for RG < 1.8 compatibility
+    activate_bundler(bundler_version.dup)
+  end
+
+  def activate_bundler(bundler_version)
+    if Gem::Version.correct?(bundler_version) && Gem::Version.new(bundler_version).release < Gem::Version.new("2.0")
+      bundler_version = "< 2"
+    end
+    gem_error = activation_error_handling do
+      gem "bundler", bundler_version
+    end
+    return if gem_error.nil?
+    require_error = activation_error_handling do
+      require "bundler/version"
+    end
+    return if require_error.nil? && Gem::Requirement.new(bundler_version).satisfied_by?(Gem::Version.new(Bundler::VERSION))
+    warn "Activating bundler (#{bundler_version}) failed:\n#{gem_error.message}\n\nTo install the version of bundler this project requires, run `gem install bundler -v '#{bundler_version}'`"
+    exit 42
+  end
+
+  def activation_error_handling
+    yield
+    nil
+  rescue StandardError, LoadError => e
+    e
+  end
+end
+
+m.load_bundler!
+
+if m.invoked_as_script?
+  load Gem.bin_path("bundler", "bundle")
+end

data/bin/pry

@@ -8,13 +8,21 @@
 # this file is here to facilitate running it.
 #
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-load(bundle_binstub) if File.file?(bundle_binstub)
-
 require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../gems.rb",
   Pathname.new(__FILE__).realpath)
 
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
 require "rubygems"
 require "bundler/setup"
 

data/bin/rspec

@@ -8,13 +8,21 @@
 # this file is here to facilitate running it.
 #
 
-bundle_binstub = File.expand_path("../bundle", __FILE__)
-load(bundle_binstub) if File.file?(bundle_binstub)
-
 require "pathname"
-ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../Gemfile",
+ENV["BUNDLE_GEMFILE"] ||= File.expand_path("../../gems.rb",
   Pathname.new(__FILE__).realpath)
 
+bundle_binstub = File.expand_path("../bundle", __FILE__)
+
+if File.file?(bundle_binstub)
+  if File.read(bundle_binstub, 300) =~ /This file was generated by Bundler/
+    load(bundle_binstub)
+  else
+    abort("Your `bin/bundle` was not generated by Bundler, so this binstub cannot run.
+Replace `bin/bundle` by running `bundle binstubs bundler --force`, then run this command again.")
+  end
+end
+
 require "rubygems"
 require "bundler/setup"
 

data/gems.rb

@@ -1,3 +1,6 @@
+# encoding: UTF-8
+# typed: false
+
 source 'https://rubygems.org'
 
 gemspec

data/lib/persistent-dmnd.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# typed: strong
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>

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

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# typed: true
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>

data/lib/persistent_dmnd/array.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# typed: false
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>

data/lib/persistent_dmnd/concurrent_ruby_support.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# typed: true
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>

data/lib/persistent_dmnd/dmndifier.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# typed: true
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>

data/lib/persistent_dmnd/everywhere.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# typed: ignore
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>

data/lib/persistent_dmnd/hash.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# typed: false
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>

data/lib/persistent_dmnd/is_persistent.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# typed: true
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>

data/lib/persistent_dmnd/jruby_9_2_set_workaround.rb

@@ -0,0 +1,155 @@
+# 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>
+#
+# 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
+# Copyright (c) 2002-2016 Akinori MUSHA <knu@iDaemons.org>
+# All rights reserved.  You can redistribute and/or modify it under the same terms as Ruby. See
+# https://github.com/ruby/ruby/blob/v2_6_0_preview2/COPYING for more details.
+
+# frozen_string_literal: true
+
+require 'set'
+
+module Persistent💎
+  # Workaround for https://github.com/jruby/jruby/issues/5227
+  # We monkey patch the Ruby Set methods affected to restore their interoperable behavior
+  #
+  module JRuby92SetWorkaround
+    def self.workaround_needed?
+      workaround_checker = Object.new
+      workaround_checker.instance_eval do
+        def is_a?(klass)
+          super || klass == Set
+        end
+
+        def size
+          0
+        end
+
+        def all?
+          false
+        end
+      end
+
+      begin
+        Set.new.superset?(workaround_checker)
+        false
+      rescue ArgumentError => e
+        e.message == "value must be a set"
+      end
+    end
+
+    if RUBY_PLATFORM == 'java' && JRUBY_VERSION.start_with?('9.2.') && workaround_needed?
+      class ::Set
+        # Save existing Set methods
+
+        alias persistent_dmnd_workaround_original_equal ==
+        alias persistent_dmnd_workaround_original_superset? superset?
+        alias persistent_dmnd_workaround_original_proper_superset? proper_superset?
+        alias persistent_dmnd_workaround_original_subset? subset?
+        alias persistent_dmnd_workaround_original_proper_subset? proper_subset?
+        alias persistent_dmnd_workaround_original_intersect? intersect?
+        alias persistent_dmnd_workaround_original_disjoint? disjoint?
+        alias persistent_dmnd_workaround_original_flatten_merge flatten_merge
+        alias persistent_dmnd_workaround_original_flatten flatten
+        alias persistent_dmnd_workaround_original_flatten! flatten!
+
+        # Redefine all set methods that use instanceof RubySet to restore previous behavior
+
+        def ==(other)
+          persistent_dmnd_workaround_original_equal(other) ||
+            (other.is_a?(::Set) && size == other.size && other.all? { |o| include?(o) })
+        end
+
+        def superset?(set)
+          persistent_dmnd_workaround_original_superset?(set)
+        rescue ArgumentError => e
+          raise unless e.message == "value must be a set" && set.is_a?(::Set)
+          size >= set.size && set.all? { |o| include?(o) }
+        end
+
+        def proper_superset?(set)
+          persistent_dmnd_workaround_original_proper_superset?(set)
+        rescue ArgumentError => e
+          raise unless e.message == "value must be a set" && set.is_a?(::Set)
+          size > set.size && set.all? { |o| include?(o) }
+        end
+
+        def subset?(set)
+          persistent_dmnd_workaround_original_subset?(set)
+        rescue ArgumentError => e
+          raise unless e.message == "value must be a set" && set.is_a?(::Set)
+          size <= set.size && all? { |o| set.include?(o) }
+        end
+
+        def proper_subset?(set)
+          persistent_dmnd_workaround_original_proper_subset?(set)
+        rescue ArgumentError => e
+          raise unless e.message == "value must be a set" && set.is_a?(::Set)
+          size < set.size && all? { |o| set.include?(o) }
+        end
+
+        def intersect?(set)
+          persistent_dmnd_workaround_original_intersect?(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
+        end
+
+        def disjoint?(set)
+          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
+          )
+        end
+
+        def flatten_merge(set, seen = ::Set.new)
+          set.each do |o|
+            if o.is_a?(::Set)
+              if seen.include?(o_id = o.object_id)
+                raise ArgumentError, "tried to flatten recursive Set"
+              end
+
+              seen.add(o_id)
+              flatten_merge(o, seen)
+              seen.delete(o_id)
+            else
+              add(o)
+            end
+          end
+
+          self
+        end
+
+        def flatten
+          self.class.new.flatten_merge(self)
+        end
+
+        def flatten!
+          replace(flatten()) if any? { |o| o.is_a?(::Set) }
+        end
+
+        # Reset aliases to point to redefined methods (otherwise they would keep on pointing to the old variants)
+
+        alias >= superset?
+        alias > proper_superset?
+        alias <= subset?
+        alias < proper_subset?
+      end
+    end
+  end
+end

data/lib/persistent_dmnd/jruby_workaround.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# typed: false
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
@@ -31,7 +32,7 @@
 
 module Persistent💎
   module JRubyWorkaround
-    if RUBY_PLATFORM == 'java' # Only supposed to do something on JRuby
+    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
 

data/lib/persistent_dmnd/ruby_1_9_and_2_0_support.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# typed: true
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>

data/lib/persistent_dmnd/self_conversion.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# typed: true
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>

data/lib/persistent_dmnd/set.rb

@@ -1,4 +1,5 @@
 # encoding: UTF-8
+# typed: true
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
@@ -33,6 +34,7 @@ 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'
@@ -63,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,4 +1,5 @@
 # encoding: UTF-8
+# typed: strong
 
 # Persistent-💎: Ruby gem for easily creating immutable data structures
 # Copyright (c) 2017 Ivo Anjo <ivo.anjo@ist.utl.pt>
@@ -30,5 +31,5 @@
 # frozen_string_literal: true
 
 module Persistent💎
-  VERSION = '1.0.1'
+  VERSION = '2.0.1'
 end