ncore 3.4.3 → 3.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6470a812da166c0852f57b34a60f8632ba22359fe84cab9cde7f005e552f12ac
-  data.tar.gz: 2e5dc6c7998ef95911c8c739ca39142105f73ab59c165383342e086a3755c526
+  metadata.gz: f96f627fc2c860f1a647ac69f9c165319c6a79b4d5ddd2b9885e470d44f01e06
+  data.tar.gz: 40497aeaee34ffc1b63ac3018b80ce0422800c0451acee3b3f3acfbe7495b920
 SHA512:
-  metadata.gz: 551b111c0e2a86b0d0ce3b209001e1bb7307f347fdec2122c62971edd25dd9a2d658def1569c64abda20fd53439e99280571bc706e48bf219e4313aee1b3b093
-  data.tar.gz: 5c4def6f9020d41f7e3a52504d26c946d9d884952b1cb198f9a4dd8c81552576b9bc5241925e0793b73f5e75856bf6a282d5fe0c3b09b58a69bdf3fc31f2d7f2
+  metadata.gz: 565bbd2f26a065bcb4bb6eb8f15515109db6ae0ebd4a388a9ea1ae18050d5462c14c15178806f3927e98079c52f9fb091c7cdec659e212ecb796128737b569c5
+  data.tar.gz: ab02acdb71d0fbc5006ef2bc071449f5cd3b1525e8a321b46c3b22c64aad3b99e6ea17fb6bcd0fb2a455d908885fdf4263ee6508779208e42607fcaf26563477

data/CHANGELOG.md

@@ -1,3 +1,14 @@
+#### 3.5.0
+
+- Allow ActiveModel 7.1
+- Update LogSubscriber for ActiveSupport 7.1
+- Associations: add arg :association_key to has_many, belongs_to
+- Associations: has_many now builds retrieve_{assoc}
+
+#### 3.4.4
+
+- Improve keepalive handling
+
 #### 3.4.3
 
 - Fix Rails controller reporting of API times
@@ -92,6 +103,10 @@ Other changes
   - #i18n_scope, config via Api.i18n_scope=
   - #cache_key, #cache_version, #cache_key_with_version
 
+#### 2.3.3
+
+- Improve keepalive handling
+
 #### 2.3.2
 
 - Allow ActiveSupport 7.0

data/LICENSE

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

data/lib/ncore/associations.rb

@@ -1,109 +1,148 @@
 module NCore
   module Associations
 
-    def has_many(assoc, class_name: nil)
-      assoc = assoc.to_s
-      klass = class_name || "#{module_name}::#{assoc.camelize.singularize}"
-      key = "#{attrib_name}_id"
-      class_eval <<-M1, __FILE__, __LINE__+1
-        def #{assoc}(params={})
+    # assoc_name       - plural association name
+    # :association_key - key used by the association to reference the parent
+    #                    defaults to `attrib_name+'_id'`
+    # :class_name      - Module::Class of the child association, as a string
+    def has_many(assoc_name, association_key: nil, class_name: nil)
+      assoc_name = assoc_name.to_s
+      parent_key = association_key&.to_s || "#{attrib_name}_id"
+      klass      = class_name || "#{module_name}::#{assoc_name.camelize.singularize}"
+
+      # def items({})
+      class_eval <<-A1, __FILE__, __LINE__+1
+        def #{assoc_name}(params={})
           return [] unless id
           reload = params.delete :reload
           cacheable = params.except(:credentials, :request).empty?
           params = parse_request_params(params).reverse_merge credentials: api_creds
-          params[:#{key}] = id
+          params[:#{parent_key}] = id
           if cacheable
             # only cache unfiltered, default api call
-            @attribs[:#{assoc}] = (!reload && @attribs[:#{assoc}]) || #{klass}.all(params)
+            @attribs[:#{assoc_name}] = (!reload && @attribs[:#{assoc_name}]) || #{klass}.all(params)
           else
             #{klass}.all(params)
           end
         end
-      M1
-      class_eval <<-M2, __FILE__, __LINE__+1
-        def find_#{assoc.singularize}(aid, params={})
+      A1
+
+      # def find_item(id, {})
+      class_eval <<-F1, __FILE__, __LINE__+1
+        def find_#{assoc_name.singularize}(aid, params={})
           raise UnsavedObjectError unless id
           params = parse_request_params(params).reverse_merge credentials: api_creds
-          params[:#{key}] = id
+          params[:#{parent_key}] = id
           #{klass}.find(aid, params)
         end
-      M2
-      # will always return the object; check .errors? or .valid? to see how it went
-      class_eval <<-M3, __FILE__, __LINE__+1
-        def create_#{assoc.singularize}(params={})
+      F1
+
+      # def retrieve_item(id, {})
+      class_eval <<-F2, __FILE__, __LINE__+1
+        def retrieve_#{assoc_name.singularize}(aid, params={})
           raise UnsavedObjectError unless id
           params = parse_request_params(params).reverse_merge credentials: api_creds
-          params[:#{key}] = id
-          #{klass}.create(params)
+          params[:#{parent_key}] = id
+          #{klass}.retrieve(aid, params)
         end
-      M3
+      F2
+
+      # def create_item({})
       # will always return the object; check .errors? or .valid? to see how it went
-      class_eval <<-M4, __FILE__, __LINE__+1
-        def update_#{assoc.singularize}(aid, params={})
+      class_eval <<-C1, __FILE__, __LINE__+1
+        def create_#{assoc_name.singularize}(params={})
           raise UnsavedObjectError unless id
           params = parse_request_params(params).reverse_merge credentials: api_creds
-          params[:#{key}] = id
-          #{klass}.update(aid, params)
+          params[:#{parent_key}] = id
+          #{klass}.create(params)
         end
-      M4
-      class_eval <<-M5, __FILE__, __LINE__+1
-        def create_#{assoc.singularize}!(params={})
+      C1
+
+      # def create_item!({})
+      class_eval <<-C2, __FILE__, __LINE__+1
+        def create_#{assoc_name.singularize}!(params={})
           raise UnsavedObjectError unless id
           params = parse_request_params(params).reverse_merge credentials: api_creds
-          params[:#{key}] = id
+          params[:#{parent_key}] = id
           #{klass}.create!(params)
         end
-      M5
-      class_eval <<-M6, __FILE__, __LINE__+1
-        def update_#{assoc.singularize}!(aid, params={})
+      C2
+
+      # def update_item(id, {})
+      # will always return the object; check .errors? or .valid? to see how it went
+      class_eval <<-U1, __FILE__, __LINE__+1
+        def update_#{assoc_name.singularize}(aid, params={})
+          raise UnsavedObjectError unless id
+          params = parse_request_params(params).reverse_merge credentials: api_creds
+          params[:#{parent_key}] = id
+          #{klass}.update(aid, params)
+        end
+      U1
+
+      # def update_item!(id, {})
+      class_eval <<-U2, __FILE__, __LINE__+1
+        def update_#{assoc_name.singularize}!(aid, params={})
           raise UnsavedObjectError unless id
           params = parse_request_params(params).reverse_merge credentials: api_creds
-          params[:#{key}] = id
+          params[:#{parent_key}] = id
           #{klass}.update!(aid, params)
         end
-      M6
+      U2
+
+      # def delete_item(id, {})
       # will always return the object; check .errors? or .valid? to see how it went
-      class_eval <<-M7, __FILE__, __LINE__+1
-        def delete_#{assoc.singularize}(aid, params={})
+      class_eval <<-D1, __FILE__, __LINE__+1
+        def delete_#{assoc_name.singularize}(aid, params={})
           raise UnsavedObjectError unless id
           params = parse_request_params(params).reverse_merge credentials: api_creds
-          params[:#{key}] = id
+          params[:#{parent_key}] = id
           #{klass}.delete(aid, params)
         end
-      M7
-      class_eval <<-M8, __FILE__, __LINE__+1
-        def delete_#{assoc.singularize}!(aid, params={})
+      D1
+
+      # def delete_item!(id, {})
+      class_eval <<-D2, __FILE__, __LINE__+1
+        def delete_#{assoc_name.singularize}!(aid, params={})
           raise UnsavedObjectError unless id
           params = parse_request_params(params).reverse_merge credentials: api_creds
-          params[:#{key}] = id
+          params[:#{parent_key}] = id
           #{klass}.delete!(aid, params)
         end
-      M8
+      D2
     end
 
-    def belongs_to(assoc, class_name: nil)
-      assoc = assoc.to_s
-      klass = class_name || "#{module_name}::#{assoc.camelize}"
-      class_eval <<-M1, __FILE__, __LINE__+1
-        attr :#{assoc}_id
-        def #{assoc}(params={})
-          return nil unless #{assoc}_id
+    # assoc_name       - singular association name
+    # :association_key - key on this resource used to reference the parent association
+    #                    defaults to `assoc_name+'_id'`
+    # :class_name      - Module::Class of the parent association, as a string
+    def belongs_to(assoc_name, association_key: nil, class_name: nil)
+      assoc_name = assoc_name.to_s
+      parent_key = association_key&.to_s || "#{assoc_name}_id"
+      klass      = class_name || "#{module_name}::#{assoc_name.camelize}"
+
+      # attr :parent_id
+      # def parent({})
+      class_eval <<-P1, __FILE__, __LINE__+1
+        attr :#{parent_key}
+        def #{assoc_name}(params={})
+          return nil unless #{parent_key}
           params = parse_request_params(params).reverse_merge credentials: api_creds
           if params.except(:credentials, :request).empty?
             # only cache unfiltered, default api call
-            @attribs[:#{assoc}] ||= #{klass}.find(#{assoc}_id, params)
+            @attribs[:#{assoc_name}] ||= #{klass}.find(#{parent_key}, params)
           else
-            #{klass}.find(#{assoc}_id, params)
+            #{klass}.find(#{parent_key}, params)
           end
         end
-      M1
-      class_eval <<-M2, __FILE__, __LINE__+1
-        def #{assoc}_id=(v)
-          @attribs[:#{assoc}] = nil unless @attribs[:#{assoc}_id] == v
-          @attribs[:#{assoc}_id] = v
+      P1
+
+      class_eval <<-P2, __FILE__, __LINE__+1
+        def #{parent_key}=(v)
+          @attribs[:#{assoc_name}] = nil unless @attribs[:#{parent_key}] == v
+          @attribs[:#{parent_key}] = v
         end
-        private :#{assoc}_id=
-      M2
+        private :#{parent_key}=
+      P2
     end
 
   end

data/lib/ncore/client.rb

@@ -177,9 +177,9 @@ module NCore
               tries += 1
               response = connection.request rest_opts.except(:url)
             rescue Excon::Error::Socket, Excon::Errors::SocketError, Excon::Error::Timeout,
-                Errno::EADDRNOTAVAIL => e
+                Errno::EADDRNOTAVAIL, Errno::ECONNRESET => e
               # retry when keepalive was closed
-              if tries <= 1 #&& e.message =~ /end of file reached/
+              if tries <= 1
                 retry
               else
                 raise e

data/lib/ncore/rails/log_subscriber.rb

@@ -37,11 +37,11 @@ module NCore
       msg = "%s %s" % [http_method, url]
       res = " -> %d (%.1f ms)" % [http_status, event.duration]
 
-      msg = color(msg, ActiveSupport::LogSubscriber::YELLOW, false)
+      msg = color(msg, :yellow)
       if (200..299).include? http_status
-        res = color(res, ActiveSupport::LogSubscriber::GREEN, true)
+        res = color(res, :green, bold: true)
       else
-        res = color(res, ActiveSupport::LogSubscriber::RED, true)
+        res = color(res, :red, bold: true)
       end
 
       if (200..299).include? http_status

data/lib/ncore/version.rb

@@ -1,3 +1,3 @@
 module NCore
-  VERSION = '3.4.3'
+  VERSION = '3.5.0'
 end

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', '< 7.1'
+  spec.add_dependency 'activemodel', '>= 5.2', '< 7.2'
   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.4.3
+  version: 3.5.0
 platform: ruby
 authors:
 - Notioneer Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-03-27 00:00:00.000000000 Z
+date: 2023-01-07 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: '7.1'
+        version: '7.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,7 +29,7 @@ dependencies:
         version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '7.1'
+        version: '7.2'
 - !ruby/object:Gem::Dependency
   name: excon
   requirement: !ruby/object:Gem::Requirement
@@ -142,7 +142,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.2.32
+rubygems_version: 3.3.26
 signing_key:
 specification_version: 4
 summary: NCore - Gem for building REST API clients