docxify 0.0.9 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c43501f65a265d3e8ce49ae0c5081d425c838465e31392b8e17c66c5d32214f9
-  data.tar.gz: efff6888d11c6ba8d9984150c0589d57e960b0e04fdc3daa79a2a458517b0fdd
+  metadata.gz: bc2de5623d8d0605d4aa0ad437c657749e0b39c91c13dc3af0bea385e75dabc3
+  data.tar.gz: 026160dfca1a977e7a8b7563e4268c363918f2130fe2e89dc0346037013d13ef
 SHA512:
-  metadata.gz: c8dae5642665518f3c8be12d9a3d16a54ab626e3601b0b1073583f5c6f67cc80e31215e045f9ce593e520db7e35349d55363fee1f4713be4bb8eb7a704081780
-  data.tar.gz: 2d6aca43dba5dbe008f58e83a7bac426d6edb43aac83ba9812dc3eb1ab9bbe9218d128f88d6dfbd78fafaef38f8be32b1a97a47ba1519d13f4c86b81417c62c7
+  metadata.gz: 41d3b81b2ef6e3f90a1cc9a0149b19f93b96f86bb581d0c83a7f739d55cac24bae6337871a70c7278039f46ca50ecd164525d3b2f9631a7e329d1bd2e3a54989
+  data.tar.gz: eca5c4a3eeb6855546fb7584605fc6579c8cfbe6a31014b1d0dd9896da9c6e15482c34b2638a98c6bca6d6ca887f0f12c076d71018af6f52bcc1421ba03e5ff1

data/CHANGELOG.md

@@ -1,5 +1,23 @@
 # CHANGELOG
 
+## 0.1.1
+
+Features:
+
+- Allow combining bold, italic and underline on a single element (thanks to @b0nn1e for the PR)
+
+## 0.1.0
+
+Features:
+
+- Implemented Document#bounds_width and Document#bounds_height
+
+## 0.0.9
+
+Features:
+
+- Fixed page layout loading
+
 ## 0.0.8
 
 Features:

data/lib/docxify/document.rb

@@ -16,6 +16,14 @@ module DocXify
       @margins = { top: 2, bottom: 2, left: 2, right: 2 }.merge(options[:margins] || {})
     end
 
+    def bounds_width
+      @page_layout&.bounds_width || (@width - @margins[:left] - @margins[:right])
+    end
+
+    def bounds_height
+      @page_layout&.bounds_height || (@height - @margins[:top] - @margins[:bottom])
+    end
+
     def default_styling(options = {})
       @font = options[:font] if options[:font]
       @size = options[:size] if options[:size]
@@ -89,7 +97,8 @@ module DocXify
 
     def add_page_layout(options = {})
       options[:document] = self
-      add DocXify::Element::PageLayout.new(options)
+      @page_layout = DocXify::Element::PageLayout.new(options)
+      add @page_layout
     end
 
     def add_divider

data/lib/docxify/element/page_layout.rb

@@ -15,6 +15,15 @@ module DocXify
         @orientation = options[:orientation] || :portrait
       end
 
+      # Don't consider this part of the public API, they're used by Document if it's been created
+      def bounds_width
+        @width - @margins[:left] - @margins[:right]
+      end
+
+      def bounds_height
+        @height - @margins[:top] - @margins[:bottom]
+      end
+
       def to_s(_container = nil)
         <<~XML
           <w:p>

data/lib/docxify/element/paragraph.rb

@@ -21,10 +21,10 @@ module DocXify
 
       def to_s(_container = nil)
         nodes = if @inline_styling
-          parse_simple_html(@text)
-        else
-          [@text.gsub("<", "&lt;").gsub(">", "&gt;")]
-        end
+                  parse_simple_html(@text)
+                else
+                  [@text.gsub("<", "&lt;").gsub(">", "&gt;")]
+                end
 
         xml = "<w:p>"
 
@@ -58,9 +58,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.0.9".freeze
+  VERSION = "0.1.1".freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: docxify
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.1.1
 platform: ruby
 authors:
 - Andy Jeffries
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-08-23 00:00:00.000000000 Z
+date: 2024-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip