ncore 3.3.4 → 3.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 36ef02739c4a1da72bcddc653c521e617947618f18819df4cf03d5e83695c7bd
-  data.tar.gz: fb2363f1754bb367126b871faeaaa0327869166f276715dbde1ec9cea698f41a
+  metadata.gz: c66806c855a5d52a9461e2bc48542dff6b5f9d7628c5bc3a850dbd3a99fdef11
+  data.tar.gz: eeee6c280d80ab935925e883c39d493b8d9dafa39c4d1c6019055781ecf6ce77
 SHA512:
-  metadata.gz: d5f6e466021e4ddfdd378ebc381e515931861a51cd3df4c1340de887f044f47ffe8721a0a94f6c3fb4e59c44eeb78abd94a21e6682ec8ce999072b74e7fa3d3c
-  data.tar.gz: 195dc54e8e8414819ceef4d0714ac1118cf9bae7fc03143019c18d8fa5fe4d800b8850a9ded557667d85a970329dc9589ee2e5363ceb3546d43bfcf90d433349
+  metadata.gz: 9c9d20b236e6dd742ee5863a6bcfff5908993354cef3944ba1d17c930278400df01099ac957d40421bd63d2c7384cadfe8414126d14abe5471b97350d1f3e2b3
+  data.tar.gz: da4473efcb0e5796d9eedf65b0edf1e438c3e5a67a813f0d69f62770e95dbd0cf2e4473349a5e560d030e513c532f07d8d9fb815151c35ded21586547e5ee6de

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+#### 3.4.0
+
+- Add SomeResource#wait_for and WaitTimeout
+
 #### 3.3.4
 
 - Fix :cache option on Ruby 3.0

data/lib/ncore/base.rb

@@ -11,6 +11,7 @@ module NCore
       include Identity
       include Lifecycle
       include Util
+      include Wait
     end
 
     module ClassMethods

data/lib/ncore/exceptions.rb

@@ -15,22 +15,41 @@ module NCore
         class RecordNotFound < Error ; end
         class UnsavedObjectError < Error ; end
 
-        class RecordInvalid < Error
+        class RecordError < Error
           attr_reader :object
 
-          def initialize(object)
+          def initialize(object, msg: nil)
             @object = object
-            cl_name = object.class_name if object.respond_to?(:class_name)
-            cl_name ||= object.class.class_name if object.class.respond_to?(:class_name)
-            cl_name ||= object.name if object.respond_to?(:name)
-            cl_name ||= object.class.name
-            msg = "\#{cl_name} Invalid: \#{object.errors.to_a.join(' ')}"
+            msg ||= "Error on \#{class_name_for(object)}"
             super msg
           end
 
           def errors
             object&.errors
           end
+
+          private
+
+          def class_name_for(object)
+            n   = object.class_name if object.respond_to?(:class_name)
+            n ||= object.class.class_name if object.class.respond_to?(:class_name)
+            n ||= object.name if object.respond_to?(:name)
+            n ||= object.class.name
+          end
+        end
+
+        class RecordInvalid < RecordError
+          def initialize(object)
+            msg = "\#{class_name_for(object)} Invalid: \#{object.errors.to_a.join(' ')}"
+            super object, msg: msg
+          end
+        end
+
+        class WaitTimeout < RecordError
+          def initialize(object)
+            msg = "Timeout waiting for condition on \#{class_name_for(object)}"
+            super object, msg: msg
+          end
         end
 
         class QueryError < Error

data/lib/ncore/singleton_base.rb

@@ -10,6 +10,7 @@ module NCore
       include Identity
       include Lifecycle
       include Util
+      include Wait
     end
 
     module ClassMethods

data/lib/ncore/version.rb

@@ -1,3 +1,3 @@
 module NCore
-  VERSION = '3.3.4'
+  VERSION = '3.4.0'
 end

data/lib/ncore/wait.rb

@@ -0,0 +1,27 @@
+module NCore
+  module Wait
+    extend ActiveSupport::Concern
+
+    private
+
+    def wait_for(seconds, &block)
+      return unless seconds
+      seconds = 45 if seconds == true
+      end_by = seconds.seconds.from_now
+      cnt = 0
+      until Time.current > end_by
+        wait = [end_by-Time.current, retry_in(cnt)].min
+        cnt += 1
+        sleep wait
+        reload
+        return true if block.call
+      end
+      raise self.class.module_parent::WaitTimeout, self
+    end
+
+    def retry_in(count)
+      (count**1.7).round + 1
+    end
+
+  end
+end

data/lib/ncore.rb

@@ -16,6 +16,7 @@ require 'pp'
   identity
   lifecycle
   util
+  wait
   base
   singleton_base
 ).each do |f|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ncore
 version: !ruby/object:Gem::Version
-  version: 3.3.4
+  version: 3.4.0
 platform: ruby
 authors:
 - Notioneer Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-22 00:00:00.000000000 Z
+date: 2021-10-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -121,6 +121,7 @@ files:
 - lib/ncore/singleton_base.rb
 - lib/ncore/util.rb
 - lib/ncore/version.rb
+- lib/ncore/wait.rb
 - ncore.gemspec
 homepage: https://notioneer.com/
 licenses: