dub 0.12.4 → 0.12.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 66da0756afa302568f27f615694cf428bc3f0e8b113e80c4238ae5263af1d0f4
-  data.tar.gz: 5bbb12ae587c7d37f366c86f0fa215f9273b26990530e705825c631141d5d163
+  metadata.gz: f701a9cd800286dd31fad8640f3aaff94fec79ccef9fde5be854f5bd8eda862c
+  data.tar.gz: 18e8ca8226425e8ea64fc8b6b28a0a394fd36b796d06a7e44725f9e046ec64f0
 SHA512:
-  metadata.gz: 469bd062d22c8b5a90f0d9739de0eb0c54c7bc9a8b9a59940f0db01cb2bc4597ce1dc7367096eb35b869cf446da72b39b5f14a6b06a55de6eb6622f981ad9323
-  data.tar.gz: ef641f821c7f66680853ae70cc89bd546acc32b89adb8fda3c1bde600a2895a080c27d70cdb96fd65d61bc148df51f10e472763bd4c013100265b8cd0a4fe16f
+  metadata.gz: 0c8eaed5e40302eb6f964a3c244bbf62d67889bc588f2c781bd2ada3933c695b939790b70c494df1f17d498da1f2b8242d59e5396b85c8d70c52722c99afa4e1
+  data.tar.gz: 5d3251aa3dda9d498f12c99883f82e51247d5c0e8a0204c96837b22432a481cb299e26b7bd48f5d67c1adeb4fa0a6274aa75c6bb68c4a21414e54332c7a3364a

data/lib/crystalline/metadata_fields.rb

@@ -37,19 +37,30 @@ module Crystalline
       def unmarshal_single(field_type, value, format_metadata = nil)
         decoder = format_metadata.fetch(:decoder, nil)
 
-        if field_type.instance_of?(Class) && field_type.include?(::Crystalline::MetadataFields)
+        # Delegate complex Crystalline types to unmarshal_json
+        if field_type.is_a?(Crystalline::DiscriminatedUnion) ||
+           Crystalline::Utils.arr?(field_type) ||
+           Crystalline::Utils.hash?(field_type) ||
+           Crystalline::Utils.union?(field_type)
+          return Crystalline.unmarshal_json(value, field_type)
+        elsif field_type.instance_of?(Class) && field_type.include?(::Crystalline::MetadataFields)
           return field_type.from_dict(value)
         elsif field_type.to_s == 'Date'
           return Date.parse(value)
         elsif field_type.to_s == 'DateTime'
           return DateTime.parse(value)
         elsif field_type.to_s == 'Object'
-          # rubocop:disable Lint/SuppressedException
-          begin
-            value = JSON.parse(value)
-          rescue TypeError, JSON::ParserError
+          if value.is_a?(::String)
+            trimmed = value.lstrip
+            if trimmed.start_with?('{') || trimmed.start_with?('[')
+              # rubocop:disable Lint/SuppressedException
+              begin
+                value = JSON.parse(value)
+              rescue TypeError, JSON::ParserError
+              end
+              # rubocop:enable Lint/SuppressedException
+            end
           end
-          # rubocop:enable Lint/SuppressedException
           return value
         elsif field_type.to_s == 'Float'
           return value.to_f
@@ -65,12 +76,27 @@ module Crystalline
       def from_dict(d)
         to_build = {}
 
+        # Collect lookup keys for regular fields so we can identify additional properties later
+        known_keys = {}
+        additional_props_fields = []
         fields.each do |field|
+          format_metadata = field.metadata.fetch(:format_json, {})
+          if format_metadata.fetch(:additional_properties, false)
+            additional_props_fields << field
+          else
+            lookup = format_metadata.fetch(:letter_case, nil).call
+            known_keys[lookup] = true
+          end
+        end
+
+        # Process regular fields
+        (fields - additional_props_fields).each do |field|
           key = field.name
           format_metadata = field.metadata.fetch(:format_json, {})
