ncore 3.6.2 → 3.7.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 72b21510020d16c3b3867166bd04a2a7f36a10e81e53f3fffafe6ff65dfd58c3
-  data.tar.gz: 0abc02e39d688fd674fd6eabfc6f57de375b92ee6e037642ec80ab3dbc43345d
+  metadata.gz: 6c6562d9f0e6fca58cc5ad061d9461006dc509f92e960a55ed83bd127fd1d503
+  data.tar.gz: f61859177171d285d7442dfdee1a66964b318bb14824b7e409da2e3e27b92e0d
 SHA512:
-  metadata.gz: 7602eb0f8a31448ea87b96c7d8838e91a1380e45b098fa0a8b7e44241c9bdf6b73330338083b20bbfec1e36c76104180a2681bb89cb7ac8493d1e0d676e2b165
-  data.tar.gz: e8faccd4fe7495644f6f3c1abeb616f7d57b7cab32bcbf24a2a72eb7334b97de551f7ac690d28cd760b78abe22d37db362a8c47b1a80db24ef1fadffc25a471e
+  metadata.gz: 2b702ea0bc616e2aabbd685ac53579759e59176865e562f383aff61682f3cb6defc5aa177ec398a0a9b18229bd8f5a78d5fc5e390f61ce722998e5301bd7dfa1
+  data.tar.gz: e2ab8234b5fc0358ba38f2460065dfe029ee92d59d575dbb7f35c9d5b8edb71aff8d15fb0278a50678401a71bea55705eb12bda756e4c99295430d45ae16cbee

data/CHANGELOG.md

@@ -1,3 +1,20 @@
+#### 3.7.1
+
+- Don't send both mixed and lowercase headers for accept, user-agent
+
+#### 3.7.0
+
+- Allow request params to be or contain ActionController::Parameters
+  Unless MultiJson is present, this changes json generation to use the
+    configured encoder in ActiveSupport::JSON::Encoding.json_encoder instead
+    of directly using ::JSON.
+- Change request header names to lowercase
+- Log 404, 409, 422 responses at :debug instead of :error
+
+#### 3.6.2
+
+- Ensure cache key is stable
+
 #### 3.6.1
 
 - Restore usage of Resource.new(some_attr: 'value')

data/example/lib/my_api/api_config.rb

@@ -27,7 +27,7 @@ module MyApi
 
     self.status_page = 'http://my.api.status.page'
 
-    self.auth_header_prefix = 'X-MyApi'
+    self.auth_header_prefix = 'x-myapi'
 
     # self.bearer_credential_key = :api_key
 

data/lib/ncore/builder.rb

@@ -1,7 +1,7 @@
 module NCore
   module Builder
     extend ActiveSupport::Concern
-    
+
     included do
       class_eval <<-INCL, __FILE__, __LINE__+1
         include NCore::Exceptions
@@ -24,7 +24,7 @@ module NCore
 
         class << self
           def configure(&block)
-            Api.instance_eval &block
+            Api.instance_eval(&block)
           end
         end
       INCL

data/lib/ncore/client.rb

@@ -26,15 +26,15 @@ module NCore
 
         path = URI.parse(url).path
         if [:get, :head, :delete].include? method
-          qs = build_query_string params
+          qs = build_query_string params.as_json
           url += qs
           path += qs
           payload = nil
         else
           if defined? MultiJson
-            payload = MultiJson.encode params
+            payload = MultiJson.encode params.as_json
           else
-            payload = JSON.generate params
+            payload = params.to_json
           end
         end
 
@@ -79,7 +79,7 @@ module NCore
         h = {}
         [default_headers, auth_headers(req_credentials), headers].each do |set|
           set.each do |k,v|
-            k = k.to_s.tr('_','-').gsub(%r{(^|-)\w}){$&.upcase}
+            k = k.to_s.tr('_','-').downcase
             h[k] = v.respond_to?(:call) ? v.call : v
           end
         end
@@ -118,7 +118,7 @@ module NCore
 
       # create a new excon client if necessary
       # keeps a pool of the last 10 urls
-      #   in almost all cases this will be more than enough 
+      #   in almost all cases this will be more than enough
       def excon_client(uri)
         u = URI.parse uri
         u.path = ''
@@ -138,6 +138,10 @@ module NCore
           end
           ex_opts = {
             connect_timeout: 10,
+            headers: {
+              'accept'     => '*/*',
+              'user-agent' => "ncore/ruby v#{VERSION}",
+            },
             persistent: true
           }
           if verify_ssl_cert?
@@ -153,6 +157,7 @@ module NCore
       end
 
       def pool
+        # is actually fiber-local
         Thread.current[:ncore_pool] ||= {}
       end
 
