docx 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: db3defcbe5cacff393d7c87a7ad93cb305a630397f90c4ae6e93c51cf0d5b6a1
-  data.tar.gz: 63efc745ef47ae41110937e2b4596ad49a8b8e4bb5e4557799be6efcabee369a
+  metadata.gz: 6dd59a023e1430fce917809931fe955651324db4fadb7a55d9a380731240466e
+  data.tar.gz: eb91759397bdc0782691c6ed46b37a67a031ab580d590568a7f221a223d2f80c
 SHA512:
-  metadata.gz: 1b7540ec11e9067374988c91bf09c733892275d39803bf121e88025bc27233e129712a7e478167598e8c6cf805947004807ed80cddf8461bf28c602336b53d9e
-  data.tar.gz: abedf7373093642703701f6ac6b7e4026a4fe713ab9af6665b39fd01de58ceffac211916cec08b14e0179f5d691afac3be3d0c5b05b8fcc0e397466e0a672385
+  metadata.gz: c722c427338ceb1f4d8c926c4e3b2a8c2b2de9889e77a9b78fec4ffe2270b633dfd8f843a31ed17a77b6b5d09d9e9d8b4c88e52569b3c410d1f8ae9183c76c6d
+  data.tar.gz: 41af211af034071991a920f1ed00e9ee9c8e5e739f41553c8b263081e7626183bc21e38735bfed88f01fdea0599f13a313cfc0ea1f9cc8331edff97e5cd5c40d

data/README.md

@@ -2,6 +2,7 @@
 
 [![Gem Version](https://badge.fury.io/rb/docx.svg)](https://badge.fury.io/rb/docx)
 [![Build Status](https://travis-ci.org/ruby-docx/docx.svg?branch=master)](https://travis-ci.org/ruby-docx/docx)
+[![Coverage Status](https://coveralls.io/repos/github/ruby-docx/docx/badge.svg?branch=master)](https://coveralls.io/github/ruby-docx/docx?branch=master)
 [![Gitter](https://badges.gitter.im/ruby-docx/community.svg)](https://gitter.im/ruby-docx/community?utm_source=badge&utm_medium=badge&utm_campaign=pr-badge)
 
 A ruby library/gem for interacting with `.docx` files. currently capabilities include reading paragraphs/bookmarks, inserting text at bookmarks, reading tables/rows/columns/cells and saving the document.

data/lib/docx/containers/paragraph.rb

@@ -55,7 +55,7 @@ module Docx
 
         # Array of text runs contained within paragraph
         def text_runs
-          @node.xpath('w:r|w:hyperlink/w:r').map { |r_node| Containers::TextRun.new(r_node, @document_properties) }
+          @node.xpath('w:r|w:hyperlink').map { |r_node| Containers::TextRun.new(r_node, @document_properties) }
         end
 
         # Iterate over each text run within a paragraph

data/lib/docx/containers/text_run.rb

@@ -23,6 +23,8 @@ module Docx
         def initialize(node, document_properties = {})
           @node = node
           @text_nodes = @node.xpath('w:t').map {|t_node| Elements::Text.new(t_node) }
+          @text_nodes = @node.xpath('w:t|w:r/w:t').map {|t_node| Elements::Text.new(t_node) }
+
           @properties_tag = 'rPr'
           @text       = parse_text || ''
           @formatting = parse_formatting || DEFAULT_FORMATTING
@@ -74,6 +76,7 @@ module Docx
           # No need to be granular with font size down to the span level if it doesn't vary.
           styles['font-size'] = "#{font_size}pt" if font_size != @font_size 
           html = html_tag(:span, content: html, styles: styles) unless styles.empty?
+          html = html_tag(:a, content: html, attributes: {href: href, target: "_blank"}) if hyperlink?
           return html
         end
 
@@ -89,6 +92,18 @@ module Docx
           @formatting[:underline]
         end
 
+        def hyperlink?
+          @node.name == 'hyperlink'
+        end
+
+        def href
+          @document_properties[:hyperlinks][hyperlink_id]
+        end
+
+        def hyperlink_id
+          @node.attributes['id'].value
+        end        
+
         def font_size
           size_tag = @node.xpath('w:rPr//w:sz').first
           size_tag ? size_tag.attributes['val'].value.to_i / 2 : @font_size

data/lib/docx/document.rb

@@ -45,7 +45,8 @@ module Docx
     # This stores the current global document properties, for now
     def document_properties
       {
-        font_size: font_size
+        font_size: font_size,
+        hyperlinks: hyperlinks
       }
     end
 
@@ -83,6 +84,17 @@ module Docx
       size_tag ? size_tag.attributes['val'].value.to_i / 2 : nil
     end
 
+    # Hyperlink targets are extracted from the document.xml.rels file
+    def hyperlinks
+      hyperlink_relationships.each_with_object({}) do |rel, hash|
+        hash[rel.attributes['Id'].value] = rel.attributes['Target'].value
+      end 
+    end
+
+    def hyperlink_relationships
+      @rels.xpath("//xmlns:Relationship[contains(@Type,'hyperlink')]")
+    end    
+
     ##
     # *Deprecated*
     #
@@ -101,7 +113,7 @@ module Docx
 
     # Output entire document as a String HTML fragment
     def to_html
-      paragraphs.map(&:to_html).join('\n')
+      paragraphs.map(&:to_html).join("\n")
     end
 
     # Save document to provided path
@@ -157,6 +169,8 @@ module Docx
     def load_styles
       @styles_xml = @zip.read('word/styles.xml')
       @styles = Nokogiri::XML(@styles_xml)
+      @rels_xml = @zip.read('word/_rels/document.xml.rels')
+      @rels = Nokogiri::XML(@rels_xml)
     rescue Errno::ENOENT => e
       warn e.message
       nil

data/lib/docx/elements/element.rb

@@ -65,8 +65,10 @@ module Docx
       def html_tag(name, options = {})
         content = options[:content]
         styles = options[:styles]
+        attributes = options[:attributes]
 
         html = "<#{name.to_s}"
+        
         unless styles.nil? || styles.empty?
           styles_array = []
           styles.each do |property, value|
@@ -74,6 +76,13 @@ module Docx
           end
           html << " style=\"#{styles_array.join('')}\""
         end
+        
+        unless attributes.nil? || attributes.empty?
+          attributes.each do |attr_name, attr_value|
+            html << " #{attr_name}=\"#{attr_value}\""
+          end
+        end
+        
         html << ">"
         html << content if content
         html << "</#{name.to_s}>"

data/lib/docx/version.rb

@@ -1,3 +1,3 @@
 module Docx #:nodoc:
-  VERSION = '0.5.0'
+  VERSION = '0.6.0'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docx
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Christopher Hunt
@@ -9,10 +9,10 @@ authors:
 - Higgins Dragon
 - Toms Mikoss
 - Sebastian Wittenkamp
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2020-03-09 00:00:00.000000000 Z
+date: 2020-10-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -49,19 +49,19 @@ dependencies:
       - !ruby/object:Gem::Version
         version: '2.0'
 - !ruby/object:Gem::Dependency
-  name: rspec
+  name: coveralls
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0.8'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.7'
+        version: '0.8'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -76,6 +76,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '13.0'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3.7'
 description: thin wrapper around rubyzip and nokogiri as a way to get started with
   docx files
 email:
@@ -106,7 +120,7 @@ homepage: https://github.com/chrahunt/docx
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -114,7 +128,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 2.5.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
@@ -122,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.2
-signing_key: 
+signing_key:
 specification_version: 4
 summary: a ruby library/gem for interacting with .docx files
 test_files: []