docx 0.6.2 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2a33dcd9e31c60144261a15670cd1c01b37877044aaf33f7091b46cc85ab3412
-  data.tar.gz: 1911db027b3e2fbf8eb9363eaa99b95231f875afe8de2a0c060b38fee86c7238
+  metadata.gz: b777dc986b688750a284502115839f0c1fa58b50d562f1c098155e4386afe85b
+  data.tar.gz: 6de4259ddd408787823b60557535906aacc3357d54794941df3ef7e58105c713
 SHA512:
-  metadata.gz: 0a823fedf1b0bfc542c88533c787aefa5e9cee12ae4422a01f106985a2f03e8b636aa70820a179f5501ba8f996672f8f75e24356282cd7d81505cbb1984fa967
-  data.tar.gz: c06b4078536bd8b12b5c5e4f61fe0ef5f2f9e03e9cbc7c4017f2d01d3e8a0bc9200fa7457fac54c0b110a57ddc4bff8ad74c28d3e873512900266ac00137c6e6
+  metadata.gz: 8dd7ac5d3396372c3c5e21c1a8f73e6090854397874b5f69fe26f8e289c7417dd963fd1767434c8b6af920de96a1ea7a14d165e4ea9cb027f087f2b5c5248e02
+  data.tar.gz: '084b2be2ebf7072a472802ca449806063930723d244cda22ff6e73bcee24d9a6689d0daaf531bb2429372f639714ed8f8d18f0925c8800cbd8ff1bb313391610'

data/README.md

@@ -11,7 +11,7 @@ A ruby library/gem for interacting with `.docx` files. currently capabilities in
 
 ### Prerequisites
 
-- Ruby 2.5 or later
+- Ruby 2.6 or later
 
 ### Install
 

data/lib/docx/containers/text_run.rb

@@ -12,14 +12,14 @@ module Docx
           bold:      false,
           underline: false
         }
-        
+
         def self.tag
           'r'
         end
 
         attr_reader :text
         attr_reader :formatting
-        
+
         def initialize(node, document_properties = {})
           @node = node
           @text_nodes = @node.xpath('w:t').map {|t_node| Elements::Text.new(t_node) }
@@ -40,6 +40,7 @@ module Docx
             new_t = Elements::Text.create_within(self)
             new_t.content = content
           end
+          reset_text
         end
 
         # Returns text contained within text run
@@ -52,6 +53,7 @@ module Docx
           @text_nodes.each do |text_node|
             text_node.content = text_node.content.gsub(match, replacement)
           end
+          reset_text
         end
 
         def parse_formatting
@@ -74,7 +76,7 @@ module Docx
           styles = {}
           styles['text-decoration'] = 'underline' if underlined?
           # 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 
+          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
@@ -83,11 +85,11 @@ module Docx
         def italicized?
           @formatting[:italic]
         end
-        
+
         def bolded?
           @formatting[:bold]
         end
-        
+
         def underlined?
           @formatting[:underline]
         end
@@ -102,12 +104,18 @@ module Docx
 
         def hyperlink_id
           @node.attributes['id'].value
-        end        
+        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
         end
+
+        private
+
+        def reset_text
+          @text = parse_text
+        end
       end
     end
   end

data/lib/docx/document.rb

@@ -70,6 +70,10 @@ module Docx
       bkmrks_hsh
     end
 
+    def to_xml
+      Nokogiri::XML(@document_xml)
+    end
+
     def tables
       @doc.xpath('//w:document//w:body//w:tbl').map { |t_node| parse_table_from t_node }
     end

data/lib/docx/elements/element.rb

@@ -14,13 +14,20 @@ module Docx
       end
 
       attr_accessor :node
-      delegate :at_xpath, :xpath, :to => :@node
 
       # TODO: Should create a docx object from this
       def parent(type = '*')
         @node.at_xpath("./parent::#{type}")
       end
 
+      def at_xpath(*args)
+        @node.at_xpath(*args)
+      end
+
+      def xpath(*args)
+        @node.xpath(*args)
+      end
+
       # Get parent paragraph of element
       def parent_paragraph
         Elements::Containers::Paragraph.new(parent('w:p'))
