microsoft_kiota_serialization_json 0.10.0 → 0.18.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d639bc65366dd996f9718322979d0a2016b7153f485a54e827e52872427bbb8a
-  data.tar.gz: 8df1b983bf62a8ec269fca317f3813df3c4dc188cdba117507d4e36b35af9e96
+  metadata.gz: 03c2671ff8b81e0982ff03b15285dfae320222b7c28e3b9ff2281203a4bf4595
+  data.tar.gz: 434eca2c601a3a57b9dffee91e5e82027c5c85b3373e25005ea0199e5852831c
 SHA512:
-  metadata.gz: 360f4f242b9da0b167bc690c839d773437368ac0388d9444cf8c5f42d658214359f7cd79f1f9b4c1e609028c5b9c53ed1ed649b72bf89e439fa8f6add3ef4a25
-  data.tar.gz: 42566ba5d373ad2962479f8806168503ef40fbce1292a3546d0bcf39740585ba444b062f75ea98a284a2176f25a4acb87f74fd0bc6492e6ced9656556644e590
+  metadata.gz: 133b184021bf30144feee69a1aaded931e843152f954020266fede9ef0c26bdb673fc27c6d6665f4b738ea60705576528267334aaafa362dc01edda229146c44
+  data.tar.gz: b0afcd96b99e13f7dbfd006b3221901386c9b31a8f54e418ae8446e96a30f48968b032b0ca532d929e7f0d3b1e9dc3f514b44fdbaf8e9ff8e87794fd514ebe1f

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,13 +1,15 @@
+# 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
@@ -36,15 +38,15 @@ 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
 
@@ -60,7 +62,7 @@ module MicrosoftKiotaSerializationJson
           current_parse_node.get_float_value
         when Integer
           current_parse_node.get_float_value
-        when "Boolean"
+        when 'Boolean'
           current_parse_node.get_float_value
         when DateTime
           current_parse_node.get_date_time_value
@@ -82,6 +84,7 @@ module MicrosoftKiotaSerializationJson
 
     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 +95,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,7 +114,7 @@ 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
@@ -127,8 +131,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,227 +1,171 @@
+# 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 = {}
     end
 
-    def writer
-      @writer
-    end
+    attr_reader :writer
 
     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 && !value
+      return value.to_s unless key
+
+      @writer[key] = (value || nil)
     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 && !value
+      return value unless key
+
       @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 && !value
+      return value unless key
+
       @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 && !value
+      return value unless key
+
       @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 do |v|
-            self.write_object_value(nil, v)
-          end
-        end
-        @writer[key] = values.map do |v|
-          self.write_object_value(nil, v).writer
-        end
-      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)
-      if value
-        if !key
-          temp = JsonSerializationWriter.new()
-          value.serialize(temp)
-          return temp
-        end
-        begin
-          temp = JsonSerializationWriter.new()
-          value.serialize(temp)
-          @writer[key] = temp.writer
-        rescue StandardError => e
-          raise e.class, "no key or value included in write_boolean_value(key, value)" 
-        end
+    def write_object_value(key, value, *additional_values_to_merge)
+      return unless 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) }
       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
+      @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
 
+    private
+
+    def object_value_hash(value, *additional_values_to_merge)
+      temp = JsonSerializationWriter.new
+      value.serialize(temp)
+      additional_values_to_merge.each { |v| v&.serialize(temp) }
+      temp.writer
+    end
+
+    public
+
     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.10.0"
+  VERSION = '0.18.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.14', '< 0.16'
-  spec.add_runtime_dependency 'uuidtools', '>= 2.2', '< 3.1'
-  spec.add_runtime_dependency 'json', '>= 2.6.3', '< 2.20.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'