microsoft_kiota_serialization_json 0.18.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03c2671ff8b81e0982ff03b15285dfae320222b7c28e3b9ff2281203a4bf4595
-  data.tar.gz: 434eca2c601a3a57b9dffee91e5e82027c5c85b3373e25005ea0199e5852831c
+  metadata.gz: cb3c8ad046e7bb462b1a2b8142285f7524652c456ebf4d829d1405a5be5cc735
+  data.tar.gz: 2f4c604480b717b808521d309b4788d304ffc4e6f40de4c103478a1a5efc9ff4
 SHA512:
-  metadata.gz: 133b184021bf30144feee69a1aaded931e843152f954020266fede9ef0c26bdb673fc27c6d6665f4b738ea60705576528267334aaafa362dc01edda229146c44
-  data.tar.gz: b0afcd96b99e13f7dbfd006b3221901386c9b31a8f54e418ae8446e96a30f48968b032b0ca532d929e7f0d3b1e9dc3f514b44fdbaf8e9ff8e87794fd514ebe1f
+  metadata.gz: c564b6ba4b03e7a9f6a6881b8db19d7ba53a991176020f5d6cc16271a3de1129cf44a00460749232745adcef17e8bc08828f51c8d8b63b7d5137bb83cb6f2294
+  data.tar.gz: 6b52a93a107d2e90dd93d7c03cc9dc03a23f7cbafeb97ce8154cb23cacb70806988462ab95bb0b9a88f6c01e597cc548748db5cbccb3b0adbb0ea5c073eb8806

data/lib/microsoft_kiota_serialization_json/json_parse_node.rb

@@ -14,20 +14,25 @@ module MicrosoftKiotaSerializationJson
       @current_node = node
     end
 
+    # The scalar readers answer only for the type they are named after and return nil otherwise,
+    # matching the dotnet and Python runtimes. Coercing instead would make every reader answer for
+    # every payload, which leaves a composed type unable to tell which member it holds.
     def get_string_value
-      @current_node.to_s
+      @current_node.is_a?(String) ? @current_node : nil
     end
 
     def get_boolean_value
-      @current_node
+      [true, false].include?(@current_node) ? @current_node : nil
     end
 
     def get_number_value
-      @current_node.to_i
+      @current_node.is_a?(Integer) ? @current_node : nil
     end
 
+    # Widened to Numeric because JSON writes a whole number without a fraction, so a float field can
+    # legitimately arrive as an Integer.
     def get_float_value
-      @current_node.to_f
+      @current_node.is_a?(Numeric) ? @current_node.to_f : nil
     end
 
     def get_guid_value
@@ -50,35 +55,34 @@ module MicrosoftKiotaSerializationJson
       MicrosoftKiotaAbstractions::ISODuration.new(@current_node)
     end
 
+    # The generator passes the type as a class, except for booleans which it passes as a plain
+    # string. A `case` cannot dispatch on that: `when String` asks whether the type is an instance
+    # of String, and a class is an instance of Class, so every branch fell through to the string
+    # reader. A hash keys on the class object itself.
+    PRIMITIVE_READERS = {
+      String => :get_string_value,
+      Float => :get_float_value,
+      Integer => :get_number_value,
+      Date => :get_date_value,
+      DateTime => :get_date_time_value,
+      Time => :get_time_value,
+      MicrosoftKiotaAbstractions::ISODuration => :get_duration_value,
+      UUIDTools::UUID => :get_guid_value,
+      'boolean' => :get_boolean_value,
+      'Boolean' => :get_boolean_value
+    }.freeze
+
     def get_collection_of_primitive_values(type)
+      reader = PRIMITIVE_READERS[type]
       @current_node.map do |object|
         next if object.nil?
+        # an untyped collection is generated as Object, which has no reader of its own; the parsed
+        # JSON scalar is already the value, so it passes through rather than being stringified
+        next object if reader.nil?
 
-        current_parse_node = JsonParseNode.new(object)
-        case type
-        when String
-          current_parse_node.get_string_value
-        when Float
-          current_parse_node.get_float_value
-        when Integer
-          current_parse_node.get_float_value
-        when 'Boolean'
-          current_parse_node.get_float_value
-        when DateTime
-          current_parse_node.get_date_time_value
-        when Time
-          current_parse_node.get_time_value
-        when Date
-          current_parse_node.get_date_value
-        when MicrosoftKiotaAbstractions::ISODuration
-          current_parse_node.get_duration_value
-        when UUIDTools::UUID
-          current_parse_node.get_guid_value
-        else
-          current_parse_node.get_string_value
-        end
+        JsonParseNode.new(object).public_send(reader)
       rescue StandardError => e
-        raise e.class, `Failed to fetch #{type} type`
+        raise e.class, "Failed to fetch #{type} type: #{e.message}"
       end
     end
 
@@ -121,6 +125,8 @@ module MicrosoftKiotaSerializationJson
 
     def get_enum_values(_type)
       raw_values = get_string_value
+      return [] if raw_values.nil?
+
       raw_values.split(',').map(&:strip)
     end
 

data/lib/microsoft_kiota_serialization_json/json_serialization_writer.rb

@@ -12,34 +12,48 @@ module MicrosoftKiotaSerializationJson
 
     def initialize
       @writer = {}
+      @root_value = nil
+      @has_root_value = false
     end
 
-    attr_reader :writer
+    attr_reader :writer, :root_value
+
+    # A composed type whose selected member is a primitive serializes the scalar as the whole
+    # document rather than as a member of an object, so a nil key means "this is the root".
+    def set_root_value(value)
+      @root_value = value
+      @has_root_value = true
+      value
+    end
+
+    def root_value?
+      @has_root_value
+    end
 
     def write_string_value(key, value)
-      raise StandardError, 'no key or value included in write_string_value(key, value)' if !key && !value
-      return value.to_s unless key
+      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?
 
-      @writer[key] = (value || nil)
+      @writer[key] = value
     end
 
     def write_boolean_value(key, value)
-      raise StandardError, 'no key or value included in write_boolean_value(key, value)' if !key && !value
-      return value unless key
+      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?
 
       @writer[key] = value
     end
 
     def write_number_value(key, value)
-      raise StandardError, 'no key or value included in write_number_value(key, value)' if !key && !value
-      return value unless key
+      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?
 
       @writer[key] = value
     end
 
     def write_float_value(key, value)
-      raise StandardError, 'no key or value included in write_float_value(key, value)' if !key && !value
-      return value unless key
+      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?
 
       @writer[key] = value
     end
@@ -99,13 +113,13 @@ module MicrosoftKiotaSerializationJson
     end
 
     def write_object_value(key, value, *additional_values_to_merge)
-      return unless value
+      values = [value, *additional_values_to_merge].compact
+      return if values.empty?
 
       if key
-        @writer[key] = object_value_hash(value, *additional_values_to_merge)
+        @writer[key] = object_value_hash(*values)
       else
-        value.serialize(self)
-        additional_values_to_merge.each { |v| v&.serialize(self) }
+        values.each { |v| v.serialize(self) }
       end
     end
 
@@ -114,7 +128,7 @@ module MicrosoftKiotaSerializationJson
     end
 
     def get_serialized_content
-      @writer.to_json # TODO: encode to byte array to stay content type agnostic
+      (@has_root_value ? @root_value : @writer).to_json # TODO: encode to byte array to stay content type agnostic
     end
 
     def write_additional_data(value)

data/lib/microsoft_kiota_serialization_json/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module MicrosoftKiotaSerializationJson
-  VERSION = '0.18.0' # x-release-please-version
+  VERSION = '0.19.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.18.0
+  version: 0.19.0
 platform: ruby
 authors:
 - Microsoft Corporation
@@ -35,14 +35,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.18.0
+        version: 0.19.0
 - !ruby/object:Gem::Dependency
   name: uuidtools
   requirement: !ruby/object:Gem::Requirement