microsoft_kiota_serialization_json 0.21.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f4c78759c2b5ddda66461cc4d08cf5eb57ceed877a2e5f04e2876f36fafe13e6
-  data.tar.gz: c55852e6f0ef2cc369647881610f9eebcb94acc3295784f01b7334e6c05af187
+  metadata.gz: 99d3aaf3bb83a8c789383d853f1181377ee92db658f667fb110306995311e4c1
+  data.tar.gz: b7827075fc0b80e2d8bbc7bdb291d618aea39ed4df0a904545ec87e9cad15b6f
 SHA512:
-  metadata.gz: 2e2d4b6678b50247a0098226cacc7693c4e6a26751cb8b5535ed34e8beb09c079a51bfc82fd6521953497c6c6131fd3d6bd71a23e335f518a6d165893e5da24a
-  data.tar.gz: 977f31b44c36c56b196d14fd80a2dcc2555c04cbe1a6ef7d7cfa44a701f7aa1e84401893b0d8d9dc78d3f3700c79b303f86e09f84e00fd01f1a5c0793333c260
+  metadata.gz: 6ec0ac94f56351227acf2b01099cec17257e73f8302671ddf7175295a6aa0ee32efa3644aea3552a28b9640c6585135d6e4a2e769e7ae4daac08dfd0fe663d07
+  data.tar.gz: 89be60bd077fab8ece0ad40b7f94dc425ea7112a817dccee2829f399cc80b318dee46faea2f812e63d680d3b37f30d81d37debe1ed688737e16c2da6f354d477

data/lib/microsoft_kiota_serialization_json/json_parse_node.rb

@@ -124,16 +124,27 @@ module MicrosoftKiotaSerializationJson
       end
     end
 
-    def get_enum_values(_type)
+    def get_enum_values(type)
       raw_values = get_string_value
-      return [] if raw_values.nil?
+      return [] if raw_values.nil? || raw_values.empty?
 
-      raw_values.split(',').map(&:strip)
+      raw_values.split(',').map { |raw| resolve_enum_member(type, raw.strip) }
     end
 
     def get_enum_value(type)
-      items = get_enum_values(type).map(&:to_sym)
-      items[0] if items.length.positive?
+      get_enum_values(type).first
+    end
+
+    def get_collection_of_enum_values(type)
+      return get_enum_values(type) unless @current_node.is_a?(Array)
+
+      @current_node.map { |value| JsonParseNode.new(value).get_enum_value(type) }
+    end
+
+    def resolve_enum_member(type, raw)
+      return raw.to_sym unless type.is_a?(Hash)
+
+      type[raw.to_sym] || type[(raw[0].to_s.upcase + raw[1..].to_s).to_sym]
     end
 
     def get_child_node(name)

data/lib/microsoft_kiota_serialization_json/json_serialization_writer.rb

@@ -64,7 +64,7 @@ module MicrosoftKiotaSerializationJson
 
     def write_guid_value(key, value)
       raise StandardError, 'no key or value included in write_guid_value(key, value)' if !key && !value
-      return value.to_s unless key
+      return set_root_value(value.to_s) unless key
       return if value.nil?
 
       @writer[key] = value.to_s
@@ -72,7 +72,7 @@ module MicrosoftKiotaSerializationJson
 
     def write_date_value(key, value)
       raise StandardError, 'no key or value included in write_date_value(key, value)' if !key && !value
-      return value.strftime('%Y-%m-%d') unless key
+      return set_root_value(value.strftime('%Y-%m-%d')) unless key
       return if value.nil?
 
       @writer[key] = value.strftime('%Y-%m-%d')
@@ -80,7 +80,7 @@ module MicrosoftKiotaSerializationJson
 
     def write_time_value(key, value)
       raise StandardError, 'no key or value included in write_time_value(key, value)' if !key && !value
-      return value.strftime('%H:%M:%S%Z') unless key
+      return set_root_value(value.strftime('%H:%M:%S%Z')) unless key
       return if value.nil?
 
       @writer[key] = value.strftime('%H:%M:%S%Z')
@@ -88,7 +88,7 @@ module MicrosoftKiotaSerializationJson
 
     def write_date_time_value(key, value)
       raise StandardError, 'no key or value included in write_date_time_value(key, value)' if !key && !value
-      return value.strftime('%Y-%m-%dT%H:%M:%S%Z') unless key
+      return set_root_value(value.strftime('%Y-%m-%dT%H:%M:%S%Z')) unless key
       return if value.nil?
 
       @writer[key] = value.strftime('%Y-%m-%dT%H:%M:%S%Z')
@@ -96,7 +96,7 @@ module MicrosoftKiotaSerializationJson
 
     def write_duration_value(key, value)
       raise StandardError, 'no key or value included in write_duration_value(key, value)' if !key && !value
-      return value.string unless key
+      return set_root_value(value.string) unless key
       return if value.nil?
 
       @writer[key] = value.string
@@ -104,11 +104,8 @@ module MicrosoftKiotaSerializationJson
 
     def write_collection_of_primitive_values(key, values)
       return unless values
-      unless key
-        return values.map do |v|
-          write_any_value(nil, v)
-        end
-      end
+      return set_root_value(values.map { |v| serialized_scalar(v) }) unless key
+
       @writer[key] = values.map do |v|
         write_any_value(key, v)
       end
@@ -132,6 +129,15 @@ module MicrosoftKiotaSerializationJson
       end
     end
 
+    def write_collection_of_enum_values(key, values)
+      return unless values
+
+      serialized = values.compact.map(&:to_s)
+      return set_root_value(serialized) unless key
+
+      @writer[key] = serialized
+    end
+
     def write_enum_value(key, values)
       raise StandardError, 'no key or value included in write_enum_value(key, values)' if key.nil? && values.nil?
       return if values.nil?
@@ -162,6 +168,14 @@ module MicrosoftKiotaSerializationJson
 
     public
 
+    def serialized_scalar(value)
+      return value if value.nil? || value == true || value == false
+
+      temp = JsonSerializationWriter.new
+      result = temp.write_any_value(nil, value)
+      temp.root_value? ? temp.root_value : result
+    end
+
     def write_any_value(key, value)
       if value
         if !value.nil? == value

data/lib/microsoft_kiota_serialization_json/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MicrosoftKiotaSerializationJson
-  VERSION = '0.21.0' # x-release-please-version
+  VERSION = '0.22.0' # x-release-please-version
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: microsoft_kiota_serialization_json
 version: !ruby/object:Gem::Version
-  version: 0.21.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Microsoft Corporation
@@ -35,14 +35,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.21.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement