volcano-sdk 0.32.3 → 0.32.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9d3d0ea5cca245b91aacf3a1df887df87aa5ca81419e1410019f9536fcb640aa
-  data.tar.gz: 7173bed2407482a5122d11439e2c557764c1ed10463012490c38448e480bfbb8
+  metadata.gz: daa3b30e5d6ef2a172ccad71ae9ace1de3d3699dd6563865c0374619d1ba619f
+  data.tar.gz: dd35800dd54f826f75cb544138a48c12b3a98a1e335dda1f3f423fda3c431ab6
 SHA512:
-  metadata.gz: 7fe8b416c01cf5be74751679b0487e9f5c6031ff35caa039b936b63eb49fdf87ece8f3e65e7afbd28f4acf3ccbddf3892f492d2796aec82f59c840ba82f4c7fe
-  data.tar.gz: 76844522cca4fbfefb369d9d597079d5b6ae28d385a297f77b43c012c6101b3fbc42bd96f9dee82da7a9f66b318e9446b17524e4803f9f9e83ed9cac4d9a1e64
+  metadata.gz: a3754eae91b45c73dbf26c74469d04a20290e5a493955f9484c1e37b9376075ef375d0e5fdb77c982ec11fc704a6776a806eeed909d3b2f741ff8139cf9067c8
+  data.tar.gz: 9c4aa2b75b21ff3ff9cea9380260ed8f90ee4429a85798f8beb6d7b2ae215f6c76b0152f608ff7c01d85ab8c845e498b3fbd0344eb93f995251e87a64c0ba4f9

data/lib/volcano/storage_object_response.rb

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require 'json'
+
 module Volcano
   # Validates object metadata and paginated storage responses.
   module StorageObjectResponse
@@ -69,20 +71,40 @@ module Volcano
     def storage_json_hash(value)
       raise Error::TransportError, 'invalid storage JSON object' unless value.is_a?(Hash)
 
+      # @type var active: Hash[Integer, bool]
+      active = {}
+      copy = storage_json_container(value, active) { storage_json_entries(value, active) }
+      JSON.generate(copy)
+      copy
+    rescue JSON::GeneratorError
+      raise Error::TransportError, 'invalid storage JSON value', cause: nil
+    end
+
+    def storage_json_entries(value, active)
       value.to_h do |key, item|
         raise Error::TransportError, 'invalid storage JSON key' unless key.is_a?(String)
 
-        [key, storage_json_value(item)]
+        [key, storage_json_value(item, active)]
       end
     end
 
-    def storage_json_value(value)
+    def storage_json_value(value, active)
       case value
       when NilClass, TrueClass, FalseClass, Integer, Float, String then value
-      when Array then value.map { |item| storage_json_value(item) }
-      when Hash then storage_json_hash(value)
+      when Array then storage_json_container(value, active) { value.map { |item| storage_json_value(item, active) } }
+      when Hash then storage_json_container(value, active) { storage_json_entries(value, active) }
       else raise Error::TransportError, 'invalid storage JSON value'
       end
     end
+
+    def storage_json_container(value, active)
+      id = value.object_id
+      raise Error::TransportError, 'invalid storage JSON value' if active.key?(id) || active.size >= 100
+
+      active[id] = true
+      copy = yield
+      active.delete(id)
+      copy
+    end
   end
 end

data/lib/volcano/transport.rb

@@ -52,45 +52,6 @@ module Volcano
       message.is_a?(String) ? message : 'Volcano request failed'
     end
 
-    def self.json_value(value)
-      case value
-      when Array then value.map { |entry| json_value(entry) }
-      when Hash then json_object(value)
-      else json_scalar(value)
-      end
-    end
-
-    def self.json_object(value, message: 'Expected a JSON object')
-      raise TypeError, message unless value.is_a?(Hash)
-
-      value.to_h do |key, item|
-        raise TypeError, message unless key.is_a?(String)
-
-        [key, json_value(item)]
-      end
-    end
-
-    def self.json_rows(value)
-      rows = json_object(value)['data']
-      raise TypeError, 'Expected database rows' unless rows.is_a?(Array)
-
-      rows.map { |row| json_object(row) }
-    end
-
-    def self.finite_float(value)
-      raise TypeError, 'Expected a finite JSON number' unless value.finite?
-
-      value
-    end
-
-    def self.json_scalar(value)
-      case value
-      when NilClass, TrueClass, FalseClass, Integer, String then value
-      when Float then finite_float(value)
-      else raise TypeError, 'Expected a JSON response'
-      end
-    end
-
     def self.error_type(status)
       ERROR_TYPES.fetch(status) do
         status.between?(500, 599) ? Error::ServerError : Error::VolcanoError
@@ -101,6 +62,8 @@ module Volcano
       value = headers&.find { |key, _| key.casecmp?(name) }&.last
       Integer(value, exception: false)
     end
-    private_class_method :error_type, :integer_header, :response_error, :finite_float, :json_scalar
+    private_class_method :error_type, :integer_header, :response_error
   end
 end
+
+require_relative 'transport_json'

data/lib/volcano/transport_json.rb

@@ -0,0 +1,84 @@
+# frozen_string_literal: true
+
+require 'json'
+
+module Volcano
+  # Validates and copies JSON response values from function and database transports.
+  module Transport
+    def self.json_value(value)
+      # @type var active: Hash[Integer, bool]
+      active = {}
+      copy = json_copy(value, active)
+      validate_json_encoding(copy)
+      copy
+    end
+
+    def self.json_copy(value, active)
+      case value
+      when Array then json_container(value, active) { value.map { |entry| json_copy(entry, active) } }
+      when Hash then json_hash(value, active, message: 'Expected a JSON object')
+      else json_scalar(value)
+      end
+    end
+
+    def self.json_object(value, message: 'Expected a JSON object')
+      # @type var active: Hash[Integer, bool]
+      active = {}
+      copy = json_hash(value, active, message:)
+      validate_json_encoding(copy)
+      copy
+    end
+
+    def self.json_hash(value, active, message:)
+      raise TypeError, message unless value.is_a?(Hash)
+
+      json_container(value, active) do
+        value.to_h do |key, item|
+          raise TypeError, message unless key.is_a?(String)
+
+          [key, json_copy(item, active)]
+        end
+      end
+    end
+
+    def self.json_container(value, active)
+      id = value.object_id
+      raise TypeError, 'Expected a JSON response' if active.key?(id) || active.size >= 100
+
+      active[id] = true
+      copy = yield
+      active.delete(id)
+      copy
+    end
+
+    def self.validate_json_encoding(value)
+      JSON.generate(value)
+      nil
+    rescue JSON::GeneratorError
+      raise TypeError, 'Expected a JSON response', cause: nil
+    end
+
+    def self.json_rows(value)
+      rows = json_object(value)['data']
+      raise TypeError, 'Expected database rows' unless rows.is_a?(Array)
+
+      rows.map { |row| json_object(row) }
+    end
+
+    def self.finite_float(value)
+      raise TypeError, 'Expected a finite JSON number' unless value.finite?
+
+      value
+    end
+
+    def self.json_scalar(value)
+      case value
+      when NilClass, TrueClass, FalseClass, Integer, String then value
+      when Float then finite_float(value)
+      else raise TypeError, 'Expected a JSON response'
+      end
+    end
+
+    private_class_method :json_copy, :json_hash, :json_container, :validate_json_encoding, :finite_float, :json_scalar
+  end
+end

data/lib/volcano/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Volcano
-  VERSION = '0.32.3'
+  VERSION = '0.32.5'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: volcano-sdk
 version: !ruby/object:Gem::Version
-  version: 0.32.3
+  version: 0.32.5
 platform: ruby
 authors:
 - Kong
@@ -613,6 +613,7 @@ files:
 - lib/volcano/storage_upload_models.rb
 - lib/volcano/storage_upload_sessions.rb
 - lib/volcano/transport.rb
+- lib/volcano/transport_json.rb
 - lib/volcano/user.rb
 - lib/volcano/version.rb
 - sig/auth_credentials.rbs