+          field_type = field.type
+
           lookup = format_metadata.fetch(:letter_case, nil).call
           value = d[lookup]
-          field_type = field.type
           if ::Crystalline::Utils.nilable? field_type
             if value == 'null'
               to_build[key] = nil
@@ -78,13 +104,15 @@ module Crystalline
             end
             field_type = ::Crystalline::Utils.nilable_of(field_type)
           end
-          
+
           # If field is not nilable, and the value is not in the dict, raise a KeyError
           raise KeyError, "key #{lookup} not found in hash" if value.nil? && !::Crystalline::Utils.nilable?(field.type)
           # If field is nilable, and the value is not in the dict, just move to the next field
           next if value.nil?
 
-          if Crystalline::Utils.arr? field_type
+          if field_type.is_a?(Crystalline::DiscriminatedUnion)
+            to_build[key] = field_type.parse(value)
+          elsif Crystalline::Utils.arr? field_type
             inner_type = Crystalline::Utils.arr_of(field_type)
             unmarshalled_array = value.map { |f| unmarshal_single(inner_type, f, format_metadata) }
             to_build[key] = unmarshalled_array
@@ -135,6 +163,32 @@ module Crystalline
             to_build[key] = unmarshal_single(field_type, value, format_metadata)
           end
         end
+
+        # Process additional properties fields: collect remaining keys from the dict
+        additional_props_fields.each do |field|
+          key = field.name
+          format_metadata = field.metadata.fetch(:format_json, {})
+          field_type = field.type
+
+          remaining = d.reject { |k, _| known_keys.key?(k) }
+          if remaining.empty?
+            next if ::Crystalline::Utils.nilable?(field.type)
+
+            raise KeyError, 'no additional properties found in hash'
+          end
+
+          inner_field_type = field_type
+          inner_field_type = ::Crystalline::Utils.nilable_of(inner_field_type) if ::Crystalline::Utils.nilable?(inner_field_type)
+          if Crystalline::Utils.hash?(inner_field_type)
+            val_type = Crystalline::Utils.hash_of(inner_field_type)
+            # rubocop:disable Style/HashTransformValues
+            to_build[key] = remaining.map { |k, v| [k, unmarshal_single(val_type, v, format_metadata)] }.to_h
+            # rubocop:enable Style/HashTransformValues
+          else
+            to_build[key] = remaining
+          end
+        end
+
         new(**to_build)
       end
     end
@@ -176,6 +230,8 @@ module Crystalline
       fields.sort_by(&:name).each do |field|
         format_json_meta = field.metadata[:format_json]
         required = !format_json_meta.nil? && format_json_meta.include?(:required)
+        is_additional_props = !format_json_meta.nil? && format_json_meta.fetch(:additional_properties, false)
+
         if !format_json_meta.nil? && format_json_meta.include?(:letter_case)
           key = format_json_meta[:letter_case].call(field.name)
         else
@@ -186,7 +242,10 @@ module Crystalline
         next if f.nil? && !required
         result[key] = nil if f.nil? && required
 
-        if f.is_a? ::Array
+        # Flatten additional properties into the parent object
+        if is_additional_props && f.is_a?(::Hash)
+          f.each { |k, v| result[k] = marshal_single(v) }
+        elsif f.is_a? ::Array
           result[key] = f.map { |o| marshal_single(o) }
         elsif f.is_a? ::Hash
           result[key] = f.transform_values { |v| marshal_single(v) }

data/lib/crystalline/module.rb

@@ -11,9 +11,9 @@ module Crystalline
   end
 
   def self.to_dict(complex)
-    if complex.is_a? Array
+    if complex.is_a? ::Array
       complex.map { |v| Crystalline.to_dict(v) }
-    elsif complex.is_a? Hash
+    elsif complex.is_a? ::Hash
       complex.transform_values { |v| Crystalline.to_dict(v) }
     elsif complex.respond_to?(:class) && complex.class.include?(::Crystalline::MetadataFields)
       complex.to_dict
