lib/isodoc/function/utils.rb in isodoc-1.1.1 vs lib/isodoc/function/utils.rb in isodoc-1.1.2

- old
+ new

@@ -1,5 +1,7 @@ +# frozen_string_literal: true + module IsoDoc::Function module Utils def date_range(date) self.class.date_range(date) end @@ -7,54 +9,54 @@ def ns(xpath) self.class.ns(xpath) end def insert_tab(out, n) - [1..n].each { out << "&nbsp; " } + [1..n].each { out << '&nbsp; ' } end # add namespaces for Word fragments - NOKOHEAD = <<~HERE.freeze - <!DOCTYPE html SYSTEM - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> - <html xmlns="http://www.w3.org/1999/xhtml"> - <head> <title></title> <meta charset="UTF-8" /> </head> - <body> </body> </html> + NOKOHEAD = <<~HERE + <!DOCTYPE html SYSTEM + "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> + <html xmlns="http://www.w3.org/1999/xhtml"> + <head> <title></title> <meta charset="UTF-8" /> </head> + <body> </body> </html> HERE # block for processing XML document fragments as XHTML, # to allow for HTMLentities def noko(&block) doc = ::Nokogiri::XML.parse(NOKOHEAD) - fragment = doc.fragment("") + fragment = doc.fragment('') ::Nokogiri::XML::Builder.with fragment, &block - fragment.to_xml(encoding: "US-ASCII").lines.map do |l| - l.gsub(/\s*\n/, "") + fragment.to_xml(encoding: 'US-ASCII').lines.map do |l| + l.gsub(/\s*\n/, '') end end def attr_code(attributes) attributes = attributes.reject { |_, val| val.nil? }.map attributes.map do |k, v| - [k, (v.is_a? String) ? HTMLEntities.new.decode(v) : v] + [k, v.is_a?(String) ? HTMLEntities.new.decode(v) : v] end.to_h end DOCTYPE_HDR = '<!DOCTYPE html SYSTEM '\ - '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">'.freeze + '"http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">' def to_xhtml(xml) - xml.gsub!(/<\?xml[^>]*>/, "") - /<!DOCTYPE /.match xml or xml = DOCTYPE_HDR + xml + xml.gsub!(/<\?xml[^>]*>/, '') + /<!DOCTYPE /.match(xml) || (xml = DOCTYPE_HDR + xml) xml = xml.split(/(\&[^ \r\n\t#;]+;)/).map do |t| - /^(\&[^ \t\r\n#;]+;)/.match(t) ? + /^(\&[^ \t\r\n#;]+;)/.match?(t) ? HTMLEntities.new.encode(HTMLEntities.new.decode(t), :hexadecimal) : t - end.join("") + end.join('') begin - Nokogiri::XML.parse(xml) { |config| config.strict } + Nokogiri::XML.parse(xml, &:strict) rescue Nokogiri::XML::SyntaxError => e - File.open("#{@filename}.#{@format}.err", "w:UTF-8") { |f| f.write xml } + File.open("#{@filename}.#{@format}.err", 'w:UTF-8') { |f| f.write xml } abort "Malformed Output XML for #{@format}: #{e} (see #{@filename}.#{@format}.err)" end end def to_xhtml_fragment(xml) @@ -62,19 +64,19 @@ fragment = doc.fragment(xml) fragment end def from_xhtml(xml) - xml.to_xml.sub(%r{ xmlns="http://www.w3.org/1999/xhtml"}, "") + xml.to_xml.sub(%r{ xmlns="http://www.w3.org/1999/xhtml"}, '') end CLAUSE_ANCESTOR = ".//ancestor::*[local-name() = 'annex' or "\ "local-name() = 'acknowledgements' or local-name() = 'term' or "\ "local-name() = 'appendix' or local-name() = 'foreword' or "\ "local-name() = 'introduction' or local-name() = 'terms' or "\ - "local-name() = 'clause' or local-name() = 'references']/@id".freeze + "local-name() = 'clause' or local-name() = 'references']/@id" def get_clause_id(node) clause = node.xpath(CLAUSE_ANCESTOR) clause&.last&.text || nil end @@ -84,48 +86,48 @@ "local-name() = 'foreword' or local-name() = 'appendix' or "\ "local-name() = 'introduction' or local-name() = 'terms' or "\ "local-name() = 'acknowledgements' or local-name() = 'term' or "\ "local-name() = 'clause' or local-name() = 'references' or "\ "local-name() = 'figure' or local-name() = 'formula' or "\ - "local-name() = 'table' or local-name() = 'example']/@id".freeze + "local-name() = 'table' or local-name() = 'example']/@id" def get_note_container_id(node) container = node.xpath(NOTE_CONTAINER_ANCESTOR) container&.last&.text || nil end def sentence_join(array) - return "" if array.nil? || array.empty? + return '' if array.nil? || array.empty? if array.length == 1 then array[0] else IsoDoc::Function::I18n::l10n("#{array[0..-2].join(', ')} "\ "#{@and_lbl} #{array.last}", @lang, @script) end end # avoid `; avoid {{ (Liquid Templates); avoid [[ (Javascript) def extract_delims(text) - @openmathdelim = "(#(" - @closemathdelim = ")#)" + @openmathdelim = '(#(' + @closemathdelim = ')#)' while text.include?(@openmathdelim) || text.include?(@closemathdelim) - @openmathdelim += "(" - @closemathdelim += ")" + @openmathdelim += '(' + @closemathdelim += ')' end [@openmathdelim, @closemathdelim] end def header_strip(h) - h = h.to_s.gsub(%r{<br\s*/>}, " ").gsub(/<\/?h[123456][^>]*>/, ""). - gsub(/<\/?b[^>]*>/, "") + h = h.to_s.gsub(%r{<br\s*/>}, ' ').gsub(/<\/?h[123456][^>]*>/, '') + .gsub(/<\/?b[^>]*>/, '') h1 = to_xhtml_fragment(h.dup) h1.traverse do |x| - x.replace(" ") if x.name == "span" && /mso-tab-count/.match(x["style"]) - x.remove if x.name == "span" && x["class"] == "MsoCommentReference" - x.remove if x.name == "a" && x["class"] == "FootnoteRef" - x.remove if x.name == "span" && /mso-bookmark/.match(x["style"]) - x.replace(x.children) if x.name == "a" + x.replace(' ') if x.name == 'span' && /mso-tab-count/.match(x['style']) + x.remove if x.name == 'span' && x['class'] == 'MsoCommentReference' + x.remove if x.name == 'a' && x['class'] == 'FootnoteRef' + x.remove if x.name == 'span' && /mso-bookmark/.match(x['style']) + x.replace(x.children) if x.name == 'a' end from_xhtml(h1) end def liquid(doc) @@ -133,51 +135,55 @@ end def liquid(doc) # unescape HTML escapes in doc doc = doc.split(%r<(\{%|%\})>).each_slice(4).map do |a| - a[2] = a[2].gsub(/\&lt;/, "<").gsub(/\&gt;/, ">") if a.size > 2 - a.join("") - end.join("") + a[2] = a[2].gsub(/\&lt;/, '<').gsub(/\&gt;/, '>') if a.size > 2 + a.join('') + end.join('') Liquid::Template.parse(doc) end def empty2nil(v) return nil if !v.nil? && v.is_a?(String) && v.empty? v end def populate_template(docxml, _format = nil) - meta = @meta.get.merge(@labels || {}).merge(@meta.labels || {}) + meta = @meta + .get + .merge(@labels || {}) + .merge(@meta.labels || {}) + .merge(@meta.fonts_options || {}) template = liquid(docxml) - template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h). - gsub('&lt;', '&#x3c;').gsub('&gt;', '&#x3e;').gsub('&amp;', '&#x26;') + template.render(meta.map { |k, v| [k.to_s, empty2nil(v)] }.to_h) + .gsub('&lt;', '&#x3c;').gsub('&gt;', '&#x3e;').gsub('&amp;', '&#x26;') end - def save_dataimage(uri, relative_dir = true) + def save_dataimage(uri, _relative_dir = true) %r{^data:image/(?<imgtype>[^;]+);base64,(?<imgdata>.+)$} =~ uri - imgtype.sub!(/\+[a-z0-9]+$/, "") # svg+xml - imgtype = "png" unless /^[a-z0-9]+$/.match imgtype - Tempfile.open(["image", ".#{imgtype}"]) do |f| + imgtype.sub!(/\+[a-z0-9]+$/, '') # svg+xml + imgtype = 'png' unless /^[a-z0-9]+$/.match imgtype + Tempfile.open(['image', ".#{imgtype}"]) do |f| f.binmode f.write(Base64.strict_decode64(imgdata)) - @tempfile_cache << f #persist to the end + @tempfile_cache << f # persist to the end f.path end end def image_localfile(i) - if /^data:image/.match i["src"] - save_dataimage(i["src"], false) - elsif %r{^([A-Z]:)?/}.match i["src"] - i["src"] + if /^data:image/.match? i['src'] + save_dataimage(i['src'], false) + elsif %r{^([A-Z]:)?/}.match? i['src'] + i['src'] else - File.join(@localdir, i["src"]) + File.join(@localdir, i['src']) end end def labelled_ancestor(node) - return !node.ancestors("example, requirement, recommendation, permission, "\ - "table, figure, sourcecode").empty? + !node.ancestors('example, requirement, recommendation, permission, '\ + 'table, figure, sourcecode').empty? end end end