@@ -171,7 +176,6 @@ module NCore
         response = nil
         begin
           ActiveSupport::Notifications.instrument(instrument_key, rest_opts) do
-
             connection = excon_client(rest_opts[:url])
             begin
               tries += 1
@@ -286,9 +290,9 @@ module NCore
         creds.inject({}) do |h,(k,v)|
           if v.present?
             if k == bearer_credential_key
-              h["Authorization"] = "Bearer #{v}"
+              h['authorization'] = "Bearer #{v}"
             else
-              h["#{auth_header_prefix}-#{k}"] = v 
+              h["#{auth_header_prefix}-#{k}"] = v
             end
           end
           h
@@ -325,6 +329,7 @@ module NCore
 
       def debug_response(response)
         return unless logger.debug?
+        headers = response.headers.transform_keys(&:downcase)
         if defined? MultiJson
           json = MultiJson.load(response.body||'', symbolize_keys: false) rescue response.body
         else
@@ -332,8 +337,8 @@ module NCore
         end
         logger << <<~DBG
           RESPONSE:
-            #{response.headers['Status']} | #{response.headers['Content-Type']} | #{response.body.size} bytes
-            #{response.headers.except('Status', 'Connection', 'Content-Type').map{|h,d| "#{h}: #{d}"}.join("\n  ")}
+            #{response.status} | #{headers['content-type']} | #{response.body.size} bytes
+            #{headers.except('status', 'connection', 'content-length', 'content-type').map{|h,d| "#{h}: #{d}"}.join("\n  ")}
             #{json.pretty_inspect.split("\n").join("\n  ")}
           #{'-=- '*18}
         DBG

data/lib/ncore/client_cache.rb

@@ -37,7 +37,7 @@ module NCore
 
 
       def request_cache_key(url:, headers:)
-        hdrs = headers.reject{|k,v| k=='X-Request-Id'}.sort
+        hdrs = headers.reject{|k,v| k=='x-request-id'}.sort
         [ 'ncore',
           url.gsub(/[^a-zA-Z0-9]+/,'-'),
           Digest::MD5.hexdigest(hdrs.to_s)

data/lib/ncore/configuration.rb

@@ -38,7 +38,7 @@ module NCore
         self.status_page = 'the status page'
 
         mattr_accessor :auth_header_prefix
-        self.auth_header_prefix = 'X-Api'
+        self.auth_header_prefix = 'x-api'
 
         mattr_reader :bearer_credential_key
         class_eval <<-MTH

data/lib/ncore/methods/delete_bulk.rb

@@ -7,7 +7,7 @@ module NCore
         raise(module_parent::RecordNotFound, "ids must not be empty") if ids.blank?
         params[:ids] = ids
         params = parse_request_params(params)
-        parsed, creds = request(:delete, resource_path, params)
+        parsed, _creds = request(:delete, resource_path, params)
         if parsed[:errors].any?
           raise module_parent::BulkActionError, parsed[:errors]
         else

data/lib/ncore/methods/update_bulk.rb

@@ -7,7 +7,7 @@ module NCore
         raise(module_parent::RecordNotFound, "ids must not be empty") if ids.blank?
         params = parse_request_params(params, json_root: json_root)
         params[:ids] = ids
-        parsed, creds = request(:put, resource_path, params)
+        parsed, _creds = request(:put, resource_path, params)
         if parsed[:errors].any?
           raise module_parent::BulkActionError, parsed[:errors]
         else

data/lib/ncore/rails/log_subscriber.rb

@@ -26,6 +26,8 @@ module NCore
       end
     end
 
+    DEBUG_STATUSES = (200..299).to_a + [404, 409, 422]
+
     def log_request(event)
       self.class.runtime += event.duration
 
@@ -45,7 +47,7 @@ module NCore
         res = color(res, :red, bold: true)
       end
 
-      if (200..299).include? http_status
+      if DEBUG_STATUSES.include? http_status
         debug "  #{msg}"
         debug "  #{res}"
       else

data/lib/ncore/util.rb

@@ -53,7 +53,7 @@ module NCore
         klass_name = key.to_s.camelize.singularize
         begin
           "#{module_name}::#{klass_name}".constantize
-        rescue NameError => e
+        rescue NameError
           default_klass
         end
       end

data/lib/ncore/version.rb

@@ -1,3 +1,3 @@
 module NCore
-  VERSION = '3.6.2'
+  VERSION = '3.7.1'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ncore
 version: !ruby/object:Gem::Version
-  version: 3.6.2
+  version: 3.7.1
 platform: ruby
 authors:
 - Notioneer Team
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-09 00:00:00.000000000 Z
+date: 2023-12-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activemodel