ncore 3.3.3 → 3.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c1bfad3aa6f47ff4917335016f0dc43e51617e68b932e064b50bc5fefa84c51d
-  data.tar.gz: d7a5385d7a62e4429e192ed032da3a205f5d74aaddc8e7961a9b19c52f413f6c
+  metadata.gz: e05865527c77bbb27e9a70c0b880db847160b8904fa7c0693dac8e84be15870f
+  data.tar.gz: f10b8e34df3e7a95d2994e533c45d70671f5ea479e585ac7b3ff89f8ceea9226
 SHA512:
-  metadata.gz: e3bc26138793e56edf190fd010486a2e3e14e9559326d55251e2992ad518dc0c091523d23f27d2a21dc2351f9cadf4e8dc6e50e444ab5d183e158837702d41ce
-  data.tar.gz: cc000c1c0c60d559527080aae6d152b26b0281816fdb49d83b22c2b9f44f5f337c23dff0ecaabaa83efa7fdb6e7ff75ad371d47317e15502fc26db3ea88c001a
+  metadata.gz: 82dbca21c895a10441d08fd7390af765d397966ec90d528f7caf988d8bc9485b5f128ba6c766361c90fbb8eb1ddc47525a7d27366f29e29a3a7dcb552e811b0f
+  data.tar.gz: 0f9971e5d56859937c5b21e0dcacdfdeacab3049e327bf727ff28c9e47ec13ee7c36ab7f5b55786924508fb6ccca56187080b79d82bb98019e1eb8c71b0aa60b

data/CHANGELOG.md

@@ -1,3 +1,19 @@
+#### 3.4.2
+
+- Fix SomeResource.all when payload includes 'data' attribute
+
+#### 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
@@ -72,6 +88,10 @@ Other changes
   - #i18n_scope, config via Api.i18n_scope=
   - #cache_key, #cache_version, #cache_key_with_version
 
+#### 2.3.2
+
+- Allow ActiveSupport 7.0
+
 #### 2.3.1
 
 - Allow ActiveModel 6.1

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2014-2021 Notioneer, Inc.
+Copyright (c) 2014-2022 Notioneer, Inc.
 
 MIT License
 

data/example/lib/my_api/rails/railtie.rb

@@ -1,7 +1,12 @@
 module MyApi
   class Railtie < Rails::Railtie
 
-    config.after_initialize do
+    config.action_dispatch.rescue_responses.merge!(
+      'MyApi::RecordInvalid'  => :unprocessable_entity, # 422
+      'MyApi::RecordNotFound' => :not_found, # 404
+    )
+
+    initializer "my_api.cache_store" do |app|
       MyApi::Api.cache_store = Rails.cache
     end
 

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

@@ -6,11 +6,12 @@ module NCore
 
       private
 
+      # only caches GET requests with 200..299, 409, 422 responses
       # cache_opts: true
       #   use *::Api.cache_store
       # cache_opts: {...}
       #   use: *::Api.cache_store, with options: {...}
-      #   hint: add  force: true  execute the query and rewrite the cache
+      #   hint: add  force: true  to execute the query and rewrite the cache
       # cache_opts: Store.new
       #   use Store.new as-is
       def execute_request(req, cache_opts=nil)
@@ -26,7 +27,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/methods/all.rb

@@ -12,7 +12,7 @@ module NCore
         Collection.new.tap do |coll|
           coll.metadata = parsed[:metadata]
           parsed[:data].each do |hash|
-            coll << factory(hash.merge(metadata: parsed[:metadata]), creds)
+            coll << factory({data: hash, metadata: parsed[:metadata]}, creds)
           end
         end
       end

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.3'
+  VERSION = '3.4.2'
 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,7 +18,7 @@ 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"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ncore
 version: !ruby/object:Gem::Version
-  version: 3.3.3
+  version: 3.4.2
 platform: ruby
 authors:
 - Notioneer Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-16 00:00:00.000000000 Z
+date: 2022-01-27 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
@@ -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.2.15
+rubygems_version: 3.2.22
 signing_key:
 specification_version: 4
 summary: NCore - Gem for building REST API clients