authlete_ruby_test 0.0.1.beta → 0.0.2.pre.beta.1

data/lib/authlete/verifiable_credentials.rb

@@ -82,7 +82,7 @@ module Authlete
       hook_ctx = SDKHooks::HookContext.new(
         config: @sdk_configuration,
         base_url: base_url,
-        oauth2_scopes: [],
+        oauth2_scopes: nil,
         operation_id: 'vci_metadata_api',
         security_source: @sdk_configuration.security_source
       )
@@ -164,7 +164,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -179,7 +179,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -237,7 +237,7 @@ module Authlete
       hook_ctx = SDKHooks::HookContext.new(
         config: @sdk_configuration,
         base_url: base_url,
-        oauth2_scopes: [],
+        oauth2_scopes: nil,
         operation_id: 'vci_jwtissuer_api',
         security_source: @sdk_configuration.security_source
       )
@@ -319,7 +319,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -334,7 +334,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -392,7 +392,7 @@ module Authlete
       hook_ctx = SDKHooks::HookContext.new(
         config: @sdk_configuration,
         base_url: base_url,
-        oauth2_scopes: [],
+        oauth2_scopes: nil,
         operation_id: 'vci_jwks_api',
         security_source: @sdk_configuration.security_source
       )
@@ -474,7 +474,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -489,7 +489,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -547,7 +547,7 @@ module Authlete
       hook_ctx = SDKHooks::HookContext.new(
         config: @sdk_configuration,
         base_url: base_url,
-        oauth2_scopes: [],
+        oauth2_scopes: nil,
         operation_id: 'vci_offer_create_api',
         security_source: @sdk_configuration.security_source
       )
@@ -629,7 +629,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -644,7 +644,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -702,7 +702,7 @@ module Authlete
       hook_ctx = SDKHooks::HookContext.new(
         config: @sdk_configuration,
         base_url: base_url,
-        oauth2_scopes: [],
+        oauth2_scopes: nil,
         operation_id: 'vci_offer_info_api',
         security_source: @sdk_configuration.security_source
       )
@@ -784,7 +784,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -799,7 +799,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -857,7 +857,7 @@ module Authlete
       hook_ctx = SDKHooks::HookContext.new(
         config: @sdk_configuration,
         base_url: base_url,
-        oauth2_scopes: [],
+        oauth2_scopes: nil,
         operation_id: 'vci_single_parse_api',
         security_source: @sdk_configuration.security_source
       )
@@ -939,7 +939,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -954,7 +954,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -1012,7 +1012,7 @@ module Authlete
       hook_ctx = SDKHooks::HookContext.new(
         config: @sdk_configuration,
         base_url: base_url,
-        oauth2_scopes: [],
+        oauth2_scopes: nil,
         operation_id: 'vci_single_issue_api',
         security_source: @sdk_configuration.security_source
       )
@@ -1094,7 +1094,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -1109,7 +1109,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -1167,7 +1167,7 @@ module Authlete
       hook_ctx = SDKHooks::HookContext.new(
         config: @sdk_configuration,
         base_url: base_url,
-        oauth2_scopes: [],
+        oauth2_scopes: nil,
         operation_id: 'vci_batch_parse_api',
         security_source: @sdk_configuration.security_source
       )
@@ -1249,7 +1249,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -1264,7 +1264,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -1322,7 +1322,7 @@ module Authlete
       hook_ctx = SDKHooks::HookContext.new(
         config: @sdk_configuration,
         base_url: base_url,
-        oauth2_scopes: [],
+        oauth2_scopes: nil,
         operation_id: 'vci_batch_issue_api',
         security_source: @sdk_configuration.security_source
       )
@@ -1404,7 +1404,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -1419,7 +1419,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -1477,7 +1477,7 @@ module Authlete
       hook_ctx = SDKHooks::HookContext.new(
         config: @sdk_configuration,
         base_url: base_url,
-        oauth2_scopes: [],
+        oauth2_scopes: nil,
         operation_id: 'vci_deferred_parse_api',
         security_source: @sdk_configuration.security_source
       )
@@ -1559,7 +1559,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -1574,7 +1574,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -1632,7 +1632,7 @@ module Authlete
       hook_ctx = SDKHooks::HookContext.new(
         config: @sdk_configuration,
         base_url: base_url,
-        oauth2_scopes: [],
+        oauth2_scopes: nil,
         operation_id: 'vci_deferred_issue_api',
         security_source: @sdk_configuration.security_source
       )
@@ -1714,7 +1714,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         end
@@ -1729,7 +1729,7 @@ module Authlete
           response_data = http_response.env.response_body
           obj = Crystalline.unmarshal_json(JSON.parse(response_data), Models::Errors::ResultError)
           obj.raw_response = http_response
-          throw obj
+          raise obj
         else
           raise ::Authlete::Models::Errors::APIError.new(status_code: http_response.status, body: http_response.env.response_body, raw_response: http_response), 'Unknown content type received'
         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,9 +97,16 @@ 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)

data/lib/crystalline/module.rb

@@ -51,6 +51,10 @@ module Crystalline
       data.transform_values { |v| Crystalline.unmarshal_json(v, Crystalline::Utils.hash_of(type)) }
     elsif Crystalline::Utils.nilable?(type) && data == 'null'
       nil
+    elsif Crystalline::Utils.boolean? type
+      Crystalline::Utils.to_boolean(data)
+    elsif type.is_a?(Class) && type < T::Enum
+      type.deserialize(data)
     else
       data
     end

data/lib/crystalline/types.rb

@@ -41,38 +41,43 @@ 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
 
-      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]
+        else
+          raise "Invalid value for enum: #{val}"
         end
-        @mapping[instance.serialize] = instance
       end
     end
 
     def serialize
       @val
     end
-
-    def deserialize(val)
-      if @mapping.include? val
-        @mapping[val]
-      else
-        raise "Invalid value for enum: #{val}"
-      end
-    end
   end
 end

data/lib/crystalline/utils.rb

@@ -52,5 +52,18 @@ module Crystalline
     def self.get_union_types(t)
       t.types
     end
+
+    def self.boolean?(t)
+      t.instance_of? Crystalline::Boolean
+    end
+
+    def self.to_boolean(value)
+      case value
+      when true, false
+        value
+      else
+        raise TypeError, "Cannot convert #{value.inspect} to boolean. The value is of type #{value.class}"
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: authlete_ruby_test
 version: !ruby/object:Gem::Version
-  version: 0.0.1.beta
+  version: 0.0.2.pre.beta.1
 platform: ruby
 authors:
 - Authlete, Inc.
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-12-18 00:00:00.000000000 Z
+date: 2025-12-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: base64