@@ -91,7 +98,7 @@ module Docx
       module ClassMethods
         def create_with(element)
           # Need to somehow get the xml document accessible here by default, but this is alright in the interim
-          self.new(Nokogiri::XML::Node.new("w:#{self.tag}", element.node))
+          self.new(Nokogiri::XML::Node.new("w:#{self.tag}", element.node.document))
         end
 
         def create_within(element)
@@ -102,4 +109,4 @@ module Docx
       end
     end
   end
-end
+end

data/lib/docx/elements/text.rb

@@ -2,16 +2,22 @@ module Docx
   module Elements
     class Text
       include Element
-      delegate :content, :content=, :to => :@node
 
       def self.tag
         't'
       end
 
+      def content
+        @node.content
+      end
+
+      def content=(args)
+        @node.content = args
+      end
 
       def initialize(node)
         @node = node
       end
     end
   end
-end
+end

data/lib/docx/version.rb

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

data/lib/docx.rb

@@ -4,4 +4,3 @@ module Docx #:nodoc:
   autoload :Document, 'docx/document'
 end
 
-require 'docx/core_ext/module'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: docx
 version: !ruby/object:Gem::Version
-  version: 0.6.2
+  version: 0.8.0
 platform: ruby
 authors:
 - Christopher Hunt
@@ -12,7 +12,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-07-21 00:00:00.000000000 Z
+date: 2023-05-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -20,20 +20,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.13.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.10'
+        version: '1.13'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.4
+        version: 1.13.0
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
@@ -109,7 +109,6 @@ files:
 - lib/docx/containers/table_column.rb
 - lib/docx/containers/table_row.rb
 - lib/docx/containers/text_run.rb
-- lib/docx/core_ext/module.rb
 - lib/docx/document.rb
 - lib/docx/elements.rb
 - lib/docx/elements/bookmark.rb
@@ -128,14 +127,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.5.0
+      version: 2.6.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.4.1
 signing_key:
 specification_version: 4
 summary: a ruby library/gem for interacting with .docx files

data/lib/docx/core_ext/module.rb

@@ -1,172 +0,0 @@
-unless Object.const_defined?("ActiveSupport")
-  class Module
-    # Provides a delegate class method to easily expose contained objects' public methods
-    # as your own. Pass one or more methods (specified as symbols or strings)
-    # and the name of the target object via the <tt>:to</tt> option (also a symbol
-    # or string). At least one method and the <tt>:to</tt> option are required.
-    #
-    # Delegation is particularly useful with Active Record associations:
-    #
-    #   class Greeter < ActiveRecord::Base
-    #     def hello
-    #       'hello'
-    #     end
-    #
-    #     def goodbye
-    #       'goodbye'
-    #     end
-    #   end
-    #
-    #   class Foo < ActiveRecord::Base
-    #     belongs_to :greeter
-    #     delegate :hello, to: :greeter
-    #   end
-    #
-    #   Foo.new.hello   # => "hello"
-    #   Foo.new.goodbye # => NoMethodError: undefined method `goodbye' for #<Foo:0x1af30c>
-    #
-    # Multiple delegates to the same target are allowed:
-    #
-    #   class Foo < ActiveRecord::Base
-    #     belongs_to :greeter
-    #     delegate :hello, :goodbye, to: :greeter
-    #   end
-    #
-    #   Foo.new.goodbye # => "goodbye"
-    #
-    # Methods can be delegated to instance variables, class variables, or constants
-    # by providing them as a symbols:
-    #
-    #   class Foo
-    #     CONSTANT_ARRAY = [0,1,2,3]
-    #     @@class_array  = [4,5,6,7]
-    #
-    #     def initialize
-    #       @instance_array = [8,9,10,11]
-    #     end
-    #     delegate :sum, to: :CONSTANT_ARRAY
-    #     delegate :min, to: :@@class_array
-    #     delegate :max, to: :@instance_array
-    #   end
-    #
-    #   Foo.new.sum # => 6
-    #   Foo.new.min # => 4
-    #   Foo.new.max # => 11
-    #
-    # It's also possible to delegate a method to the class by using +:class+:
-    #
-    #   class Foo
-    #     def self.hello
-    #       "world"
-    #     end
-    #
-    #     delegate :hello, to: :class
-    #   end
-    #
-    #   Foo.new.hello # => "world"
-    #
-    # Delegates can optionally be prefixed using the <tt>:prefix</tt> option. If the value
-    # is <tt>true</tt>, the delegate methods are prefixed with the name of the object being
-    # delegated to.
-    #
-    #   Person = Struct.new(:name, :address)
-    #
-    #   class Invoice < Struct.new(:client)
-    #     delegate :name, :address, to: :client, prefix: true
-    #   end
-    #
-    #   john_doe = Person.new('John Doe', 'Vimmersvej 13')
-    #   invoice = Invoice.new(john_doe)
-    #   invoice.client_name    # => "John Doe"
-    #   invoice.client_address # => "Vimmersvej 13"
-    #
-    # It is also possible to supply a custom prefix.
-    #
-    #   class Invoice < Struct.new(:client)
-    #     delegate :name, :address, to: :client, prefix: :customer
-    #   end
-    #
-    #   invoice = Invoice.new(john_doe)
-    #   invoice.customer_name    # => 'John Doe'
-    #   invoice.customer_address # => 'Vimmersvej 13'
-    #
-    # If the delegate object is +nil+ an exception is raised, and that happens
-    # no matter whether +nil+ responds to the delegated method. You can get a
-    # +nil+ instead with the +:allow_nil+ option.
-    #
-    #   class Foo
-    #     attr_accessor :bar
-    #     def initialize(bar = nil)
-    #       @bar = bar
-    #     end
-    #     delegate :zoo, to: :bar
-    #   end
-    #
-    #   Foo.new.zoo   # raises NoMethodError exception (you called nil.zoo)
-    #
-    #   class Foo
-    #     attr_accessor :bar
-    #     def initialize(bar = nil)
-    #       @bar = bar
-    #     end
-    #     delegate :zoo, to: :bar, allow_nil: true
-    #   end
-    #
-    #   Foo.new.zoo   # returns nil
-    def delegate(*methods)
-      options = methods.pop
-      unless options.is_a?(Hash) && to = options[:to]
-        raise ArgumentError, 'Delegation needs a target. Supply an options hash with a :to key as the last argument (e.g. delegate :hello, to: :greeter).'
-      end
-
-      prefix, allow_nil = options.values_at(:prefix, :allow_nil)
-
-      if prefix == true && to =~ /^[^a-z_]/
-        raise ArgumentError, 'Can only automatically set the delegation prefix when delegating to a method.'
-      end
-
-      method_prefix = \
-        if prefix
-          "#{prefix == true ? to : prefix}_"
-        else
-          ''
-        end
-
-      file, line = caller.first.split(':', 2)
-      line = line.to_i
-
-      to = to.to_s
-      to = 'self.class' if to == 'class'
-
-      methods.each do |method|
-        # Attribute writer methods only accept one argument. Makes sure []=
-        # methods still accept two arguments.
-        definition = (method =~ /[^\]]=$/) ? 'arg' : '*args, &block'
-
-        if allow_nil
-          module_eval(<<-EOS, file, line - 2)
-            def #{method_prefix}#{method}(#{definition})        # def customer_name(*args, &block)
-              if #{to} || #{to}.respond_to?(:#{method})         #   if client || client.respond_to?(:name)
-                #{to}.#{method}(#{definition})                  #     client.name(*args, &block)
-              end                                               #   end
-            end                                                 # end
-          EOS
-        else
-          exception = %(raise "#{self}##{method_prefix}#{method} delegated to #{to}.#{method}, but #{to} is nil: \#{self.inspect}")
-
-          module_eval(<<-EOS, file, line - 1)
-            def #{method_prefix}#{method}(#{definition})        # def customer_name(*args, &block)
-              #{to}.#{method}(#{definition})                    #   client.name(*args, &block)
-            rescue NoMethodError                                # rescue NoMethodError
-              if #{to}.nil?                                     #   if client.nil?
-                #{exception}                                    #     # add helpful message to the exception
-              else                                              #   else
-                raise                                           #     raise
-              end                                               #   end
-            end                                                 # end
-          EOS
-        end
-      end
-    end
-  end
-end