dry-effects 0.1.2 → 0.2.0

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/effects/effect'
+require "dry/effects/effect"
 
 module Dry
   module Effects
@@ -11,6 +11,8 @@ module Dry
         end
 
         def initialize(scope = :default)
+          super()
+
           interrupt = InterruptEffect.new(type: :interrupt, scope: scope)
 
           module_eval do
@@ -18,7 +20,7 @@ module Dry
               if Undefined.equal?(payload)
                 ::Dry::Effects.yield(interrupt)
               else
-                ::Dry::Effects.yield(interrupt.(payload))
+                ::Dry::Effects.yield(interrupt.payload(payload))
               end
             end
           end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/effects/effect'
+require "dry/effects/effect"
 
 module Dry
   module Effects
@@ -12,17 +12,19 @@ module Dry
         Locked = Effect.new(type: :lock, name: :locked?)
 
         def initialize
+          super
+
           module_eval do
             define_method(:lock) do |key, meta: Undefined, &block|
               if block
                 begin
-                  handle = ::Dry::Effects.yield(Lock.(key, meta))
+                  handle = ::Dry::Effects.yield(Lock.payload(key, meta))
                   block.(!handle.nil?)
                 ensure
-                  ::Dry::Effects.yield(Unlock.(handle)) if handle
+                  ::Dry::Effects.yield(Unlock.payload(handle)) if handle
                 end
               else
-                ::Dry::Effects.yield(Lock.(key, meta))
+                ::Dry::Effects.yield(Lock.payload(key, meta))
               end
             end
 
@@ -31,11 +33,11 @@ module Dry
             end
 
             define_method(:locked?) do |key|
-              ::Dry::Effects.yield(Locked.(key))
+              ::Dry::Effects.yield(Locked.payload(key))
             end
 
             define_method(:lock_meta) do |key|
-              ::Dry::Effects.yield(Meta.(key))
+              ::Dry::Effects.yield(Meta.payload(key))
             end
           end
         end

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

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require 'dry/effects/effect'
+require "dry/effects/effect"
 
 module Dry
   module Effects
@@ -10,8 +10,10 @@ module Dry
         Join = Effect.new(type: :parallel, name: :join)
 
         def initialize
+          super
+
           define_method(:par) { |&block| ::Dry::Effects.yield(Par).(&block) }
-          define_method(:join) { |xs| ::Dry::Effects.yield(Join.(xs)) }
+          define_method(:join) { |xs| ::Dry::Effects.yield(Join.payload(xs)) }
         end
       end
     end

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

@@ -1,16 +1,18 @@
 # frozen_string_literal: true
 
-require 'dry/effects/effect'
+require "dry/effects/effect"
 
 module Dry
   module Effects
     module Effects
       class Random < ::Module
-        Read = Effect.new(type: :random, name: :rand)
+        Rand = Effect.new(type: :random, name: :rand)
 
         def initialize
+          super
+
           module_eval do
-            define_method(:rand) { |n| ::Dry::Effects.yield(Read.(n)) }
+            define_method(:rand) { |n = nil| ::Dry::Effects.yield(Rand.payload(n)) }
           end
         end
       end

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

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

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

@@ -1,23 +1,43 @@
 # frozen_string_literal: true
 
-require 'dry/effects/effect'
-require 'dry/effects/constructors'
+require "dry/effects/effect"
+require "dry/effects/constructors"
 
 module Dry
   module Effects
     module Effects
       class Resolve < ::Module
+        DependencyNameInvalid = Class.new(StandardError)
+
+        VALID_NAME = /([a-z_][a-zA-Z_0-9]*)$/.freeze
+
         Resolve = Effect.new(type: :resolve)
 
         Constructors.register(:Resolve) { |key| Resolve.(key) }
 
         def initialize(*keys, **aliases)
+          super()
+
+          keys_aliased = keys.map { |k| name_for(k) }.zip(keys)
           module_eval do
-            (keys.zip(keys) + aliases.to_a).each do |name, key|
+            (keys_aliased + aliases.to_a).each do |name, key|
               define_method(name) { |&block| ::Dry::Effects.yield(Resolve.(key), &block) }
             end
           end
         end
+
+        private
+
+        # similar approach in dry-auto_inject https://github.com/dry-rb/dry-auto_inject/blob/master/lib/dry/auto_inject/dependency_map.rb#L42
+        def name_for(identifier)
+          matched = VALID_NAME.match(identifier.to_s)
+          unless matched
+            raise DependencyNameInvalid,
+                  "name +#{identifier}+ is not a valid Ruby identifier"
+          end
+
+          matched[0]
+        end
       end
     end
   end

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

@@ -0,0 +1,13 @@
+# frozen_string_literal: true
+
+require "active_support/tagged_logging"
+
+ActiveSupport::TaggedLogging::Formatter.prepend(Module.new {
+  def current_tags
+    thread_key = @thread_key ||= "activesupport_tagged_logging_tags:#{object_id}"
+    unless Thread.current.thread_variable_get(thread_key)
+      Thread.current.thread_variable_set(thread_key, [])
+    end
+    Thread.current.thread_variable_get(thread_key)
+  end
+})

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,17 +1,25 @@
 # 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"
+end
+
+Dry::Effects.register_extension(:active_support) do
+  Dry::Effects.load_extensions(:active_support_tagged_logging)
 end

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