dry-effects 0.1.5 → 0.2.0

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/effects/effect'
-require 'dry/effects/constructors'
+require "dry/effects/effect"
+require "dry/effects/constructors"
 
 module Dry
   module Effects
@@ -18,6 +18,8 @@ module Dry
         end
 
         def initialize
+          super
+
           module_eval do
             define_method(:repeat) do |scope|
               effect = Retry.new(type: :retry, scope: scope)

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

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require 'dry/effects/effect'
-require 'dry/effects/constructors'
+require "dry/effects/effect"
+require "dry/effects/constructors"
 
 module Dry
   module Effects
@@ -22,6 +22,8 @@ module Dry
         end
 
         def initialize(scope, default: Undefined, writer: true, as: scope)
+          super()
+
           read = State.new(type: :state, name: :read, scope: scope)
           write = State.new(type: :state, name: :write, scope: scope)
 

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/effects/effect'
+require "dry/effects/effect"
 
 module Dry
   module Effects
@@ -13,6 +13,8 @@ module Dry
         end
 
         def initialize(scope)
+          super()
+
           timeout = TimeoutEffect.new(type: :timeout, name: :timeout, scope: scope)
 
           module_eval do

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/effects/effect'
+require "dry/effects/effect"
 
 module Dry
   module Effects
@@ -9,6 +9,8 @@ module Dry
         Timestamp = Effect.new(type: :timestamp)
 
         def initialize(options = EMPTY_HASH)
+          super()
+
           module_eval do
             define_method(:timestamp) do |round: Undefined|
               round_to = Undefined.coalesce(round, options.fetch(:round, Undefined))

data/lib/dry/effects/errors.rb

@@ -20,7 +20,7 @@ module Dry
           super(
             Undefined.default(message) {
               "Effect #{effect.inspect} not handled. "\
-              'Effects must be wrapped with corresponding handlers'
+              "Effects must be wrapped with corresponding handlers"
             }
           )
         end
@@ -32,7 +32,7 @@ module Dry
       class MissingStateError < UnhandledEffectError
         def initialize(effect)
           message = "Value of +#{effect.scope}+ is not set, "\
-                    'you need to provide value with an effect handler'
+                    "you need to provide value with an effect handler"
 
           super(effect, message)
         end
@@ -46,8 +46,8 @@ module Dry
 
         def initialize(effect)
           message = "+#{effect.scope}+ is not defined, you need to assign it first "\
-                    'by using a writer, passing initial value to the handler, or '\
-                    'providing a fallback value'
+                    "by using a writer, passing initial value to the handler, or "\
+                    "providing a fallback value"
 
           super(message)
         end

data/lib/dry/effects/extensions/active_support/tagged_logging.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'active_support/tagged_logging'
+require "active_support/tagged_logging"
 
 ActiveSupport::TaggedLogging::Formatter.prepend(Module.new {
   def current_tags

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

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
-require 'concurrent/map'
-require 'dry/auto_inject/strategies/constructor'
-require 'dry/effects/effects/resolve'
+require "concurrent/map"
+require "dry/auto_inject/strategies/constructor"
+require "dry/effects/effects/resolve"
 
 module Dry
   module Effects
@@ -24,7 +24,7 @@ module Dry
       class Static < Base
         private
 
-        def define_readers(dynamic = false)
+        def define_readers(dynamic = false) # rubocop:disable Style/OptionalBooleanParameter
           map = dependency_map.to_h
           cache = ::Concurrent::Map.new
           instance_mod.class_exec do
@@ -49,7 +49,7 @@ module Dry
       class Dynamic < Static
         private
 
-        def define_readers(dynamic = true)
+        def define_readers(dynamic = true) # rubocop:disable Style/OptionalBooleanParameter
           super
         end
       end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/system/container'
+require "dry/system/container"
 
 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)
+          components(component_dir).each 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
+        config.auto_registrar = AutoRegistrar
 
         def self.injector(effects: true, **kwargs)
           if effects

data/lib/dry/effects/extensions.rb

@@ -1,23 +1,23 @@
 # frozen_string_literal: true
 
-require 'dry/core/extensions'
+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,15 +41,36 @@ 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
+
+        if RUBY_VERSION >= "2.7"
+          # @api private
+          def raise_in_fiber(fiber, error)
+            fiber.raise(error)
+          end
+        else
+          # @api private
+          def raise_in_fiber(fiber, error)
+            fiber.resume(Instructions.Raise(error))
           end
         end
       end

data/lib/dry/effects/halt.rb

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

data/lib/dry/effects/handler.rb

@@ -12,7 +12,7 @@ module Dry
         @frame = Frame.new(provider)
       end
 
-      if RUBY_VERSION >= '2.7'
+      if RUBY_VERSION >= "2.7"
         class_eval(<<~RUBY, __FILE__, __LINE__ + 1)
           def call(...)
             frame.(...)

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 { |_, d| d.option }
+            .size
         end
 
         # @api private
@@ -48,20 +46,20 @@ module Dry
             .definitions
             .reject { |_, d| d.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/instruction.rb

@@ -2,7 +2,7 @@
 
 module Dry
   module Effects
-    class Instruction
+    class Instruction # rubocop:disable Lint/EmptyClass
     end
   end
 end

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,7 @@
 # frozen_string_literal: true
 
-require 'dry/core/class_attributes'
-require 'dry/effects/frame'
+require "dry/core/class_attributes"
+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