docxify 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: '078327d60105c81b5d2408dc41a12f8938fc99ef39fc813e5313913b4fb85fe8'
-  data.tar.gz: 8a96ec54548b34768e3480db12349ed9301c5fbc0f3f5b5f470b2788805541a0
+  metadata.gz: 2001fd538f53baaa855da323413656be06af5c3d6ad55c662a27cda494e03d8b
+  data.tar.gz: ca1ade585eb4a3e662362d7909daf2026f6069e7ede204be165fec2f542ac6a4
 SHA512:
-  metadata.gz: 7891e352135d11bba98851c99733afece051a37fb283d2f576179dfd66a1a0da6e8656cd0b2d1885389b448baff183194cb0ce3e0599d468330f5b6981f4619f
-  data.tar.gz: 28098adcc6b17ca39f67c15a5dacfe63c5d1d453bd19da781b0124b9398fb534fdeae8f78597c36372aa5f2b4103e961553474c9ea14783be9a86d7161a27400
+  metadata.gz: d1dcbd60cdd20008d7f3ae06d624024d7d236ef3740e8c7b86f4a6dee052e23bb5f1a4431ef3c2c0eb4005b0b73ce1d731995f30da534778ce9ad93ad798142b
+  data.tar.gz: fec075ad3e35e7cd0d8c3d449d758d06174762734e56f2365b80d829e9dff48708c12152d253dc11d6187e779e76c71b795bc0deb5c60380a7c6299d34645471

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 0.1.8
+
+Bugfix:
+
+- Fix FrozenError when used with `--enable=frozen-string-literal` (RUBYOPT); all mutable string accumulators now initialised with `+""` or `+<<~HEREDOC`
+
+## 0.1.7
+
+Feature:
+
+- Add ability to inline highlight parts
+
 ## 0.1.6
 
 Bugfix:

data/README.md

@@ -31,7 +31,7 @@ gem install docxify
 @docx.add_paragraph "Highlighted text", background: "#FFFF99"
 @docx.add_paragraph "This won't show as <b>bold</b>", inline_styling: false
 
-@docx.add_paragraph "\t1.1.1\tBody copy", tab_stops_cm: [1, 2]
+@docx.add_paragraph "\t1.1.1\tBody copy", tab_stops_cm: [1, 2], hanging_cm: 2
 @docx.add_paragraph "{CHECKBOX_EMPTY}\tEmpty checkbox", tab_stops_cm: [2]
 @docx.add_paragraph "{CHECKBOX_CHECKED}\tChecked checkbox", tab_stops_cm: [2]
 

data/lib/docxify/container.rb

@@ -56,7 +56,7 @@ module DocXify
     end
 
     def document_xml_rels
-      xml = <<~XML
+      xml = +<<~XML
         <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
         <Relationships xmlns="http://schemas.openxmlformats.org/package/2006/relationships">
           <Relationship Id="rId3" Target="webSettings.xml" Type="http://schemas.openxmlformats.org/officeDocument/2006/relationships/webSettings"/>

data/lib/docxify/document.rb

@@ -44,7 +44,7 @@ module DocXify
     end
 
     def build_xml(container)
-      xml = <<~XML
+      xml = +<<~XML
         <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
         <w:document mc:Ignorable="w14 w15 w16se w16cid w16 w16cex w16sdtdh w16du wp14" xmlns:aink="http://schemas.microsoft.com/office/drawing/2016/ink" xmlns:am3d="http://schemas.microsoft.com/office/drawing/2017/model3d" xmlns:cx="http://schemas.microsoft.com/office/drawing/2014/chartex" xmlns:cx1="http://schemas.microsoft.com/office/drawing/2015/9/8/chartex" xmlns:cx2="http://schemas.microsoft.com/office/drawing/2015/10/21/chartex" xmlns:cx3="http://schemas.microsoft.com/office/drawing/2016/5/9/chartex" xmlns:cx4="http://schemas.microsoft.com/office/drawing/2016/5/10/chartex" xmlns:cx5="http://schemas.microsoft.com/office/drawing/2016/5/11/chartex" xmlns:cx6="http://schemas.microsoft.com/office/drawing/2016/5/12/chartex" xmlns:cx7="http://schemas.microsoft.com/office/drawing/2016/5/13/chartex" xmlns:cx8="http://schemas.microsoft.com/office/drawing/2016/5/14/chartex" xmlns:m="http://schemas.openxmlformats.org/officeDocument/2006/math" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:o="urn:schemas-microsoft-com:office:office" xmlns:oel="http://schemas.microsoft.com/office/2019/extlst" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships" xmlns:v="urn:schemas-microsoft-com:vml" xmlns:w="http://schemas.openxmlformats.org/wordprocessingml/2006/main" xmlns:w10="urn:schemas-microsoft-com:office:word" xmlns:w14="http://schemas.microsoft.com/office/word/2010/wordml" xmlns:w15="http://schemas.microsoft.com/office/word/2012/wordml" xmlns:w16="http://schemas.microsoft.com/office/word/2018/wordml" xmlns:w16cex="http://schemas.microsoft.com/office/word/2018/wordml/cex" xmlns:w16cid="http://schemas.microsoft.com/office/word/2016/wordml/cid" xmlns:w16du="http://schemas.microsoft.com/office/word/2023/wordml/word16du" xmlns:w16sdtdh="http://schemas.microsoft.com/office/word/2020/wordml/sdtdatahash" xmlns:w16se="http://schemas.microsoft.com/office/word/2015/wordml/symex" xmlns:wne="http://schemas.microsoft.com/office/word/2006/wordml" xmlns:wp="http://schemas.openxmlformats.org/drawingml/2006/wordprocessingDrawing" xmlns:wp14="http://schemas.microsoft.com/office/word/2010/wordprocessingDrawing" xmlns:wpc="http://schemas.microsoft.com/office/word/2010/wordprocessingCanvas" xmlns:wpg="http://schemas.microsoft.com/office/word/2010/wordprocessingGroup" xmlns:wpi="http://schemas.microsoft.com/office/word/2010/wordprocessingInk" xmlns:wps="http://schemas.microsoft.com/office/word/2010/wordprocessingShape">
           <w:body>

data/lib/docxify/element/base.rb

@@ -9,10 +9,10 @@ module DocXify
 
       def parse_simple_html(html)
         state = :text
-        tag = ""
-        content = ""
+        tag = +""
+        content = +""
         result = []
-        text = ""
+        text = +""
         last_char = ""
 
         html.each_char do |char|
@@ -21,16 +21,16 @@ module DocXify
           when :text # This is a text node, not part of an HTML tag
             if char == "<"
               state = :tag
-              tag = ""
+              tag = +""
               result << text unless text.empty?
-              text = ""
+              text = +""
             else
               text << char
             end
           when :tag # Within an HTML tag itself
             if char == ">"
               state = :content
-              content = ""
+              content = +""
               tag_name, *attributes = tag.split
               tag_name.gsub!(/\s*\//, "")
               attributes.delete_if { |attr| attr == "/" }
@@ -62,7 +62,7 @@ module DocXify
             if char == "<"
               state = :tag
               result.last[:content] = content
-              content = ""
+              content = +""
             else
               content << char
             end

data/lib/docxify/element/image.rb

@@ -37,7 +37,7 @@ module DocXify
       end
 
       def to_s(_container = nil)
-        xml = "<w:p>"
+        xml = +"<w:p>"
 
         xml << "<w:pPr>"
         if @align == :right

data/lib/docxify/element/paragraph.rb

@@ -27,7 +27,7 @@ module DocXify
           [@text.gsub("<", "&lt;").gsub(">", "&gt;")]
         end
 
-        xml = "<w:p>"
+        xml = +"<w:p>"
 
         xml << "<w:pPr>"
         xml << "<w:jc w:val=\"#{@align}\"/>" if @align != :left
@@ -59,7 +59,7 @@ module DocXify
               <w:color w:val="#{@color.gsub("#", "")}"/>
               <w:sz w:val="#{DocXify.pt2halfpt(@size)}"/>
               <w:szCs w:val="#{DocXify.pt2halfpt(@size)}"/>
-              #{"<w:highlight w:val=\"yellow\"/>" if @highlight}
+              #{"<w:highlight w:val=\"yellow\"/>" if @highlight || (node.is_a?(Hash) && node[:tag].match?("mark"))}
               #{"<w:b/><w:bCs/>" if node.is_a?(Hash) && node[:tag].match?("b")}
               #{"<w:i/><w:iCs/>" if node.is_a?(Hash) && node[:tag].match?("i")}
               #{"<w:u w:val=\"single\"/>" if node.is_a?(Hash) && (node[:tag].match?("u") || node[:tag] == "a")}

data/lib/docxify/element/table.rb

@@ -28,7 +28,7 @@ module DocXify
       end
 
       def to_s(_container = nil)
-        xml = ""
+        xml = +""
         xml << table_element_start
         xml << table_properties
         xml << table_grid
@@ -44,7 +44,7 @@ module DocXify
       end
 
       def table_properties
-        xml = ""
+        xml = +""
         xml << "<w:tblPr>"
         xml << '<w:tblStyle w:val="TableGrid"/>'
         xml << '<w:tblW w:type="auto" w:w="0"/>'
@@ -63,7 +63,7 @@ module DocXify
         default_equal_width = (@document.width / @rows.first.size).to_i
 
         @column_widths = []
-        xml = "<w:tblGrid>"
+        xml = +"<w:tblGrid>"
         @rows.first.each do |cell|
           width = if cell.width_cm
             DocXify.cm2dxa(cell.width_cm)
@@ -79,7 +79,7 @@ module DocXify
       end
 
       def table_row(row)
-        xml = "<w:tr>"
+        xml = +"<w:tr>"
         widths = @column_widths.dup
         row.each do |cell|
           if cell.nil?

data/lib/docxify/element/table_cell.rb

@@ -6,7 +6,7 @@ module DocXify
       def initialize(content, options = {})
         super()
         @content = content
-        @valign = options[:valign] || :top
+        @valign = (options[:valign] if %i[top center bottom].include?(options[:valign])) || :top
         @align = options[:align] || :left
         @nowrap = options[:nowrap]
         @colspan = options[:colspan]
@@ -15,11 +15,15 @@ module DocXify
         @font = options[:font]
         @size = options[:size]
         @color = options[:color]
+
         @borders = options[:borders]&.map(&:to_sym) || []
+        if @borders.include?(:all)
+          @borders = %i[top bottom left right]
+        end
       end
 
       def to_s
-        xml = "<w:tc>"
+        xml = +"<w:tc>"
         xml << "<w:tcPr>"
         xml << %Q(<w:tcW w:type="dxa" w:w="#{DocXify.cm2dxa(@width_cm)}"/>)
         if !@colspan.nil? && @colspan.to_i > 1

data/lib/docxify/version.rb

@@ -1,3 +1,3 @@
 module DocXify
-  VERSION = "0.1.6".freeze
+  VERSION = "0.1.8".freeze
 end

metadata

@@ -1,15 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docxify
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Andy Jeffries
 - FounderCatalyst Ltd
-autorequire:
 bindir: exe
 cert_chain: []
-date: 2025-03-14 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_size
@@ -75,7 +74,6 @@ metadata:
   source_code_uri: https://github.com/foundercatalyst/docxify
   changelog_uri: https://github.com/foundercatalyst/docxify/CHANGELOG.md
   rubygems_mfa_required: 'true'
-post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -90,8 +88,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.21
-signing_key:
+rubygems_version: 4.0.6
 specification_version: 4
 summary: DocXify is a gem to help you generate Word documents from Ruby.
 test_files: []