docxify 0.1.5 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71db0768a21fe9c99eaca1fe8835db8f0619530f3b111fc767afd1bbd15c5da5
-  data.tar.gz: 46507a64f582f7f6486556ab68e26baf93a4d3c1353293b0c1aa9068cbe9a0cf
+  metadata.gz: f27dd06895b320a411d00a17cdd4135681e76e2a49e366b607b4afa521d0867b
+  data.tar.gz: 07a866bd7de92a6e50fd4be479576a77de79edfede68d5a9e0b05b7b16fada9b
 SHA512:
-  metadata.gz: eaecad61bffa383575bc36536ac8c39d66e745e22fd2b26f509f39325b1faeecb66904ac9184b179e3e27883065ebd7dfe982667bb68c9b6cbdb7dfacb866055
-  data.tar.gz: 1bd65897a04c0a22ff34b7d1224c8d39a1421219d4d6e4abf7e187bd14764e493c72fb205a7b4f33699866d1f018d5c420989123b6a05542e57c962acb83721b
+  metadata.gz: f5563cc357c8aa8618b854fdf9073393494c98e6a132600c682b7b26b909119af91c553796b17c70f09cbed5582f139f0c5ed9c6a3820b73c5c131b02120bf95
+  data.tar.gz: '08f10d16e93ee74c01dbb1ce35fc8f5ea6b91a63e2c95d3abca1c72b72f758ce0703b2e4270ae3844d2d1f976582d31280bd5678447a1fd480597afc602f8fe2'

data/CHANGELOG.md

@@ -1,5 +1,17 @@
 # CHANGELOG
 
+## 0.1.7
+
+Feature:
+
+- Add ability to inline highlight parts
+
+## 0.1.6
+
+Bugfix:
+
+- Stop additional page being added after content. Add known issue.
+
 ## 0.1.5
 
 Bugfix:

data/README.md

@@ -90,6 +90,10 @@ The main object created by users is a `DocXify::Document`. This builds up a `@co
 
 The `render` method on a `DocXify::Document` will generate a complete `document.xml` (Word terminology not a Ruby method) by creating a template and iterating each `@content` item. It will then create a `DocXify::Container` with that `document.xml` to generate a complete Zipped DocX file, and call it's `render` method to generate an in-memory file. This is then either returned to the `render` caller, or if a file path was passed as the first attribute, then it writes it out.
 
+### Known issues
+
+The only known issue is that it doesn't like mixing and matching page orientations. If you start a document as portrait or landscape, it's fine, but it really doesn't like a single page being in a different orientation.
+
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at <https://github.com/foundercatalyst/docxify>.

data/lib/docxify/document.rb

@@ -8,7 +8,7 @@ module DocXify
       @relationships = []
       @width = options[:width] || A4_PORTRAIT_WIDTH
       @height = options[:height] || A4_PORTRAIT_HEIGHT
-      @orientation = options[:orientation] || :portrait
+      @orientation = options[:orientation]
       @font = options[:font] || "Times New Roman"
       @size = options[:size] || 12
       @color = options[:color] || 12

data/lib/docxify/element/page_layout.rb

@@ -12,7 +12,7 @@ module DocXify
         @margins = @document.margins
         @width = options[:width] || @document&.width || DocXify::A4_PORTRAIT_WIDTH
         @height = options[:height] || @document&.height || DocXify::A4_PORTRAIT_HEIGHT
-        @orientation = options[:orientation] || :portrait
+        @orientation = options[:orientation]
       end
 
       # Don't consider this part of the public API, they're used by Document if it's been created
@@ -26,16 +26,12 @@ module DocXify
 
       def to_s(_container = nil)
         <<~XML
-          <w:p>
-            <w:pPr>
-              <w:sectPr>
-                <w:pgSz w:w="#{@width}" w:h="#{@height}" w:orient="#{@orientation}"/>
-                <w:pgMar w:bottom="#{DocXify.cm2dxa @margins[:bottom]}" w:footer="708" w:gutter="0" w:header="708" w:left="#{DocXify.cm2dxa @margins[:left]}" w:right="#{DocXify.cm2dxa @margins[:right]}" w:top="#{DocXify.cm2dxa @margins[:top]}"/>
-                <w:cols w:space="708"/>
-                <w:docGrid w:linePitch="360"/>
-              </w:sectPr>
-            </w:pPr>
-          </w:p>
+          <w:sectPr>
+            <w:pgSz w:w="#{@width}" w:h="#{@height}" #{'w:orient="portrait}"' if @orientation.to_s == "portrait"} #{'w:orient="landscape}"' if @orientation.to_s == "landscape"} />
+            <w:pgMar w:bottom="#{DocXify.cm2dxa @margins[:bottom]}" w:footer="708" w:gutter="0" w:header="708" w:left="#{DocXify.cm2dxa @margins[:left]}" w:right="#{DocXify.cm2dxa @margins[:right]}" w:top="#{DocXify.cm2dxa @margins[:top]}"/>
+            <w:cols w:space="708"/>
+            <w:docGrid w:linePitch="360"/>
+          </w:sectPr>
         XML
       end
     end

data/lib/docxify/element/paragraph.rb

@@ -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/version.rb

@@ -1,3 +1,3 @@
 module DocXify
-  VERSION = "0.1.5".freeze
+  VERSION = "0.1.7".freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docxify
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.7
 platform: ruby
 authors:
 - Andy Jeffries
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2024-09-24 00:00:00.000000000 Z
+date: 2025-03-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: image_size
@@ -90,7 +90,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.17
+rubygems_version: 3.5.21
 signing_key:
 specification_version: 4
 summary: DocXify is a gem to help you generate Word documents from Ruby.