microsoft_kiota_serialization_json 0.11.0 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: cdbaf363a7da4ffef9473c460d3435062f8f37ad1417ce4f172ee83afa87980c
-  data.tar.gz: 62cee70699af59a54aeeb9636744df27fff8434e7652842a37eb59e7ef07a3f3
+  metadata.gz: cb3c8ad046e7bb462b1a2b8142285f7524652c456ebf4d829d1405a5be5cc735
+  data.tar.gz: 2f4c604480b717b808521d309b4788d304ffc4e6f40de4c103478a1a5efc9ff4
 SHA512:
-  metadata.gz: 7d6670a909cd3c15adb39ee9b99537efbd928cd17c952b2874bd89f398c5b28b71816803540a40cc9b21ddaf53779027d54f98769f021fb541cd32744c3f6240
-  data.tar.gz: c09ff923f79b2cb6f07de2ae23351412a027b6ad191bc67576a721e4d9af9378ae35e47a1094153599d02bafcdb7f38134b499a14f6217561a94b486d7e16f03
+  metadata.gz: c564b6ba4b03e7a9f6a6881b8db19d7ba53a991176020f5d6cc16271a3de1129cf44a00460749232745adcef17e8bc08828f51c8d8b63b7d5137bb83cb6f2294
+  data.tar.gz: 6b52a93a107d2e90dd93d7c03cc9dc03a23f7cbafeb97ce8154cb23cacb70806988462ab95bb0b9a88f6c01e597cc548748db5cbccb3b0adbb0ea5c073eb8806

data/Gemfile

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
-source "https://rubygems.org"
+source 'https://rubygems.org'
+
+gem 'microsoft_kiota_abstractions', path: '../../abstractions'
 
 gemspec

data/Rakefile

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-require "bundler/gem_tasks"
-require "rspec/core/rake_task"
+require 'bundler/gem_tasks'
+require 'rspec/core/rake_task'
 
 RSpec::Core::RakeTask.new(:spec)
 

data/lib/microsoft_kiota_serialization_json/json_parse_node.rb

@@ -1,31 +1,38 @@
+# frozen_string_literal: true
+
 require 'time'
 require 'date'
 require 'json'
 require 'uuidtools'
 require 'microsoft_kiota_abstractions'
 
-
 module MicrosoftKiotaSerializationJson
   class JsonParseNode
     include MicrosoftKiotaAbstractions::ParseNode
+
     def initialize(node)
       @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
@@ -36,52 +43,52 @@ module MicrosoftKiotaSerializationJson
       Date.parse(@current_node)
     end
 
-    def get_time_value()
+    def get_time_value
       Time.parse(@current_node)
     end
 
-    def get_date_time_value()
+    def get_date_time_value
       DateTime.parse(@current_node)
     end
 
-    def get_duration_value()
+    def get_duration_value
       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
 
     def get_collection_of_object_values(factory)
       raise StandardError, 'Factory cannot be null' if factory.nil?
+
       @current_node.map do |object|
         next if object.nil?
 
@@ -92,6 +99,7 @@ module MicrosoftKiotaSerializationJson
 
     def get_object_value(factory)
       raise StandardError, 'Factory cannot be null' if factory.nil?
+
       item = factory.call(self)
       assign_field_values(item)
       item
@@ -110,13 +118,15 @@ module MicrosoftKiotaSerializationJson
         elsif item.additional_data
           item.additional_data[k] = v
         else
-          item.additional_data = Hash.new(k => v)
+          item.additional_data = Hash.new({ k => v })
         end
       end
     end
 
     def get_enum_values(_type)
       raw_values = get_string_value
+      return [] if raw_values.nil?
+
       raw_values.split(',').map(&:strip)
     end
 
@@ -127,8 +137,9 @@ module MicrosoftKiotaSerializationJson
 
     def get_child_node(name)
       raise StandardError, 'Name cannot be null' if name.nil? || name.empty?
+
       raw_value = @current_node[name]
-      return JsonParseNode.new(raw_value) if raw_value
+      JsonParseNode.new(raw_value) if raw_value
     end
   end
 end

data/lib/microsoft_kiota_serialization_json/json_parse_node_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'json'
 require 'microsoft_kiota_abstractions'
 

data/lib/microsoft_kiota_serialization_json/json_serialization_writer.rb

@@ -1,183 +1,141 @@
+# frozen_string_literal: true
+
 require 'time'
 require 'date'
 require 'json'
-require "uuidtools"
+require 'uuidtools'
 require 'microsoft_kiota_abstractions'
 
 module MicrosoftKiotaSerializationJson
   class JsonSerializationWriter
     include MicrosoftKiotaAbstractions::SerializationWriter
-    @writer
 
-    def initialize()
-      @writer = Hash.new()
+    def initialize
+      @writer = {}
+      @root_value = nil
+      @has_root_value = false
     end
 
-    def writer
-      @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)
-      if !key && !value
-        raise StandardError, "no key or value included in write_string_value(key, value)"
-      end
-      if !key
-        return value.to_s
-      end
-      if !value
-        @writer[key] = nil
-      else
-        @writer[key] = value
-      end
+      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
     end
 
     def write_boolean_value(key, value)
-      if !key && !value
-        raise StandardError, "no key or value included in write_boolean_value(key, value)"
-      end
-      if !key 
-        return value
-      end
+      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)
-      if !key && !value
-        raise StandardError, "no key or value included in write_number_value(key, value)"
-      end
-      if !key
-        return value
-      end
+      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)
-      if !key && !value
-        raise StandardError, "no key or value included in write_float_value(key, value)"
-      end
-      if !key
-        return value
-      end
+      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
 
     def write_guid_value(key, value)
-      if !key && !value
-        raise StandardError, "no key or value included in write_guid_value(key, value)"
-      end
-      if !key
-        return value.to_s
-      end
-      if !value
-        @writer[key] = nil
-      else
-        @writer[key] = value.to_s
-      end
+      raise StandardError, 'no key or value included in write_guid_value(key, value)' if !key && !value
+      return value.to_s unless key
+
+      @writer[key] = (value.to_s if value)
     end
 
     def write_date_value(key, value)
-      if !key && !value
-        raise StandardError, "no key or value included in write_date_value(key, value)"
-      end
-      if !key
-        return value.strftime("%Y-%m-%d")
-      end
-      if !value
-        @writer[key] = nil
-      else
-        @writer[key] = value.strftime("%Y-%m-%d")
-      end
+      raise StandardError, 'no key or value included in write_date_value(key, value)' if !key && !value
+      return value.strftime('%Y-%m-%d') unless key
+
+      @writer[key] = (value.strftime('%Y-%m-%d') if value)
     end
 
     def write_time_value(key, value)
-      if !key && !value
-        raise StandardError, "no key or value included in write_time_value(key, value)"
-      end
-      if !key
-        return value.strftime("%H:%M:%S%Z")
-      end
-      if !value
-        @writer[key] = nil
-      else
-        @writer[key] = value.strftime("%H:%M:%S%Z")
-      end
+      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
+
+      @writer[key] = (value.strftime('%H:%M:%S%Z') if value)
     end
 
     def write_date_time_value(key, value)
-      if !key && !value
-        raise StandardError, "no key or value included in write_date_time_value(key, value)"
-      end
-      if !key
-        return value.strftime("%Y-%m-%dT%H:%M:%S%Z")
-      end
-      if !value
-        @writer[key] = nil
-      else
-        @writer[key] = value.strftime("%Y-%m-%dT%H:%M:%S%Z")
-      end
+      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
+
+      @writer[key] = (value.strftime('%Y-%m-%dT%H:%M:%S%Z') if value)
     end
 
     def write_duration_value(key, value)
-      if !key && !value
-        raise StandardError, "no key or value included in write_duration_value(key, value)"
-      end
-      if !key
-        return value.string
-      end
-      if !value
-        @writer[key] = nil
-      else
-        @writer[key] = value.string
-      end
+      raise StandardError, 'no key or value included in write_duration_value(key, value)' if !key && !value
+      return value.string unless key
+
+      @writer[key] = (value.string if value)
     end
 
     def write_collection_of_primitive_values(key, values)
