dry-monads 1.4.0 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 06e9ae65089e5f79f92b2d1c67d463757dc960af7a7edbd92d527c0fb6cfd997
-  data.tar.gz: 9d49d077c77edd1580bcc0cdd97fce2d527cabd9013b71611340b14ef6dae7d0
+  metadata.gz: 8ccc6809b903aa20a600330e62b86d8164da8394f2b7c63740d6708c73386578
+  data.tar.gz: a1c92edd9908da609bfe9048bf5ca1220d1f7e4c2cc894df9ea025e7df578625
 SHA512:
-  metadata.gz: 5720b87b50ce55e727f169e3bf62d4ad23aa0b6779b8086e326b79cf0242b93fc9f89f840f1a3d6718d2401461a19eea6e4f0679e91499816ccf295aee619d1d
-  data.tar.gz: c95f43c4a51dd831d248cae4bc1afa8d226743e295081dfc4bf05a58c2e18aa146afd64dedb415b8189bbf3f2f54c0c0edb9033fb5a9367551f3fb6d88c37374
+  metadata.gz: 9286042f25cbb89f74d7159ef238cb834f7dddc74890c7d575978a14bd69d8d95aa46728c0f7dbfa81507af068cba4f3efa871eed9ec60d95da62db6f9810320
+  data.tar.gz: d723b367ba2014fa7bf907316dd93cff45be330329c83281a8640aaaa480a83c20e222d8d89736caf6acc6675c61927e3e54bf0ecb1b4df73ec1d5e2999f0d9a

data/CHANGELOG.md