@@ -34,7 +34,9 @@ module Crystalline
     if Crystalline::Utils.nilable? type
       type = Crystalline::Utils.nilable_of type
     end
-    if type.instance_of?(Class) && type.include?(::Crystalline::MetadataFields)
+    if type.is_a?(Crystalline::DiscriminatedUnion)
+      type.parse(data)
+    elsif type.instance_of?(Class) && type.include?(::Crystalline::MetadataFields)
       type.from_dict(data)
     elsif Crystalline::Utils.union? type
       union_types = Crystalline::Utils.get_union_types(type)
@@ -66,7 +68,7 @@ module Crystalline
     if val.class.respond_to? :enums
       val.serialize
     elsif val.is_a? DateTime
-      val.strftime('%Y-%m-%dT%H:%M:%S.%NZ')
+      val.strftime('%Y-%m-%dT%H:%M:%S.%NZ').sub(/(\.\d*[1-9])0+Z\z/, '\1Z').sub(/\.0+Z\z/, 'Z')
     elsif val.nil?
       nil
     elsif primitives
@@ -123,7 +125,9 @@ module Crystalline
     inexact = 0
     unmatched = 0
 
-    if value.class.include?(::Crystalline::MetadataFields)
+    if value.is_a?(Crystalline::Unknown)
+      return [0, 0, 0]
+    elsif value.class.include?(::Crystalline::MetadataFields)
       value.fields.each do |field|
         format_metadata = field.metadata.fetch(:format_json, {})
         lookup = format_metadata.fetch(:letter_case, nil)&.call

data/lib/crystalline/types.rb

@@ -14,7 +14,7 @@ module Crystalline
 
   class Hash
     attr_accessor :key_type, :value_type
-    
+
     def initialize(key_type, value_type)
       @key_type = key_type
       @value_type = value_type
@@ -23,7 +23,7 @@ module Crystalline
 
   class Union
     attr_accessor :types
-    
+
     def initialize(*types)
       @types = types
     end
@@ -31,7 +31,7 @@ module Crystalline
 
   class Nilable
     attr_accessor :inner_type
-    
+
     def initialize(inner_type)
       @inner_type = inner_type
     end
@@ -40,6 +40,58 @@ module Crystalline
   class Boolean
   end
 
+  # Wraps an unrecognized payload from an open discriminated union.
+  # Produced when the discriminator value is missing, unknown, or schema validation fails.
+  class Unknown
+    attr_reader :raw
+
+    def initialize(raw:)
+      @raw = raw
+    end
+
+    def unknown?
+      true
+    end
+  end
+
+  # Forward-compatible discriminated union parser.
+  # Known discriminator values are deserialized to their mapped types.
+  # Unknown or invalid payloads are captured as Crystalline::Unknown.
+  class DiscriminatedUnion
+    attr_reader :discriminator, :variants
+
+    def initialize(discriminator, variants)
+      @discriminator = discriminator
+      @variants = variants
+    end
+
+    def parse(payload)
+      unless payload.is_a?(::Hash)
+        return Unknown.new(raw: payload)
+      end
+
+      disc_value = payload[@discriminator]
+      unless disc_value.is_a?(::String)
+        return Unknown.new(raw: payload)
+      end
+
+      variant_type = @variants[disc_value]
+      unless variant_type
+        return Unknown.new(raw: payload)
+      end
+
+      begin
+        Crystalline.unmarshal_json(payload, variant_type)
+      rescue StandardError
+        Unknown.new(raw: payload)
+      end
+    end
+  end
+
+  def self.unknown?(value)
+    value.is_a?(Unknown)
+  end
+
   module Enum
     def self.included(base)
       base.extend(ClassMethods)
@@ -90,6 +142,14 @@ module Crystalline
       @val
     end
 
+    def to_s
+      serialize.to_s
+    end
+
+    def inspect
+      "#<#{self.class} #{serialize.inspect}>"
+    end
+
     def known?
       self.class.instance_variable_get(:@mapping)&.value?(self) || false
     end

