dry-effects 0.1.5 → 0.3.0

data/lib/dry/effects/extensions/system.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/system/container'
+require "dry/system"
 
 Dry::Effects.load_extensions(:auto_inject)
 
@@ -8,17 +8,18 @@ module Dry
   module Effects
     module System
       class AutoRegistrar < ::Dry::System::AutoRegistrar
-        def call(dir)
-          super do |config|
-            config.memoize = true
-            config.instance { |c| c.instance.freeze }
-            yield(config) if block_given?
+        # Always memoize and freeze registered components
+        def call(component_dir)
+          component_dir.each_component do |component|
+            next unless register_component?(component)
+
+            container.register(component.key, memoize: true) { component.instance.freeze }
           end
         end
       end
 
       class Container < ::Dry::System::Container
-        setting :auto_registrar, AutoRegistrar
+        setting :auto_registrar, default: AutoRegistrar
 
         def self.injector(effects: true, **kwargs)
           if effects
@@ -34,7 +35,7 @@ module Dry
           super
 
           # Force all components to load
-          each_key { |key| resolve(key) }
+          each_key { resolve(_1) }
           self
         end
       end

data/lib/dry/effects/extensions.rb

@@ -1,23 +1,21 @@
 # frozen_string_literal: true
 
-require 'dry/core/extensions'
-
 Dry::Effects.extend(Dry::Core::Extensions)
 
 Dry::Effects.register_extension(:auto_inject) do
-  require 'dry/effects/extensions/auto_inject'
+  require "dry/effects/extensions/auto_inject"
 end
 
 Dry::Effects.register_extension(:system) do
-  require 'dry/effects/extensions/system'
+  require "dry/effects/extensions/system"
 end
 
 Dry::Effects.register_extension(:rspec) do
-  require 'dry/effects/extensions/rspec'
+  require "dry/effects/extensions/rspec"
 end
 
 Dry::Effects.register_extension(:active_support_tagged_logging) do
-  require 'dry/effects/extensions/active_support/tagged_logging'
+  require "dry/effects/extensions/active_support/tagged_logging"
 end
 
 Dry::Effects.register_extension(:active_support) do

data/lib/dry/effects/frame.rb

@@ -1,11 +1,11 @@
 # frozen_string_literal: true
 
-require 'fiber'
-require 'dry/effects/initializer'
-require 'dry/effects/effect'
-require 'dry/effects/errors'
-require 'dry/effects/stack'
-require 'dry/effects/instructions/raise'
+require "fiber"
+require "dry/effects/initializer"
+require "dry/effects/effect"
+require "dry/effects/errors"
+require "dry/effects/stack"
+require "dry/effects/instructions/raise"
 
 module Dry
   module Effects
@@ -41,17 +41,31 @@ module Dry
           result = fiber.resume
 
           loop do
+            error = false
             break result unless fiber.alive?
 
             provided = stack.(result) do
-              ::Dry::Effects.yield(result) do |_, error|
-                Instructions.Raise(error)
+              ::Dry::Effects.yield(result) do |_, e|
+                error = true
+                e
               end
             end
 
-            result = fiber.resume(provided)
+            result =
+              if error
+                raise_in_fiber(fiber, provided)
+              else
+                fiber.resume(provided)
+              end
           end
         end
+
+        private
+
+        # @api private
+        def raise_in_fiber(fiber, error)
+          fiber.raise(error)
+        end
       end
 
       extend Initializer

data/lib/dry/effects/halt.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-require 'concurrent/map'
-require 'dry/core/class_attributes'
-require 'dry/effects/inflector'
+require "concurrent/map"
+require "dry/effects/inflector"
 
 module Dry
   module Effects

data/lib/dry/effects/handler.rb

@@ -12,16 +12,8 @@ module Dry
         @frame = Frame.new(provider)
       end
 
-      if RUBY_VERSION >= '2.7'
-        class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
-          def call(...)
-            frame.(...)
-          end
-        RUBY
-      else
-        def call(*args, &block)
-          frame.(*args, &block)
-        end
+      def call(...)
+        frame.(...)
       end
 
       def to_s

data/lib/dry/effects/inflector.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/inflector'
+require "dry/inflector"
 
 module Dry
   module Effects

data/lib/dry/effects/initializer.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/initializer'
+require "dry/initializer"
 
 module Dry
   module Effects
@@ -27,12 +27,10 @@ module Dry
 
         # @api private
         def params_arity
-          @params_arity ||= begin
-            dry_initializer
-              .definitions
-              .reject { |_, d| d.option }
-              .size
-          end
+          @params_arity ||= dry_initializer
+            .definitions
+            .reject { _2.option }
+            .size
         end
 
         # @api private
@@ -46,22 +44,22 @@ module Dry
         def __define_with__
           seq_names = dry_initializer
             .definitions
-            .reject { |_, d| d.option }
+            .reject { _2.option }
             .keys
-            .join(', ')
+            .join(", ")
 
-          seq_names << ', ' unless seq_names.empty?
+          seq_names << ", " unless seq_names.empty?
 
           undef_method(:with) if method_defined?(:with)
 
           class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-            def with(**new_options)
