aspose_slides_cloud 22.10.0 → 22.12.0

data/spec/spec_utils.rb

@@ -45,11 +45,11 @@ module AsposeSlidesCloud
       end
       files = Hash.new
       SpecUtils.test_rules["Files"].each do |rule|
-        if SpecUtils.good_rule?(rule, name, method)
-          actual_name = SpecUtils.untemplatize(rule["File"], value)
+        if SpecUtils.good_rule?(rule, name, method, nil)
+          actual_name = SpecUtils.untemplatize(rule["File"], name, value)
           path = "TempSlidesSDK"
           if rule.key?("Folder")
-            path = SpecUtils.untemplatize(rule["Folder"], value)
+            path = SpecUtils.untemplatize(rule["Folder"], name, value)
           end
           path = path + "/" + actual_name
           files[path] = rule
@@ -61,70 +61,41 @@ module AsposeSlidesCloud
           SpecUtils.api.copy_file("TempTests/" + rule['ActualName'], path)
         elsif rule["Action"] == "Delete"
           SpecUtils.api.delete_file(path)
+          SpecUtils.api.delete_folder(path)
         end
       end
     end
 
     def self.get_param_value(name, method, type)
-      if type == 'File'
-        fileName = "test.pptx"
-        if method.casecmp("ImportFromPdf") == 0
-          fileName = "test.pdf"
-        elsif name.casecmp("Image") == 0
-          if method.casecmp("ImportShapesFromSvg") == 0
-            fileName = "shapes.svg"
-          else
-            fileName = "watermark.png"
-          end
-        elsif name.casecmp("Font") == 0
-            fileName = "calibri.ttf"
-        end
-        return File.binread(File.join(TEST_DATA_PATH, fileName))
-      end
-      if type == 'File[]'
-        files = []
-        files.push(File.binread(File.join(AsposeSlidesCloud::SpecUtils::TEST_DATA_PATH, "test.pptx")))
-        files.push(File.binread(File.join(AsposeSlidesCloud::SpecUtils::TEST_DATA_PATH, "test-unprotected.pptx")))
-        return files
-      end
-      value = "test" + name
+      value = nil
       SpecUtils.test_rules["Values"].each do |rule|
-        if SpecUtils.good_rule?(rule, name, method) and rule.key?("Value")
-          if rule.key?("Type")
-            if TypeRegistry.subclass?(rule["Type"], type)
-              value = rule["Value"]
-            end
-          else
-            value = rule["Value"]
-          end
+        if SpecUtils.good_rule?(rule, name, method, type) and rule.key?("Value")
+          value = rule["Value"]
         end
       end
-      value
+      SpecUtils.untemplatize(value, name, nil)
     end
 
     def self.invalidize_param_value(name, method, value, type)
-      if type == 'File'
-        return nil
-      end
       invalid_value = nil
       SpecUtils.test_rules["Values"].each do |rule|
-        if SpecUtils.good_rule?(rule, name, method) and rule.key?("InvalidValue")
+        if SpecUtils.good_rule?(rule, name, method, type) and rule.key?("InvalidValue")
           invalid_value = rule["InvalidValue"]
         end
       end
-      SpecUtils.untemplatize(invalid_value, value)
+      SpecUtils.untemplatize(invalid_value, name, value)
     end
 
-    def self.get_expected_error(method, name, value)
+    def self.get_expected_error(method, name, value, type)
       code = 0
       message = "Unexpeceted message"
       SpecUtils.test_rules["Results"].each do |rule|
-        if SpecUtils.good_rule?(rule, name, method)
+        if SpecUtils.good_rule?(rule, name, method, type)
           if rule.key?("Code")
             code = rule["Code"]
           end
           if rule.key?("Message")
-            message = SpecUtils.untemplatize(rule["Message"], value)
+            message = SpecUtils.untemplatize(rule["Message"], name, value)
           end
         end
       end
@@ -138,30 +109,95 @@ module AsposeSlidesCloud
       return false
     end
 
-    def self.good_rule?(rule, name, method)
-      (not rule.key?("Language") or rule["Language"].casecmp("Ruby") == 0) \
+    def self.good_rule?(rule, name, method, type)
+      SpecUtils.good_rule_key?(rule, "Language", "Ruby") \
         and (not rule.key?("Invalid") or ((name != nil) == rule["Invalid"])) \
-        and (not rule.key?("Parameter") or (name != nil and rule["Parameter"].casecmp(name) == 0)) \
-        and (not rule.key?("Method") or (method != nil and rule["Method"].casecmp(method) == 0))
+        and SpecUtils.good_rule_key?(rule, "Parameter", name) \
+        and SpecUtils.good_rule_key?(rule, "Method", method) \
+        and SpecUtils.good_rule_type?(rule, type)
+    end
+
+    def self.good_rule_key?(rule, key, value)
+      if not rule.key?(key)
+        return true
+      end
+      if not value
+        return false
+      end
+      if rule[key].start_with?("/") and rule[key].end_with?("/")
+        return value =~ /#{rule[key][1..-2]}/i
+      end
+      return rule[key].casecmp(value) == 0
+    end
+
+    def self.good_rule_type?(rule, type)
+      if not rule.key?("Type")
+        return true
+      end
+      if not type
+        return false
+      end
+      if rule["Type"] == "bool"
+        return type == "BOOLEAN"
+      end
+      if rule["Type"] == "number"
+        return type == "Integer"
+      end
+      if rule["Type"] == "int"
+        return type == "Integer"
+      end
+      if rule["Type"] == "int[]"
+        return type == "Integer[]"
+      end
+      if rule["Type"] == "stream"
+        return type == "File"
+      end
+      if rule["Type"] == "stream[]"
+        return type == "File[]"
+      end
+      if rule["Type"] == "model"
+        return !TypeRegistry.type_determiners[type.to_sym].nil?
+      end
+      if !TypeRegistry.type_determiners[rule["Type"].to_sym].nil?
+        return TypeRegistry.subclass?(rule["Type"], type)
+      end
+      return false
     end
 
-    def self.untemplatize(template, value)
+    def self.untemplatize(template, name, value)
       if template == nil
         value
       else
         result = template
-        if template.is_a? String and template.match("%v")
+        if template.is_a? String
           result = "" + template
-          if value != nil
-            result["%v"] = value.to_s
+          if template.start_with?("@")
+            file_name = result[1..-1]
+            if file_name.start_with?("(") and file_name.end_with?(")")
+              result = file_name[1..-2].split(",").map {|f| File.binread(File.join(AsposeSlidesCloud::SpecUtils::TEST_DATA_PATH, f)) }
+            else
+              result = File.binread(File.join(AsposeSlidesCloud::SpecUtils::TEST_DATA_PATH, file_name))
+            end
           else
-            result["%v"] = ""
+            result = SpecUtils.replace(result, "%n", name)
+            result = SpecUtils.replace(result, "%v", value)
           end
         end
         result
       end
     end
 
+    def self.replace(template, oldValue, newValue)
+      if template.match(oldValue)
+        if newValue != nil
+          template[oldValue] = newValue.to_s
+        else
+          template[oldValue] = ""
+        end
+      end
+      template
+    end
+
     def self.test_rules
       unless @@test_rules
         @@test_rules = JSON.parse(File.read('testRules.json'))
@@ -180,6 +216,7 @@ module AsposeSlidesCloud
         configuration.app_sid = config["ClientId"]
         configuration.app_key = config["ClientSecret"]
         configuration.debugging = config["Debug"]
+        configuration.verify_ssl = !config["AllowInsecureRequests"]
         @@api = AsposeSlidesCloud::SlidesApi.new(configuration)
       end
       @@api

data/spec/use_cases/chart_spec.rb

@@ -33,7 +33,7 @@ describe 'UseCases' do
       expect(chart.categories.length).to eq(4)
     end
 
-    it 'create' do
+    it 'create chart auto data source' do
       folder_name = "TempSlidesSDK"
       file_name = "test.pptx"
       AsposeSlidesCloud::SpecUtils.api.copy_file("TempTests/" + file_name, folder_name + "/" + file_name)
@@ -72,6 +72,118 @@ describe 'UseCases' do
       expect(result.categories.length).to eq(3)
     end
 
+    it 'create chart workbook data source' do
+      folder_name = "TempSlidesSDK"
+      file_name = "test.pptx"
+      AsposeSlidesCloud::SpecUtils.api.copy_file("TempTests/" + file_name, folder_name + "/" + file_name)
+      chart = AsposeSlidesCloud::Chart.new
+      chart.chart_type = 'ClusteredColumn'
+      chart.width = 400
+      chart.height = 300
+
+      data_source_for_categories = AsposeSlidesCloud::Workbook.new
+      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 = 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 = 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 = 70
+      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 = 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 = 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
+      point22 = AsposeSlidesCloud::OneValueChartDataPoint.new
+      point22.value = 35
+      point23 = AsposeSlidesCloud::OneValueChartDataPoint.new
+      point23.value = 90
+      series2.data_points = [point21, point22, point23]
+      chart.series = [ series1, series2 ]
+      category1 = AsposeSlidesCloud::ChartCategory.new
+      category1.value = "Category1"
+      category2 = AsposeSlidesCloud::ChartCategory.new
+      category2.value = "Category2"
+      category3 = AsposeSlidesCloud::ChartCategory.new
+      category3.value = "Category3"
+      chart.categories = [category1, category2, category3]
+      result = AsposeSlidesCloud::SpecUtils.api.create_shape(file_name, 3, chart, nil, nil, "password", folder_name)
+      expect(result.series.length).to eq(2)
+      expect(result.categories.length).to eq(3)
+    end
+
+    it 'create chart literals' do
+      folder_name = "TempSlidesSDK"
+      file_name = "test.pptx"
+      AsposeSlidesCloud::SpecUtils.api.copy_file("TempTests/" + file_name, folder_name + "/" + file_name)
+      chart = AsposeSlidesCloud::Chart.new
+      chart.chart_type = 'ClusteredColumn'
+      chart.width = 400
+      chart.height = 300
+
+      chart.data_source_for_categories = AsposeSlidesCloud::Literals.new
+
+      series1 = AsposeSlidesCloud::OneValueSeries.new
+      series1.data_source_for_series_name = AsposeSlidesCloud::Literals.new
+      series1.name = "Series1"
+      series1.data_source_for_values = AsposeSlidesCloud::Literals.new
+      point11 = AsposeSlidesCloud::OneValueChartDataPoint.new
+      point11.value = 40
+      point12 = AsposeSlidesCloud::OneValueChartDataPoint.new
+      point12.value = 50
+      point13 = AsposeSlidesCloud::OneValueChartDataPoint.new
+      point13.value = 70
+      series1.data_points = [point11, point12, point13]
+      series2 = AsposeSlidesCloud::OneValueSeries.new
+      series2.data_source_for_series_name = AsposeSlidesCloud::Literals.new
+      series2.name = "Series2"
+      series2.data_source_for_values = AsposeSlidesCloud::Literals.new
+      point21 = AsposeSlidesCloud::OneValueChartDataPoint.new
+      point21.value = 55
+      point22 = AsposeSlidesCloud::OneValueChartDataPoint.new
+      point22.value = 35
+      point23 = AsposeSlidesCloud::OneValueChartDataPoint.new
+      point23.value = 90
+      series2.data_points = [point21, point22, point23]
+      chart.series = [ series1, series2 ]
+      category1 = AsposeSlidesCloud::ChartCategory.new
+      category1.value = "Category1"
+      category2 = AsposeSlidesCloud::ChartCategory.new
+      category2.value = "Category2"
+      category3 = AsposeSlidesCloud::ChartCategory.new
+      category3.value = "Category3"
+      chart.categories = [category1, category2, category3]
+      result = AsposeSlidesCloud::SpecUtils.api.create_shape(file_name, 3, chart, nil, nil, "password", folder_name)
+      expect(result.series.length).to eq(2)
+      expect(result.categories.length).to eq(3)
+    end
+
     it 'update' do
       folder_name = "TempSlidesSDK"
       file_name = "test.pptx"
@@ -496,5 +608,51 @@ describe 'UseCases' do
       expect(data_point.line_format.fill_format.type).to eq("Solid")
       expect(data_point.effect_format.blur).not_to eq(nil)
     end
+
+    it 'chart formulas' do
+      folder_name = "TempSlidesSDK"
+      file_name = "test.pptx"
+      AsposeSlidesCloud::SpecUtils.api.copy_file("TempTests/" + file_name, folder_name + "/" + file_name)
+      chart = AsposeSlidesCloud::Chart.new
+      chart.chart_type = 'ClusteredColumn'
+      chart.width = 400
+      chart.height = 300
+
+      data_source_for_categories = AsposeSlidesCloud::Workbook.new
+      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 = 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 = 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_formula = "SUM(B2:B3)"
+      series1.data_points = [point11, point12, point13]
+      chart.series = [ series1 ]
+      category1 = AsposeSlidesCloud::ChartCategory.new
+      category1.value = "Category1"
+      category2 = AsposeSlidesCloud::ChartCategory.new
+      category2.value = "Category2"
+      category3 = AsposeSlidesCloud::ChartCategory.new
+      category3.value = "Category3"
+      chart.categories = [category1, category2, category3]
+      result = AsposeSlidesCloud::SpecUtils.api.create_shape(file_name, 3, chart, nil, nil, "password", folder_name)
+      expect(result.series[0].data_points[2].value).to eq(90)
+    end
   end
 end

data/spec/use_cases/nullable_field_spec.rb

@@ -42,6 +42,13 @@ describe 'UseCases' do
       dto.title = AsposeSlidesCloud::ChartTitle.new
       dto.title.has_title = true
       dto.title.text = "MyTitle"
+
+      category1 = AsposeSlidesCloud::ChartCategory.new
+      category1.value = "Category1"
+      category2 = AsposeSlidesCloud::ChartCategory.new
+      category2.value = "Category2"
+      dto.categories = [ category1, category2 ]
+
       dto.series = []
       dto.series.push(AsposeSlidesCloud::OneValueSeries.new)
       dto.series[0].type = "ClusteredColumn"

data/spec/use_cases/shape_spec.rb

@@ -180,13 +180,17 @@ describe 'UseCases' do
       expect(result).to be_kind_of(AsposeSlidesCloud::SmartArt)
     end
 
-    it 'chart empty' do #See Chart tests for non-empty chart examples
+    it 'chart empty' do
       folder_name = "TempSlidesSDK"
       file_name = "test.pptx"
       AsposeSlidesCloud::SpecUtils.api.copy_file("TempTests/" + file_name, folder_name + "/" + file_name)
       dto = AsposeSlidesCloud::Chart.new
-      result = AsposeSlidesCloud::SpecUtils.api.create_shape(file_name, 1, dto, nil, nil, "password", folder_name)
-      expect(result).to be_kind_of(AsposeSlidesCloud::Chart)
+      begin
+        result = AsposeSlidesCloud::SpecUtils.api.create_shape(file_name, 1, dto, nil, nil, "password", folder_name)
+        fail "Chart with undefinined series should not have been created"
+      rescue AsposeSlidesCloud::ApiError => e
+        expect(e.code).to eq(500)
+      end
     end
 
     it 'table add' do
@@ -406,14 +410,9 @@ describe 'UseCases' do
       dto.width = 200
       dto.height = 100
       dto.target_slide_index = 2
-      begin
-        shape = AsposeSlidesCloud::SpecUtils.api.create_shape(file_name, slide_index, dto, nil, nil, password, folder_name)
-        expect(shape).to be_kind_of(AsposeSlidesCloud::ZoomFrame)
-        expect(shape.target_slide_index).to eq(2)
-        fail "The exception has been fixed. Please remove the begin/rescue block"
-      rescue ArgumentError => e
-        #
-      end
+      shape = AsposeSlidesCloud::SpecUtils.api.create_shape(file_name, slide_index, dto, nil, nil, password, folder_name)
+      expect(shape).to be_kind_of(AsposeSlidesCloud::ZoomFrame)
+      expect(shape.target_slide_index).to eq(2)
     end
 
     it "section zoom frame add" do
@@ -428,14 +427,9 @@ describe 'UseCases' do
       dto.width = 200
       dto.height = 100
       dto.target_section_index = 2
-      begin
-        shape = AsposeSlidesCloud::SpecUtils.api.create_shape(file_name, slide_index, dto, nil, nil, password, folder_name)
-        expect(shape).to be_kind_of(AsposeSlidesCloud::SectionZoomFrame)
-        expect(shape.target_section_index).to eq(2)
-        fail "The exception has been fixed. Please remove the begin/rescue block"
-      rescue ArgumentError => e
-        #
-      end
+      shape = AsposeSlidesCloud::SpecUtils.api.create_shape(file_name, slide_index, dto, nil, nil, password, folder_name)
+      expect(shape).to be_kind_of(AsposeSlidesCloud::SectionZoomFrame)
+      expect(shape.target_section_index).to eq(2)
     end
 
     it "ole object frame add by link" do