aspose_slides_cloud 22.11.0 → 22.12.0

data/lib/aspose_slides_cloud/models/zoom_object.rb

@@ -215,44 +215,48 @@ module AsposeSlidesCloud
     # @param string value Value to be deserialized
     # @return [Object] Deserialized data
     def _deserialize(type, value)
-      case type.to_sym
-      when :DateTime
-        DateTime.parse(value)
-      when :Date
-        Date.parse(value)
-      when :String
-        value.to_s
-      when :Integer
-        value.to_i
-      when :Float
-        value.to_f
-      when :BOOLEAN
-        if value.to_s =~ /\A(true|t|yes|y|1)\z/i
-          true
-        else
-          false
-        end
-      when :Object
-        # generic object (usually a Hash), return directly
-        value
-      when /\AArray<(?<inner_type>.+)>\z/
-        inner_type = Regexp.last_match[:inner_type]
-        value.map { |v| _deserialize(inner_type, v) }
-      when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
-        k_type = Regexp.last_match[:k_type]
-        v_type = Regexp.last_match[:v_type]
-        {}.tap do |hash|
-          value.each do |k, v|
-            hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+      if value.nil?
+        nil
+      else
+        case type.to_sym
+        when :DateTime
+          DateTime.parse(value)
+        when :Date
+          Date.parse(value)
+        when :String
+          value.to_s
+        when :Integer
+          value.to_i
+        when :Float
+          value.to_f
+        when :BOOLEAN
+          if value.to_s =~ /\A(true|t|yes|y|1)\z/i
+            true
+          else
+            false
           end
+        when :Object
+          # generic object (usually a Hash), return directly
+          value
+        when /\AArray<(?<inner_type>.+)>\z/
+          inner_type = Regexp.last_match[:inner_type]
+          value.map { |v| _deserialize(inner_type, v) }
+        when /\AHash<(?<k_type>.+?), (?<v_type>.+)>\z/
+          k_type = Regexp.last_match[:k_type]
+          v_type = Regexp.last_match[:v_type]
+          {}.tap do |hash|
+            value.each do |k, v|
+              hash[_deserialize(k_type, k)] = _deserialize(v_type, v)
+            end
+          end
+        else # model
+          registry_type = AsposeSlidesCloud::TypeRegistry.get_type(type.to_s, value)
+          if registry_type
+            type = registry_type
+          end
+          temp_model = AsposeSlidesCloud.const_get(type).new
+          temp_model.build_from_hash(value)
         end
-      else # model
-        registry_type = AsposeSlidesCloud::TypeRegistry.get_type(type.to_s, value)
-        if registry_type
-          type = registry_type
-        end
-        temp_model = AsposeSlidesCloud.const_get(type).new
-        temp_model.build_from_hash(value)
       end
     end
 

data/lib/aspose_slides_cloud/type_registry.rb

@@ -51,13 +51,15 @@ module AsposeSlidesCloud
         is_good = true
         determiners.each do |k, v|
           is_good_key = false
-          if !map[k].nil?
-            is_good_key = v == map[k]
-          else
-            keyString = k.to_s
-            keyString[0] = keyString[0].downcase
-            if !map[keyString.to_sym].nil?
-              is_good_key = v == map[keyString.to_sym]
+          if !map.nil?
+            if !map[k].nil?
+              is_good_key = v == map[k]
+            else
+              keyString = k.to_s
+              keyString[0] = keyString[0].downcase
+              if !map[keyString.to_sym].nil?
+                is_good_key = v == map[keyString.to_sym]
+              end
             end
           end
           is_good = is_good && is_good_key
@@ -264,8 +266,8 @@ module AsposeSlidesCloud
         :'BorderBoxElement' => { :'Type' => 'BorderBox', },
         :'BoxElement' => { :'Type' => 'Box', },
         :'DataPoint' => {  },
-        :'ScatterChartDataPoint' => {  },
-        :'BubbleChartDataPoint' => {  },
+        :'ScatterChartDataPoint' => { :'Type' => 'Scatter', },
+        :'BubbleChartDataPoint' => { :'Type' => 'Bubble', },
         :'Series' => {  },
         :'XYSeries' => {  },
         :'BubbleSeries' => { :'DataPointType' => 'Bubble', },
@@ -366,7 +368,7 @@ module AsposeSlidesCloud
         :'NotesSlideHeaderFooter' => {  },
         :'ObjectExist' => {  },
         :'OleObjectFrame' => { :'Type' => 'OleObjectFrame', },
-        :'OneValueChartDataPoint' => {  },
+        :'OneValueChartDataPoint' => { :'Type' => 'OneValue', },
         :'OneValueSeries' => { :'DataPointType' => 'OneValue', },
         :'OrderedMergeRequest' => {  },
         :'OuterShadowEffect' => {  },

data/lib/aspose_slides_cloud/version.rb

@@ -21,5 +21,5 @@ SOFTWARE.
 =end
 
 module AsposeSlidesCloud
-  VERSION = '22.11.0'
+  VERSION = '22.12.0'
 end

data/spec/use_cases/chart_spec.rb

@@ -82,22 +82,22 @@ describe 'UseCases' do
       chart.height = 300
 
       data_source_for_categories = AsposeSlidesCloud::Workbook.new
-      data_source_for_categories.worksheet_index = 0
-      data_source_for_categories.column_index = 0
-      data_source_for_categories.row_index = 1
+      data_source_for_categories.worksheet_index = 1
+      data_source_for_categories.column_index = 1
+      data_source_for_categories.row_index = 2
       chart.data_source_for_categories = data_source_for_categories
 
       series1 = AsposeSlidesCloud::OneValueSeries.new
       data_source_for_series1_name = AsposeSlidesCloud::Workbook.new
-      data_source_for_series1_name.worksheet_index = 0
-      data_source_for_series1_name.column_index = 1
-      data_source_for_series1_name.row_index = 0
+      data_source_for_series1_name.worksheet_index = 1
+      data_source_for_series1_name.column_index = 2
+      data_source_for_series1_name.row_index = 1
       series1.data_source_for_series_name = data_source_for_series1_name    
       series1.name = "Series1"
       data_source_for_series1_values =  AsposeSlidesCloud::Workbook.new
-      data_source_for_series1_values.worksheet_index = 0
-      data_source_for_series1_values.column_index = 1
-      data_source_for_series1_values.row_index = 1
+      data_source_for_series1_values.worksheet_index = 1
+      data_source_for_series1_values.column_index = 2
+      data_source_for_series1_values.row_index = 2
       series1.data_source_for_values = data_source_for_series1_values
       point11 = AsposeSlidesCloud::OneValueChartDataPoint.new
       point11.value = 40
@@ -108,15 +108,15 @@ describe 'UseCases' do
       series1.data_points = [point11, point12, point13]
       series2 = AsposeSlidesCloud::OneValueSeries.new
       data_source_for_series2_name = AsposeSlidesCloud::Workbook.new
-      data_source_for_series2_name.worksheet_index = 0
-      data_source_for_series2_name.column_index = 2
-      data_source_for_series2_name.row_index = 0
+      data_source_for_series2_name.worksheet_index = 1
+      data_source_for_series2_name.column_index = 3
+      data_source_for_series2_name.row_index = 1
       series2.data_source_for_series_name = data_source_for_series2_name 
       series2.name = "Series2"
       data_source_for_series2_values = AsposeSlidesCloud::Workbook.new
-      data_source_for_series2_values.worksheet_index = 0
-      data_source_for_series2_values.column_index = 2
-      data_source_for_series2_values.row_index = 1
+      data_source_for_series2_values.worksheet_index = 1
+      data_source_for_series2_values.column_index = 3
+      data_source_for_series2_values.row_index = 2
       series2.data_source_for_values = data_source_for_series2_values
       point21 = AsposeSlidesCloud::OneValueChartDataPoint.new
       point21.value = 55
@@ -161,9 +161,9 @@ describe 'UseCases' do
       point13.value = 70
       series1.data_points = [point11, point12, point13]
       series2 = AsposeSlidesCloud::OneValueSeries.new
-      series2.data_source_for_series_name = AsposeSlidesCloud::Workbook.new
+      series2.data_source_for_series_name = AsposeSlidesCloud::Literals.new
       series2.name = "Series2"
-      series2.data_source_for_values = AsposeSlidesCloud::Workbook.new
+      series2.data_source_for_values = AsposeSlidesCloud::Literals.new
       point21 = AsposeSlidesCloud::OneValueChartDataPoint.new
       point21.value = 55
       point22 = AsposeSlidesCloud::OneValueChartDataPoint.new
@@ -619,29 +619,28 @@ describe 'UseCases' do
       chart.height = 300
 
       data_source_for_categories = AsposeSlidesCloud::Workbook.new
-      data_source_for_categories.worksheet_index = 0
-      data_source_for_categories.column_index = 0
-      data_source_for_categories.row_index = 1
+      data_source_for_categories.worksheet_index = 1
+      data_source_for_categories.column_index = 1
+      data_source_for_categories.row_index = 2
       chart.data_source_for_categories = data_source_for_categories
 
       series1 = AsposeSlidesCloud::OneValueSeries.new
       data_source_for_series1_name = AsposeSlidesCloud::Workbook.new
-      data_source_for_series1_name.worksheet_index = 0
-      data_source_for_series1_name.column_index = 1
-      data_source_for_series1_name.row_index = 0
+      data_source_for_series1_name.worksheet_index = 1
+      data_source_for_series1_name.column_index = 2
+      data_source_for_series1_name.row_index = 1
       series1.data_source_for_series_name = data_source_for_series1_name    
       series1.name = "Series1"
       data_source_for_series1_values = AsposeSlidesCloud::Workbook.new
-      data_source_for_series1_values.worksheet_index = 0
-      data_source_for_series1_values.column_index = 1
-      data_source_for_series1_values.row_index = 1
+      data_source_for_series1_values.worksheet_index = 1
+      data_source_for_series1_values.column_index = 2
+      data_source_for_series1_values.row_index = 2
       series1.data_source_for_values = data_source_for_series1_values
       point11 = AsposeSlidesCloud::OneValueChartDataPoint.new
       point11.value = 40
       point12 = AsposeSlidesCloud::OneValueChartDataPoint.new
       point12.value = 50
       point13 = AsposeSlidesCloud::OneValueChartDataPoint.new
-      point13.value = 0
       point13.value_formula = "SUM(B2:B3)"
       series1.data_points = [point11, point12, point13]
       chart.series = [ series1 ]

data/testRules.json

@@ -46,7 +46,7 @@
 		{ "Value": {}, "InvalidValue": null, "Type": "model" },
 		{ "Value": { "MasterSlide": { "Href": "masterSlides/2" } }, "Type": "LayoutSlide" },
 		{ "Value": { "DataPointType": "OneValue" }, "Type": "OneValueSeries" },
-		{ "Value": { "XValue": 32.5, "YValue": 42.9 }, "Type": "ScatterChartDataPoint" },
+		{ "Value": { "Type": "Scatter", "XValue": 32.5, "YValue": 42.9 }, "Type": "ScatterChartDataPoint" },
 		{ "Value": { "TriggerShapeIndex": 1 }, "Type": "InteractiveSequence" },
 		{ "Value": { "ShapeIndex": 1, "Type": "Appear" }, "Type": "Effect" },
 		{ "Value": { "Type": "Regular", "Author": "Caesar", "Text": "Veni vidi vici" }, "Type": "SlideComment", "Method": "/CreateComment/" },
@@ -56,6 +56,7 @@
 		{ "Value": { "Presentations": [{ "Path": "file1", "Password": "password" }, { "Path": "file2" }] }, "Type": "OrderedMergeRequest", "Language": "Python" },
 		{ "Value": { "Presentations": [{ "Path": "file1", "Password": "password" }, { "Path": "file2" }] }, "Type": "OrderedMergeRequest", "Language": "Go" },
 		{ "Value": { "Presentations": [{ "Path": "file1", "Password": "password" }, { "Path": "file2" }] }, "Type": "OrderedMergeRequest", "Language": "Ruby" },
+		{ "Value": { "Presentations": [{ "Path": "file1", "Password": "password" }, { "Path": "file2" }] }, "Type": "OrderedMergeRequest", "Language": "Perl" },
 		{ "Value": {}, "Type": "OrderedMergeRequest", "Method": "OrderedMerge" },
 		{ "Value": { "paths": [ { "pathData": [ { "type": "MoveTo" } ] } ] }, "Type": "GeometryPaths" },
 		{ "Value": null, "Parameter": "PictureFrame" },

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aspose_slides_cloud
 version: !ruby/object:Gem::Version
-  version: 22.11.0
+  version: 22.12.0
 platform: ruby
 authors:
 - Victor Putrov
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-26 00:00:00.000000000 Z
+date: 2022-12-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday