dry-effects 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a830eaa18fc97f22045d9f3aaffe905729749e6a69d05b0d4e5e7de435a3f5ab
-  data.tar.gz: 414d49b7b5e1be23f327aa33511a575153aefc5ff50dc429def6739b81cb4571
+  metadata.gz: 2b27bb0be01cba09f3ce2957a46f61c89ab25f3ff06cfc4ecea30b20ebaa9817
+  data.tar.gz: d9066e6045bdf2c57f4102d17aefdd4733d4c97698740eafc463881f675770b7
 SHA512:
-  metadata.gz: d599d1e85269f9a65bfdef7d9b6c60b37c91c1b340c8b18d2b8e40980be4a312a8cd9e5573f905b6b84a0d800aaac480b3eb422c6cc3d63eaa2b5578690b801e
-  data.tar.gz: 39809721fe1bb1d1b0e190fd75cf58c772ad36fe4f6ecec734da4e48a2226923da084ddb0425589bdff781c9640a7ba4323c53b8a72f4bb82c9017f2784adadf
+  metadata.gz: 27e4ad1dbdb3dca88b20e8da65828060961319d1b16e21144c5361df94078018c5a2626ddc5387efe70cfc6e4d580da3c856ea703ba8b26be7c02d9943c8d579
+  data.tar.gz: 1eb0f585c19f17cf75c9411a297e460107654af280b414bb9be582054de33e09117ff6d52b429cce0df221e7bb9dc6e90ee8df53a84536b26cf6b36186077a73

data/.github/ISSUE_TEMPLATE/---bug-report.md

@@ -9,11 +9,7 @@ assignees: ''
 
 **Before you submit this: WE ONLY ACCEPT BUG REPORTS AND FEATURE REQUESTS**
 
