aspose_html_cloud 22.10.1 → 22.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b84dff5e029232e46970d82ad5f3802ec49e338808ce8ba822668cc6a00fbacf
-  data.tar.gz: 475b5eaa882a5b97c44053f9d98853c6d49af395acedeee9dd96976499bfe81c
+  metadata.gz: 5d1b7ca4f575f576715bd56b470d6e326e18439c9f626e941f8242b9632e73e9
+  data.tar.gz: e32204d5d61c8e07a66cfa3c6ed1bf7483948ea79af04210dc2b80023b696594
 SHA512:
-  metadata.gz: 2ab8fe2f13529a99780fb5f144f469232e6088019a1001f1f3b207a541091abbc82222b3ed1fc91ee28915349baef88568f4560a295d63af4ff8e63b26872024
-  data.tar.gz: fb4ba274dff2bc84934e3f6c9680e94fe94f2c71f3e6cdb9dc0e5ed7dbebf377c01cc442e544b5e92df76039ea6a2bd6002a633dca5cb78cf502e744d1d329a7
+  metadata.gz: 5f89551d802e98480870d680e176524482be01506aee6971d86236412e3cba069998b208d6ae31aff814e265f68ee293ba18c29c838e15302d7862f0fdc58709
+  data.tar.gz: 3af762e1b9007b820d08ddadef2291cd506b8e30687fd086770954fa4cfd25f79a1feca89d7a4ebcff52c97dd0e7f7fb9da9c675582fb59ff6cdcd9801482ffd

data/lib/aspose_html_cloud/api/html_api.rb

@@ -43,7 +43,7 @@ module AsposeHtml
     #
     # @param src Full path to source file.
     # @param dst Full path to a result file (pdf, xps, docx, md, mhtml, jpeg, png, bmp, tiff, gif).
-    # @param [Hash] options the optional parameters
+    # @param [Hash, nil] options the optional parameters
     # @option options [Double] :width Resulting width. For images in pixels, for PDF, XPS, DOCX in inches.
     # @option options [Double] :height Resulting height. For images in pixels, for PDF, XPS, DOCX in inches.
     # @option options [Double] :left_margin Left resulting margin. For images in pixels, for PDF, XPS, DOCX in inches.
@@ -52,7 +52,7 @@ module AsposeHtml
     # @option options [Double] :bottom_margin Bottom resulting margin. For images in pixels, for PDF, XPS, DOCX in inches.
     # @return [ConversionResult] Result of conversion. See ConversionResult object.
     def convert_local_to_local(src, dst, options = nil)
-      return convert(src, dst, true, true, false, options)
+      convert(src, dst, true, true, false, options)
     end
 
     # Converting the HTML, EPUB document from the local file and putting the result in the storage
@@ -60,7 +60,7 @@ module AsposeHtml
     # @param src Full path to source file.
     # @param dst Full path to a result file (pdf, xps, docx, md, mhtml, jpeg, png, bmp, tiff, gif).
     # @param storage Storage name. Default storage is nil.
-    # @param [Hash] options the optional parameters
+    # @param [Hash, nil] options the optional parameters
     # @option options [Double] :width Resulting width. For images in pixels, for PDF, XPS, DOCX in inches.
     # @option options [Double] :height Resulting height. For images in pixels, for PDF, XPS, DOCX in inches.
     # @option options [Double] :left_margin Left resulting margin. For images in pixels, for PDF, XPS, DOCX in inches.
@@ -69,7 +69,7 @@ module AsposeHtml
     # @option options [Double] :bottom_margin Bottom resulting margin. For images in pixels, for PDF, XPS, DOCX in inches.
     # @return [ConversionResult] Result of conversion. See ConversionResult object.
     def convert_local_to_storage(src, dst, storage, options=nil)
-      return convert(src, dst, true, false, false, options, storage)
+      convert(src, dst, true, false, false, options, storage)
     end
 
     # Converting the HTML, EPUB document from the storage and putting the result in the local file
@@ -77,7 +77,7 @@ module AsposeHtml
     # @param src Full path to source file.
     # @param dst Full path to a result file (pdf, xps, docx, md, mhtml, jpeg, png, bmp, tiff, gif).
     # @param storage Storage name. Default storage is nil.
-    # @param [Hash] options the optional parameters
+    # @param [Hash, nil] options the optional parameters
     # @option options [Double] :width Resulting width. For images in pixels, for PDF, XPS, DOCX in inches.
     # @option options [Double] :height Resulting height. For images in pixels, for PDF, XPS, DOCX in inches.
     # @option options [Double] :left_margin Left resulting margin. For images in pixels, for PDF, XPS, DOCX in inches.
@@ -86,7 +86,7 @@ module AsposeHtml
     # @option options [Double] :bottom_margin Bottom resulting margin. For images in pixels, for PDF, XPS, DOCX in inches.
     # @return [ConversionResult] Result of conversion. See ConversionResult object.
     def convert_storage_to_local(src, dst, storage, options=nil)
-      return convert(src, dst, false, true, false, options, storage)
+      convert(src, dst, false, true, false, options, storage)
     end
 
     # Converting the HTML, EPUB document from the storage and putting the result in the storage
@@ -94,7 +94,7 @@ module AsposeHtml
     # @param src Full path to source file.
     # @param dst Full path to a result file (pdf, xps, docx, md, mhtml, jpeg, png, bmp, tiff, gif).
     # @param storage Storage name. Default storage is nil.
-    # @param [Hash] options the optional parameters
+    # @param [Hash, nil] options the optional parameters
     # @option options [Double] :width Resulting width. For images in pixels, for PDF, XPS, DOCX in inches.
     # @option options [Double] :height Resulting height. For images in pixels, for PDF, XPS, DOCX in inches.
     # @option options [Double] :left_margin Left resulting margin. For images in pixels, for PDF, XPS, DOCX in inches.
@@ -103,14 +103,14 @@ module AsposeHtml
     # @option options [Double] :bottom_margin Bottom resulting margin. For images in pixels, for PDF, XPS, DOCX in inches.
     # @return [ConversionResult] Result of conversion. See ConversionResult object.
     def convert_storage_to_storage(src, dst, storage, options=nil)
-      return convert(src, dst, false, false, false, options, storage)
+      convert(src, dst, false, false, false, options, storage)
     end
 
     # Converting the HTML page from URL and putting the result in the local file
     #
     # @param src URI of the website.
     # @param dst Full path to a result file (pdf, xps, docx, md, mhtml, jpeg, png, bmp, tiff, gif).
-    # @param [Hash] options the optional parameters
+    # @param [Hash, nil] options the optional parameters
     # @option options [Double] :width Resulting width. For images in pixels, for PDF, XPS, DOCX in inches.
     # @option options [Double] :height Resulting height. For images in pixels, for PDF, XPS, DOCX in inches.
     # @option options [Double] :left_margin Left resulting margin. For images in pixels, for PDF, XPS, DOCX in inches.
@@ -119,7 +119,7 @@ module AsposeHtml
     # @option options [Double] :bottom_margin Bottom resulting margin. For images in pixels, for PDF, XPS, DOCX in inches.
     # @return [ConversionResult] Result of conversion. See ConversionResult object.
     def convert_url_to_local(src, dst, options=nil)
-      return convert(src, dst, false, true, true, options)
+      convert(src, dst, false, true, true, options)
     end
 
     # Converting the HTML page from URL and putting the result in the storage
@@ -127,7 +127,7 @@ module AsposeHtml
     # @param src URI of the website.
     # @param dst Full path to a result file (pdf, xps, docx, md, mhtml, jpeg, png, bmp, tiff, gif).
     # @param storage Storage name. Default storage is nil.
-    # @param [Hash] options the optional parameters
+    # @param [Hash, nil] options the optional parameters
     # @option options [Double] :width Resulting width. For images in pixels, for PDF, XPS, DOCX in inches.
     # @option options [Double] :height Resulting height. For images in pixels, for PDF, XPS, DOCX in inches.
     # @option options [Double] :left_margin Left resulting margin. For images in pixels, for PDF, XPS, DOCX in inches.
@@ -136,7 +136,7 @@ module AsposeHtml
     # @option options [Double] :bottom_margin Bottom resulting margin. For images in pixels, for PDF, XPS, DOCX in inches.
     # @return [ConversionResult] Result of conversion. See ConversionResult object.
     def convert_url_to_storage(src, dst, storage, options=nil)
-      return convert(src, dst, false, false, true, options, storage)
+      convert(src, dst, false, false, true, options, storage)
     end
 
     # Converting the HTML document to various formats
@@ -146,7 +146,7 @@ module AsposeHtml
     # @param src_in_local Flag, true if source in the local file.
     # @param dst_in_local Flag, true if result in the local file.
     # @param is_url Flag, true if source is website.
-    # @param [Hash] options the optional parameters
+    # @param [Hash, nil] options the optional parameters
     # @option options [Double] :width Resulting width. For images in pixels, for PDF, XPS, DOCX in inches.
     # @option options [Double] :height Resulting height. For images in pixels, for PDF, XPS, DOCX in inches.
     # @option options [Double] :left_margin Left resulting margin. For images in pixels, for PDF, XPS, DOCX in inches.
@@ -189,15 +189,22 @@ module AsposeHtml
       post_body[:'outputFile'] = out_file.to_s
       post_body[:'storageName'] = storage_name.to_s
 
-      if !options.nil?
+      unless options.nil?
         post_body[:'options'] = {}
-        post_body[:'options'][:'width'] = options[:'width'] if !options[:'width'].nil?
-        post_body[:'options'][:'height'] = options[:'height'] if !options[:'height'].nil?
-        post_body[:'options'][:'leftMargin'] = options[:'left_margin'] if !options[:'left_margin'].nil?
-        post_body[:'options'][:'rightMargin'] = options[:'right_margin'] if !options[:'right_margin'].nil?
-        post_body[:'options'][:'topMargin'] = options[:'top_margin'] if !options[:'top_margin'].nil?
-        post_body[:'options'][:'bottomMargin'] = options[:'bottom_margin'] if !options[:'bottom_margin'].nil?
-        post_body[:'options'][:'resolution'] = options[:'resolution'] if !options[:'resolution'].nil?
+        post_body[:'options'][:'width'] = options[:'width'] unless options[:'width'].nil?
+        post_body[:'options'][:'height'] = options[:'height'] unless options[:'height'].nil?
+        post_body[:'options'][:'leftMargin'] = options[:'left_margin'] unless options[:'left_margin'].nil?
+        post_body[:'options'][:'rightMargin'] = options[:'right_margin'] unless options[:'right_margin'].nil?
+        post_body[:'options'][:'topMargin'] = options[:'top_margin'] unless options[:'top_margin'].nil?
+        post_body[:'options'][:'bottomMargin'] = options[:'bottom_margin'] unless options[:'bottom_margin'].nil?
+        post_body[:'options'][:'resolution'] = options[:'resolution'] unless options[:'resolution'].nil?
+        post_body[:'options'][:'background'] = options[:'background'] unless options[:'background'].nil?
+        post_body[:'options'][:'jpegquality'] = options[:'jpeg_quality'] unless options[:'jpeg_quality'].nil?
+        post_body[:'options'][:'usegit'] = options[:'use_git'] unless options[:'use_git'].nil?
+        post_body[:'options'][:'error_threshold'] = options[:'error_threshold'] unless options[:'error_threshold'].nil?
+        post_body[:'options'][:'max_iterations'] = options[:'max_iterations'] unless options[:'max_iterations'].nil?
+        post_body[:'options'][:'colors_limit'] = options[:'colors_limit'] unless options[:'colors_limit'].nil?
+        post_body[:'options'][:'line_width'] = options[:'line_width'] unless options[:'line_width'].nil?
       end
 
       query_params = {}
@@ -268,22 +275,20 @@ module AsposeHtml
     end
 
     def get_input_format(path)
-      ext = File.extname(path).upcase
+      ext = File.extname(path).downcase[1..-1]
       case ext
-        when '.HTML', '.HTM'
+        when 'htm'
           return 'html'
-        when '.MHT', '.MHTML'
-          return 'mht'
-        when '.XHTML', '.XML'
+        when 'mht'
+          return 'mhtml'
+        when 'xml'
           return 'xhtml'
-        when '.EPUB'
-          return 'epub'
-        when '.SVG'
-          return 'svg'
-        when '.MD'
-          return 'md'
+        when 'jpg'
+          return 'jpeg'
+        when 'tif'
+          return 'tiff'
         else
-          return nil
+          ext
       end
     end
 

data/lib/aspose_html_cloud/api_client.rb

@@ -57,7 +57,7 @@ module AsposeHtml
         'User-Agent' => @user_agent,
         'Authorization' => "Bearer #{@config.access_token}",
         'x-aspose-client' => "aspose.html-cloud ruby sdk",
-        'x-aspose-client-version' => "20.8.0"
+        'x-aspose-client-version' => "22.11.1"
       }
     end
 

data/spec/api/html_api_spec.rb

@@ -411,4 +411,298 @@ describe 'Test html_api_V4' do
       }
     end
   end
+
+  describe 'convert markdown local to local' do
+
+    src = File.realpath(__dir__ + '/../../testdata') + '/README.md'
+    dst_dir = File.realpath(__dir__ + '/../../testresult') + '/'
+
+    describe 'convert local to local markdown to doc' do
+
+      %w[pdf xps docx html mhtml mht].each { |ext|
+        it "Convert markdown to " + ext do
+
+          dst = dst_dir + 'locToLocDocMD.' + ext
+          answer = @html_api.convert_local_to_local(src, dst)
+
+          expect(answer.code).to eql(200)
+          expect(answer.status).to eql('completed')
+          expect(File.exist?(answer.file)).to be_truthy
+        end
+      }
+    end
+
+    describe 'convert local to local markdown to doc with options' do
+
+      %w[pdf xps docx].each { |ext|
+        it "Convert markdown to " + ext do
+
+          options_A4 = {
+            width: 8.3,
+            height: 11.7,
+            top_margin: 0.5,
+            bottom_margin: 0.5,
+            left_margin: 0.5,
+            right_margin: 0.5
+          }
+
+          dst = dst_dir + 'locToLocDocMDWithOpts.' + ext
+          answer = @html_api.convert_local_to_local(src, dst, options_A4)
+
+          expect(answer.code).to eql(200)
+          expect(answer.status).to eql('completed')
+          expect(File.exist?(answer.file)).to be_truthy
+        end
+      }
+    end
+
+    describe 'convert local to local markdown to image' do
+
+      %w[jpeg jpg bmp png tiff tif gif].each { |ext|
+        it "Convert markdown to " + ext do
+
+          dst = dst_dir + 'locToLocMDImg.' + ext
+          answer = @html_api.convert_local_to_local(src, dst)
+
+          expect(answer.code).to eql(200)
+          expect(answer.status).to eql('completed')
+          expect(File.exist?(answer.file)).to be_truthy
+        end
+      }
+    end
+
+    describe 'convert local to local markdown to image with options' do
+
+      opts = {
+        width: 800,
+        height: 1000,
+        left_margin: 30,
+        right_margin: 30,
+        top_margin: 50,
+        bottom_margin: 50
+      }
+
+      %w[jpeg jpg bmp png tiff tif gif].each { |ext|
+        it "Convert markdown to " + ext do
+
+          dst = dst_dir + 'locToLocMDImgOpt.' + ext
+          answer = @html_api.convert_local_to_local(src, dst, opts)
+
+          expect(answer.code).to eql(200)
+          expect(answer.status).to eql('completed')
+          expect(File.exist?(answer.file)).to be_truthy
+        end
+      }
+    end
+  end
+
+  describe 'convert MHTML local to local' do
+
+    src = File.realpath(__dir__ + '/../../testdata') + '/fileformatinfo.mht'
+    dst_dir = File.realpath(__dir__ + '/../../testresult') + '/'
+
+    describe 'convert local to local MHTML to doc' do
+
+      %w[pdf xps docx].each { |ext|
+        it "Convert MHTML to " + ext do
+
+          dst = dst_dir + 'locToLocDocMHTML.' + ext
+          answer = @html_api.convert_local_to_local(src, dst)
+
+          expect(answer.code).to eql(200)
+          expect(answer.status).to eql('completed')
+          expect(File.exist?(answer.file)).to be_truthy
+        end
+      }
+    end
+
+    describe 'convert local to local MHTML to doc with options' do
+
+      %w[pdf xps docx].each { |ext|
+        it "Convert MHTML to " + ext do
+
+          options_A4 = {
+            width: 8.3,
+            height: 11.7,
+            top_margin: 0.5,
+            bottom_margin: 0.5,
+            left_margin: 0.5,
+            right_margin: 0.5
+          }
+
+          dst = dst_dir + 'locToLocDocMHTMLWithOpts.' + ext
+          answer = @html_api.convert_local_to_local(src, dst, options_A4)
+
+          expect(answer.code).to eql(200)
+          expect(answer.status).to eql('completed')
+          expect(File.exist?(answer.file)).to be_truthy
+        end
+      }
+    end
+
+    describe 'convert local to local MHTML to image' do
+
+      %w[jpeg jpg bmp png tiff tif gif].each { |ext|
+        it "Convert MHTML to " + ext do
+
+          dst = dst_dir + 'locToLocMHTMLImg.' + ext
+          answer = @html_api.convert_local_to_local(src, dst)
+
+          expect(answer.code).to eql(200)
+          expect(answer.status).to eql('completed')
+          expect(File.exist?(answer.file)).to be_truthy
+        end
+      }
+    end
+
+    describe 'convert local to local MHTML to image with options' do
+
+      opts = {
+        width: 800,
+        height: 1000,
+        left_margin: 30,
+        right_margin: 30,
+        top_margin: 50,
+        bottom_margin: 50
+      }
+
+      %w[jpeg jpg bmp png tiff tif gif].each { |ext|
+        it "Convert MHTML to " + ext do
+
+          dst = dst_dir + 'locToLocMHTMLImgOpt.' + ext
+          answer = @html_api.convert_local_to_local(src, dst, opts)
+
+          expect(answer.code).to eql(200)
+          expect(answer.status).to eql('completed')
+          expect(File.exist?(answer.file)).to be_truthy
+        end
+      }
+    end
+  end
+
+  describe 'convert SVG local to local' do
+
+    src = File.realpath(__dir__ + '/../../testdata') + '/testpage1.svg'
+    dst_dir = File.realpath(__dir__ + '/../../testresult') + '/'
+
+    describe 'convert local to local SVG to doc' do
+
+      %w[pdf xps].each { |ext|
+        it "Convert SVG to " + ext do
+
+          dst = dst_dir + 'locToLocDocSVG.' + ext
+          answer = @html_api.convert_local_to_local(src, dst)
+
+          expect(answer.code).to eql(200)
+          expect(answer.status).to eql('completed')
+          expect(File.exist?(answer.file)).to be_truthy
+        end
+      }
+    end
+
+    describe 'convert local to local SVG to doc with options' do
+
+      %w[pdf xps].each { |ext|
+        it "Convert SVG to " + ext do
+
+          options_A4 = {
+            width: 8.3,
+            height: 11.7,
+            top_margin: 0.5,
+            bottom_margin: 0.5,
+            left_margin: 0.5,
+            right_margin: 0.5
+          }
+
+          dst = dst_dir + 'locToLocDocSVGWithOpts.' + ext
+          answer = @html_api.convert_local_to_local(src, dst, options_A4)
+
+          expect(answer.code).to eql(200)
+          expect(answer.status).to eql('completed')
+          expect(File.exist?(answer.file)).to be_truthy
+        end
+      }
+    end
+
+    describe 'convert local to local SVG to image' do
+
+      %w[jpeg jpg bmp png tiff tif gif].each { |ext|
+        it "Convert SVG to " + ext do
+
+          dst = dst_dir + 'locToLocSVGImg.' + ext
+          answer = @html_api.convert_local_to_local(src, dst)
+
+          expect(answer.code).to eql(200)
+          expect(answer.status).to eql('completed')
+          expect(File.exist?(answer.file)).to be_truthy
+        end
+      }
+    end
+
+    describe 'convert local to local SVG to image with options' do
+
+      opts = {
+        width: 800,
+        height: 1000,
+        left_margin: 30,
+        right_margin: 30,
+        top_margin: 50,
+        bottom_margin: 50
+      }
+
+      %w[jpeg jpg bmp png tiff tif gif].each { |ext|
+        it "Convert SVG to " + ext do
+
+          dst = dst_dir + 'locToLocSVGImgOpt.' + ext
+          answer = @html_api.convert_local_to_local(src, dst, opts)
+
+          expect(answer.code).to eql(200)
+          expect(answer.status).to eql('completed')
+          expect(File.exist?(answer.file)).to be_truthy
+        end
+      }
+    end
+  end
+
+  describe 'convert to SVG local to local' do
+
+    src = File.realpath(__dir__ + '/../../testdata') + '/car.'
+    dst_dir = File.realpath(__dir__ + '/../../testresult') + '/'
+
+    describe 'convert to SVG' do
+
+      %w[bmp jpg gif tiff png].each { |ext|
+        it "Trace " + ext + " to svg" do
+          dst = dst_dir + ext.upcase + 'toSVG.svg'
+          answer = @html_api.convert_local_to_local(src + ext, dst)
+
+          expect(answer.code).to eql(200)
+          expect(answer.status).to eql('completed')
+          expect(File.exist?(answer.file)).to be_truthy
+        end
+      }
+    end
+
+    describe 'convert to SVG with options' do
+
+      %w[bmp jpg gif tiff png].each { |ext|
+        it "Trace to SVG with opts " + ext do
+
+          opts = {
+            error_threshold: 30,
+            max_iterations: 50,
+            colors_limit: 3,
+            line_width: 2.0,
+          }
+          dst = dst_dir + ext.upcase + 'ToSVGWithOpts.svg'
+          answer = @html_api.convert_local_to_local(src + ext, dst, opts)
+
+          expect(answer.code).to eql(200)
+          expect(answer.status).to eql('completed')
+          expect(File.exist?(answer.file)).to be_truthy
+        end
+      }
+    end
+
+  end
 end

data/spec/spec_helper.rb

@@ -30,10 +30,14 @@
 require 'aspose_html_cloud'
 
 CONFIG = {
-  "basePath": "https://api.aspose.cloud/v4.0",
-  "authPath": "https://api.aspose.cloud/connect/token",
-  "apiKey": "c8dda7d6445d82635b8797d1c8edd153",
-  "appSID": "2225baa2-097b-4731-9831-d0d56c28230f",
+  # "basePath": "https://api.aspose.cloud/v4.0",
+  # "authPath": "https://api.aspose.cloud/connect/token",
+  # "apiKey": "c8dda7d6445d82635b8797d1c8edd153",
+  # "appSID": "2225baa2-097b-4731-9831-d0d56c28230f",
+  "basePath": "http://localhost:5000/v4.0",
+  "authPath": "https://api-qa.aspose.cloud/connect/token",
+  "apiKey": "html.cloud",
+  "appSID": "html.cloud",
   "debug": true
 }
 # from storage api

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: aspose_html_cloud
 version: !ruby/object:Gem::Version
-  version: 22.10.1
+  version: 22.11.1
 platform: ruby
 authors:
 - Alexander Makogon
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-10-11 00:00:00.000000000 Z
+date: 2022-11-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: typhoeus