iopromise 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1189b2ad73f76eff39b347922c03e2e40fc188ff95b7a6771da921d193c88ed5
-  data.tar.gz: 169d59659740616c94508bdd3fabfd8fd1850c2a593dade86fda7267efa03eb7
+  metadata.gz: 566685c55c8c71504647196e5cc9edcb96cde013c316a9b5a8b2ad771afde67e
+  data.tar.gz: 4928d07726ea8b3df4a79fa056fd3b0ce3c6e5b2493f166b5ea0d7261346b8c6
 SHA512:
-  metadata.gz: 11f75193659f6f37295faf3d0ecea8166aa446da826da462cfc8ea5631eae2f107a65c1d093f1c082ae1e2690166f124244ea2ddf9bcc837ae3c6763e13ae063
-  data.tar.gz: d16beca1753c4c31994801787925b25713ac315599cc246dc19a92169fab7afe5948717454e9511be59735e542e8eea4805660c86c6c8de7a906a4e376848dc4
+  metadata.gz: 9b849e9d40682cda87bf901c734a65a7db10f27c9bcfa22f9760a06943c386c617dccc7f1f186fd92da6fa42956ac8b56384b7be0e4f081bd4e78e5cfd7ecf1f
+  data.tar.gz: 174b5ab72c8a3ef1c6de7a412bcaa35f2a1165066494b7b9e4cbe22d8b858ea57ed0fb274a20a34020dcaffdbd4e998ddd067512ac031174fb4b3ff9c069420a

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    iopromise (0.1.4)
+    iopromise (0.1.5)
       nio4r
       promise.rb (~> 0.7.4)
 

data/lib/iopromise/data_loader.rb

@@ -3,17 +3,23 @@
 module IOPromise
   module DataLoader
     module ClassMethods
-      def attr_promised_data(*args)
-        @promised_data_keys ||= []
-        @promised_data_keys.concat(args)
+      def attr_async(attr_name, build_func = nil)
+        self.attr_async_names << attr_name
 
-        args.each do |arg|
-          self.class_eval("def #{arg};@#{arg}.sync;end")
+        if build_func.nil?
+          self.class_eval("def async_#{attr_name};@#{attr_name};end")
+        else
+          self.define_method("async_#{attr_name}") do
+            @attr_async_memo ||= {}
+            @attr_async_memo[attr_name] ||= self.instance_exec(&build_func)
+          end
         end
+
+        self.class_eval("def #{attr_name};async_#{attr_name}.sync;end")
       end
   
-      def promised_data_keys
-        @promised_data_keys ||= []
+      def attr_async_names
+        @attr_async_names ||= []
       end
     end
 
@@ -21,19 +27,29 @@ module IOPromise
       base.extend(ClassMethods)
     end
 
-    def data_promises
-      self.class.promised_data_keys.flat_map do |k|
-        p = instance_variable_get('@' + k.to_s)
+    def async_attributes
+      @async_attributes ||= Promise.all(attr_async_promises)
+    end
+
+    def sync
+      async_attributes.sync
+      self
+    end
+
+    protected
+    def attr_async_promises
+      self.class.attr_async_names.flat_map do |k|
+        p = send("async_#{k}")
         case p
         when ::IOPromise::DataLoader
           # greedily, recursively preload all nested data that we know about immediately
-          p.data_promises
+          p.attr_async_promises
         when ::Promise
           # allow nesting of dataloaders chained behind other promises
           resolved = p.then do |result|
             if result.is_a?(::IOPromise::DataLoader)
               # likewise, if we resolved a promise that we can recurse, load that data too.
-              result.data_as_promise
+              result.async_attributes
             else
               result
             end
@@ -41,18 +57,9 @@ module IOPromise
 
           [resolved]
         else
-          raise TypeError.new("Instance variable #{k.to_s} used with attr_promised_data but was not a promise or a IOPromise::DataLoader.")
+          raise TypeError.new("Instance variable #{k.to_s} used with attr_async but was not a promise or a IOPromise::DataLoader.")
         end
       end
     end
-
-    def data_as_promise
-      @data_as_promise ||= Promise.all(data_promises)
-    end
-
-    def sync
-      data_as_promise.sync
-      self
-    end
   end
 end

data/lib/iopromise/deferred/promise.rb

@@ -5,13 +5,13 @@ require_relative 'executor_pool'
 module IOPromise
   module Deferred
     class DeferredPromise < ::IOPromise::Base
-      def initialize(timeout: nil, &block)
+      def initialize(delay: nil, &block)
         super()
     
         @block = block
         
-        unless timeout.nil?
-          @defer_until = Process.clock_gettime(Process::CLOCK_MONOTONIC) + timeout
+        unless delay.nil?
+          @defer_until = Process.clock_gettime(Process::CLOCK_MONOTONIC) + delay
         end
     
         ::IOPromise::ExecutorContext.current.register(self) unless @block.nil?

data/lib/iopromise/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module IOPromise
-  VERSION = '0.1.4'
+  VERSION = '0.1.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: iopromise
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Theo Julienne
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-07-28 00:00:00.000000000 Z
+date: 2021-08-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: promise.rb