dry-effects 0.1.0.alpha → 0.1.0.alpha2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66aa8408a51ae62ea853de06a0d19617925646c28783044e01338e46d5e75e0d
-  data.tar.gz: f226f1cbb69164f77db634870e139439290927f58075aa0a2fa83b37bb438c46
+  metadata.gz: e467f4de9697568b05a68ccc58c3d7acc44ab3f196e6a93c07c574b6aaeca6f9
+  data.tar.gz: 4f3b5093c7aabb77aeab310080bc1a1e2091537da7724c5c1b70587cbcbce12b
 SHA512:
-  metadata.gz: bebd714592097d5dde1852ad38bc5162e1d275c7c92d98a36a9f9445dead76dde4325a6b4e58758ca3fc40ae7ba554a2484c1ae64f59b344273f34da9e4d5305
-  data.tar.gz: '06600796cf9707b1e55141d3fec4cae8584a8525b3ed3155eb36be05095db85148e2cdc75f2d9aad662096cb454f5a8ab4070989022d6cc16ce98c3af87b3261'
+  metadata.gz: bc7202bfd43a789fd1221323126eee3000479c45508ccb08874a29b91b86ee089a6248b7f33a64a651aa296b84a4ae425bcdab689b18709144ea33ab3cd9e582
+  data.tar.gz: 1e2a61bcfe1e64991317b028b1bae6e3ddd663c3b658c9f67ecb14dc0570610d75bccc94ad8ec9cb7d8f935099086dadcb6e075bc702a920820fc07b90bb8571

data/.travis.yml

@@ -7,6 +7,7 @@ before_script:
   - chmod +x ./cc-test-reporter
   - ./cc-test-reporter before-build
 rvm:
+  - 2.4.6
   - 2.5.5
   - 2.6.3
   - truffleruby

data/dry-effects.gemspec

@@ -35,6 +35,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'exe'
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
+  spec.required_ruby_version = '>= 2.4'
 
   spec.add_runtime_dependency 'concurrent-ruby', '~> 1.0'
   spec.add_runtime_dependency 'dry-container', '~> 0.7', '>= 0.7.2'

data/lib/dry/effects/all.rb

@@ -9,7 +9,7 @@ module Dry
     default = %i[
       cache current_time random resolve defer
       state interrupt amb retry fork parallel
-      async implicit env lock reader
+      async implicit env lock reader timestamp
     ]
 
     effect_modules = ::Concurrent::Map.new
@@ -38,7 +38,7 @@ module Dry
           Providers.const_get(Inflector.camelize(key))
         end
 
-        Handler.singleton_class.define_method(class_name) do |*args|
+        Handler.singleton_class.send(:define_method, class_name) do |*args|
           ::Dry::Effects.providers[key].mixin(*args)
         end
       end

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

@@ -8,16 +8,18 @@ module Dry
       class CurrentTime < ::Module
         CurrentTime = Effect.new(type: :current_time)
 
-        def initialize(round: Undefined)
-          get = CurrentTime.payload(round_to: round)
-
+        def initialize(options = EMPTY_HASH)
           module_eval do
-            define_method(:current_time) do |round: Undefined|
-              if Undefined.equal?(round)
-                ::Dry::Effects.yield(get)
+            define_method(:current_time) do |round: Undefined, refresh: false|
+              round_to = Undefined.coalesce(round, options.fetch(:round, Undefined))
+
+              if Undefined.equal?(round_to) && refresh.equal?(false)
+                effect = CurrentTime
               else
-                ::Dry::Effects.yield(get.payload(round_to: round))
+                effect = CurrentTime.payload(round_to: round_to, refresh: refresh)
               end
+
+              ::Dry::Effects.yield(effect)
             end
           end
         end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+require 'dry/effects/effect'