-              if new_options.empty?
-                self
-              else
-                self.class.new(#{seq_names}**options, **new_options)
-              end
-            end
+            def with(**new_options)                                    # def with(**new_options)
+              if new_options.empty?                                    #   if new_options.empty?
+                self                                                   #     self
+              else                                                     #   else
+                self.class.new(#{seq_names}**options, **new_options)   #     self.class.new(attr1, attr2, **options, **new_options)
+              end                                                      #   end
+            end                                                        # end
           RUBY
         end
       end
@@ -81,9 +79,11 @@ module Dry
         #
         # @api public
         def options
+          # rubocop:disable Layout/LineLength
           @__options__ ||= self.class.dry_initializer.definitions.values.each_with_object({}) do |item, obj|
             obj[item.target] = instance_variable_get(item.ivar)
           end
+          # rubocop:enable Layout/LineLength
         end
 
         define_method(:class, Kernel.instance_method(:class))

data/lib/dry/effects/instructions/execute.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/effects/instruction'
+require "dry/effects/instruction"
 
 module Dry
   module Effects
@@ -9,6 +9,7 @@ module Dry
         attr_reader :block
 
         def initialize(block)
+          super()
           @block = block
         end
 

data/lib/dry/effects/instructions/raise.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/effects/instruction'
+require "dry/effects/instruction"
 
 module Dry
   module Effects
@@ -9,6 +9,7 @@ module Dry
         attr_reader :error
 
         def initialize(error)
+          super()
           @error = error
         end
 

data/lib/dry/effects/provider/class_interface.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/core/class_attributes'
-require 'dry/effects/frame'
+require "dry/effects/frame"
 
 module Dry
   module Effects

data/lib/dry/effects/provider.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/effects/initializer'
-require 'dry/effects/provider/class_interface'
+require "dry/effects/initializer"
+require "dry/effects/provider/class_interface"
 
 module Dry
   module Effects

data/lib/dry/effects/providers/async.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/effects/provider'
-require 'dry/effects/frame'
+require "dry/effects/provider"
+require "dry/effects/frame"
 
 module Dry
   module Effects

data/lib/dry/effects/providers/cache.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/effects/provider'
-require 'dry/effects/instructions/execute'
+require "dry/effects/provider"
+require "dry/effects/instructions/execute"
 
 module Dry
   module Effects

data/lib/dry/effects/providers/cmp.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/effects/provider'
+require "dry/effects/provider"
 
 module Dry
   module Effects

data/lib/dry/effects/providers/current_time/time_generators.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/effects/provider'
+require "dry/effects/provider"
 
 module Dry
   module Effects

data/lib/dry/effects/providers/current_time.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'time'
-require 'dry/effects/provider'
-require 'dry/effects/providers/current_time/time_generators'
+require "time"
+require "dry/effects/provider"
+require "dry/effects/providers/current_time/time_generators"
 
 module Dry
   module Effects
@@ -55,12 +55,12 @@ module Dry
         def represent
           if fixed?
             if generator.nil?
-              'current_time[fixed=true]'
+              "current_time[fixed=true]"
             else
               "current_time[fixed=#{generator.().iso8601(6)}]"
             end
           else
-            'current_time[fixed=false]'
+            "current_time[fixed=false]"
           end
         end
 

data/lib/dry/effects/providers/defer.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'concurrent/promise'
-require 'dry/effects/provider'
-require 'dry/effects/frame'
+require "concurrent/promise"
+require "dry/effects/provider"
+require "dry/effects/frame"
 
 module Dry
   module Effects
@@ -51,7 +51,7 @@ module Dry
         # Yield the block with the handler installed
         #
         # @api private
-        def call(options = { executor: Undefined })
+        def call(options = {executor: Undefined})
           unless Undefined.equal?(options[:executor])
             @executor = options[:executor]
           end
@@ -65,7 +65,7 @@ module Dry
 
         def dup
           if defined? @later_calls
-            super.tap { |p| p.instance_variable_set(:@later_calls, EMPTY_ARRAY) }
+            super.tap { _1.instance_variable_set(:@later_calls, EMPTY_ARRAY) }
           else
             super
           end
@@ -79,9 +79,9 @@ module Dry
           info << "call_later=#{later_calls.size}" if later_calls.any?
 
           if info.empty?
-            'defer'
+            "defer"
           else
-            "defer[#{info.join(' ')}]"
+            "defer[#{info.join(" ")}]"
           end
         end
       end

data/lib/dry/effects/providers/env.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/effects/provider'
-require 'dry/effects/instructions/raise'
+require "dry/effects/provider"
+require "dry/effects/instructions/raise"
 
 module Dry
   module Effects
@@ -67,7 +67,7 @@ module Dry
         end
 
         def key?(key)
-          values.key?(key) || key.is_a?(::String) && ::ENV.key?(key) || parent.key?(key)
+          values.key?(key) || (key.is_a?(::String) && ::ENV.key?(key)) || parent.key?(key)
         end
       end
     end

data/lib/dry/effects/providers/fork.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/effects/provider'
-require 'dry/effects/frame'
+require "dry/effects/provider"
+require "dry/effects/frame"
 
 module Dry
   module Effects

data/lib/dry/effects/providers/implicit.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/effects/provider'
+require "dry/effects/provider"
 
 module Dry
   module Effects

data/lib/dry/effects/providers/interrupt.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'dry/effects/provider'
-require 'dry/effects/instructions/raise'
-require 'dry/effects/halt'
+require "dry/effects/provider"
+require "dry/effects/instructions/raise"
+require "dry/effects/halt"
 
 module Dry
   module Effects

data/lib/dry/effects/providers/lock.rb

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/equalizer'
-require 'dry/effects/provider'
-require 'dry/effects/initializer'
+require "dry/effects/provider"
+require "dry/effects/initializer"
 
 module Dry
   module Effects
@@ -96,11 +95,9 @@ module Dry
           end
 
           with_backend(backend_replace) do
-            begin
-              yield
-            ensure
-              owned.each { |handle| unlock(handle) }
-            end
+            yield
+          ensure
+            owned.each { unlock(_1) }
           end
         end
 

data/lib/dry/effects/providers/parallel.rb

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'concurrent/promise'
-require 'dry/effects/provider'
-require 'dry/effects/frame'
+require "concurrent/promise"
+require "dry/effects/provider"
+require "dry/effects/frame"
 
 module Dry
   module Effects

data/lib/dry/effects/providers/random.rb

@@ -1,14 +1,15 @@
 # frozen_string_literal: true
 
-require 'dry/effects/provider'
+require "dry/effects/provider"
 
 module Dry
   module Effects
     module Providers
       class Random < Provider[:random]
-        DEFAULT = -> _ { ::Random::DEFAULT.rand }
+        DEFAULT_RANDOM = ::Random
+        DEFAULT = -> _ { DEFAULT_RANDOM.rand }
 
-        DEFAULT_RANGE = 0.0...1.0
+        DEFAULT_RANGE = (0.0...1.0).freeze
 
         def rand(range_or_limit = nil)
           range_or_limit ||= DEFAULT_RANGE
@@ -66,7 +67,7 @@ module Dry
             if options.key?(:seed)
               random = ::Random.new(options[:seed])
             else
-              random = ::Random::DEFAULT
+              random = DEFAULT_RANDOM
             end
 
             -> _ { random.rand }

data/lib/dry/effects/providers/reader.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/effects/provider'
+require "dry/effects/provider"
 
 module Dry
   module Effects

data/lib/dry/effects/providers/resolve.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/effects/provider'
-require 'dry/effects/instructions/raise'
+require "dry/effects/provider"
+require "dry/effects/instructions/raise"
 
 module Dry
   module Effects
@@ -84,16 +84,17 @@ module Dry
         # @return [String]
         # @api public
         def represent
-          containers = [represent_container(static), represent_container(dynamic)].compact.join('+')
-          "resolve[#{containers.empty? ? 'empty' : containers}]"
+          containers = [represent_container(static), represent_container(dynamic)].compact.join("+")
+          "resolve[#{containers.empty? ? "empty" : containers}]"
         end
 
         # @return [String]
         # @api private
         def represent_container(container)
-          if container.is_a?(::Hash)
-            container.empty? ? nil : 'hash'
-          elsif container.is_a?(::Class)
+          case container
+          when ::Hash
+            container.empty? ? nil : "hash"
+          when ::Class
             container.name || container.to_s
           else
             container.to_s

data/lib/dry/effects/providers/retry.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/effects/provider'
-require 'dry/effects/halt'
+require "dry/effects/provider"
+require "dry/effects/halt"
 
 module Dry
   module Effects
@@ -18,15 +18,13 @@ module Dry
         # Yield the block with the handler installed
         #
         # @api private
-        def call(limit)
+        def call(limit, &block)
           @limit = limit
           @attempts = 0
 
           loop do
-            begin
-              return attempt { yield }
-            rescue halt
-            end
+            return attempt(&block)
+          rescue halt # rubocop:disable Lint/SuppressedException
           end
         end
 

data/lib/dry/effects/providers/state.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/effects/providers/reader'
-require 'dry/effects/instructions/raise'
+require "dry/effects/providers/reader"
+require "dry/effects/instructions/raise"
 
 module Dry
   module Effects

data/lib/dry/effects/providers/timeout.rb

@@ -1,12 +1,12 @@
 # frozen_string_literal: true
 
-require 'dry/effects/provider'
+require "dry/effects/provider"
 
 module Dry
   module Effects
     module Providers
       class Timeout < Provider[:timeout]
-        def self.handle_method(scope, as: Undefined, **)
+        def self.handle_method(_scope, as: Undefined, **)
           Undefined.default(as) { :with_timeout }
         end
 

data/lib/dry/effects/providers/timestamp.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/effects/provider'
-require 'dry/effects/providers/current_time'
+require "dry/effects/provider"
+require "dry/effects/providers/current_time"
 
 module Dry
   module Effects