dub 0.12.2 → 0.12.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: abeb8afffaeaf87606ba65eb4b3b76177e4059d2c367e5409ee2b3ec7650da70
-  data.tar.gz: 3f3c524a23d79ee15560eccdcd056a523571e852e58ca91b42d44c335690e340
+  metadata.gz: 66da0756afa302568f27f615694cf428bc3f0e8b113e80c4238ae5263af1d0f4
+  data.tar.gz: 5bbb12ae587c7d37f366c86f0fa215f9273b26990530e705825c631141d5d163
 SHA512:
-  metadata.gz: c1f7ce170dcc85990d26e6125f6692962f0523cd5290ee190ac6aa5e8d927bad562faa38720c4e8fbcc74418a330800f161ec505f0a4ad37f59cbfba878acc86
-  data.tar.gz: bdb1f33212acecd67bdde1c50789e4c56239b1cee519a48254397060f4295bf1bccf50d79c37c980da9f8d7c87cfdea261acb770724b10af6019d1a2381dfb07
+  metadata.gz: 469bd062d22c8b5a90f0d9739de0eb0c54c7bc9a8b9a59940f0db01cb2bc4597ce1dc7367096eb35b869cf446da72b39b5f14a6b06a55de6eb6622f981ad9323
+  data.tar.gz: ef641f821c7f66680853ae70cc89bd546acc32b89adb8fda3c1bde600a2895a080c27d70cdb96fd65d61bc148df51f10e472763bd4c013100265b8cd0a4fe16f

data/lib/crystalline/enum.rbi

@@ -0,0 +1,17 @@
+# typed: true
+
+module Crystalline
+  module Enum
+    mixes_in_class_methods(ClassMethods)
+
+    module ClassMethods
+      def enums(&blk); end
+      def open!; end
+      def open?; end
+      def deserialize(val); end
+    end
+
+    def serialize; end
+    def known?; end
+  end
+end

data/lib/crystalline/metadata_fields.rb

@@ -62,20 +62,6 @@ module Crystalline
         end
       end
 
-      def from_json(json_obj)
-        case json_obj
-        when String
-          begin
-            d = JSON.parse(json_obj)
-          rescue JSON::ParserError
-            d = json_obj
-          end
-        else
-          d = json_obj
-        end
-        from_json(d)
-      end
-
       def from_dict(d)
         to_build = {}
 
@@ -111,25 +97,36 @@ module Crystalline
             to_build[key] = unmarshalled_hash
           elsif Crystalline::Utils.union? field_type
             discriminator = field.metadata.fetch(:discriminator, nil)
+            discriminator_mapping = field.metadata.fetch(:discriminator_mapping, nil)
             if !discriminator.nil?
-              type_to_deserialize = value.fetch(discriminator)
-              type_to_deserialize = Crystalline::Utils.get_union_types(field_type).find { |t| t.name.split('::').last == type_to_deserialize }
+              discriminator_value = value.fetch(discriminator)
+              if !discriminator_mapping.nil?
+                # Use explicit mapping from discriminator value to type
+                type_to_deserialize = discriminator_mapping[discriminator_value]
+              else
+                # Fallback: try to match discriminator value against type name
+                type_to_deserialize = Crystalline::Utils.get_union_types(field_type).find { |t| t.name.split('::').last == discriminator_value }
+              end
               to_build[key] = Crystalline.unmarshal_json(value, type_to_deserialize)
             else
               union_types = Crystalline::Utils.get_union_types(field_type)
               union_types = union_types.sort_by { |klass| Crystalline.non_nilable_attr_count(klass) }
 
-              union_types.each do |union_type|
-                begin
-                  to_build[key] = Crystalline.unmarshal_json(value, union_type)
-                rescue TypeError
-                  next
-                rescue NoMethodError
-                  next
-                rescue KeyError
-                  next
+              if Crystalline.union_strategy == :populated_fields
+                to_build[key] = Crystalline.unmarshal_union_populated_fields(value, union_types)
+              else
+                union_types.each do |union_type|
+                  begin
+                    to_build[key] = Crystalline.unmarshal_json(value, union_type)
+                  rescue TypeError
+                    next
+                  rescue NoMethodError
+                    next
+                  rescue KeyError
+                    next
+                  end
+                  break
                 end
-                break
               end
             end
           elsif field_type.instance_of?(Class) && field_type.include?(::Crystalline::MetadataFields)
@@ -189,10 +186,10 @@ module Crystalline
         next if f.nil? && !required
         result[key] = nil if f.nil? && required
 
-        if f.is_a? Array
+        if f.is_a? ::Array
           result[key] = f.map { |o| marshal_single(o) }
-        elsif f.is_a? Hash
-          result[key] = f.map { |k, v| [k, marshal_single(v)] }
+        elsif f.is_a? ::Hash
+          result[key] = f.transform_values { |v| marshal_single(v) }
         else
           result[key] = marshal_single(f)
         end

data/lib/crystalline/module.rb

@@ -4,6 +4,11 @@
 # frozen_string_literal: true
 
 module Crystalline
+  @union_strategy = :left_to_right
+
+  class << self
+    attr_accessor :union_strategy
+  end
 
   def self.to_dict(complex)
     if complex.is_a? Array
@@ -35,15 +40,10 @@ module Crystalline
       union_types = Crystalline::Utils.get_union_types(type)
       union_types = union_types.sort_by { |klass| Crystalline.non_nilable_attr_count(klass) }
 
-      union_types.each do |union_type|
-        unmarshalled_val = Crystalline.unmarshal_json(data, union_type)
-        return unmarshalled_val
-      rescue TypeError
-        next
-      rescue NoMethodError
-        next
-      rescue KeyError
-        next
+      if Crystalline.union_strategy == :populated_fields
+        Crystalline.unmarshal_union_populated_fields(data, union_types)
+      else
+        Crystalline.unmarshal_union_left_to_right(data, union_types)
       end
     elsif Crystalline::Utils.arr? type
       data.map { |v| Crystalline.unmarshal_json(v, Crystalline::Utils.arr_of(type)) }
@@ -55,6 +55,8 @@ module Crystalline
       Crystalline::Utils.to_boolean(data)
     elsif type.is_a?(Class) && type < T::Enum
       type.deserialize(data)
+    elsif type.is_a?(Class) && type.respond_to?(:enums) && type.respond_to?(:deserialize)
+      type.deserialize(data)
     else
       data
     end
@@ -74,6 +76,86 @@ module Crystalline
     end
   end
 
+  def self.unmarshal_union_left_to_right(data, union_types)
+    union_types.each do |union_type|
+      return Crystalline.unmarshal_json(data, union_type)
+    rescue TypeError
+      next
+    rescue NoMethodError
+      next
+    rescue KeyError
+      next
+    end
+    nil
+  end
+
+  def self.unmarshal_union_populated_fields(data, union_types)
+    best_value = nil
+    best_matched = -1
+    best_inexact = 0
+    best_unmatched = 0
+
+    union_types.each do |union_type|
+      value = Crystalline.unmarshal_json(data, union_type)
+      matched, inexact, unmatched = count_matched_fields(value, data)
+
+      if best_value.nil? ||
+         matched > best_matched ||
+         (matched == best_matched && inexact < best_inexact) ||
+         (matched == best_matched && inexact == best_inexact && unmatched < best_unmatched)
+        best_value = value
+        best_matched = matched
+        best_inexact = inexact
+        best_unmatched = unmatched
+      end
+    rescue TypeError
+      next
+    rescue NoMethodError
+      next
+    rescue KeyError
+      next
+    end
+    best_value
+  end
+
+  def self.count_matched_fields(value, raw_data)
+    matched = 0
+    inexact = 0
+    unmatched = 0
+
+    if 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
+        field_val = value.send(field.name)
+
+        if raw_data.is_a?(::Hash) && lookup && raw_data.key?(lookup)
+          if field_val.class.include?(::Crystalline::MetadataFields) && raw_data[lookup].is_a?(::Hash)
+            nested_matched, nested_inexact, nested_unmatched = count_matched_fields(field_val, raw_data[lookup])
+            matched += nested_matched
+            inexact += nested_inexact
+            unmatched += nested_unmatched
+          else
+            matched += 1
+            if field_val.respond_to?(:known?) && !field_val.known?
+              inexact += 1
+            end
+          end
+        elsif !::Crystalline::Utils.nilable?(field.type)
+          unmatched += 1
+        end
+      end
+    elsif value.is_a?(::Array)
+      matched = value.length
+    elsif value.is_a?(::Hash)
+      matched = value.length
+    else
+      matched = 1
+    end
+
+    [matched, inexact, unmatched]
+  end
+
   def self.non_nilable_attr_count(klass)
     # somewhat sane sort ordering for Union deserialization.
     # All Crystalline objects return the number of non-nilable fields

data/lib/crystalline/types.rb

@@ -41,25 +41,48 @@ module Crystalline
   end
 
   module Enum
+    def self.included(base)
+      base.extend(ClassMethods)
+    end
+
     def initialize(val)
-      puts methods
-      if instance_methods(false).include?(:initialize)
+      if self.class.instance_methods(false).include?(:initialize)
         super(val)
       else
         @val = val
       end
     end
 
-    def self.enums(&blk)
-      @mapping = {}
+    module ClassMethods
+      def enums(&blk)
+        @mapping = {}
+
+        yield
+        constants(false).each do |const_name|
+          instance = const_get(const_name, false)
+          unless instance.is_a? self
+            raise 'Enum constants must be instances of the Enum class (e.g. `Foo = new`)'
+          end
+          @mapping[instance.serialize] = instance
+        end
+      end
+
+      def open!
+        @open = true
+      end
+
+      def open?
+        @open == true
+      end
 
-      yield
-      constants(false).each do |const_name|
-        instance = const_get(const_name, false)
-        unless instance.is_a? self
-          raise 'Enum constants must be instances of the Enum class (e.g. `Foo = new`)'
+      def deserialize(val)
+        if @mapping.include? val
+          @mapping[val]
+        elsif open?
+          new(val)
+        else
+          raise "Invalid value for enum: #{val}"
         end
-        @mapping[instance.serialize] = instance
       end
     end
 
@@ -67,12 +90,21 @@ module Crystalline
       @val
     end
 
-    def deserialize(val)
-      if @mapping.include? val
-        @mapping[val]
-      else
-        raise "Invalid value for enum: #{val}"
-      end
+    def known?
+      self.class.instance_variable_get(:@mapping)&.value?(self) || false
+    end
+
+    def ==(other)
+      other = other.serialize if other.is_a?(self.class)
+      @val == other
+    end
+
+    def eql?(other)
+      self == other
+    end
+
+    def hash
+      @val.hash
     end
   end
 end

data/lib/dub.rb

@@ -15,7 +15,7 @@ module OpenApiSDK
   autoload :Customers, 'open_api_sdk/customers'
   autoload :Partners, 'open_api_sdk/partners'
   autoload :Commissions, 'open_api_sdk/commissions'
-  autoload :Workspaces, 'open_api_sdk/workspaces'
+  autoload :Payouts, 'open_api_sdk/payouts'
   autoload :EmbedTokens, 'open_api_sdk/embed_tokens'
   autoload :QRCodes, 'open_api_sdk/qr_codes'
   autoload :Bounties, 'open_api_sdk/bounties'

data/lib/open_api_sdk/bounties.rb

@@ -42,7 +42,7 @@ module OpenApiSDK
     sig { params(request: Models::Operations::ListBountySubmissionsRequest, timeout_ms: T.nilable(Integer)).returns(T::Array[Models::Operations::ListBountySubmissionsResponseBody]) }
     def list_submissions(request:, timeout_ms: nil)
       # list_submissions - List bounty submissions
-      # List all submissions for a specific bounty.
+      # List all submissions for a specific bounty in your partner program.
       url, params = @sdk_configuration.get_server_details
       base_url = Utils.template_url(url, params)
       url = Utils.generate_url(

data/lib/open_api_sdk/commissions.rb

@@ -41,8 +41,8 @@ module OpenApiSDK
 
     sig { params(request: Models::Operations::ListCommissionsRequest, timeout_ms: T.nilable(Integer)).returns(T::Array[Models::Operations::ListCommissionsResponseBody]) }
     def list(request:, timeout_ms: nil)
-      # list - Get commissions for a program.
-      # Retrieve a list of commissions for a program.
+      # list - List all commissions
+      # Retrieve a list of commissions for your partner program.
       url, params = @sdk_configuration.get_server_details
       base_url = Utils.template_url(url, params)
       url = "#{base_url}/commissions"

data/lib/open_api_sdk/customers.rb

@@ -496,31 +496,23 @@ module OpenApiSDK
     end
 
 
-    sig { params(request: Models::Operations::UpdateCustomerRequest, timeout_ms: T.nilable(Integer)).returns(Models::Operations::UpdateCustomerResponseBody) }
-    def update(request:, timeout_ms: nil)
-      # update - Update a customer
-      # Update a customer for the authenticated workspace.
+    sig { params(id: ::String, timeout_ms: T.nilable(Integer)).returns(Models::Operations::DeleteCustomerResponseBody) }
+    def delete(id:, timeout_ms: nil)
+      # delete - Delete a customer
+      # Delete a customer from a workspace.
+      request = Models::Operations::DeleteCustomerRequest.new(
+        id: id
+      )
       url, params = @sdk_configuration.get_server_details
       base_url = Utils.template_url(url, params)
       url = Utils.generate_url(
-        Models::Operations::UpdateCustomerRequest,
+        Models::Operations::DeleteCustomerRequest,
         base_url,
         '/customers/{id}',
         request
       )
       headers = {}
       headers = T.cast(headers, T::Hash[String, String])
-      req_content_type, data, form = Utils.serialize_request_body(request, false, false, :request_body, :json)
-      headers['content-type'] = req_content_type
-
-      if form
-        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]))
-      else
-        body = data
-      end
-      query_params = Utils.get_query_params(Models::Operations::UpdateCustomerRequest, request, nil)
       headers['Accept'] = 'application/json'
       headers['user-agent'] = @sdk_configuration.user_agent
 
@@ -536,7 +528,7 @@ module OpenApiSDK
         config: @sdk_configuration,
         base_url: base_url,
         oauth2_scopes: nil,
-        operation_id: 'updateCustomer',
+        operation_id: 'deleteCustomer',
         security_source: @sdk_configuration.security_source
       )
 
@@ -545,11 +537,9 @@ module OpenApiSDK
       
       
       begin
-        http_response = T.must(connection).patch(url) do |req|
-          req.body = body
+        http_response = T.must(connection).delete(url) do |req|
           req.headers.merge!(headers)
           req.options.timeout = timeout unless timeout.nil?
-          req.params = query_params
           Utils.configure_request_security(req, security)
 
           @sdk_configuration.hooks.before_request(
@@ -595,7 +585,7 @@ module OpenApiSDK
             response: http_response
           )
           response_data = http_response.env.response_body
-          obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Operations::UpdateCustomerResponseBody)
+          obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Operations::DeleteCustomerResponseBody)
 
           return obj
         else
@@ -738,23 +728,31 @@ module OpenApiSDK
     end
 
 
-    sig { params(id: ::String, timeout_ms: T.nilable(Integer)).returns(Models::Operations::DeleteCustomerResponseBody) }
-    def delete(id:, timeout_ms: nil)
-      # delete - Delete a customer
-      # Delete a customer from a workspace.
-      request = Models::Operations::DeleteCustomerRequest.new(
-        id: id
-      )
+    sig { params(request: Models::Operations::UpdateCustomerRequest, timeout_ms: T.nilable(Integer)).returns(Models::Operations::UpdateCustomerResponseBody) }
+    def update(request:, timeout_ms: nil)
+      # update - Update a customer
+      # Update a customer for the authenticated workspace.
       url, params = @sdk_configuration.get_server_details
       base_url = Utils.template_url(url, params)
       url = Utils.generate_url(
-        Models::Operations::DeleteCustomerRequest,
+        Models::Operations::UpdateCustomerRequest,
         base_url,
         '/customers/{id}',
         request
       )
       headers = {}
       headers = T.cast(headers, T::Hash[String, String])
+      req_content_type, data, form = Utils.serialize_request_body(request, false, false, :request_body, :json)
+      headers['content-type'] = req_content_type
+
+      if form
+        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]))
+      else
+        body = data
+      end
+      query_params = Utils.get_query_params(Models::Operations::UpdateCustomerRequest, request, nil)
       headers['Accept'] = 'application/json'
       headers['user-agent'] = @sdk_configuration.user_agent
 
@@ -770,7 +768,7 @@ module OpenApiSDK
         config: @sdk_configuration,
         base_url: base_url,
         oauth2_scopes: nil,
-        operation_id: 'deleteCustomer',
+        operation_id: 'updateCustomer',
         security_source: @sdk_configuration.security_source
       )
 
@@ -779,9 +777,11 @@ module OpenApiSDK
       
       
       begin
-        http_response = T.must(connection).delete(url) do |req|
+        http_response = T.must(connection).patch(url) do |req|
+          req.body = body
           req.headers.merge!(headers)
           req.options.timeout = timeout unless timeout.nil?
+          req.params = query_params
           Utils.configure_request_security(req, security)
 
           @sdk_configuration.hooks.before_request(
@@ -827,7 +827,7 @@ module OpenApiSDK
             response: http_response
           )
           response_data = http_response.env.response_body
-          obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Operations::DeleteCustomerResponseBody)
+          obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Operations::UpdateCustomerResponseBody)
 
           return obj
         else