+
+module Dry
+  module Effects
+    module Effects
+      class Timestamp < ::Module
+        Timestamp = Effect.new(type: :timestamp)
+
+        def initialize(options = EMPTY_HASH)
+          module_eval do
+            define_method(:timestamp) do |round: Undefined|
+              round_to = Undefined.coalesce(round, options.fetch(:round, Undefined))
+
+              if Undefined.equal?(round_to)
+                ::Dry::Effects.yield(Timestamp)
+              else
+                ::Dry::Effects.yield(Timestamp.payload(round_to: round_to))
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -46,8 +46,8 @@ module Dry
           handler = Handler.new(provider)
 
           ::Module.new do
-            define_method(handle_method) do |*args, &block|
-              handler.(args, &block)
+            define_method(handle_method) do |*xs, &block|
+              handler.(xs, &block)
             end
           end
         end

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

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require 'dry/effects/provider'
+
+module Dry
+  module Effects
+    module Providers
+      class CurrentTime < Provider[:current_time]
+        module TimeGenetators
+          FixedTimeGenerator = lambda do
+            time = ::Time.now
+            lambda do |refresh: false, **|
+              time = ::Time.now if refresh
+              time
+            end
+          end
+
+          RunningTime = -> ** { ::Time.now }
+          RunningTimeGenerator = -> { RunningTime }
+
+          IncrementingTimeGenerator = lambda do |initial, step|
+            start = Undefined.default(initial) { ::Time.now }
+            current = nil
+
+            lambda do |**|
+              if current.nil?
+                current = start
+              else
+                current += step
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,12 +1,16 @@
 # frozen_string_literal: true
 
 require 'dry/effects/provider'
+require 'dry/effects/providers/current_time/time_generators'
 
 module Dry
   module Effects
     module Providers
       class CurrentTime < Provider[:current_time]
         include Dry::Equalizer(:fixed, :round)
+        include TimeGenetators
+
+        Locate = Effect.new(type: :current_time, name: :locate)
 
         option :fixed, default: -> { true }
 
@@ -14,31 +18,52 @@ module Dry
 
         alias_method :fixed?, :fixed
 
-        attr_reader :time
+        attr_reader :generator
 
-        def call(stack, time = Undefined)
-          if fixed?
-            @time = Undefined.default(time) { ::Time.now }
+        def call(stack, generator = Undefined, **options)
+          @generator = build_generator(generator, **options)
+          super(stack)
+        end
+
+        def build_generator(generator, step: Undefined, initial: Undefined, overridable: false)
+          if overridable
+            parent = ::Dry::Effects.yield(Locate) { nil }
           else
-            @time = time
+            parent = nil
+          end
+
+          if !parent.nil?
+            -> options { parent.current_time(options) }
+          elsif !Undefined.equal?(generator)
+            generator
+          elsif !Undefined.equal?(step)
+            IncrementingTimeGenerator.(initial, step)
+          elsif fixed?
+            FixedTimeGenerator.()
+          else
+            RunningTimeGenerator.()
           end
-          super(stack)
         end
 
-        def current_time(round_to: Undefined)
-          t = fixed? ? time : Undefined.default(time) { ::Time.now }
-          round = Undefined.default(round_to) { self.round }
+        def current_time(round_to: Undefined, **options)
+          time = generator.(**options)
+
+          round = Undefined.coalesce(round_to, self.round)
 
           if Undefined.equal?(round)
-            t
+            time
           else
-            t.round(round)
+            time.round(round)
           end
         end
 
+        def locate
+          self
+        end
+
         def represent
           if fixed?
-            "current_time[fixed=#{time.iso8601(6)}]"
+            "current_time[fixed=#{generator.().iso8601(6)}]"
           else
             'current_time[fixed=false]'
           end

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

@@ -89,9 +89,11 @@ module Dry
           end
 
           with_backend(backend_replace) do
-            super(stack)
-          ensure
-            owned.each { |handle| unlock(handle) }
+            begin
+              super(stack)
+            ensure
+              owned.each { |handle| unlock(handle) }
+            end
           end
         end
 

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

@@ -20,8 +20,10 @@ module Dry
           @attempts = 0
 
           loop do
-            return attempt { yield }
-          rescue halt
+            begin
+              return attempt { yield }
+            rescue halt
+            end
           end
         end
 

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

@@ -0,0 +1,60 @@
+# frozen_string_literal: true
+
+require 'dry/effects/provider'
+require 'dry/effects/providers/current_time'
+
+module Dry
+  module Effects
+    module Providers
+      class Timestamp < Provider[:timestamp]
+        include Dry::Equalizer(:round)
+        include CurrentTime::TimeGenetators
+
+        Locate = Effect.new(type: :timestamp, name: :locate)
+
+        option :round, default: -> { Undefined }
+
+        attr_reader :generator
+
+        def call(stack, generator = Undefined, **options)
+          @generator = build_generator(generator, **options)
+          super(stack)
+        end
+
+        def build_generator(generator, step: Undefined, initial: Undefined, overridable: false)
+          if overridable
+            parent = ::Dry::Effects.yield(Locate) { nil }
+          else
+            parent = nil
+          end
+
+          if !parent.nil?
+            -> options { parent.timestamp(options) }
+          elsif !Undefined.equal?(generator)
+            generator
+          elsif !Undefined.equal?(step)
+            IncrementingTimeGenerator.(initial, step)
+          else
+            RunningTimeGenerator.()
+          end
+        end
+
+        def timestamp(round_to: Undefined, **options)
+          time = generator.(**options)
+
+          round = Undefined.coalesce(round_to, self.round)
+
+          if Undefined.equal?(round)
+            time
+          else
+            time.round(round)
+          end
+        end
+
+        def locate
+          self
+        end
+      end
+    end
+  end
+end

data/lib/dry/effects/stack.rb

@@ -25,10 +25,12 @@ module Dry
 
       def push(provider, args)
         provider.(self, *args) do
-          providers.unshift(provider)
-          yield
-        ensure
-          providers.shift
+          begin
+            providers.unshift(provider)
+            yield
+          ensure
+            providers.shift
+          end
         end
       end
 

data/lib/dry/effects/version.rb

@@ -2,6 +2,6 @@
 
 module Dry
   module Effects
-    VERSION = '0.1.0.alpha'
+    VERSION = '0.1.0.alpha2'
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dry-effects
 version: !ruby/object:Gem::Version
-  version: 0.1.0.alpha
+  version: 0.1.0.alpha2
 platform: ruby
 authors:
 - Nikita Shilnikov
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-18 00:00:00.000000000 Z
+date: 2019-08-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: concurrent-ruby
@@ -202,6 +202,7 @@ files:
 - lib/dry/effects/effects/resolve.rb
 - lib/dry/effects/effects/retry.rb
 - lib/dry/effects/effects/state.rb
+- lib/dry/effects/effects/timestamp.rb
 - lib/dry/effects/errors.rb
 - lib/dry/effects/extensions.rb
 - lib/dry/effects/extensions/auto_inject.rb
@@ -219,6 +220,7 @@ files:
 - lib/dry/effects/providers/async.rb
 - lib/dry/effects/providers/cache.rb
 - lib/dry/effects/providers/current_time.rb
+- lib/dry/effects/providers/current_time/time_generators.rb
 - lib/dry/effects/providers/defer.rb
 - lib/dry/effects/providers/env.rb
 - lib/dry/effects/providers/fork.rb
@@ -231,6 +233,7 @@ files:
 - lib/dry/effects/providers/resolve.rb
 - lib/dry/effects/providers/retry.rb
 - lib/dry/effects/providers/state.rb
+- lib/dry/effects/providers/timestamp.rb
 - lib/dry/effects/stack.rb
 - lib/dry/effects/version.rb
 homepage: https://github.com/dry-rb/dry-effects
@@ -249,7 +252,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '0'
+      version: '2.4'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">"