data/lib/open_api_sdk/analytics.rb

@@ -39,8 +39,10 @@ module OpenApiSDK
     end
 
 
-    sig { params(request: Models::Operations::RetrieveAnalyticsRequest, timeout_ms: T.nilable(Integer)).returns(T.any(Models::Shared::AnalyticsCount, T::Array[Models::Shared::AnalyticsTimeseries], T::Array[Models::Shared::AnalyticsContinents], T::Array[Models::Shared::AnalyticsCountries], T::Array[Models::Shared::AnalyticsRegions], T::Array[Models::Shared::AnalyticsCities], T::Array[Models::Shared::AnalyticsDevices], T::Array[Models::Shared::AnalyticsBrowsers], T::Array[Models::Shared::AnalyticsOS], T::Array[Models::Shared::AnalyticsTriggers], T::Array[Models::Shared::AnalyticsReferers], T::Array[Models::Shared::AnalyticsRefererUrls], T::Array[Models::Shared::AnalyticsTopLinks], T::Array[Models::Shared::AnalyticsTopUrls])) }
-    def retrieve(request:, timeout_ms: nil)
+
+
+    sig { params(request: Models::Operations::RetrieveAnalyticsRequest, timeout_ms: T.nilable(Integer), http_headers: T.nilable(T::Hash[T.any(String, Symbol), String])).returns(T.any(Models::Shared::AnalyticsCount, T::Array[Models::Shared::AnalyticsTimeseries], T::Array[Models::Shared::AnalyticsContinents], T::Array[Models::Shared::AnalyticsCountries], T::Array[Models::Shared::AnalyticsRegions], T::Array[Models::Shared::AnalyticsCities], T::Array[Models::Shared::AnalyticsDevices], T::Array[Models::Shared::AnalyticsBrowsers], T::Array[Models::Shared::AnalyticsOS], T::Array[Models::Shared::AnalyticsTriggers], T::Array[Models::Shared::AnalyticsReferers], T::Array[Models::Shared::AnalyticsRefererUrls], T::Array[Models::Shared::AnalyticsTopLinks], T::Array[Models::Shared::AnalyticsTopUrls])) }
+    def retrieve(request:, timeout_ms: nil, http_headers: nil)
       # retrieve - Retrieve analytics for a link, a domain, or the authenticated workspace.
       # Retrieve analytics for a link, a domain, or the authenticated workspace. The response type depends on the `event` and `type` query parameters.
       url, params = @sdk_configuration.get_server_details
@@ -78,6 +80,9 @@ module OpenApiSDK
           req.options.timeout = timeout unless timeout.nil?
           req.params = query_params
           Utils.configure_request_security(req, security)
+          http_headers&.each do |key, value|
+            req.headers[key.to_s] = value
+          end
 
           @sdk_configuration.hooks.before_request(
             hook_ctx: SDKHooks::BeforeRequestHookContext.new(
@@ -263,5 +268,5 @@ module OpenApiSDK
 
       end
     end
-  end
+end
 end

data/lib/open_api_sdk/bounties.rb

@@ -39,8 +39,10 @@ module OpenApiSDK
     end
 
 
-    sig { params(request: Models::Operations::ListBountySubmissionsRequest, timeout_ms: T.nilable(Integer)).returns(T::Array[Models::Operations::ListBountySubmissionsResponseBody]) }
-    def list_submissions(request:, timeout_ms: nil)
+
+
+    sig { params(request: Models::Operations::ListBountySubmissionsRequest, timeout_ms: T.nilable(Integer), http_headers: T.nilable(T::Hash[T.any(String, Symbol), String])).returns(T::Array[Models::Operations::ListBountySubmissionsResponseBody]) }
+    def list_submissions(request:, timeout_ms: nil, http_headers: nil)
       # list_submissions - List bounty submissions
       # List all submissions for a specific bounty in your partner program.
       url, params = @sdk_configuration.get_server_details
@@ -83,6 +85,9 @@ module OpenApiSDK
           req.options.timeout = timeout unless timeout.nil?
           req.params = query_params
           Utils.configure_request_security(req, security)
+          http_headers&.each do |key, value|
+            req.headers[key.to_s] = value
+          end
 
           @sdk_configuration.hooks.before_request(
             hook_ctx: SDKHooks::BeforeRequestHookContext.new(
@@ -270,8 +275,8 @@ module OpenApiSDK
     end
 
 
-    sig { params(request: Models::Operations::ApproveBountySubmissionRequest, timeout_ms: T.nilable(Integer)).returns(Models::Operations::ApproveBountySubmissionResponseBody) }
-    def approve_submission(request:, timeout_ms: nil)
+    sig { params(request: Models::Operations::ApproveBountySubmissionRequest, timeout_ms: T.nilable(Integer), http_headers: T.nilable(T::Hash[T.any(String, Symbol), String])).returns(Models::Operations::ApproveBountySubmissionResponseBody) }
+    def approve_submission(request:, timeout_ms: nil, http_headers: nil)
       # approve_submission - Approve a bounty submission
       # Approve a bounty submission. Optionally specify a custom reward amount.
       url, params = @sdk_configuration.get_server_details
@@ -287,7 +292,7 @@ module OpenApiSDK
       req_content_type, data, form = Utils.serialize_request_body(request, false, false, :request_body, :json)
       headers['content-type'] = req_content_type
 
-      if form
+      if form && !form.empty?
         body = Utils.encode_form(form)
       elsif Utils.match_content_type(req_content_type, 'application/x-www-form-urlencoded')
         body = URI.encode_www_form(T.cast(data, T::Hash[Symbol, Object]))
@@ -323,6 +328,9 @@ module OpenApiSDK
           req.headers.merge!(headers)
           req.options.timeout = timeout unless timeout.nil?
           Utils.configure_request_security(req, security)
+          http_headers&.each do |key, value|
+            req.headers[key.to_s] = value
+          end
 
           @sdk_configuration.hooks.before_request(
             hook_ctx: SDKHooks::BeforeRequestHookContext.new(
@@ -510,8 +518,8 @@ module OpenApiSDK
     end
 
 
-    sig { params(request: Models::Operations::RejectBountySubmissionRequest, timeout_ms: T.nilable(Integer)).returns(Models::Operations::RejectBountySubmissionResponseBody) }
-    def reject_submission(request:, timeout_ms: nil)
+    sig { params(request: Models::Operations::RejectBountySubmissionRequest, timeout_ms: T.nilable(Integer), http_headers: T.nilable(T::Hash[T.any(String, Symbol), String])).returns(Models::Operations::RejectBountySubmissionResponseBody) }
+    def reject_submission(request:, timeout_ms: nil, http_headers: nil)
       # reject_submission - Reject a bounty submission
       # Reject a bounty submission with a specified reason and optional note.
       url, params = @sdk_configuration.get_server_details
@@ -527,7 +535,7 @@ module OpenApiSDK
       req_content_type, data, form = Utils.serialize_request_body(request, false, false, :request_body, :json)
       headers['content-type'] = req_content_type
 
-      if form
+      if form && !form.empty?
         body = Utils.encode_form(form)
       elsif Utils.match_content_type(req_content_type, 'application/x-www-form-urlencoded')
         body = URI.encode_www_form(T.cast(data, T::Hash[Symbol, Object]))
@@ -563,6 +571,9 @@ module OpenApiSDK
           req.headers.merge!(headers)
           req.options.timeout = timeout unless timeout.nil?
           Utils.configure_request_security(req, security)
+          http_headers&.each do |key, value|
+            req.headers[key.to_s] = value
+          end
 
           @sdk_configuration.hooks.before_request(
             hook_ctx: SDKHooks::BeforeRequestHookContext.new(
@@ -748,5 +759,5 @@ module OpenApiSDK
 
       end
     end
-  end
+end
 end