microsoft_kiota_serialization_json 0.20.0 → 0.22.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c8f2344ced8c7835492e23bed44767ead7ba90afed45752d6a5e84ebb5773371
-  data.tar.gz: c08dac9dfb7a4a99fc05a089d4ea2b1d237c8258a7a63d6df8fc8962eda81d5f
+  metadata.gz: 99d3aaf3bb83a8c789383d853f1181377ee92db658f667fb110306995311e4c1
+  data.tar.gz: b7827075fc0b80e2d8bbc7bdb291d618aea39ed4df0a904545ec87e9cad15b6f
 SHA512:
-  metadata.gz: d3e3e08f0e8f94987d5dca9873afeedeb1b834b7e1a0585f236f644d67147d91ef34c81924fbb9aba140c22a304c3f9cb3f811afd992825cfdc7a082c3761bee
-  data.tar.gz: 366c826c2533a5851fd5bea038035361261583391f52d55529c8e3ddbd4703c41a76952f9f72e1daab1f444f7647f31ae7ffc0a66fac462ea760b01de11c1ffb
+  metadata.gz: 6ec0ac94f56351227acf2b01099cec17257e73f8302671ddf7175295a6aa0ee32efa3644aea3552a28b9640c6585135d6e4a2e769e7ae4daac08dfd0fe663d07
+  data.tar.gz: 89be60bd077fab8ece0ad40b7f94dc425ea7112a817dccee2829f399cc80b318dee46faea2f812e63d680d3b37f30d81d37debe1ed688737e16c2da6f354d477

data/lib/microsoft_kiota_serialization_json/json_parse_node.rb

@@ -108,31 +108,43 @@ module MicrosoftKiotaSerializationJson
     end
 
     def assign_field_values(item)
+      return unless @current_node.is_a?(Hash)
+
       fields = item.get_field_deserializers
       @current_node.each do |k, v|
         next if v.nil?
 
         deserializer = fields[k]
-        if deserializer
-          deserializer.call(JsonParseNode.new(v))
-        elsif item.additional_data
-          item.additional_data[k] = v
-        else
-          item.additional_data = Hash.new({ k => v })
-        end
+        next deserializer.call(JsonParseNode.new(v)) if deserializer
+
+        additional_data = item.respond_to?(:additional_data) ? item.additional_data : nil
+        next if additional_data.nil?
+
+        additional_data[k] = v
       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

@@ -33,6 +33,7 @@ module MicrosoftKiotaSerializationJson
     def write_string_value(key, value)
       raise StandardError, 'no key or value included in write_string_value(key, value)' if key.nil? && value.nil?
       return set_root_value(value) if key.nil?
+      return if value.nil?
 
       @writer[key] = value
     end
@@ -40,6 +41,7 @@ module MicrosoftKiotaSerializationJson
     def write_boolean_value(key, value)
       raise StandardError, 'no key or value included in write_boolean_value(key, value)' if key.nil? && value.nil?
       return set_root_value(value) if key.nil?
+      return if value.nil?
 
       @writer[key] = value
     end
@@ -47,6 +49,7 @@ module MicrosoftKiotaSerializationJson
     def write_number_value(key, value)
       raise StandardError, 'no key or value included in write_number_value(key, value)' if key.nil? && value.nil?
       return set_root_value(value) if key.nil?
+      return if value.nil?
 
       @writer[key] = value
     end
@@ -54,52 +57,55 @@ module MicrosoftKiotaSerializationJson
     def write_float_value(key, value)
       raise StandardError, 'no key or value included in write_float_value(key, value)' if key.nil? && value.nil?
       return set_root_value(value) if key.nil?
+      return if value.nil?
 
       @writer[key] = value
     end
 
     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 if value)
+      @writer[key] = value.to_s
     end
 
     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') if value)
+      @writer[key] = value.strftime('%Y-%m-%d')
     end
 
     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') if value)
+      @writer[key] = value.strftime('%H:%M:%S%Z')
     end
 
     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') if value)
+      @writer[key] = value.strftime('%Y-%m-%dT%H:%M:%S%Z')
     end
 
     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 if value)
+      @writer[key] = value.string
     end
 
     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
@@ -123,7 +129,19 @@ 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?
+
       write_string_value(key, values.to_s)
     end
 
@@ -150,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.20.0' # x-release-please-version
+  VERSION = '0.22.0' # x-release-please-version
 end

data/microsoft_kiota_serialization_json.gemspec

@@ -27,7 +27,7 @@ Gem::Specification.new do |spec|
   spec.bindir        = 'bin'
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-  spec.add_dependency 'json', '>= 2.6.3', '< 2.22.0'
+  spec.add_dependency 'json', '>= 2.6.3', '< 3.1.0'
   spec.add_dependency 'microsoft_kiota_abstractions', MicrosoftKiotaSerializationJson::VERSION
   spec.add_dependency 'uuidtools', '>= 2.2', '< 3.1'
   spec.add_development_dependency 'rake', '~> 13.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: microsoft_kiota_serialization_json
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.22.0
 platform: ruby
 authors:
 - Microsoft Corporation
@@ -18,7 +18,7 @@ dependencies:
         version: 2.6.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.22.0
+        version: 3.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -28,21 +28,21 @@ dependencies:
         version: 2.6.3
     - - "<"
       - !ruby/object:Gem::Version
-        version: 2.22.0
+        version: 3.1.0
 - !ruby/object:Gem::Dependency
   name: microsoft_kiota_abstractions
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.22.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.20.0
+        version: 0.22.0
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement