ncore 3.3.2 → 3.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e01099b869ce4be69bdcd101bfa51241372f3618074547f58b417140505468d1
-  data.tar.gz: 762499cfa2d0527e628f54acf3c541850dfc430cc96b8ed45d6a7fe2e813dea4
+  metadata.gz: 4ad09fd322d7d12373a6546e276cf7d350c4425b273a864c705fc580c10a269c
+  data.tar.gz: 6fd560c150a0ef389ac40b989c71f8c092f5d88802a1d35851d2bff06ca44d8c
 SHA512:
-  metadata.gz: bac55e24257dbfc697ff3c529aab817d851aa89e3439ccf74b79d4c199ec1877c5aadf93d1c50bb0e44bfed21c2ad29b5a411f13ff8282f4f9869db147639c30
-  data.tar.gz: df661b5e833cbcb166d737515888de893e829984be45b760e3b6bcd99d1a0215f269fa6f1b971b3ec7542b0a40c91a9d22e606e6f70840c82a7f045dfc09ea0a
+  metadata.gz: c33362a9a2553c073d449aa58c97d850763e73b15a08fc34e5cf399c7c0043961ecb371fed29df917235fc482e62f8d1a3f944e05c36292253c65d5f5398d426
+  data.tar.gz: ebdd0b5a3cf136fbce954bbcda99cd2f0fd8cdeedb52347da76f5acf076aac57865d9bf77cc65fcfcb88a48f3390a9722bb9d8704ed24d20c84c7891f88e4a32

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+#### 3.4.1
+
+- Allow ActiveModel 7.0
+
+#### 3.4.0
+
+- Add SomeResource#wait_for and WaitTimeout
+
+#### 3.3.4
+
+- Fix :cache option on Ruby 3.0
+
+#### 3.3.3
+
+- Handle recursion in #inspect
+
 #### 3.3.2
 
 - Ruby 3.0 compatibility

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/client_cache.rb

@@ -26,7 +26,7 @@ module NCore
         end
 
         if store && req[:method] == :get
-          store.fetch request_cache_key(req.slice(:url, :headers)), cache_opts do
+          store.fetch request_cache_key(**req.slice(:url, :headers)), cache_opts do
             super
           end
         else

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/util.rb

@@ -62,7 +62,15 @@ module NCore
 
 
     def inspect
-      "#<#{self.class}:0x#{'%016x'%self.object_id} id: #{id.inspect}, attribs: #{@attribs.except(:id).inspect}, metadata: #{metadata.inspect}>"
+      base = "#{self.class}:0x#{'%016x'%self.object_id} id: #{id.inspect}"
+      @@inspect_chain ||= []
+      return "#<#{base}, ...>" if @@inspect_chain.include? self
+      begin
+        @@inspect_chain.push self
+        "#<#{base}, attribs: #{@attribs.except(:id).inspect}, metadata: #{metadata.inspect}>"
+      ensure
+        @@inspect_chain.pop
+      end
     end
 
   end

data/lib/ncore/version.rb

@@ -1,3 +1,3 @@
 module NCore
-  VERSION = '3.3.2'
+  VERSION = '3.4.1'
 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 self 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|

data/ncore.gemspec

@@ -18,9 +18,9 @@ Gem::Specification.new do |spec|
   spec.test_files    = spec.files.grep(%r{^(test|spec|features)/})
   spec.require_paths = ["lib"]
 
-  spec.add_dependency 'activemodel', '>= 5.2', '< 6.2'
+  spec.add_dependency 'activemodel', '>= 5.2', '< 7.1'
   spec.add_dependency 'excon', '~> 0.32'
 
-  spec.add_development_dependency "bundler", "~> 1.3"
+  spec.add_development_dependency "bundler"
   spec.add_development_dependency "rake"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ncore
 version: !ruby/object:Gem::Version
-  version: 3.3.2
+  version: 3.4.1
 platform: ruby
 authors:
 - Notioneer Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-05-23 00:00:00.000000000 Z
+date: 2021-10-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel
@@ -19,7 +19,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -48,16 +48,16 @@ dependencies:
   name: bundler
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '1.3'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -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:
@@ -141,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
+rubygems_version: 3.2.15
 signing_key:
 specification_version: 4
 summary: NCore - Gem for building REST API clients