dry-effects 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abc06cbff85f6545a5b05ebeb778737a316fadf9222c9e98c015e05a91e16cdf
-  data.tar.gz: 7023b7bc8b4807c957f561706f9cd8215cc181cf37de06ae218ec48fac48f9da
+  metadata.gz: '019d3a5a4ceac14c0bf1fc045315034746b2076f82e17c8cd43d1e4d15453a73'
+  data.tar.gz: 7c6bc85d0688ff60a98152a50f0bd27e2ee7cbd45379a33be51584bfad456c3e
 SHA512:
-  metadata.gz: f240e7f7cf989b27dc384bf2ec84f6a2b021c8f9b76694167a493140d4beb0dfed96fcad700681154362b2cb8569051baf07e849993d8744b91ec24443ba32af
-  data.tar.gz: 60185bafd1a5f68a771c9bcd971412ca09e4cf5b81da8ea659706b713b1a55a67989ae4f59d8ae1c57adbf006731416a3f9e4c78254637a73e7a24ccd03c7203
+  metadata.gz: 8a900139589cf38dcdacb469021826ade7e435a9229243ae9392b76fc0cfcca6762ef48373e5a2d7b4a16f7ae51cb769c7f1de1559c92c14d8bdd3725def5932
+  data.tar.gz: 91d5e392c86b9a91b5bef272914d4a647790606716de5722d4cccd555584bdfb33e7cdaa6fb653ffa870b33f21481fa4a057babf85131077d9a85cca65b25c6d

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 <!--- DO NOT EDIT THIS FILE - IT'S AUTOMATICALLY GENERATED VIA DEVTOOLS --->
 
+## 0.4.1 
+
+
+### Changed
+
+- Workaround for a clash with Object#with (@tallica + @flash-gordon)
+
+[Compare v0.4.0...main](https://github.com/dry-rb/dry-effects/compare/v0.4.0...main)
+
+## 0.4.0 
+
+
+### Changed
+
+- This version is compatible with recently released dry-rb dependencies (@flash-gordon)
+
+[Compare v0.3.1...main](https://github.com/dry-rb/dry-effects/compare/v0.3.1...main)
+
 ## 0.3.1 2022-10-17
 
 

data/LICENSE

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

@@ -1,29 +1,21 @@
 <!--- this file is synced from dry-rb/template-gem project -->
 [gem]: https://rubygems.org/gems/dry-effects
 [actions]: https://github.com/dry-rb/dry-effects/actions
-[codacy]: https://www.codacy.com/gh/dry-rb/dry-effects
-[chat]: https://dry-rb.zulipchat.com
-[inchpages]: http://inch-ci.org/github/dry-rb/dry-effects
 
-# dry-effects [![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-effects.svg)][gem]
-[![CI Status](https://github.com/dry-rb/dry-effects/workflows/ci/badge.svg)][actions]
-[![Codacy Badge](https://api.codacy.com/project/badge/Grade/158a8a584a3845eba4a67a71ad540210)][codacy]
-[![Codacy Badge](https://api.codacy.com/project/badge/Coverage/158a8a584a3845eba4a67a71ad540210)][codacy]
-[![Inline docs](http://inch-ci.org/github/dry-rb/dry-effects.svg?branch=main)][inchpages]
+# dry-effects [![Gem Version](https://badge.fury.io/rb/dry-effects.svg)][gem] [![CI Status](https://github.com/dry-rb/dry-effects/workflows/ci/badge.svg)][actions]
 
 ## Links
 
 * [User documentation](https://dry-rb.org/gems/dry-effects)
 * [API documentation](http://rubydoc.info/gems/dry-effects)
+* [Forum](https://discourse.dry-rb.org)
 
 ## Supported Ruby versions
 
 This library officially supports the following Ruby versions:
 
-* MRI `>= 2.7.0`
-* jruby `>= 9.3` (postponed until 2.7 is supported)
+* MRI `>= 3.0.0`
+* jruby `>= 9.4` (not tested on CI)
 
 ## License
 

data/dry-effects.gemspec

@@ -26,14 +26,14 @@ Gem::Specification.new do |spec|
   spec.metadata["source_code_uri"]   = "https://github.com/dry-rb/dry-effects"
   spec.metadata["bug_tracker_uri"]   = "https://github.com/dry-rb/dry-effects/issues"
 
-  spec.required_ruby_version = ">= 2.7.0"
+  spec.required_ruby_version = ">= 3.0.0"
 
   # to update dependencies edit project.yml
   spec.add_runtime_dependency "concurrent-ruby", "~> 1.0"
-  spec.add_runtime_dependency "dry-container", "~> 0.7", ">= 0.7.2"
-  spec.add_runtime_dependency "dry-core", "~> 0.9", ">= 0.9"
-  spec.add_runtime_dependency "dry-inflector", "~> 0.1", ">= 0.1.2"
+  spec.add_runtime_dependency "dry-core", "~> 1.0"
+  spec.add_runtime_dependency "dry-inflector", "~> 1.0"
   spec.add_runtime_dependency "dry-initializer", "~> 3.0"
+  spec.add_runtime_dependency "zeitwerk", "~> 2.6"
 
   spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"

data/lib/dry/effects/constructors.rb

@@ -3,8 +3,6 @@
 module Dry
   module Effects
     module Constructors
-      extend self
-
       # @api public
       def CurrentTime(**kwargs)
         if kwargs.empty?
@@ -33,6 +31,8 @@ module Dry
       def Write(scope, value)
         Effects::State::State.new(type: :state, name: :write, scope: scope, payload: [value])
       end
+
+      instance_methods(false).each { module_function(_1) }
     end
   end
 end

data/lib/dry/effects/container.rb

@@ -3,7 +3,7 @@
 module Dry
   module Effects
     class Container
-      include ::Dry::Container::Mixin
+      include Core::Container::Mixin
     end
   end
 end

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

@@ -6,7 +6,7 @@ module Dry
       class Resolve < ::Module
         DependencyNameInvalid = ::Class.new(StandardError)
 
-        VALID_NAME = /([a-z_][a-zA-Z_0-9]*)$/.freeze
+        VALID_NAME = /([a-z_][a-zA-Z_0-9]*)$/
 
         Resolve = Effect.new(type: :resolve)
 

data/lib/dry/effects/errors.rb

@@ -19,7 +19,7 @@ module Dry
 
           super(
             Undefined.default(message) {
-              "Effect #{effect.inspect} not handled. "\
+              "Effect #{effect.inspect} not handled. " \
                 "Effects must be wrapped with corresponding handlers"
             }
           )
@@ -31,7 +31,7 @@ module Dry
       # @api private
       class MissingStateError < UnhandledEffectError
         def initialize(effect)
-          message = "Value of +#{effect.scope}+ is not set, "\
+          message = "Value of +#{effect.scope}+ is not set, " \
                     "you need to provide value with an effect handler"
 
           super(effect, message)
@@ -45,8 +45,8 @@ module Dry
         include Error
 
         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 "\
+          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"
 
           super(message)

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

@@ -2,12 +2,18 @@
 
 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, [])
+begin
+  require "active_support/isolated_execution_state"
+
+  # it's not needed when state is already isolated
+rescue LoadError
+  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
-    Thread.current.thread_variable_get(thread_key)
-  end
-})
+  })
+end

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

@@ -1,12 +1,17 @@
 # frozen_string_literal: true
 
 require "concurrent/map"
-require "dry/auto_inject/strategies/constructor"
+require "dry/auto_inject"
+require "dry/auto_inject/version"
+
+if Gem::Version.new(Dry::AutoInject::VERSION) < Gem::Version.new("0.10.0")
+  raise "dry-effects requires dry-auto_inject >= 0.10.0"
+end
 
 module Dry
   module Effects
     class DryAutoEffectsStrategies
-      extend ::Dry::Container::Mixin
+      extend Core::Container::Mixin
 
       class Base < AutoInject::Strategies::Constructor
         private

data/lib/dry/effects/initializer.rb

@@ -64,9 +64,15 @@ module Dry
 
       # @api private
       def self.extended(base)
-        base.extend(::Dry::Initializer)
-        base.extend(DefineWithHook)
-        base.include(InstanceMethods)
+        base.module_eval do
+          if method_defined?(:with)
+            undef_method(:with)
+          end
+
+          extend(::Dry::Initializer)
+          extend(DefineWithHook)
+          include(InstanceMethods)
+        end
       end
 
       # @api private

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

@@ -7,7 +7,7 @@ module Dry
         DEFAULT_RANDOM = ::Random
         DEFAULT = -> _ { DEFAULT_RANDOM.rand }
 
-        DEFAULT_RANGE = (0.0...1.0).freeze
+        DEFAULT_RANGE = (0.0...1.0)
 
         def rand(range_or_limit = nil)
           range_or_limit ||= DEFAULT_RANGE

data/lib/dry/effects/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Effects
-    VERSION = "0.3.1"
+    VERSION = "0.4.1"
   end
 end

data/lib/dry/effects.rb

@@ -4,7 +4,6 @@ require "zeitwerk"
 require "concurrent/map"
 
 require "dry/core"
-require "dry/container"
 require "dry/inflector"
 require "dry/initializer"
 
@@ -35,7 +34,7 @@ module Dry
           loader.ignore(
             "#{root}/dry-effects.rb",
             "#{root}/dry/effects/{all,error,extensions,inflector,initializer,version}.rb",
-            "#{root}/dry/effects/extensions/**/*.rb",
+            "#{root}/dry/effects/extensions/**/*.rb"
           )
         end
       end

data/lib/dry-effects.rb

@@ -1 +1,3 @@
+# frozen_string_literal: true
+
 require "dry/effects"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-effects
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Nikita Shilnikov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-17 00:00:00.000000000 Z
+date: 2024-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -25,79 +25,61 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: dry-container
+  name: dry-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.7'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.7.2
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: dry-core
+  name: dry-inflector
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.9'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '0.9'
+        version: '1.0'
 - !ruby/object:Gem::Dependency
-  name: dry-inflector
+  name: dry-initializer
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '3.0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 0.1.2
+        version: '3.0'
 - !ruby/object:Gem::Dependency
-  name: dry-initializer
+  name: zeitwerk
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.6'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2.6'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -229,14 +211,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.7.0
+      version: 3.0.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.26
 signing_key: 
 specification_version: 4
 summary: Algebraic effects