docx 0.13.0 → 0.13.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 236ded16324395b50579ba21fdc84891251ffc75b9bd1f5c65c4d125c6689c2f
-  data.tar.gz: d994c54de22f1829928d4fe60087d8f4667905d4e13e88e9b607a9ae3ac34077
+  metadata.gz: d639e88e5950b94157fc4f81b14f0f8bf355abb4fdedd24b7f40dc00eafb72d7
+  data.tar.gz: e64400d25d919b4cd51f4b876d7f35c3433841523055866dff2c300f7c15aca7
 SHA512:
-  metadata.gz: a5a969c0011ac31aba461a485474015b230a76d2c449275f90a5267f4ee9b38ba698090561fea0cade728502be7db6e306c8d9a29cc662400122ed138a209e18
-  data.tar.gz: f0e12812fd5d488162a4d263a41d095e31ab0500824ae99cc58f4fafe82ef4468b44fa68bcf0db86b3ecd305cd263602334dfbea81fa14622d7303060e461779
+  metadata.gz: d2ad2931111374349dd03ca04bef655a9eaa797b84d688198ebeac84cdf93af147d4f8fd5a561c4e506d7f823c9b22884c698a315d7e2bb505357c7c6da9316a
+  data.tar.gz: 25cb0bc5f3b67b4af1874b902fbdfe3061205cee0c8b288187924b80cb50a6bd5a7076ea497be702a07241841da146055b3be0dbffeb90c20922f851ad31588c

data/lib/docx/containers/text_run.rb

@@ -40,6 +40,7 @@ module Docx
           elsif @text_nodes.empty?
             new_t = Elements::Text.create_within(self)
             new_t.content = content
+            @text_nodes << new_t
           end
           reset_text
         end

data/lib/docx/document.rb

@@ -113,6 +113,9 @@ module Docx
     end
 
     def hyperlink_relationships
+      # @rels is nil when the document has no relationships part (#192)
+      return Nokogiri::XML::NodeSet.new(Nokogiri::XML::Document.new) unless @rels
+
       @rels.xpath("//xmlns:Relationship[contains(@Type,'hyperlink')]")
     end
 

data/lib/docx/elements/bookmark.rb

@@ -51,28 +51,92 @@ module Docx
 
       # Get text run immediately prior to bookmark node
       def get_run_before
-        # at_xpath returns the first match found and preceding-sibling returns siblings in the
-        # order they appear in the document not the order as they appear when moving out from
-        # the starting node
-        if not (r_nodes = @node.xpath("./preceding-sibling::w:r")).empty?
-          r_node = r_nodes.last
-          Containers::TextRun.new(r_node)
-        else
+        if enclosing_paragraph
+          # at_xpath returns the first match found and preceding-sibling returns siblings in the
+          # order they appear in the document not the order as they appear when moving out from
+          # the starting node
+          unless (r_nodes = @node.xpath("./preceding-sibling::w:r")).empty?
+            return Containers::TextRun.new(r_nodes.last)
+          end
+
           new_r = Containers::TextRun.create_with(self)
           new_r.insert_before(self)
-          new_r
+          return new_r
         end
+
+        # Block-level bookmark (e.g. Google Docs places bookmarkStart/End directly
+        # under w:body). Add a run to the preceding paragraph, or to a new
+        # paragraph before the bookmark, so the run lives inside a w:p.
+        run_at_paragraph_end(@node.xpath("./preceding-sibling::w:p").last) ||
+          run_in_new_paragraph { |paragraph| @node.add_previous_sibling(paragraph) }
       end
 
       # Get text run immediately after bookmark node
       def get_run_after
-        if (r_node = @node.at_xpath("./following-sibling::w:r"))
-          Containers::TextRun.new(r_node)
-        else
+        if enclosing_paragraph
+          if (r_node = @node.at_xpath("./following-sibling::w:r"))
+            return Containers::TextRun.new(r_node)
+          end
+
           new_r = Containers::TextRun.create_with(self)
           new_r.insert_after(self)
-          new_r
+          return new_r
+        end
+
+        # Block-level bookmark: add a run to the following paragraph, or to a new
+        # paragraph after the bookmark.
+        run_at_paragraph_start(@node.at_xpath("./following-sibling::w:p")) ||
+          run_in_new_paragraph { |paragraph| @node.add_next_sibling(paragraph) }
+      end
+
+      # Override Element#parent_paragraph so insert_multiple_lines also works for
+      # block-level bookmarks. For those we fill a fresh paragraph inserted at the
+      # bookmark, rather than an adjacent existing paragraph, so we neither crash
+      # (no enclosing paragraph) nor overwrite unrelated content.
+      def parent_paragraph
+        return Containers::Paragraph.new(enclosing_paragraph) if enclosing_paragraph
+
+        paragraph = Nokogiri::XML::Node.new("w:p", @node.document)
+        @node.add_next_sibling(paragraph)
+        Containers::Paragraph.new(paragraph)
+      end
+
+      private
+
+      # The w:p the bookmark sits inside, or nil when it is block-level.
+      def enclosing_paragraph
+        @node.at_xpath("./parent::w:p")
+      end
+
+      # A new run inserted at the start of paragraph_node (after w:pPr if present).
+      # Returns nil when paragraph_node is nil.
+      def run_at_paragraph_start(paragraph_node)
+        return nil unless paragraph_node
+
+        new_r = Containers::TextRun.create_with(self)
+        if (props = paragraph_node.at_xpath("w:pPr"))
+          props.add_next_sibling(new_r.node)
+        else
+          paragraph_node.prepend_child(new_r.node)
         end
+        new_r
+      end
+
+      # A new run appended to the end of paragraph_node. nil when it is nil.
+      def run_at_paragraph_end(paragraph_node)
+        return nil unless paragraph_node
+
+        Containers::TextRun.create_within(Containers::Paragraph.new(paragraph_node))
+      end
+
+      # Create a run wrapped in a fresh w:p; the block positions that paragraph
+      # relative to the bookmark.
+      def run_in_new_paragraph
+        new_r = Containers::TextRun.create_with(self)
+        paragraph = Nokogiri::XML::Node.new("w:p", @node.document)
+        paragraph.add_child(new_r.node)
+        yield paragraph
+        new_r
       end
     end
   end

data/lib/docx/elements/element.rb

@@ -42,7 +42,8 @@ module Docx
 
       # Insert node as first child (after properties)
       def prepend_to(element)
-        @node = element.node.properties.add_next_sibling(@node)
+        properties = element.properties if element.respond_to?(:properties)
+        @node = properties ? properties.add_next_sibling(@node) : element.node.prepend_child(@node)
         self
       end
 

data/lib/docx/helpers.rb

@@ -4,7 +4,7 @@ module Docx
     # than the default inspect method. But you can still get the default inspect method by passing
     # true as the first argument.
     def inspect(full = false)
-      return(super) if full
+      return super() if full
 
       variable_values =
         instance_variables.map do |var|

data/lib/docx/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Docx #:nodoc:
-  VERSION = '0.13.0'
+  VERSION = '0.13.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docx
 version: !ruby/object:Gem::Version
-  version: 0.13.0
+  version: 0.13.1
 platform: ruby
 authors:
 - Christopher Hunt