persistent-dmnd 2.0.5 → 2.0.6

data/lib/persistent_dmnd/dmndifier.rb

@@ -41,31 +41,30 @@ module Persistent💎
     DEFAULT_OPTIONS = {
       on_unknown: proc { |arg|
         raise ArgumentError, "Could not 💎ify an object of class #{arg.class}. Maybe you need to implement :to_💎?"
-      },
+      }
     }.freeze
 
     private_constant :DEFAULT_OPTIONS
 
     def self.[](arg, options = DEFAULT_OPTIONS)
       options = DEFAULT_OPTIONS.merge(options)
-      case
-      when arg.respond_to?(:to_💎)
+      if arg.respond_to?(:to_💎)
         arg.to_💎
-      when arg.respond_to?(:to_dmnd)
+      elsif arg.respond_to?(:to_dmnd)
         arg.to_dmnd
-      when arg.respond_to?(:to_hash)
+      elsif arg.respond_to?(:to_hash)
         h💎[arg.to_hash]
-      when arg.is_a?(Hamster::Set) || arg.is_a?(Hamster::SortedSet)
+      elsif arg.is_a?(Hamster::Set) || arg.is_a?(Hamster::SortedSet)
         s💎[*arg.to_a]
-      when arg.respond_to?(:to_ary)
+      elsif arg.respond_to?(:to_ary)
         a💎[*arg.to_ary]
-      when defined?(Concurrent::Tuple) && arg.is_a?(Concurrent::Tuple)
+      elsif defined?(Concurrent::Tuple) && arg.is_a?(Concurrent::Tuple)
         a💎[*arg.to_a]
-      when arg.respond_to?(:to_set)
+      elsif arg.respond_to?(:to_set)
         s💎[*arg.to_set.to_a]
-      when defined?(Concurrent::Map) && arg.is_a?(Concurrent::Map)
+      elsif defined?(Concurrent::Map) && arg.is_a?(Concurrent::Map)
         h💎[Persistent💎::Ruby19And20Support.enumerable_to_h(arg.enum_for(:each_pair))]
-      when arg.respond_to?(:each_pair)
+      elsif arg.respond_to?(:each_pair)
         h💎[Persistent💎::Ruby19And20Support.enumerable_to_h(arg.each_pair)]
       else
         options.fetch(:on_unknown).call(arg)

data/lib/persistent_dmnd/everywhere.rb

@@ -32,4 +32,4 @@
 require "persistent-💎"
 
 # Add our module to the main object, allowing our syntax to be used everywhere
-include Persistent💎
+include Persistent💎 # standard:disable Style/MixinUsage

data/lib/persistent_dmnd/hash.rb

@@ -55,11 +55,11 @@ module Persistent💎
     #   my_concurrent_hash = my_hash.to_concurrent_hash
     #
     def to_concurrent_hash
-      ConcurrentRubySupport::ensure_concurrent_ruby_loaded
+      ConcurrentRubySupport.ensure_concurrent_ruby_loaded
       Concurrent::Hash[self]
     end
 
-    alias :to_concurrent :to_concurrent_hash
+    alias_method :to_concurrent, :to_concurrent_hash
 
     # Return Concurrent::Map with contents of Persistent💎::Hash
     #
@@ -69,7 +69,7 @@ module Persistent💎
     #   # => #<Concurrent::Map:0x0055ad9b283ea0 entries=1 default_proc=nil>
     #
     def to_concurrent_map
-      ConcurrentRubySupport::ensure_concurrent_ruby_loaded
+      ConcurrentRubySupport.ensure_concurrent_ruby_loaded
       each_with_object(Concurrent::Map.new(initial_capacity: size)) do |(key, value), result|
         result[key] = value
       end

data/lib/persistent_dmnd/jruby_9_2_set_workaround.rb

@@ -47,30 +47,30 @@ module Persistent💎
       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!
-        alias persistend_dmnd_workaround_original_spaceship <=>
+        alias_method :persistent_dmnd_workaround_original_equal, :==
+        alias_method :persistent_dmnd_workaround_original_superset?, :superset?
+        alias_method :persistent_dmnd_workaround_original_proper_superset?, :proper_superset?
+        alias_method :persistent_dmnd_workaround_original_subset?, :subset?
+        alias_method :persistent_dmnd_workaround_original_proper_subset?, :proper_subset?
+        alias_method :persistent_dmnd_workaround_original_intersect?, :intersect?
+        alias_method :persistent_dmnd_workaround_original_disjoint?, :disjoint?
+        alias_method :persistent_dmnd_workaround_original_flatten_merge, :flatten_merge
+        alias_method :persistent_dmnd_workaround_original_flatten, :flatten
+        alias_method :persistent_dmnd_workaround_original_flatten!, :flatten!
+        alias_method :persistent_dmnd_workaround_original_spaceship, :<=>
 
         # Redefine all set methods that use instanceof RubySet to restore previous behavior
 
         if JRUBY_VERSION.start_with?("9.4.")
-          def <=>(set)
-            original = persistend_dmnd_workaround_original_spaceship(set)
+          def <=>(other)
+            original = persistent_dmnd_workaround_original_spaceship(other)
             return original if original
 
-            return unless set.is_a?(::Set)
-            case size <=> set.size
-            when -1 then -1 if proper_subset?(set)
-            when +1 then +1 if proper_superset?(set)
-            else 0 if self.==(set)
+            return unless other.is_a?(::Set)
+            case size <=> other.size
+            when -1 then -1 if proper_subset?(other)
+            when +1 then +1 if proper_superset?(other)
+            else 0 if self.==(other)
             end
           end
         end
@@ -123,11 +123,14 @@ 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)
@@ -153,15 +156,15 @@ module Persistent💎
         end
 
         def flatten!
-          replace(flatten()) if any? { |o| o.is_a?(::Set) }
+          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?
+        alias_method :>=, :superset?
+        alias_method :>, :proper_superset?
+        alias_method :<=, :subset?
+        alias_method :<, :proper_subset?
       end
     end
   end

data/lib/persistent_dmnd/jruby_workaround.rb

@@ -51,7 +51,7 @@ module Persistent💎
 
       def singleton_method_added(name)
         super
-        maybe_fix_broken_encoding(name, self.singleton_class)
+        maybe_fix_broken_encoding(name, singleton_class)
       end
 
       private
@@ -83,8 +83,8 @@ module Persistent💎
 
         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

data/lib/persistent_dmnd/set.rb

@@ -69,10 +69,10 @@ module Persistent💎
     #       see also https://rubyreferences.github.io/rubychanges/3.0.html#standard-library for details
     def <=>(other)
       case size <=> other.size
-      when (-1)
-        (-1) if self < other
-      when (+1)
-        (+1) if self > other
+      when -1
+        -1 if self < other
+      when +1
+        +1 if self > other
       else
         0 if self == other
       end
@@ -96,10 +96,12 @@ module Persistent💎
 
     alias_method :to_sDmnd, :to_s💎
 
+    alias_method :===, :include?
+
     private
 
     def set_eq?(other)
-      self.size == other.size && other.all? { |item| include?(item) }
+      size == other.size && other.all? { |item| include?(item) }
     end
   end
 end

data/lib/persistent_dmnd/version.rb

@@ -31,5 +31,5 @@
 # frozen_string_literal: true
 
 module Persistent💎
-  VERSION = "2.0.5"
+  VERSION = "2.0.6"
 end

data/persistent-dmnd.gemspec

@@ -55,14 +55,10 @@ Gem::Specification.new do |spec|
   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 "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.")
-  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"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: persistent-dmnd
 version: !ruby/object:Gem::Version
-  version: 2.0.5
+  version: 2.0.6
 platform: ruby
 authors:
 - Ivo Anjo
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-01-12 00:00:00.000000000 Z
+date: 2024-02-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake
@@ -53,21 +53,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.1'
 - !ruby/object:Gem::Dependency
-  name: rufo
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '0.13'
-- !ruby/object:Gem::Dependency
-  name: pry
+  name: standard
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -81,7 +67,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry-byebug
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -95,7 +81,7 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
-  name: sorbet
+  name: pry-byebug
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
@@ -108,20 +94,6 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-- !ruby/object:Gem::Dependency
-  name: spoom
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
 - !ruby/object:Gem::Dependency
   name: hamster
   requirement: !ruby/object:Gem::Requirement
@@ -146,7 +118,7 @@ files:
 - ".gitignore"
 - ".gitlab-ci.yml"
 - ".rspec"
-- ".ruby-version"
+- ".standard.yml"
 - CODE_OF_CONDUCT.adoc
 - LICENSE
 - README.adoc
@@ -171,14 +143,6 @@ files:
 - lib/persistent_dmnd/set.rb
 - lib/persistent_dmnd/version.rb
 - persistent-dmnd.gemspec
-- sorbet/config
-- sorbet/rbi/gems/concurrent-ruby.rbi
-- sorbet/rbi/gems/hamster.rbi
-- sorbet/rbi/hidden-definitions/errors.txt
-- sorbet/rbi/hidden-definitions/hidden.rbi
-- sorbet/rbi/sorbet-typed/lib/rake/all/rake.rbi
-- sorbet/rbi/sorbet-typed/lib/rspec-core/all/rspec-core.rbi
-- sorbet/rbi/todo.rbi
 homepage: https://gitlab.com/ivoanjo/persistent-dmnd/
 licenses:
 - MIT

data/.ruby-version

@@ -1 +0,0 @@
-ruby-3.0.2

data/sorbet/config

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