@@ -1,5 +1,26 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 1.6.0 2022-11-04
+
+
+### Changed
+
+- This version uses dry-core 1.0 (@flash-gordon)
+
+[Compare v1.5.0...v1.6.0](https://github.com/dry-rb/dry-monads/compare/v1.5.0...v1.6.0)
+
+## 1.5.0 2022-10-16
+
+
+### Changed
+
+- Use zeitwerk for auto-loading dry-monads classes (@flash-gordon)
+- `Task#then` is deprecated in favor of `Task#bind` (@flash-gordon)
+- Minimal Ruby version is now 2.7 (@flash-gordon)
+- Either (old name of Result) was removed (@flash-gordon)
+
+[Compare v1.4.0...v1.5.0](https://github.com/dry-rb/dry-monads/compare/v1.4.0...v1.5.0)
+
 ## 1.4.0 2021-07-20
 
 

data/LICENSE

@@ -1,6 +1,6 @@
 The MIT License (MIT)
 
-Copyright (c) 2015-2021 dry-rb team
+Copyright (c) 2015-2022 dry-rb team
 
 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

data/README.md

@@ -8,10 +8,10 @@
 # dry-monads [![Join the chat at https://dry-rb.zulipchat.com](https://img.shields.io/badge/dry--rb-join%20chat-%23346b7a.svg)][chat]
 
 [![Gem Version](https://badge.fury.io/rb/dry-monads.svg)][gem]
-[![CI Status](https://github.com/dry-rb/dry-monads/workflows/CI/badge.svg)][actions]
+[![CI Status](https://github.com/dry-rb/dry-monads/workflows/ci/badge.svg)][actions]
 [![Codacy Badge](https://api.codacy.com/project/badge/Grade/f2eed41bf7f04b38b0a7691c2cf6e73c)][codacy]
 [![Codacy Badge](https://api.codacy.com/project/badge/Coverage/f2eed41bf7f04b38b0a7691c2cf6e73c)][codacy]
-[![Inline docs](http://inch-ci.org/github/dry-rb/dry-monads.svg?branch=master)][inchpages]
+[![Inline docs](http://inch-ci.org/github/dry-rb/dry-monads.svg?branch=main)][inchpages]
 
 ## Links
 
@@ -22,8 +22,8 @@
 
 This library officially supports the following Ruby versions:
 
-* MRI `>= 2.6.0`
-* ~~jruby~~ `>= 9.3` (we are waiting for [2.6 support](https://github.com/jruby/jruby/issues/6161))
+* MRI `>= 2.7.0`
+* jruby `>= 9.3` (postponed until 2.7 is supported)
 
 ## License
 

data/dry-monads.gemspec

@@ -22,18 +22,18 @@ Gem::Specification.new do |spec|
   spec.require_paths = ["lib"]
 
   spec.metadata["allowed_push_host"] = "https://rubygems.org"
-  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-monads/blob/master/CHANGELOG.md"
+  spec.metadata["changelog_uri"]     = "https://github.com/dry-rb/dry-monads/blob/main/CHANGELOG.md"
   spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-monads"
   spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-monads/issues"
 
-  spec.required_ruby_version = ">= 2.6.0"
+  spec.required_ruby_version = ">= 2.7.0"
 
   # to update dependencies edit project.yml
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
-  spec.add_runtime_dependency "dry-core", "~> 0.7"
+  spec.add_runtime_dependency "dry-core", "~> 1.0", "< 2"
+  spec.add_runtime_dependency "zeitwerk", "~> 2.6"
 
   spec.add_development_dependency "bundler"
-  spec.add_development_dependency "dry-types", ">= 0.1.2"
   spec.add_development_dependency "rake"
   spec.add_development_dependency "rspec"
 end

data/lib/dry/monads/all.rb

@@ -1,11 +1,10 @@
 # frozen_string_literal: true
 
 require "dry/monads"
-require "dry/monads/registry"
 
 module Dry
   module Monads
-    known_monads.each { |m| load_monad(m) }
+    known_monads.each { load_monad(_1) }
     extend(*constructors)
   end
 end

data/lib/dry/monads/constants.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/constants"
-
 module Dry
   module Monads
     # @private

data/lib/dry/monads/curry.rb

@@ -7,8 +7,8 @@ module Dry
       # @private
       def self.call(value)
         func = value.is_a?(Proc) ? value : value.method(:call)
-        seq_args = func.parameters.count { |type, _| type == :req || type == :opt }
-        seq_args += 1 if func.parameters.any? { |type, _| type == :keyreq }
+        seq_args = func.parameters.count { |type, _| type.eql?(:req) || type.eql?(:opt) }
+        seq_args += 1 if func.parameters.any? { |type, _| type.eql?(:keyreq) }
 
         if seq_args > 1
           func.curry

data/lib/dry/monads/do/all.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/monads/do"
-
 module Dry
   module Monads
     module Do
@@ -104,7 +102,7 @@ module Dry
           def included(base)
             super
 
-            wrappers = ::Hash.new { |h, k| h[k] = ::Module.new }
+            wrappers = ::Hash.new { _1[_2] = ::Module.new }
             tracker = MethodTracker.new(wrappers)
             base.extend(tracker)
             base.extend(InstanceMixin) unless base.is_a?(::Class)

data/lib/dry/monads/do.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/monads/list"
-require "dry/monads/do/mixin"
-require "dry/monads/constants"
-
 module Dry
   module Monads
     # An implementation of do-notation.
@@ -12,8 +8,6 @@ module Dry
     module Do
       extend Mixin
 
-      DELEGATE = ::RUBY_VERSION < "2.7" ? "*" : "..."
-
       VISIBILITY_WORD = {
         public: "",
         private: "private ",
@@ -110,7 +104,7 @@ module Dry
         # @return [Module]
         def for(*methods)
           ::Module.new do
-            singleton_class.send(:define_method, :included) do |base|
+            singleton_class.define_method(:included) do |base|
               mod = ::Module.new
               base.prepend(mod)
               base.extend(MethodTracker.new(methods, base, mod))
@@ -130,13 +124,13 @@ module Dry
         # @api private
         def wrap_method(target, method, visibility)
           target.module_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-            #{VISIBILITY_WORD[visibility]} def #{method}(#{DELEGATE}) # private def create_acccount(...)
-              if block_given?                                         #   if block_given?
-                super                                                 #     super
-              else                                                    #   else
-                Do.() { super { |*ms| Do.bind(ms) } }                 #     Do.() { super { |*ms| Do.bind(ms) } }
-              end                                                     #   end
-            end                                                       # end
+            #{VISIBILITY_WORD[visibility]} def #{method}(...) # private def create_acccount(...)
+              if block_given?                                 #   if block_given?
+                super                                         #     super
+              else                                            #   else
+                Do.() { super { |*ms| Do.bind(ms) } }         #     Do.() { super { |*ms| Do.bind(ms) } }
+              end                                             #   end
+            end                                               # end
           RUBY
         end
 

data/lib/dry/monads/errors.rb

@@ -3,7 +3,7 @@
 module Dry
   module Monads
     # An unsuccessful result of extracting a value from a monad.
-    class UnwrapError < StandardError
+    class UnwrapError < ::StandardError
       attr_reader :receiver
 
       def initialize(receiver)
@@ -13,14 +13,14 @@ module Dry
     end
 
     # An error thrown on returning a Failure of unknown type.
-    class InvalidFailureTypeError < StandardError
+    class InvalidFailureTypeError < ::StandardError
       def initialize(failure)
         super("Cannot create Failure from #{failure.inspect}, it doesn't meet the constraints")
       end
     end
 
     # Improper use of None
-    class ConstructorNotAppliedError < NoMethodError
+    class ConstructorNotAppliedError < ::NoMethodError
       def initialize(method_name, constructor_name)
         super(
           "For calling .#{method_name} on #{constructor_name}() build a value "\

data/lib/dry/monads/lazy.rb

@@ -2,9 +2,6 @@
 
 require "concurrent/promise"
 
-require "dry/core/deprecations"
-require "dry/monads/task"
-
 module Dry
   module Monads
     # Lazy is a twin of Task which is always executed on the current thread.

data/lib/dry/monads/list.rb

@@ -1,15 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-
-require "dry/monads/maybe"
-require "dry/monads/task"
-require "dry/monads/result"
-require "dry/monads/try"
-require "dry/monads/validated"
-require "dry/monads/transformer"
-require "dry/monads/curry"
-
 module Dry
   module Monads
     # The List monad.
@@ -110,10 +100,10 @@ module Dry
       # @return [List]
       def bind(*args)
         if block_given?
-          List.coerce(value.map { |v| yield(v, *args) }.reduce([], &:+))
+          List.coerce(value.map { yield(_1, *args) }.reduce([], &:+))
         else
           obj, *rest = args
-          List.coerce(value.map { |v| obj.(v, *rest) }.reduce([], &:+))
+          List.coerce(value.map { obj.(_1, *rest) }.reduce([], &:+))
         end
       end
 
@@ -128,10 +118,10 @@ module Dry
       # @return [List]
       def fmap(*args)
         if block_given?
-          List.new(value.map { |v| yield(v, *args) })
+          List.new(value.map { yield(_1, *args) })
         else
           obj, *rest = args
-          List.new(value.map { |v| obj.(v, *rest) })
+          List.new(value.map { obj.(_1, *rest) })
         end
       end
 
@@ -270,7 +260,7 @@ module Dry
             self.class.warn(
               "Automatic monad inference is deprecated, pass a type explicitly "\
               "or use a predefined constant, e.g. List::Result\n"\
-              "#{caller.find { |l| l !~ %r{(lib/dry/monads)|(gems)} }}"
+              "#{caller.find { _1 !~ %r{(lib/dry/monads)|(gems)} }}"
             )
             self.class.new(value, value[0].monad)
           end
@@ -317,7 +307,7 @@ module Dry
       # @return [List]
       def apply(list = Undefined, &block)
         v = Undefined.default(list, &block)
-        fmap(Curry).bind { |f| v.fmap { |x| f.(x) } }
+        fmap(Curry).bind { |f| v.fmap { f.(_1) } }
       end
 
       # Returns the List monad.
@@ -362,7 +352,7 @@ module Dry
           List.new(collected)
         else
           Enumerator.new do |g|
-            value.each { |x| g << x.value! if x.some? }
+            value.each { g << _1.value! if _1.some? }
           end
         end
       end

data/lib/dry/monads/maybe.rb

@@ -1,14 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-require "dry/core/deprecations"
-require "dry/core/class_attributes"
-
-require "dry/monads/right_biased"
-require "dry/monads/transformer"
-require "dry/monads/unit"
-require "dry/monads/constants"
-
 module Dry
   module Monads
     # Represents a value which can exist or not, i.e. it could be nil.
@@ -127,8 +118,8 @@ module Dry
         # @param args [Array<Object>] arguments will be transparently passed through to #bind
         # @return [Maybe::Some, Maybe::None] Wrapped result, i.e. nil will be mapped to None,
         #                                    other values will be wrapped with Some
-        def fmap(*args, &block)
-          next_value = bind(*args, &block)
+        def fmap(...)
+          next_value = bind(...)
 
           if next_value.nil?
             if self.class.warn_on_implicit_nil_coercion
@@ -140,7 +131,7 @@ module Dry
                 "You can opt out of these warnings with\n"\
                 "Dry::Monads::Maybe.warn_on_implicit_nil_coercion false",
                 uplevel: 0,
-                tag: :'dry-monads'
+                tag: :"dry-monads"
               )
             end
             Monads.None()
@@ -160,8 +151,8 @@ module Dry
         # @param args [Array<Object>] arguments will be transparently passed through to #bind
         # @return [Maybe::Some, Maybe::None] Wrapped result, i.e. nil will be mapped to None,
         #                                    other values will be wrapped with Some
-        def maybe(*args, &block)
-          Maybe.coerce(bind(*args, &block))
+        def maybe(...)
+          Maybe.coerce(bind(...))
         end
 
         # Accepts a block and runs it against the wrapped value.
@@ -201,7 +192,7 @@ module Dry
         include RightBiased::Left
 
         @instance = new.freeze
-        singleton_class.send(:attr_reader, :instance)
+        singleton_class.attr_reader(:instance)
 
         # @api private
         def self.method_missing(m, *) # rubocop:disable Style/MissingRespondToMissing
@@ -255,8 +246,8 @@ module Dry
         # @param args [Array<Object>] arguments will be passed to the underlying `#or` call
         # @return [Maybe::Some, Maybe::None] Lifted `#or` result, i.e. nil will be mapped to None,
         #                                    other values will be wrapped with Some
-        def or_fmap(*args, &block)
-          Maybe.coerce(self.or(*args, &block))
+        def or_fmap(...)
+          Maybe.coerce(self.or(...))
         end
 
         # @return [String]

data/lib/dry/monads/registry.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "concurrent/map"
-
 module Dry
   # Common, idiomatic monads for Ruby
   #
@@ -9,20 +7,20 @@ module Dry
   module Monads
     @registry = {}
     @constructors = nil
-    @paths = {
-      do: "dry/monads/do/all",
-      lazy: "dry/monads/lazy",
-      list: "dry/monads/list",
-      maybe: "dry/monads/maybe",
-      task: "dry/monads/task",
-      try: "dry/monads/try",
-      validated: "dry/monads/validated",
+    @constants = {
+      do: "Do::All",
+      lazy: "Lazy",
+      list: "List",
+      maybe: "Maybe",
+      task: "Task",
+      try: "Try",
+      validated: "Validated",
       result: [
-        "dry/monads/result",
-        "dry/monads/result/fixed"
+        "Result",
+        "Result::Fixed"
       ]
     }.freeze
-    @mixins = Concurrent::Map.new
+    @mixins = ::Concurrent::Map.new
 
     class << self
       private
@@ -46,27 +44,29 @@ module Dry
 
       # @private
       def known_monads
-        @paths.keys
+        @constants.keys
       end
 
       # @private
       def load_monad(name)
-        path = @paths.fetch(name) {
-          raise ArgumentError, "#{name.inspect} is not a known monad"
+        constants = @constants.fetch(name) {
+          raise ::ArgumentError, "#{name.inspect} is not a known monad"
         }
-        Array(path).each { |p| require p }
+        Array(constants).each do |const_name|
+          const_name.split("::").reduce(Monads) { |mod, const| mod.const_get(const) }
+        end
       end
 
       # @private
       def constructors
-        @constructors ||= registry.values.map { |m|
+        @constructors ||= registry.values.filter_map { |m|
           m::Constructors if m.const_defined?(:Constructors)
-        }.compact
+        }
       end
 
       # @private
       def all_loaded?
-        registry.size == @paths.size
+        registry.size.eql?(@constants.size)
       end
     end
   end

data/lib/dry/monads/result/fixed.rb

@@ -20,10 +20,8 @@ module Dry
               if error === value
                 Failure.new(value, RightBiased::Left.trace_caller)
               else
-                # rubocop:disable Style/RaiseArgs
                 # per https://github.com/dry-rb/dry-monads/pull/142
                 raise InvalidFailureTypeError.new(value)
-                # rubocop:enable Style/RaiseArgs
               end
             end
 

data/lib/dry/monads/result.rb

@@ -1,13 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-
-require "dry/monads/constants"
-require "dry/monads/right_biased"
-require "dry/monads/transformer"
-require "dry/monads/conversion_stubs"
-require "dry/monads/unit"
-
 module Dry
   module Monads
     # Represents an operation which either succeeded or failed.
@@ -116,8 +108,8 @@ module Dry
         #
         # @param args [Array<Object>] arguments will be transparently passed through to #bind
         # @return [Result::Success]
-        def fmap(*args, &block)
-          Success.new(bind(*args, &block))
+        def fmap(...)
+          Success.new(bind(...))
         end
 
         # Returns result of applying first function to the internal value.
@@ -164,7 +156,7 @@ module Dry
         include RightBiased::Left
         include Dry::Equalizer(:failure)
 
-        singleton_class.send(:alias_method, :call, :new)
+        singleton_class.alias_method(:call, :new)
 
         # Shortcut for Failure([...])
         #
@@ -251,8 +243,8 @@ module Dry
         #
         # @param args [Array<Object>] arguments will be passed to the underlying `#or` call
         # @return [Result::Success] Wrapped value
-        def or_fmap(*args, &block)
-          Success.new(self.or(*args, &block))
+        def or_fmap(...)
+          Success.new(self.or(...))
         end
 
         # @return [String]

data/lib/dry/monads/right_biased.rb

@@ -1,10 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/monads/constants"
-require "dry/monads/unit"
-require "dry/monads/curry"
-require "dry/monads/errors"
-
 module Dry
   module Monads
     # A common module for right-biased monads, such as Result/Either, Maybe, and Try.
@@ -12,7 +7,7 @@ module Dry
       # Right part
       #
       # @api public
-      module Right # rubocop:disable Metrics/ModuleLength
+      module Right
         # @private
         def self.included(m)
           super
@@ -20,7 +15,7 @@ module Dry
           def m.to_proc
             @to_proc ||= method(:new).to_proc
           end
-          m.singleton_class.send(:alias_method, :call, :new)
+          m.singleton_class.alias_method(:call, :new)
         end
 
         # Unwraps the underlying value
@@ -70,8 +65,8 @@ module Dry
         #
         # @param [Array<Object>] args arguments will be transparently passed through to #bind
         # @return [RightBiased::Right]
-        def tee(*args, &block)
-          bind(*args, &block).bind { self }
+        def tee(...)
+          bind(...).bind { self }
         end
 
         # Abstract method for lifting a block over the monad type.
@@ -133,7 +128,7 @@ module Dry
             raise TypeError, "Cannot apply #{val.inspect} to #{@value.inspect}"
           end
 
-          Undefined.default(val, &block).fmap { |unwrapped| curry.(unwrapped) }
+          Undefined.default(val, &block).fmap { curry.(_1) }
         end
 
         # @param other [Object]
@@ -236,19 +231,12 @@ module Dry
 
         private
 
-        if RUBY_VERSION >= "2.7"
-          # @api private
-          def destructure(value)
-            if value.is_a?(::Hash)
-              [EMPTY_ARRAY, value]
-            else
-              [[value], EMPTY_HASH]
-            end
-          end
-        else
-          # @api private
-          def destructure(*args, **kwargs)
-            [args, kwargs]
+        # @api private
+        def destructure(value)
+          if value.is_a?(::Hash)
+            [EMPTY_ARRAY, value]
+          else
+            [[value], EMPTY_HASH]
           end
         end
 

data/lib/dry/monads/task.rb

@@ -2,10 +2,6 @@
 
 require "concurrent/promise"
 
-require "dry/monads/unit"
-require "dry/monads/curry"
-require "dry/monads/conversion_stubs"
-
 module Dry
   module Monads
     # The Task monad represents an async computation. The implementation
@@ -15,7 +11,7 @@ module Dry
     # @api public
     class Task
       # @api private
-      class Promise < Concurrent::Promise
+      class Promise < ::Concurrent::Promise
         public :on_fulfill, :on_reject
       end
       private_constant :Promise
@@ -83,6 +79,7 @@ module Dry
       end
 
       include ConversionStubs[:to_maybe, :to_result]
+      extend ::Dry::Core::Deprecations[:"dry-monads"]
 
       # @api private
       attr_reader :promise
@@ -124,9 +121,9 @@ module Dry
       #                     and returns another task
       # @return [Task]
       def bind(&block)
-        self.class.new(promise.flat_map { |value| block.(value).promise })
+        self.class.new(promise.flat_map { block.(_1).promise })
       end
-      alias_method :then, :bind
+      deprecate :then, :bind
 
       # @return [String]
       def to_s
@@ -168,12 +165,12 @@ module Dry
         promise.on_error do |v|
           inner = block.(v).promise
           inner.execute
-          inner.on_success { |r| child.on_fulfill(r) }
-          inner.on_error { |e| child.on_reject(e) }
+          inner.on_success { child.on_fulfill(_1) }
+          inner.on_error { child.on_reject(_1) }
         rescue StandardError => e
           child.on_reject(e)
         end
-        promise.on_success { |v| child.on_fulfill(v) }
+        promise.on_success { child.on_fulfill(_1) }
 
         self.class.new(child)
       end
@@ -238,7 +235,7 @@ module Dry
       # @return [Task]
       def apply(val = Undefined, &block)
         arg = Undefined.default(val, &block)
-        bind { |f| arg.fmap { |v| curry(f).(v) } }
+        bind { |f| arg.fmap { curry(f).(_1) } }
       end
 
       # Maps a successful result to Unit, effectively discards it
@@ -267,8 +264,8 @@ module Dry
       # @api private
       def compare_promises(x, y)
         x.equal?(y) ||
-          x.fulfilled? && y.fulfilled? && x.value == y.value ||
-          x.rejected? && y.rejected? && x.reason == y.reason
+          (x.fulfilled? && y.fulfilled? && x.value == y.value) ||
+          (x.rejected? && y.rejected? && x.reason == y.reason)
       end
 
       # Task constructors.

data/lib/dry/monads/traverse.rb

@@ -3,8 +3,6 @@
 # rubocop:disable Naming/ConstantName
 # rubocop:disable Style/MutableConstant
 
-require "dry/monads/validated"
-
 module Dry
   module Monads
     to_list = List::Validated.method(:pure)

data/lib/dry/monads/try.rb

@@ -1,11 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/core/equalizer"
-require "dry/core/deprecations"
-
-require "dry/monads/right_biased"
-require "dry/monads/conversion_stubs"
-
 module Dry
   module Monads
     # Represents a value which can be either success or a failure (an exception).
@@ -135,7 +129,7 @@ module Dry
         #                             object and the rest of args will be passed
         #                             to this object along with the internal value
         # @return [Object, Try::Error]
-        def bind(*args)
+        def bind(...)
           super
         rescue *catchable => e
           Error.new(e)
@@ -153,8 +147,8 @@ module Dry
         # @param args [Array<Object>] extra arguments for the block, arguments are being processes
         #                             just as in #bind
         # @return [Try::Value, Try::Error]
-        def fmap(*args, &block)
-          Value.new(catchable, bind_call(*args, &block))
+        def fmap(...)
+          Value.new(catchable, bind_call(...))
         rescue *catchable => e
           Error.new(e)
         end
@@ -186,7 +180,7 @@ module Dry
         include Dry::Equalizer(:exception)
         include RightBiased::Left
 
-        singleton_class.send(:alias_method, :call, :new)
+        singleton_class.alias_method(:call, :new)
 
         # @param exception [Exception]
         def initialize(exception)
@@ -238,7 +232,7 @@ module Dry
             classes = errors
           end
 
-          if classes.any? { |c| c === exception }
+          if classes.any? { _1 === exception }
             Value.new([exception.class], yield(exception))
           else
             self

data/lib/dry/monads/unit.rb

@@ -18,7 +18,7 @@ module Dry
     #   Maybe(Unit)
     #   => Some(Unit)
     #
-    Unit = Object.new.tap do |unit|
+    Unit = ::Object.new.tap do |unit|
       def unit.to_s
         "Unit"
       end
@@ -30,6 +30,8 @@ module Dry
       def unit.deconstruct
         EMPTY_ARRAY
       end
+
+      unit.freeze
     end
   end
 end

data/lib/dry/monads/validated.rb

@@ -1,9 +1,5 @@
 # frozen_string_literal: true
 
-require "dry/monads/conversion_stubs"
-require "dry/monads/constants"
-require "dry/monads/right_biased"
-
 module Dry
   module Monads
     # Validated is similar to Result and represents an outcome of a validation.
@@ -175,7 +171,7 @@ module Dry
         def apply(val = Undefined, &block)
           Undefined
             .default(val, &block)
-            .alt_map { |v| @error + v }
+            .alt_map { @error + _1 }
             .fmap { return self }
         end
 

data/lib/dry/monads/version.rb

@@ -3,6 +3,6 @@
 module Dry
   module Monads
     # Gem version
-    VERSION = "1.4.0"
+    VERSION = "1.6.0"
   end
 end

data/lib/dry/monads.rb

@@ -1,6 +1,10 @@
 # frozen_string_literal: true
 
-require "dry/core/constants"
+require "concurrent/map"
+require "zeitwerk"
+require "dry/core"
+require "dry/monads/constants"
+require "dry/monads/errors"
 require "dry/monads/registry"
 
 module Dry
@@ -8,6 +12,21 @@ module Dry
   #
   # @api public
   module Monads
+    # @api private
+    def self.loader
+      @loader ||= Zeitwerk::Loader.new.tap do |loader|
+        root = File.expand_path("..", __dir__)
+        loader.tag = "dry-monads"
+        loader.inflector = Zeitwerk::GemInflector.new("#{root}/dry-monads.rb")
+        loader.push_dir(root)
+        loader.ignore(
+          "#{root}/dry-monads.rb",
+          "#{root}/dry/monads/{all,constants,errors,registry,version}.rb",
+          "#{root}/json/**/*.rb"
+        )
+      end
+    end
+
     # @private
     def self.included(base)
       if all_loaded?
@@ -49,10 +68,12 @@ module Dry
     def self.[](*monads)
       monads.sort!
       @mixins.fetch_or_store(monads.hash) do
-        monads.each { |m| load_monad(m) }
-        mixins = monads.map { |m| registry.fetch(m) }
+        monads.each { load_monad(_1) }
+        mixins = monads.map { registry.fetch(_1) }
         ::Module.new { include(*mixins) }.freeze
       end
     end
+
+    loader.setup
   end
 end

data/lib/json/add/dry/monads/maybe.rb

@@ -26,8 +26,8 @@ module Dry
 
       # Stores class name (Dry::Monads::Maybe::Some or Dry::Monads::Maybe::None)
       # with the monad value as JSON string
-      def to_json(*args)
-        as_json.to_json(*args)
+      def to_json(...)
+        as_json.to_json(...)
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-monads
 version: !ruby/object:Gem::Version
-  version: 1.4.0
+  version: 1.6.0
 platform: ruby
 authors:
 - Nikita Shilnikov
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-07-20 00:00:00.000000000 Z
+date: 2022-11-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -30,42 +30,48 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
+        version: '1.0'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '2'
 - !ruby/object:Gem::Dependency
-  name: bundler
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: '2.6'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
-  name: dry-types
+  name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -114,7 +120,6 @@ files:
 - lib/dry/monads/do.rb
 - lib/dry/monads/do/all.rb
 - lib/dry/monads/do/mixin.rb
-- lib/dry/monads/either.rb
 - lib/dry/monads/errors.rb
 - lib/dry/monads/lazy.rb
 - lib/dry/monads/list.rb
@@ -136,10 +141,10 @@ licenses:
 - MIT
 metadata:
   allowed_push_host: https://rubygems.org
-  changelog_uri: https://github.com/dry-rb/dry-monads/blob/master/CHANGELOG.md
+  changelog_uri: https://github.com/dry-rb/dry-monads/blob/main/CHANGELOG.md
   source_code_uri: https://github.com/dry-rb/dry-monads
   bug_tracker_uri: https://github.com/dry-rb/dry-monads/issues
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -147,15 +152,15 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.6.0
+      version: 2.7.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.22
-signing_key:
+rubygems_version: 3.1.6
+signing_key: 
 specification_version: 4
 summary: Common monads for Ruby
 test_files: []

data/lib/dry/monads/either.rb

@@ -1,66 +0,0 @@
-# frozen_string_literal: true
-
-require "dry/core/deprecations"
-
-Dry::Core::Deprecations.warn("Either monad was renamed to Result", tag: :"dry-monads")
-
-require "dry/monads/result"
-
-module Dry
-  module Monads
-    Either = Result
-    deprecate_constant :Either
-
-    class Result
-      extend ::Dry::Core::Deprecations[:"dry-monads"]
-
-      deprecate :to_either, :to_result
-
-      Right = Success
-      Left = Failure
-
-      deprecate_constant :Right
-      deprecate_constant :Left
-
-      module Mixin
-        module Constructors
-          extend Dry::Core::Deprecations[:"dry-monads"]
-
-          Right = Success
-          Left = Failure
-          deprecate_constant :Right
-          deprecate_constant :Left
-
-          deprecate :Right, :Success
-          deprecate :Left, :Failure
-        end
-      end
-
-      class Success
-        deprecate :left?, :failure?
-        deprecate :right?, :success?
-      end
-
-      class Failure
-        deprecate :left?, :failure?
-        deprecate :right?, :success?
-
-        deprecate :left, :failure
-      end
-    end
-
-    class Try
-      class Value
-        extend Dry::Core::Deprecations[:"dry-monads"]
-
-        deprecate :to_either, :to_result
-      end
-
-      class Error
-        extend Dry::Core::Deprecations[:"dry-monads"]
-
-        deprecate :to_either, :to_result
-      end
-    end
-  end
-end