-For more information see [our contribution guidelines](https://github.com/rom-rb/rom/blob/master/CONTRIBUTING.md)
-
-**Before you report**
-
-:warning: If you have a problem related to a schema, please **report it under [dry-schema issues](https://github.com/dry-rb/dry-schema/issues/new?assignees=&labels=bug&template=---bug-report.md&title=)** instead.
+For more information see `CONTRIBUTING.md`.
 
 **Describe the bug**
 

data/.rubocop.yml

@@ -87,3 +87,9 @@ Naming/MethodName:
 
 Style/AsciiComments:
   Enabled: false
+
+Style/DateTime:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+# v0.1.2 - 2019-12-15
+
+## Fixed
+
+- Keyword warnings issued by Ruby 2.7 (flash-gordon)
+
+[Compare v0.1.1...v0.1.2](https://github.com/dry-rb/dry-effects/compare/v0.1.1...v0.1.2)
+
 # v0.1.1 - 2019-11-30
 
 ## Added

data/docsite/source/effects/interrupt.html.md

@@ -17,14 +17,14 @@ class RunDivision
   include Dry::Effects::Handler.Interrupt(:division_by_zero, as: :catch_zero_division)
 
   def call
-    success, answer = catch_zero_division do
+    error, answer = catch_zero_division do
       yield
     end
 
-    if success
-      answer
-    else
+    if error
       :error
+    else
+      answer
     end
   end
 end

data/lib/dry/effects/all.rb

@@ -30,6 +30,7 @@ module Dry
               ::Dry::Effects.effects[key].new(*args).freeze
             end
           end
+          ruby2_keywords(class_name) if respond_to?(:ruby2_keywords, true)
         end
       end
 
@@ -39,8 +40,8 @@ module Dry
           Providers.const_get(Inflector.camelize(key))
         end
 
-        Handler.singleton_class.send(:define_method, class_name) do |*args|
-          ::Dry::Effects.providers[key].mixin(*args)
+        Handler.singleton_class.send(:define_method, class_name) do |*args, **kwargs|
+          ::Dry::Effects.providers[key].mixin(*args, **kwargs)
         end
       end
     end

data/lib/dry/effects/effect.rb

@@ -8,7 +8,7 @@ module Dry
     class Effect
       extend Initializer
 
-      include ::Dry::Equalizer(:type, :name, :payload)
+      include ::Dry::Equalizer(:type, :name, :payload, :keywords)
 
       option :type
 
@@ -16,6 +16,8 @@ module Dry
 
       option :payload, default: -> { EMPTY_ARRAY }
 
+      option :keywords, default: -> { EMPTY_HASH }
+
       def payload(*payload)
         if payload.empty?
           @payload
@@ -23,7 +25,26 @@ module Dry
           with(payload: payload)
         end
       end
-      alias_method :call, :payload
+
+      def keywords(**keywords)
+        if keywords.empty?
+          @keywords
+        else
+          with(keywords: @keywords.merge(keywords))
+        end
+      end
+
+      def call(*args, **kwargs)
+        if args.empty?
+          if kwargs.empty?
+            self
+          else
+            keywords(**kwargs)
+          end
+        else
+          with(payload: args, keywords: @keywords.merge(kwargs))
+        end
+      end
     end
   end
 end

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

@@ -12,8 +12,8 @@ module Dry
 
         def initialize
           module_eval do
-            define_method(:async) { |&block| ::Dry::Effects.yield(Async.payload(block)) }
-            define_method(:await) { |task| ::Dry::Effects.yield(Await.payload(task)) }
+            define_method(:async) { |&block| ::Dry::Effects.yield(Async.(block)) }
+            define_method(:await) { |task| ::Dry::Effects.yield(Await.(task)) }
           end
         end
       end

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

@@ -10,8 +10,10 @@ module Dry
           option :scope
         end
 
-        def initialize(scope, shared: false)
-          if scope.is_a?(::Hash)
+        def initialize(scope = nil, shared: false, **kw)
+          if !kw.empty?
+            scope, as = kw.to_a[0]
+          elsif scope.is_a?(::Hash)
             scope, as = scope.to_a[0]
           else
             as = :cache

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

@@ -13,19 +13,21 @@ module Dry
           if kwargs.empty?
             CurrentTime
           else
-            CurrentTime.payload(kwargs)
+            CurrentTime.(**kwargs)
           end
         end
 
-        def initialize(options = EMPTY_HASH)
+        def initialize(**options)
           module_eval do
-            define_method(:current_time) do |round: Undefined, refresh: false|
+            define_method(:current_time) do |opts = EMPTY_HASH|
+              round = opts.fetch(:round, Undefined)
+              refresh = opts.fetch(:refresh, false)
               round_to = Undefined.coalesce(round, options.fetch(:round, Undefined))
 
               if Undefined.equal?(round_to) && refresh.equal?(false)
                 effect = CurrentTime
               else
-                effect = CurrentTime.payload(round_to: round_to, refresh: refresh)
+                effect = CurrentTime.(round_to: round_to, refresh: refresh)
               end
 
               ::Dry::Effects.yield(effect)

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

@@ -48,7 +48,7 @@ module Dry
 
             if writer
               define_method(:"#{as}=") do |value|
-                ::Dry::Effects.yield(write.(value))
+                ::Dry::Effects.yield(write.(value: value))
               end
             end
           end

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

@@ -16,7 +16,7 @@ module Dry
               if Undefined.equal?(round_to)
                 ::Dry::Effects.yield(Timestamp)
               else
-                ::Dry::Effects.yield(Timestamp.payload(round_to: round_to))
+                ::Dry::Effects.yield(Timestamp.keywords(round_to: round_to))
               end
             end
           end

data/lib/dry/effects/frame.rb

@@ -66,13 +66,19 @@ module Dry
       # @param [Array<Object>] args Handler arguments
       # @param [Proc] block Program to run
       # @api private
-      def call(args = EMPTY_ARRAY, &block)
+      def call(*args, &block)
         stack = Frame.stack
+        prov = provider.dup
+        was_empty = stack.empty?
 
-        if stack.empty?
-          stack.push(provider.dup, args) { Frame.spawn_fiber(stack, &block) }
-        else
-          stack.push(provider.dup, args, &block)
+        prov.(*args) do
+          if was_empty
+            stack.push(prov) do
+              Frame.spawn_fiber(stack, &block)
+            end
+          else
+            stack.push(prov, &block)
+          end
         end
       end
     end

data/lib/dry/effects/handler.rb

@@ -12,8 +12,16 @@ module Dry
         @frame = Frame.new(provider)
       end
 
-      def call(*args, &block)
-        frame.(args, &block)
+      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
       end
 
       def to_s

data/lib/dry/effects/initializer.rb

@@ -14,6 +14,7 @@ module Dry
             __define_with__
           end
         end
+        ruby2_keywords(:param) if respond_to?(:ruby2_keywords, true)
 
         # @api private
         def option(*)
@@ -22,6 +23,7 @@ module Dry
             @has_options = true
           end
         end
+        ruby2_keywords(:option) if respond_to?(:ruby2_keywords, true)
 
         # @api private
         def params_arity
@@ -52,11 +54,11 @@ module Dry
           undef_method(:with) if method_defined?(:with)
 
           class_eval(<<-RUBY, __FILE__, __LINE__ + 1)
-            def with(new_options = EMPTY_HASH)
+            def with(**new_options)
               if new_options.empty?
                 self
               else
-                self.class.new(#{seq_names}options.merge(new_options))
+                self.class.new(#{seq_names}**options, **new_options)
               end
             end
           RUBY

data/lib/dry/effects/provider.rb

@@ -15,7 +15,7 @@ module Dry
       # yield the block with the handler installed
       #
       # @api private
-      def call(_stack)
+      def call
         yield
       end
 
@@ -43,6 +43,29 @@ module Dry
       def provide?(effect)
         type.equal?(effect.type)
       end
+
+      # @return [String]
+      # @api public
+      def inspect
+        "#<#{self.class.name} #{represent}>"
+      end
+
+      private
+
+      def value_with_options_from_args(args)
+        case args.size
+        when 2
+          args
+        when 1
+          if args[0].is_a?(::Hash)
+            [Undefined, args[0]]
+          else
+            [args[0], EMPTY_HASH]
+          end
+        when 0
+          [Undefined, EMPTY_HASH]
+        end
+      end
     end
   end
 end

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

@@ -40,15 +40,15 @@ module Dry
           end
         end
 
-        def mixin(*args, **kwargs)
-          handle_method = handle_method(*args, **kwargs)
+        def mixin(*as, **kw)
+          handle_method = handle_method(*as, **kw)
 
-          provider = new(*args, **kwargs).freeze
+          provider = new(*as, **kw).freeze
           frame = Frame.new(provider)
 
           ::Module.new do
-            define_method(handle_method) do |*xs, &block|
-              frame.(xs, &block)
+            define_method(handle_method) do |*args, &block|
+              frame.(*args, &block)
             end
           end
         end

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'dry/effects/provider'
+require 'dry/effects/frame'
 
 module Dry
   module Effects
@@ -23,8 +24,8 @@ module Dry
         # Yield the block with the handler installed
         #
         # @api private
-        def call(stack)
-          @stack = stack
+        def call
+          @stack = Frame.stack
           super
           nil
         end

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

@@ -7,7 +7,7 @@ module Dry
   module Effects
     module Providers
       class Cache < Provider[:cache]
-        include Dry::Equalizer(:scope, :cache)
+        include ::Dry::Equalizer(:scope, :cache, inspect: false)
 
         param :scope
 
@@ -24,9 +24,9 @@ module Dry
         # Yield the block with the handler installed
         #
         # @api private
-        def call(stack, cache = EMPTY_HASH.dup)
+        def call(cache = EMPTY_HASH.dup)
           @cache = cache
-          super(stack)
+          yield
         end
 
         # @param [Effect] effect

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

@@ -6,7 +6,7 @@ module Dry
   module Effects
     module Providers
       class Cmp < Provider[:cmp]
-        include Dry::Equalizer(:id, :value)
+        include ::Dry::Equalizer(:id, :value, inspect: false)
 
         attr_reader :value
 
@@ -20,15 +20,15 @@ module Dry
         #
         # @return [Array(Any, Any)]
         # @api private
-        def call(stack, value = Undefined)
+        def call(value = Undefined)
           if Undefined.equal?(value)
             @value = false
-            first = super(stack)
+            first = yield
             @value = true
-            [first, super(stack)]
+            [first, yield]
           else
             @value = value
-            super(stack)
+            yield
           end
         end
 

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

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require 'time'
 require 'dry/effects/provider'
 require 'dry/effects/providers/current_time/time_generators'
 
@@ -7,7 +8,7 @@ module Dry
   module Effects
     module Providers
       class CurrentTime < Provider[:current_time]
-        include Dry::Equalizer(:fixed, :round)
+        include ::Dry::Equalizer(:fixed, :round, inspect: false)
         include TimeGenetators
 
         Locate = Effect.new(type: :current_time, name: :locate)
@@ -23,9 +24,10 @@ module Dry
         # Yield the block with the handler installed
         #
         # @api private
-        def call(stack, generator = Undefined, **options)
-          @generator = build_generator(generator, **options)
-          super(stack)
+        def call(*args)
+          gen, options = value_with_options_from_args(args)
+          @generator = build_generator(gen, **options)
+          yield
         end
 
         def current_time(round_to: Undefined, **options)

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

@@ -2,12 +2,13 @@
 
 require 'concurrent/promise'
 require 'dry/effects/provider'
+require 'dry/effects/frame'
 
 module Dry
   module Effects
     module Providers
       class Defer < Provider[:defer]
-        include Dry::Equalizer(:executor)
+        include ::Dry::Equalizer(:executor, inspect: false)
 
         option :executor, default: -> { :io }
 
@@ -50,21 +51,21 @@ module Dry
         # Yield the block with the handler installed
         #
         # @api private
-        def call(stack, executor: Undefined)
-          unless Undefined.equal?(executor)
-            @executor = executor
+        def call(options = { executor: Undefined })
+          unless Undefined.equal?(options[:executor])
+            @executor = options[:executor]
           end
 
-          @stack = stack
+          @stack = Frame.stack
           @later_calls = []
-          super(stack)
+          yield
         ensure
           later_calls.each(&:execute)
         end
 
         def dup
           if defined? @later_calls
-            super.tap { |p| p.instance_exec { @later_calls = EMPTY_ARRAY } }
+            super.tap { |p| p.instance_variable_set(:@later_calls, EMPTY_ARRAY) }
           else
             super
           end

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

@@ -7,7 +7,7 @@ module Dry
   module Effects
     module Providers
       class Env < Provider[:env]
-        include Dry::Equalizer(:values, :dynamic)
+        include ::Dry::Equalizer(:values, :dynamic, inspect: false)
 
         Locate = Effect.new(type: :env, name: :locate)
 
@@ -41,7 +41,7 @@ module Dry
         # Yield the block with the handler installed
         #
         # @api private
-        def call(stack, values = EMPTY_HASH, options = EMPTY_HASH)
+        def call(values = EMPTY_HASH, options = EMPTY_HASH)
           unless values.empty?
             @values = @values.merge(values)
           end
@@ -52,7 +52,7 @@ module Dry
             @parent = EMPTY_HASH
           end
 
-          super(stack)
+          yield
         end
 
         # @param [Effect] effect

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

@@ -1,6 +1,7 @@
 # frozen_string_literal: true
 
 require 'dry/effects/provider'
+require 'dry/effects/frame'
 
 module Dry
   module Effects
@@ -13,8 +14,8 @@ module Dry
           -> &cont { Frame.spawn_fiber(stack.dup, &cont) }
         end
 
-        def call(stack)
-          @stack = stack
+        def call
+          @stack = Frame.stack
           super
         end
       end

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

@@ -6,7 +6,7 @@ module Dry
   module Effects
     module Providers
       class Implicit < Provider[:implicit]
-        include Dry::Equalizer(:name, :static, :dictionary)
+        include ::Dry::Equalizer(:name, :static, :dictionary, inspect: false)
 
         param :dependency
 
@@ -21,14 +21,14 @@ module Dry
         # Yield the block with the handler installed
         #
         # @api private
-        def call(stack, dynamic = EMPTY_HASH)
+        def call(dynamic = EMPTY_HASH)
           if dynamic.empty?
             @dictionary = static
           else
             @dictionary = static.merge(dynamic)
           end
 
-          super(stack)
+          yield
         end
 
         # @param [Effect] effect

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

@@ -17,7 +17,7 @@ module Dry
         # Yield the block with the handler installed
         #
         # @api private
-        def call(_stack)
+        def call
           [false, yield]
         rescue halt => e
           [true, e.payload[0]]

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

@@ -89,7 +89,7 @@ module Dry
         # Yield the block with the handler installed
         #
         # @api private
-        def call(stack, backend = Undefined)
+        def call(backend = Undefined)
           backend_replace = Undefined.default(backend) do
             parent = ::Dry::Effects.yield(Locate) { Undefined }
             Undefined.map(parent, &:backend)
@@ -97,7 +97,7 @@ module Dry
 
           with_backend(backend_replace) do
             begin
-              super(stack)
+              yield
             ensure
               owned.each { |handle| unlock(handle) }
             end

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

@@ -2,11 +2,14 @@
 
 require 'concurrent/promise'
 require 'dry/effects/provider'
+require 'dry/effects/frame'
 
 module Dry
   module Effects
     module Providers
       class Parallel < Provider[:parallel]
+        include ::Dry::Equalizer(:executor, inspect: false)
+
         option :executor, default: -> { :io }
 
         attr_reader :stack
@@ -27,9 +30,9 @@ module Dry
         # Yield the block with the handler installed
         #
         # @api private
-        def call(stack)
-          @stack = stack
-          super
+        def call
+          @stack = Frame.stack
+          yield
         end
       end
     end

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

@@ -10,13 +10,13 @@ module Dry
           Undefined.default(as) { :"with_#{scope}" }
         end
 
-        Any = Object.new.tap { |any|
+        Any = ::Object.new.tap { |any|
           def any.===(_)
             true
           end
         }.freeze
 
-        include Dry::Equalizer(:scope, :state)
+        include ::Dry::Equalizer(:scope, :state, inspect: false)
 
         attr_reader :state
 
@@ -24,7 +24,7 @@ module Dry
 
         option :type, as: :state_type, default: -> { Any }
 
-        def initialize(*)
+        def initialize(*, **)
           super
 
           @state = Undefined
@@ -37,11 +37,11 @@ module Dry
         # Yield the block with the handler installed
         #
         # @api private
-        def call(stack, state)
+        def call(state)
           case state
           when state_type
             @state = state
-            super(stack)
+            yield
           else
             raise Errors::InvalidValueError.new(state, scope)
           end

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

@@ -11,7 +11,7 @@ module Dry
           Undefined.default(as, :provide)
         end
 
-        include Dry::Equalizer(:static, :parent, :dynamic)
+        include Dry::Equalizer(:static, :parent, :dynamic, inspect: false)
 
         Locate = Effect.new(type: :resolve, name: :locate)
 
@@ -49,7 +49,7 @@ module Dry
         # Yield the block with the handler installed
         #
         # @api private
-        def call(stack, dynamic = EMPTY_HASH, options = EMPTY_HASH)
+        def call(dynamic = EMPTY_HASH, options = EMPTY_HASH)
           @dynamic = dynamic
 
           if options.fetch(:overridable, false)
@@ -58,7 +58,7 @@ module Dry
             @parent = nil
           end
 
-          super(stack)
+          yield
         ensure
           @dynamic = EMPTY_HASH
         end

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

@@ -7,7 +7,7 @@ module Dry
   module Effects
     module Providers
       class Retry < Provider[:retry]
-        include Dry::Equalizer(:scope, :limit, :attempts)
+        include Dry::Equalizer(:scope, :limit, :attempts, inspect: false)
 
         param :scope
 
@@ -18,7 +18,7 @@ module Dry
         # Yield the block with the handler installed
         #
         # @api private
-        def call(_, limit)
+        def call(limit)
           @limit = limit
           @attempts = 0
 

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

@@ -7,7 +7,7 @@ module Dry
   module Effects
     module Providers
       class State < Reader[:state]
-        def write(value)
+        def write(value:)
           case value
           when state_type
             @state = value
@@ -19,7 +19,7 @@ module Dry
         # Yield the block with the handler installed
         #
         # @api private
-        def call(stack, state = Undefined)
+        def call(state = Undefined)
           r = super
           [self.state, r]
         end

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

@@ -25,10 +25,10 @@ module Dry
         # Yield the block with the handler installed
         #
         # @api private
-        def call(stack, timeout)
+        def call(timeout)
           @time_out_at = read_clock + timeout
 
-          super(stack)
+          yield
         end
 
         # @param [Effect] effect

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

@@ -19,9 +19,10 @@ module Dry
         # Yield the block with the handler installed
         #
         # @api private
-        def call(stack, generator = Undefined, **options)
-          @generator = build_generator(generator, **options)
-          super(stack)
+        def call(*args)
+          gen, options = value_with_options_from_args(args)
+          @generator = build_generator(gen, **options)
+          yield
         end
 
         def timestamp(round_to: Undefined, **options)
@@ -56,7 +57,7 @@ module Dry
           end
 
           if !parent.nil?
-            -> options { parent.timestamp(options) }
+            -> **options { parent.timestamp(**options) }
           elsif !Undefined.equal?(generator)
             generator
           elsif !Undefined.equal?(step)

data/lib/dry/effects/stack.rb

@@ -15,7 +15,11 @@ module Dry
 
       def call(effect)
         if effect.is_a?(Effect) && (provider = provider(effect))
-          provider.public_send(effect.name, *effect.payload)
+          if effect.keywords.empty?
+            provider.public_send(effect.name, *effect.payload)
+          else
+            provider.public_send(effect.name, *effect.payload, **effect.keywords)
+          end
         else
           yield
         end
@@ -23,15 +27,11 @@ module Dry
         Instructions::Raise.new(e)
       end
 
-      def push(provider, args)
-        provider.(self, *args) do
-          begin
-            providers.unshift(provider)
-            yield
-          ensure
-            providers.shift
-          end
-        end
+      def push(provider)
+        providers.unshift(provider)
+        yield
+      ensure
+        providers.shift
       end
 
       def provider(effect)

data/lib/dry/effects/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Effects
-    VERSION = '0.1.1'
+    VERSION = '0.1.2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-effects
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Nikita Shilnikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-30 00:00:00.000000000 Z
+date: 2019-12-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby