aspose_slides_cloud 20.6.0 → 21.1.0

data/lib/aspose_slides_cloud/models/one_value_chart_data_point.rb

@@ -24,31 +24,28 @@ require 'date'
 
 module AsposeSlidesCloud
   # One value chart data point.
-  class OneValueChartDataPoint
+  class OneValueChartDataPoint < DataPoint
     # Value.
     attr_accessor :value
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
-      {
-        :'value' => :'Value'
-      }
+      super.merge({
+        :'value' => :'Value',
+      })
     end
 
     # Attribute type mapping.
     def self.swagger_types
-      {
-        :'value' => :'Float'
-      }
+      super.merge({
+        :'value' => :'Float',
+      })
     end
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
-
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
+      super
 
       if attributes.has_key?(:'Value')
         self.value = attributes[:'Value']
@@ -58,7 +55,7 @@ module AsposeSlidesCloud
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
-      invalid_properties = Array.new
+      invalid_properties = super
       if @value.nil?
         invalid_properties.push('invalid value for "value", value cannot be nil.')
       end
@@ -69,6 +66,7 @@ module AsposeSlidesCloud
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
+      return false if !super
       return false if @value.nil?
       true
     end
@@ -99,15 +97,27 @@ module AsposeSlidesCloud
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.swagger_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
-          # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+        mapKey = self.class.attribute_map[key]
+        if !mapKey.nil?
+          val = attributes[mapKey]
+          if val.nil?
+            mapKeyString = mapKey.to_s
+            mapKeyString[0] = mapKeyString[0].downcase
+            mapKey = mapKeyString.to_sym
+            val = attributes[mapKey]
+          end
+          if !val.nil?
+            if type =~ /\AArray<(.*)>/i
+              # check to ensure the input is an array given that the the attribute
+              # is documented as an array but the input is not
+              if val.is_a?(Array)
+                self.send("#{key}=", val.map { |v| _deserialize($1, v) })
+              end
+            else
+              self.send("#{key}=", _deserialize(type, val))
+            end
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+        end
       end
 
       self

data/lib/aspose_slides_cloud/models/one_value_series.rb

@@ -24,61 +24,7 @@ require 'date'
 
 module AsposeSlidesCloud
   # One value series.
-  class OneValueSeries
-    # Series type.
-    attr_accessor :type
-
-    # Series name.
-    attr_accessor :name
-
-    # True if each data marker in the series has a different color.
-    attr_accessor :is_color_varied
-
-    # Invert solid color for the series.
-    attr_accessor :inverted_solid_fill_color
-
-    # True if curve smoothing is turned on. Applies only to line and scatter connected by lines charts.
-    attr_accessor :smooth
-
-    # True if the series is plotted on second value axis.
-    attr_accessor :plot_on_second_axis
-
-    # Series order.
-    attr_accessor :order
-
-    # The number format for the series y values.
-    attr_accessor :number_format_of_y_values
-
-    # The number format for the series x values.
-    attr_accessor :number_format_of_x_values
-
-    # The number format for the series values.
-    attr_accessor :number_format_of_values
-
-    # The number format for the series bubble sizes.
-    attr_accessor :number_format_of_bubble_sizes
-
-    # True if the series shall invert its colors if the value is negative. Applies to bar, column and bubble series.
-    attr_accessor :invert_if_negative
-
-    # The distance of an open pie slice from the center of the pie chart is expressed as a percentage of the pie diameter.
-    attr_accessor :explosion
-
-    # Series marker.
-    attr_accessor :marker
-
-    # Fill properties set for the series.
-    attr_accessor :fill_format
-
-    # Effect properties set for the series.
-    attr_accessor :effect_format
-
-    # Line properties set for the series.
-    attr_accessor :line_format
-
-    # Data point type.
-    attr_accessor :data_point_type
-
+  class OneValueSeries < Series
     # Gets or sets the values.
     attr_accessor :data_points
 
@@ -106,183 +52,45 @@ module AsposeSlidesCloud
 
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
-      {
-        :'type' => :'Type',
-        :'name' => :'Name',
-        :'is_color_varied' => :'IsColorVaried',
-        :'inverted_solid_fill_color' => :'InvertedSolidFillColor',
-        :'smooth' => :'Smooth',
-        :'plot_on_second_axis' => :'PlotOnSecondAxis',
-        :'order' => :'Order',
-        :'number_format_of_y_values' => :'NumberFormatOfYValues',
-        :'number_format_of_x_values' => :'NumberFormatOfXValues',
-        :'number_format_of_values' => :'NumberFormatOfValues',
-        :'number_format_of_bubble_sizes' => :'NumberFormatOfBubbleSizes',
-        :'invert_if_negative' => :'InvertIfNegative',
-        :'explosion' => :'Explosion',
-        :'marker' => :'Marker',
-        :'fill_format' => :'FillFormat',
-        :'effect_format' => :'EffectFormat',
-        :'line_format' => :'LineFormat',
-        :'data_point_type' => :'DataPointType',
-        :'data_points' => :'DataPoints'
-      }
+      super.merge({
+        :'data_points' => :'DataPoints',
+      })
     end
 
     # Attribute type mapping.
     def self.swagger_types
-      {
-        :'type' => :'String',
-        :'name' => :'String',
-        :'is_color_varied' => :'BOOLEAN',
-        :'inverted_solid_fill_color' => :'String',
-        :'smooth' => :'BOOLEAN',
-        :'plot_on_second_axis' => :'BOOLEAN',
-        :'order' => :'Integer',
-        :'number_format_of_y_values' => :'String',
-        :'number_format_of_x_values' => :'String',
-        :'number_format_of_values' => :'String',
-        :'number_format_of_bubble_sizes' => :'String',
-        :'invert_if_negative' => :'BOOLEAN',
-        :'explosion' => :'Integer',
-        :'marker' => :'SeriesMarker',
-        :'fill_format' => :'FillFormat',
-        :'effect_format' => :'EffectFormat',
-        :'line_format' => :'LineFormat',
-        :'data_point_type' => :'String',
-        :'data_points' => :'Array<OneValueChartDataPoint>'
-      }
+      super.merge({
+        :'data_points' => :'Array<OneValueChartDataPoint>',
+      })
     end
 
     # Initializes the object
     # @param [Hash] attributes Model attributes in the form of hash
     def initialize(attributes = {})
-      return unless attributes.is_a?(Hash)
-
-      # convert string to symbol for hash key
-      attributes = attributes.each_with_object({}) { |(k, v), h| h[k.to_sym] = v }
-
-      if attributes.has_key?(:'Type')
-        self.type = attributes[:'Type']
-      end
-
-      if attributes.has_key?(:'Name')
-        self.name = attributes[:'Name']
-      end
-
-      if attributes.has_key?(:'IsColorVaried')
-        self.is_color_varied = attributes[:'IsColorVaried']
-      end
-
-      if attributes.has_key?(:'InvertedSolidFillColor')
-        self.inverted_solid_fill_color = attributes[:'InvertedSolidFillColor']
-      end
-
-      if attributes.has_key?(:'Smooth')
-        self.smooth = attributes[:'Smooth']
-      end
-
-      if attributes.has_key?(:'PlotOnSecondAxis')
-        self.plot_on_second_axis = attributes[:'PlotOnSecondAxis']
-      end
-
-      if attributes.has_key?(:'Order')
-        self.order = attributes[:'Order']
-      end
-
-      if attributes.has_key?(:'NumberFormatOfYValues')
-        self.number_format_of_y_values = attributes[:'NumberFormatOfYValues']
-      end
-
-      if attributes.has_key?(:'NumberFormatOfXValues')
-        self.number_format_of_x_values = attributes[:'NumberFormatOfXValues']
-      end
-
-      if attributes.has_key?(:'NumberFormatOfValues')
-        self.number_format_of_values = attributes[:'NumberFormatOfValues']
-      end
-
-      if attributes.has_key?(:'NumberFormatOfBubbleSizes')
-        self.number_format_of_bubble_sizes = attributes[:'NumberFormatOfBubbleSizes']
-      end
-
-      if attributes.has_key?(:'InvertIfNegative')
-        self.invert_if_negative = attributes[:'InvertIfNegative']
-      end
-
-      if attributes.has_key?(:'Explosion')
-        self.explosion = attributes[:'Explosion']
-      end
-
-      if attributes.has_key?(:'Marker')
-        self.marker = attributes[:'Marker']
-      end
-
-      if attributes.has_key?(:'FillFormat')
-        self.fill_format = attributes[:'FillFormat']
-      end
-
-      if attributes.has_key?(:'EffectFormat')
-        self.effect_format = attributes[:'EffectFormat']
-      end
-
-      if attributes.has_key?(:'LineFormat')
-        self.line_format = attributes[:'LineFormat']
-      end
-
-      if attributes.has_key?(:'DataPointType')
-        self.data_point_type = attributes[:'DataPointType']
-      end
+      super
 
       if attributes.has_key?(:'DataPoints')
         if (value = attributes[:'DataPoints']).is_a?(Array)
           self.data_points = value
         end
       end
+      self.data_point_type = "OneValue"
     end
 
     # Show invalid properties with the reasons. Usually used together with valid?
     # @return Array for valid properties with the reasons
     def list_invalid_properties
-      invalid_properties = Array.new
-      if @data_point_type.nil?
-        invalid_properties.push('invalid value for "data_point_type", data_point_type cannot be nil.')
-      end
-
+      invalid_properties = super
       invalid_properties
     end
 
     # Check to see if the all the properties in the model are valid
     # @return true if the model is valid
     def valid?
-      type_validator = EnumAttributeValidator.new('String', ['ClusteredColumn', 'StackedColumn', 'PercentsStackedColumn', 'ClusteredColumn3D', 'StackedColumn3D', 'PercentsStackedColumn3D', 'Column3D', 'ClusteredCylinder', 'StackedCylinder', 'PercentsStackedCylinder', 'Cylinder3D', 'ClusteredCone', 'StackedCone', 'PercentsStackedCone', 'Cone3D', 'ClusteredPyramid', 'StackedPyramid', 'PercentsStackedPyramid', 'Pyramid3D', 'Line', 'StackedLine', 'PercentsStackedLine', 'LineWithMarkers', 'StackedLineWithMarkers', 'PercentsStackedLineWithMarkers', 'Line3D', 'Pie', 'Pie3D', 'PieOfPie', 'ExplodedPie', 'ExplodedPie3D', 'BarOfPie', 'PercentsStackedBar', 'ClusteredBar3D', 'ClusteredBar', 'StackedBar', 'StackedBar3D', 'PercentsStackedBar3D', 'ClusteredHorizontalCylinder', 'StackedHorizontalCylinder', 'PercentsStackedHorizontalCylinder', 'ClusteredHorizontalCone', 'StackedHorizontalCone', 'PercentsStackedHorizontalCone', 'ClusteredHorizontalPyramid', 'StackedHorizontalPyramid', 'PercentsStackedHorizontalPyramid', 'Area', 'StackedArea', 'PercentsStackedArea', 'Area3D', 'StackedArea3D', 'PercentsStackedArea3D', 'ScatterWithMarkers', 'ScatterWithSmoothLinesAndMarkers', 'ScatterWithSmoothLines', 'ScatterWithStraightLinesAndMarkers', 'ScatterWithStraightLines', 'HighLowClose', 'OpenHighLowClose', 'VolumeHighLowClose', 'VolumeOpenHighLowClose', 'Surface3D', 'WireframeSurface3D', 'Contour', 'WireframeContour', 'Doughnut', 'ExplodedDoughnut', 'Bubble', 'BubbleWith3D', 'Radar', 'RadarWithMarkers', 'FilledRadar', 'SeriesOfMixedTypes', 'Treemap', 'Sunburst', 'Histogram', 'ParetoLine', 'BoxAndWhisker', 'Waterfall', 'Funnel'])
-      return false unless type_validator.valid?(@type)
-      return false if @data_point_type.nil?
-      data_point_type_validator = EnumAttributeValidator.new('String', ['OneValue', 'Scatter', 'Bubble'])
-      return false unless data_point_type_validator.valid?(@data_point_type)
+      return false if !super
       true
     end
 
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] type Object to be assigned
-    def type=(type)
-      validator = EnumAttributeValidator.new('String', ['ClusteredColumn', 'StackedColumn', 'PercentsStackedColumn', 'ClusteredColumn3D', 'StackedColumn3D', 'PercentsStackedColumn3D', 'Column3D', 'ClusteredCylinder', 'StackedCylinder', 'PercentsStackedCylinder', 'Cylinder3D', 'ClusteredCone', 'StackedCone', 'PercentsStackedCone', 'Cone3D', 'ClusteredPyramid', 'StackedPyramid', 'PercentsStackedPyramid', 'Pyramid3D', 'Line', 'StackedLine', 'PercentsStackedLine', 'LineWithMarkers', 'StackedLineWithMarkers', 'PercentsStackedLineWithMarkers', 'Line3D', 'Pie', 'Pie3D', 'PieOfPie', 'ExplodedPie', 'ExplodedPie3D', 'BarOfPie', 'PercentsStackedBar', 'ClusteredBar3D', 'ClusteredBar', 'StackedBar', 'StackedBar3D', 'PercentsStackedBar3D', 'ClusteredHorizontalCylinder', 'StackedHorizontalCylinder', 'PercentsStackedHorizontalCylinder', 'ClusteredHorizontalCone', 'StackedHorizontalCone', 'PercentsStackedHorizontalCone', 'ClusteredHorizontalPyramid', 'StackedHorizontalPyramid', 'PercentsStackedHorizontalPyramid', 'Area', 'StackedArea', 'PercentsStackedArea', 'Area3D', 'StackedArea3D', 'PercentsStackedArea3D', 'ScatterWithMarkers', 'ScatterWithSmoothLinesAndMarkers', 'ScatterWithSmoothLines', 'ScatterWithStraightLinesAndMarkers', 'ScatterWithStraightLines', 'HighLowClose', 'OpenHighLowClose', 'VolumeHighLowClose', 'VolumeOpenHighLowClose', 'Surface3D', 'WireframeSurface3D', 'Contour', 'WireframeContour', 'Doughnut', 'ExplodedDoughnut', 'Bubble', 'BubbleWith3D', 'Radar', 'RadarWithMarkers', 'FilledRadar', 'SeriesOfMixedTypes', 'Treemap', 'Sunburst', 'Histogram', 'ParetoLine', 'BoxAndWhisker', 'Waterfall', 'Funnel'])
-      unless validator.valid?(type)
-        fail ArgumentError, 'invalid value for "type", must be one of #{validator.allowable_values}.'
-      end
-      @type = type
-    end
-
-    # Custom attribute writer method checking allowed values (enum).
-    # @param [Object] data_point_type Object to be assigned
-    def data_point_type=(data_point_type)
-      validator = EnumAttributeValidator.new('String', ['OneValue', 'Scatter', 'Bubble'])
-      unless validator.valid?(data_point_type)
-        fail ArgumentError, 'invalid value for "data_point_type", must be one of #{validator.allowable_values}.'
-      end
-      @data_point_type = data_point_type
-    end
-
     # Checks equality by comparing each attribute.
     # @param [Object] Object to be compared
     def ==(o)
@@ -327,15 +135,27 @@ module AsposeSlidesCloud
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.swagger_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
-          # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+        mapKey = self.class.attribute_map[key]
+        if !mapKey.nil?
+          val = attributes[mapKey]
+          if val.nil?
+            mapKeyString = mapKey.to_s
+            mapKeyString[0] = mapKeyString[0].downcase
+            mapKey = mapKeyString.to_sym
+            val = attributes[mapKey]
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+          if !val.nil?
+            if type =~ /\AArray<(.*)>/i
+              # check to ensure the input is an array given that the the attribute
+              # is documented as an array but the input is not
+              if val.is_a?(Array)
+                self.send("#{key}=", val.map { |v| _deserialize($1, v) })
+              end
+            else
+              self.send("#{key}=", _deserialize(type, val))
+            end
+          end
+        end
       end
 
       self

data/lib/aspose_slides_cloud/models/ordered_merge_request.rb

@@ -31,14 +31,14 @@ module AsposeSlidesCloud
     # Attribute mapping from ruby-style variable name to JSON key.
     def self.attribute_map
       {
-        :'presentations' => :'Presentations'
+        :'presentations' => :'Presentations',
       }
     end
 
     # Attribute type mapping.
     def self.swagger_types
       {
-        :'presentations' => :'Array<PresentationToMerge>'
+        :'presentations' => :'Array<PresentationToMerge>',
       }
     end
 
@@ -96,15 +96,27 @@ module AsposeSlidesCloud
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.swagger_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
-          # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+        mapKey = self.class.attribute_map[key]
+        if !mapKey.nil?
+          val = attributes[mapKey]
+          if val.nil?
+            mapKeyString = mapKey.to_s
+            mapKeyString[0] = mapKeyString[0].downcase
+            mapKey = mapKeyString.to_sym
+            val = attributes[mapKey]
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+          if !val.nil?
+            if type =~ /\AArray<(.*)>/i
+              # check to ensure the input is an array given that the the attribute
+              # is documented as an array but the input is not
+              if val.is_a?(Array)
+                self.send("#{key}=", val.map { |v| _deserialize($1, v) })
+              end
+            else
+              self.send("#{key}=", _deserialize(type, val))
+            end
+          end
+        end
       end
 
       self

data/lib/aspose_slides_cloud/models/outer_shadow_effect.rb

@@ -43,7 +43,7 @@ module AsposeSlidesCloud
         :'direction' => :'Direction',
         :'distance' => :'Distance',
         :'blur_radius' => :'BlurRadius',
-        :'shadow_color' => :'ShadowColor'
+        :'shadow_color' => :'ShadowColor',
       }
     end
 
@@ -53,7 +53,7 @@ module AsposeSlidesCloud
         :'direction' => :'Float',
         :'distance' => :'Float',
         :'blur_radius' => :'Float',
-        :'shadow_color' => :'String'
+        :'shadow_color' => :'String',
       }
     end
 
@@ -139,15 +139,27 @@ module AsposeSlidesCloud
     def build_from_hash(attributes)
       return nil unless attributes.is_a?(Hash)
       self.class.swagger_types.each_pair do |key, type|
-        if type =~ /\AArray<(.*)>/i
-          # check to ensure the input is an array given that the the attribute
-          # is documented as an array but the input is not
-          if attributes[self.class.attribute_map[key]].is_a?(Array)
-            self.send("#{key}=", attributes[self.class.attribute_map[key]].map { |v| _deserialize($1, v) })
+        mapKey = self.class.attribute_map[key]
+        if !mapKey.nil?
+          val = attributes[mapKey]
+          if val.nil?
+            mapKeyString = mapKey.to_s
+            mapKeyString[0] = mapKeyString[0].downcase
+            mapKey = mapKeyString.to_sym
+            val = attributes[mapKey]
           end
-        elsif !attributes[self.class.attribute_map[key]].nil?
-          self.send("#{key}=", _deserialize(type, attributes[self.class.attribute_map[key]]))
-        end # or else data not found in attributes(hash), not an issue as the data can be optional
+          if !val.nil?
+            if type =~ /\AArray<(.*)>/i
+              # check to ensure the input is an array given that the the attribute
+              # is documented as an array but the input is not
+              if val.is_a?(Array)
+                self.send("#{key}=", val.map { |v| _deserialize($1, v) })
+              end
+            else
+              self.send("#{key}=", _deserialize(type, val))
+            end
+          end
+        end
       end
 
       self