onlyoffice_documentserver_conversion_helper 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2052d02f45954ff45a8a5d222d3387e2492b6f81b7790d27a0a270d1ebde0700
-  data.tar.gz: 112a1889a8471d5fcc1d90dd726a5fce1d4b68c976b2e72c3d97638b9a2aade9
+  metadata.gz: e61195de2597796b8ec3e2e69262e4fc8f6f0661c349c1e1ec54ea19e11c5999
+  data.tar.gz: 7ddd137983f8365ace8d38cfb071fdb270dafa9e00da98ba27a1ac4c009cfb2b
 SHA512:
-  metadata.gz: 6f06371b23c50fc660a9aa4ee76b82cfa7e6513d62d61491320115fa566ba20950f7bdd388fa956fdf52de1c8c6b4917b060569d03ea91079c3779177341722f
-  data.tar.gz: 0eeee137a054d173b5fa083990e5a06aa1db09e33684353f4e050557db5d50722a7c1047c523ac82e3baeaa29475c5d8448df07b3809b25f3838a0b7085020d4
+  metadata.gz: 594b183a8df277b5fbf9fec7530bc5852b272bda90facf702d5f796c121cdf58c6e49fd575d63cab508a6f0539f31883e358ee5d1ec98b8f24ef6e790d7b1948
+  data.tar.gz: 14987d0620cc3fd31aec3e6e647bb7d4b5318e7a149804c0816e35b08cd590b88109405fdfb5ea42b50a559e0fe4cd0b1f920cbdad0acd0df85cc11543f18979

data/lib/onlyoffice_documentserver_conversion_helper/exceptions.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+module OnlyofficeDocumentserverConversionHelper
+  # Class for unknown convert format
+  class UnknownConvertFormatError < StandardError; end
+end

data/lib/onlyoffice_documentserver_conversion_helper/version.rb

@@ -4,6 +4,6 @@ module OnlyofficeDocumentserverConversionHelper
   # This module holds the OnlyofficeDocumentserverConversionHelper gem version
   module Version
     # @return [String] version of gem
-    STRING = '0.4.0'
+    STRING = '0.5.0'
   end
 end

data/lib/onlyoffice_documentserver_conversion_helper/xml_responce_parser.rb

@@ -1,17 +1,27 @@
 # frozen_string_literal: true
 
-# Class for parse Xml responce
-class XmlResponceParser
-  def initialize(string_with_xml, file_format)
-    @string_with_xml = string_with_xml
-    @file_format = file_format
-  end
+module OnlyofficeDocumentserverConversionHelper
+  # Class for parse Xml responce
+  class XmlResponceParser
+    def initialize(string_with_xml, file_format, result_in_zip: false)
+      @string_with_xml = string_with_xml
+      @file_format = file_format
+      @result_in_zip = result_in_zip
+    end
+
+    # @return [String] output file format
+    def file_format
+      return 'zip' if @result_in_zip
+
+      @file_format
+    end
 
-  # Method parses server response
-  # returning url with unescape HTML
-  # @return [String] URL
-  def result_url
-    res_result = /(http|https).*\.(#{@file_format})/.match(@string_with_xml)
-    CGI.unescapeHTML(res_result.to_s)
+    # Method parses server response
+    # returning url with unescape HTML
+    # @return [String] URL
+    def result_url
+      res_result = /(http|https).*\.(#{file_format})/.match(@string_with_xml)
+      CGI.unescapeHTML(res_result.to_s)
+    end
   end
 end

data/lib/onlyoffice_documentserver_conversion_helper.rb

@@ -4,6 +4,7 @@ require 'jwt'
 require 'net/http'
 require 'securerandom'
 require 'timeout'
+require_relative 'onlyoffice_documentserver_conversion_helper/exceptions'
 require_relative 'onlyoffice_documentserver_conversion_helper/xml_responce_parser'
 require_relative 'onlyoffice_documentserver_conversion_helper/version'
 
@@ -46,11 +47,14 @@ module OnlyofficeDocumentserverConversionHelper
     end
 
     # Auto detect output file format
+    # @raise [UnknownConvertFormatError] if file format is not known
     # @return [String] result format
     def output_file_type_auto
       return 'docx' if DOCUMENT_EXTENSIONS.include?(@input_filetype.upcase)
       return 'xlsx' if SPREADSHEET_EXTENSIONS.include?(@input_filetype.upcase)
       return 'pptx' if PRESENTATION_EXTENSIONS.include?(@input_filetype.upcase)
+
+      raise UnknownConvertFormatError, "Unknown convert auto format: #{@input_filetype}"
     end
 
     # @return [String] random generated key
@@ -79,16 +83,6 @@ module OnlyofficeDocumentserverConversionHelper
       params
     end
 
-    # @return [String] with url to result file
-    # @param [String] data is a response body
-    # @param [String] file_format is a format of result file
-    # Method will get link from response body.
-    # Link start from 'https', and end from result file format
-    def get_url_from_responce(data, file_format)
-      res_result = /(http|https).*(#{file_format})/.match(data)
-      CGI.unescapeHTML(res_result.to_s)
-    end
-
     # Add jwt data to request
     # @param [Net::HTTP::Post] request to add data
     # @return [Net::HTTP::Post] request with JWT
@@ -109,7 +103,7 @@ module OnlyofficeDocumentserverConversionHelper
       add_jwt_data(req)
       http = Net::HTTP.new(uri.host, uri.port)
       http.read_timeout = @timeout
-      http.use_ssl = true if uri.scheme == 'https'
+      http.use_ssl = (uri.scheme == 'https')
       send_request(http, req)
     end
 
@@ -129,8 +123,8 @@ module OnlyofficeDocumentserverConversionHelper
 
     # @return [Hash] with usl for download file
     # after conversion and response data
-    # @param [Hash] args collect all parameters of request
-    #   OR [String] if you not need to use advenced params
+    # @param [Hash, Srting] args collect all parameters of request
+    #   OR string if you not need to use advenced params
     # and want to set all etc params automaticly.
     # All args, except of :url and if it is [Hash],
     # will be attache in end of request
@@ -148,8 +142,23 @@ module OnlyofficeDocumentserverConversionHelper
       @input_filetype = File.extname(@file_url).delete('.')
       advanced_params = autocomplete_missing_params(args)
       data = request(convert_url, advanced_params)
-      url = XmlResponceParser.new(data, advanced_params[:outputtype]).result_url
+      url = XmlResponceParser.new(data,
+                                  advanced_params[:outputtype],
+                                  result_in_zip: result_in_zip?(advanced_params)).result_url
       { url: url, data: data }
     end
+
+    private
+
+    # Will be result of convert in zip?
+    # @param [Hash] params with options
+    # @return [Boolean]
+    def result_in_zip?(params)
+      return false unless params.key?(:thumbnail)
+      return false unless params[:thumbnail].key?(:first)
+      return true unless params[:thumbnail][:first]
+
+      false
+    end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: onlyoffice_documentserver_conversion_helper
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-09 00:00:00.000000000 Z
+date: 2022-03-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: jwt
@@ -125,19 +125,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2'
 - !ruby/object:Gem::Dependency
-  name: simplecov-cobertura
+  name: simplecov
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
@@ -166,6 +166,7 @@ extensions: []
 extra_rdoc_files: []
 files:
 - lib/onlyoffice_documentserver_conversion_helper.rb
+- lib/onlyoffice_documentserver_conversion_helper/exceptions.rb
 - lib/onlyoffice_documentserver_conversion_helper/name.rb
 - lib/onlyoffice_documentserver_conversion_helper/version.rb
 - lib/onlyoffice_documentserver_conversion_helper/xml_responce_parser.rb
@@ -194,7 +195,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.7
+rubygems_version: 3.3.10
 signing_key: 
 specification_version: 4
 summary: onlyoffice_documentserver_conversion_helper Gem