-      if values
-        if !key
-          return values.map do |v|
-            self.write_any_value(nil, v)
-          end
-        end
-        @writer[key] = values.map do |v|
-          self.write_any_value(key, v)
+      return unless values
+      unless key
+        return values.map do |v|
+          write_any_value(nil, v)
         end
       end
+      @writer[key] = values.map do |v|
+        write_any_value(key, v)
+      end
     end
 
     def write_collection_of_object_values(key, values)
-      if values
-        if !key
-          return values.map { |v| write_object_value(nil, v) }
-        end
-        @writer[key] = values.map { |v| object_value_hash(v) }
-      end
+      return unless values
+      return values.map { |v| write_object_value(nil, v) } unless key
+
+      @writer[key] = values.map { |v| object_value_hash(v) }
     end
 
     def write_object_value(key, value, *additional_values_to_merge)
-      if value
-        if key
-          @writer[key] = object_value_hash(value, *additional_values_to_merge)
-        else
-          value.serialize(self)
-          additional_values_to_merge.each { |v| v.serialize(self) unless v.nil? }
-        end
+      values = [value, *additional_values_to_merge].compact
+      return if values.empty?
+
+      if key
+        @writer[key] = object_value_hash(*values)
+      else
+        values.each { |v| v.serialize(self) }
       end
     end
 
     def write_enum_value(key, values)
-      self.write_string_value(key, values.to_s)
+      write_string_value(key, values.to_s)
     end
 
-    def get_serialized_content()
-      return @writer.to_json #TODO encode to byte array to stay content type agnostic
+    def get_serialized_content
+      (@has_root_value ? @root_value : @writer).to_json # TODO: encode to byte array to stay content type agnostic
     end
 
     def write_additional_data(value)
-      if !value
-        return
-      end
+      return unless value
+
       value.each do |x, y|
-        self.write_any_value(x,y)
+        write_any_value(x, y)
       end
     end
 
@@ -186,7 +144,7 @@ module MicrosoftKiotaSerializationJson
     def object_value_hash(value, *additional_values_to_merge)
       temp = JsonSerializationWriter.new
       value.serialize(temp)
-      additional_values_to_merge.each { |v| v.serialize(temp) unless v.nil? }
+      additional_values_to_merge.each { |v| v&.serialize(temp) }
       temp.writer
     end
 
@@ -194,35 +152,34 @@ module MicrosoftKiotaSerializationJson
 
     def write_any_value(key, value)
       if value
-        if !!value == value
-          return value
+        if !value.nil? == value
+          value
         elsif value.instance_of? String
-          return self.write_string_value(key, value)
+          write_string_value(key, value)
         elsif value.instance_of? Integer
-          return self.write_number_value(key, value)
+          write_number_value(key, value)
         elsif value.instance_of? Float
-          return self.write_float_value(key, value)
+          write_float_value(key, value)
         elsif value.instance_of? DateTime
-          return self.write_date_time_value(key, value)
+          write_date_time_value(key, value)
         elsif value.instance_of? Time
-          return self.write_time_value(key, value)
+          write_time_value(key, value)
         elsif value.instance_of? Date
-          return self.write_date_value(key, value)
+          write_date_value(key, value)
         elsif value.instance_of? MicrosoftKiotaAbstractions::ISODuration
-          return self.write_duration_value(key, value)
+          write_duration_value(key, value)
         elsif value.instance_of? Array
-          return self.write_collection_of_primitive_values(key, value)
+          write_collection_of_primitive_values(key, value)
         elsif value.is_a? Object
-          return value.to_s
+          value.to_s
         else
-          raise StandardError, "encountered unknown value type during serialization #{value.to_s}"
+          raise StandardError, "encountered unknown value type during serialization #{value}"
         end
       else
-        if key
-          @writer[key] = nil
-        else
-          raise StandardError, "no key included when writing json property"
-        end
+        raise StandardError, 'no key included when writing json property' unless key
+
+        @writer[key] = nil
+
       end
     end
   end

data/lib/microsoft_kiota_serialization_json/json_serialization_writer_factory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'microsoft_kiota_abstractions'
 
 module MicrosoftKiotaSerializationJson

data/lib/microsoft_kiota_serialization_json/version.rb

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

data/lib/microsoft_kiota_serialization_json.rb

@@ -1,10 +1,10 @@
 # frozen_string_literal: true
 
-require_relative "microsoft_kiota_serialization_json/json_parse_node"
-require_relative "microsoft_kiota_serialization_json/json_parse_node_factory"
-require_relative "microsoft_kiota_serialization_json/json_serialization_writer"
-require_relative "microsoft_kiota_serialization_json/json_serialization_writer_factory"
-require_relative "microsoft_kiota_serialization_json/version"
+require_relative 'microsoft_kiota_serialization_json/json_parse_node'
+require_relative 'microsoft_kiota_serialization_json/json_parse_node_factory'
+require_relative 'microsoft_kiota_serialization_json/json_serialization_writer'
+require_relative 'microsoft_kiota_serialization_json/json_serialization_writer_factory'
+require_relative 'microsoft_kiota_serialization_json/version'
 
 module MicrosoftKiotaSerializationJson
 end

data/microsoft_kiota_serialization_json.gemspec

@@ -1,38 +1,35 @@
 # frozen_string_literal: true
 
-require_relative "lib/microsoft_kiota_serialization_json/version"
+require_relative 'lib/microsoft_kiota_serialization_json/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = "microsoft_kiota_serialization_json"
+  spec.name          = 'microsoft_kiota_serialization_json'
   spec.version       = MicrosoftKiotaSerializationJson::VERSION
   spec.authors       = 'Microsoft Corporation'
-  spec.email         = 'graphsdkpub@microsoft.com'
+  spec.email         = 'graphsdkpub+ruby@microsoft.com'
   spec.description   = 'Implementation of Kiota Serialization interfaces for JSON'
   spec.summary       = 'Microsoft Kiota Serialization - Ruby serialization for building library agnostic http client'
-  spec.homepage      = 'https://microsoft.github.io/kiota/'
+  spec.homepage      = 'https://learn.microsoft.com/openapi/kiota/'
   spec.license       = 'MIT'
   spec.metadata      = {
-    'bug_tracker_uri' => 'https://github.com/microsoft/kiota-serialization-json-ruby/issues',
-    'changelog_uri'   => 'https://github.com/microsoft/kiota-serialization-json-ruby/blob/main/CHANGELOG.md',
-    'homepage_uri'    => spec.homepage,
-    'source_code_uri' => 'https://github.com/microsoft/kiota-serialization-json-ruby',
-    'github_repo'     => 'ssh://github.com/microsoft/kiota-serialization-json-ruby'
+    'bug_tracker_uri' => 'https://github.com/microsoft/kiota-ruby/issues',
+    'changelog_uri' => 'https://github.com/microsoft/kiota-ruby/blob/main/CHANGELOG.md',
+    'homepage_uri' => spec.homepage,
+    'source_code_uri' => 'https://github.com/microsoft/kiota-ruby/tree/main/components/serialization/json',
+    'github_repo' => 'ssh://github.com/microsoft/kiota-ruby',
+    'rubygems_mfa_required' => 'true'
   }
-  spec.required_ruby_version = ">= 3.3.0"
+  spec.required_ruby_version = '>= 3.3.0'
 
-  # Specify which files should be added to the gem when it is released.
-  # The `git ls-files -z` loads the files in the RubyGem that have been added into git.
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
   end
-
   spec.bindir        = 'bin'
   spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
-
-  spec.add_runtime_dependency 'microsoft_kiota_abstractions', '>= 0.16', '< 0.18'
-  spec.add_runtime_dependency 'uuidtools', '>= 2.2', '< 3.1'
-  spec.add_runtime_dependency 'json', '>= 2.6.3', '< 2.22.0'
+  spec.add_dependency 'json', '>= 2.6.3', '< 2.22.0'
+  spec.add_dependency 'microsoft_kiota_abstractions', MicrosoftKiotaSerializationJson::VERSION
+  spec.add_dependency 'uuidtools', '>= 2.2', '< 3.1'
   spec.add_development_dependency 'rake', '~> 13.0'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop'