docxify 0.1.0 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 897b2f634b40161a9795499ceb4324d568792267e7e20ac0017c606cf9f42a47
-  data.tar.gz: 99f727d9d8b1d5063d9c290606911f45bdce092d83ede247fab952a112c72fae
+  metadata.gz: '02588568aa1d05caf048a8a3b861ffc9b5ec2109817b6931006ce4c36c97adea'
+  data.tar.gz: 7f2647fdf663f8fb222c544592c4910ec54aedcdd26cf8fef30a610c7a163d6f
 SHA512:
-  metadata.gz: '051835c221e1d60bf40e9ee2020ad0bb4682d67fcc3beea6f92ba80380ef0177ef7365b24562d1f19294c72fddfb83ddf860409fe835888b3682277aaf79a318'
-  data.tar.gz: 2f21816e06987a0650c4ab1f5c0628e8eccc77be64fe1bbee35f8a40ed1aede60a95d4bf8fba7bb7ce509feb394c6a1004266541f154a43bc2372a56578b9b17
+  metadata.gz: bf43c3a7194169d9cb01e0f96a44d3498dffbde8fa7f829dbf8fff1226ea9adffa4f648a06158cc7ad3450203858e2211cf2423f064a683129ef2e23c825353b
+  data.tar.gz: b4990b99e150a9f2e3aae3a45873799e91fc850c7180485caa4559ed2eca97d301672bd0181f3e5b703d3c44f32b4c3f6e64c32c36895b0c62a002659f76b83d

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 0.1.2
+
+Features:
+
+- "Add 'after' to images and paragraphs to adjust spacing after those elements
+
+## 0.1.1
+
+Features:
+
+- Allow combining bold, italic and underline on a single element (thanks to @b0nn1e for the PR)
+
 ## 0.1.0
 
 Features:

data/README.md

@@ -23,7 +23,7 @@ gem install docxify
 
 @docx.default_styling font: "Serif font here", size: 14, color: "#040404"
 
-@docx.add_paragraph "Title", font: "Something", size: 18, color: "#00000"
+@docx.add_paragraph "Title", font: "Something", size: 18, color: "#00000", after: 18
 @docx.add_paragraph "Body copy"
 @docx.add_paragraph "This is <b>bold</b>, <i>Italic</i> and <u>Underlined</u>."
 @docx.add_paragraph "Text can also contain <a href='foo'>Links</a>."
@@ -37,7 +37,7 @@ gem install docxify
 
 @docx.add_divider
 
-@docx.add_image "file_path or data", align: :right, height_cm: 2, width_cm: 4
+@docx.add_image "file_path or data", align: :right, height_cm: 2, width_cm: 4, after: 18
 
 @docx.add_page_break
 
@@ -92,4 +92,4 @@ The `render` method on a `DocXify::Document` will generate a complete `document.
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at <https://github.com/andyjeffries/docxify>.
+Bug reports and pull requests are welcome on GitHub at <https://github.com/foundercatalyst/docxify>.

data/lib/docxify/element/image.rb

@@ -8,6 +8,7 @@ module DocXify
         @file = file
 
         @align = options[:align] || :left
+        @after = options[:after]
         @height_cm = options[:height_cm] || 5
         @width_cm = options[:width_cm] || 5
       end
@@ -19,20 +20,17 @@ module DocXify
       def to_s(_container = nil)
         xml = "<w:p>"
 
+        xml << "<w:pPr>"
         if @align == :right
-          xml << <<~XML
-            <w:pPr>
-              <w:jc w:val="right"/>
-            </w:pPr>
-          XML
+          xml << "<w:jc w:val=\"right\"/>"
         elsif @align == :center
-          xml << <<~XML
-            <w:pPr>
-              <w:jc w:val="center"/>
-            </w:pPr>
-          XML
+          xml << "<w:jc w:val=\"center\"/>"
         end
 
+        xml << "<w:spacing w:after=\"#{DocXify.pt2spacing @after}\"/>" if @after
+
+        xml << "</w:pPr>"
+
         xml << <<~XML
             <w:r>
               <w:rPr>

data/lib/docxify/element/paragraph.rb

@@ -14,6 +14,7 @@ module DocXify
         @background = options[:background] if options[:background]
         @background ||= @document&.background if @document&.background
         @align = options[:align] || :left
+        @after = options[:after]
         @inline_styling = options.key?(:inline_styling) ? options[:inline_styling] : true
         @tab_stops_cm = options[:tab_stops_cm] || []
         @hanging_cm = options[:hanging_cm] || 0
@@ -30,6 +31,7 @@ module DocXify
 
         xml << "<w:pPr>"
         xml << "<w:jc w:val=\"#{@align}\"/>" if @align != :left
+        xml << "<w:spacing w:after=\"#{DocXify.pt2spacing @after}\"/>" if @after
 
         if tab_stops_cm.any?
           xml << "<w:tabs>"
@@ -58,9 +60,9 @@ module DocXify
               <w:sz w:val="#{DocXify.pt2halfpt(@size)}"/>
               <w:szCs w:val="#{DocXify.pt2halfpt(@size)}"/>
               #{"<w:highlight w:val=\"yellow\"/>" if @highlight}
-              #{"<w:b/><w:bCs/>" if node.is_a?(Hash) && node[:tag] == "b"}
-              #{"<w:i/><w:iCs/>" if node.is_a?(Hash) && node[:tag] == "i"}
-              #{"<w:u w:val=\"single\"/>" if node.is_a?(Hash) && (node[:tag] == "u" || node[:tag] == "a")}
+              #{"<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")}
               #{"<w:rStyle w:val=\"Hyperlink\"/>" if node.is_a?(Hash) && node[:tag] == "a"}
             </w:rPr>
           XML

data/lib/docxify/version.rb

@@ -1,3 +1,3 @@
 module DocXify
-  VERSION = "0.1.0".freeze
+  VERSION = "0.1.2".freeze
 end

data/lib/docxify.rb

@@ -47,6 +47,14 @@ module DocXify
     (value * 2).to_i
   end
 
+  # Used for spacing
+  def self.pt2spacing(value)
+    value = value.to_f
+    raise ArgumentError.new("Value must be greater than or equal to 0") if value.negative?
+
+    (value * 20).to_i
+  end
+
   # Used for image sizes
   def self.cm2emu(value)
     value = value.to_f

metadata

@@ -1,14 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: docxify
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.2
 platform: ruby
 authors:
 - Andy Jeffries
+- FounderCatalyst Ltd
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-29 00:00:00.000000000 Z
+date: 2024-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -27,7 +28,7 @@ dependencies:
 description: Using a relatively simple DSL, you can generate Word DocX documents from
   Ruby.
 email:
-- andy@andyjeffries.co.uk
+- andy@foundercatalyst.com
 executables: []
 extensions: []
 extra_rdoc_files: []