ooxml_parser 0.23.0 → 0.26.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a21fe67d2c235a37ec324fcd56428e39ff519f9a4f36b7c8257770b135922eec
-  data.tar.gz: c6ce18f4dd16cfc0d484ad0391b8787dbe7ba226b4fd744b5c44d7d4ac2e9f6f
+  metadata.gz: 8d10481491c8a8bb901c8514f5a7c19ee3b6482e8fb943f39b9191dbd057d395
+  data.tar.gz: efbdbe106e2e88c584e428b8536cedb96972033434b5e1457f6ae2b31946cdd4
 SHA512:
-  metadata.gz: d926a20fbd8fd1e855983994f0b7e707c3d5d603247fc3b3c4bcd8e680febb19b4cf3232bc68dd3f4c55852bb342d195a62f9af875ab6ad1a69a9f86668e38d8
-  data.tar.gz: 789f9064bbd3d17a21d6d01a9e39d8203a59f622cb2ce48e09de62dadec00e16e9ca9d38f5ebc56ff53920f7c00874077ce4d5358975844c25c14e494075c0d7
+  metadata.gz: b553b7f055d43a6a355592ac8c2d28b085795b0faadf12531f119d4a1d15b1c7bcd45a5a661aad611799aa3286266469b88c12792bb4c3bba0b6c3fac2a0f54d
+  data.tar.gz: 1a68d32efafe9ee2921ffd6c75a794dd340a4b6d814e4aa7daa6348fb1246644a12b99a071df7e7e1bfe84de02f15c96a4068f6227008ec051a1932b0bdb01db

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/drawing_properties/docx_wrap_drawing.rb

@@ -4,6 +4,16 @@ module OoxmlParser
   # Docx Wrap Drawing
   class DocxWrapDrawing < OOXMLDocumentObject
     attr_accessor :wrap_text, :distance_from_text
+    # @return [Boolean] Specifies whether this floating DrawingML
+    #   object is displayed behind the text of the
+    #   document when the document is displayed.
+    #   When a DrawingML object is displayed
+    #   within a WordprocessingML document,
+    #   that object can intersect with text in the
+    #   document. This attribute shall determine
+    #   whether the text or the object is rendered on
+    #   top in case of overlapping.
+    attr_reader :behind_doc
 
     def initialize(parent: nil)
       @wrap_text = :none
@@ -14,10 +24,16 @@ module OoxmlParser
     # @param node [Nokogiri::XML:Element] node to parse
     # @return [DocxWrapDrawing] result of parsing
     def parse(node)
-      unless node.attribute('behindDoc').nil?
-        @wrap_text = :behind if node.attribute('behindDoc').value == '1'
-        @wrap_text = :infront if node.attribute('behindDoc').value == '0'
+      node.attributes.each do |key, value|
+        case key
+        when 'behindDoc'
+          @behind_doc = attribute_enabled?(value)
+        end
       end
+
+      @wrap_text = :behind if @behind_doc == true
+      @wrap_text = :infront if @behind_doc == false
+
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'wrapSquare'

data/lib/ooxml_parser/common_parser/common_data/color.rb

@@ -60,8 +60,10 @@ module OoxmlParser
       to_s
     end
 
-    # @return [String] color in hex value
+    # @return [String, nil] color in hex value or `nil` if color is not defined
     def to_hex
+      return nil if none?
+
       (@red.to_s(16).rjust(2, '0') + @green.to_s(16).rjust(2, '0') + @blue.to_s(16).rjust(2, '0')).upcase
     end
 

data/lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_run/run_properties/shade.rb

@@ -22,8 +22,8 @@ module OoxmlParser
 
     # @return [String] text representation
     def to_s
-      "Value: `#{value}`, "\
-        "Color: `#{color}`, "\
+      "Value: `#{value}`, " \
+        "Color: `#{color}`, " \
         "Fill: `#{fill}`"
     end
 

data/lib/ooxml_parser/common_parser/common_data/paragraph/paragrpah_properties/paragraph_spacing.rb

@@ -38,8 +38,8 @@ module OoxmlParser
     private
 
     # This is dirty workaround for situations
-    # Then @line_rule parsed after @line so getting
-    # @line value is totally screwed up
+    # Then `@line_rule` parsed after `@line` so getting
+    # `@line` value is totally screwed up
     # @param [Nokogiri::XML:Node] node with ParagraphSpacing
     # @return [Hash] hash with sorted values
     # TODO: Totally redone parsing of spacing to remove this workaround

data/lib/ooxml_parser/common_parser/common_data/table/properties/table_position.rb

@@ -8,11 +8,11 @@ module OoxmlParser
 
     # @return [String] result of convert of object to string
     def to_s
-      "Table position left: #{left}, "\
-        "right: #{right}, "\
-        "top: #{top}, "\
-        "bottom #{bottom}, "\
-        "position x: #{position_x}, "\
+      "Table position left: #{left}, " \
+        "right: #{right}, " \
+        "top: #{top}, " \
+        "bottom #{bottom}, " \
+        "position x: #{position_x}, " \
         "position y: #{position_y}"
     end
 

data/lib/ooxml_parser/common_parser.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+require_relative 'common_parser/common_data/ooxml_document_object'
+require_relative 'common_parser/common_data/color'
+require_relative 'common_parser/common_data/coordinates'
+require_relative 'common_parser/common_data/font_style'
+require_relative 'common_parser/common_data/borders_properties'
+require_relative 'common_parser/common_data/hyperlink'
+require_relative 'common_parser/common_data/paragraph'
+require_relative 'common_parser/common_data/alternate_content/alternate_content'
+require_relative 'common_parser/common_data/colors/presentation_fill'
+require_relative 'common_parser/common_data/table'
+require_relative 'common_parser/common_data/relationships'
+require_relative 'common_parser/parser'
+require_relative 'common_parser/common_document_structure'

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/docx_paragraph_run/instruction_text.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `w:instrText` object
+  class InstructionText < TextValue
+    # @return [Boolean] is current object for hyperlink
+    def hyperlink?
+      value.include?('HYPERLINK')
+    end
+
+    # @return [Boolean] is current object for page number
+    def page_number?
+      value.match?(/PAGE\s+\\\*/)
+    end
+
+    # @return [Hyperlink] convert InstructionText to Hyperlink
+    def to_hyperlink
+      Hyperlink.new(value.sub('HYPERLINK ', '').split(' \\o ').first,
+                    value.sub('HYPERLINK', '').split(' \\o ').last)
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/{docx_data/document_structure → document_structure}/docx_paragraph/docx_paragraph_run.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
-# noinspection RubyTooManyInstanceVariablesInspection
 require_relative 'docx_paragraph_run/docx_paragraph_run_helpers'
+require_relative 'docx_paragraph_run/instruction_text'
 require_relative 'docx_paragraph_run/object'
 require_relative 'docx_paragraph_run/text_outline'
 require_relative 'docx_paragraph_run/text_fill'
@@ -15,9 +15,9 @@ module OoxmlParser
                   :link, :highlight, :effect, :caps, :w,
                   :position, :em, :spacing, :break, :touch, :shape, :footnote, :endnote, :fld_char, :style,
                   :comments, :alternate_content, :page_number, :text_outline, :text_fill
-    # @return [String] type of instruction used for upper level of run
-    # http://officeopenxml.com/WPfieldInstructions.php
-    attr_accessor :instruction
+    # @return [InstructionText] text of instruction
+    #   See ECMA-376, 17.16.23 instrText (Field Code)
+    attr_reader :instruction_text
     # @return [RunProperties] properties of run
     attr_accessor :run_properties
     # @return [RunObject] object of run
@@ -96,10 +96,10 @@ module OoxmlParser
           parse_properties(node_child)
           @run_properties = RunProperties.new(parent: self).parse(node_child)
         when 'instrText'
-          if node_child.text.include?('HYPERLINK')
-            hyperlink = Hyperlink.new(node_child.text.sub('HYPERLINK ', '').split(' \\o ').first, node_child.text.sub('HYPERLINK', '').split(' \\o ').last)
-            @link = hyperlink
-          elsif node_child.text[/PAGE\s+\\\*/]
+          @instruction_text = InstructionText.new(parent: self).parse(node_child)
+          if @instruction_text.hyperlink?
+            @link = @instruction_text.to_hyperlink
+          elsif @instruction_text.page_number?
             @text = '*PAGE NUMBER*'
           end
         when 'fldChar'

data/lib/ooxml_parser/docx_parser/{docx_data/document_structure → document_structure}/docx_paragraph/indents.rb

@@ -25,7 +25,7 @@ module OoxmlParser
     # Convert to string
     # @return [String] result of conversion
     def to_s
-      "first line indent: #{@first_line_indent}, left indent: #{@left_indent}, "\
+      "first line indent: #{@first_line_indent}, left indent: #{@left_indent}, " \
         "right indent: #{@right_indent}, hanging indent: #{@hanging_indent}"
     end
 

data/lib/ooxml_parser/docx_parser/{docx_data/document_structure → document_structure}/docx_paragraph.rb

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# noinspection RubyTooManyInstanceVariablesInspection
 require_relative 'docx_paragraph/bookmark_start'
 require_relative 'docx_paragraph/bookmark_end'
 require_relative 'docx_paragraph/comment_range_end'
@@ -18,7 +17,7 @@ module OoxmlParser
   # Class for data of DocxParagraph
   class DocxParagraph < OOXMLDocumentObject
     include DocxParagraphHelper
-    attr_accessor :number, :bookmark_start, :bookmark_end, :align, :spacing, :ind, :numbering,
+    attr_accessor :number, :align, :spacing, :ind, :numbering,
                   :character_style_array, :page_break, :borders, :keep_lines,
                   :contextual_spacing, :sector_properties, :page_numbering, :section_break, :style, :keep_next,
                   :orphan_control
@@ -39,8 +38,6 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @number = 0
-      @bookmark_start = []
-      @bookmark_end = []
       @align = :left
       @spacing = Spacing.new
       @ind = Indents.new
@@ -62,8 +59,6 @@ module OoxmlParser
     # @return [void]
     def initialize_copy(source)
       super
-      @bookmark_start = source.bookmark_start.clone
-      @bookmark_end = source.bookmark_end.clone
       @character_style_array = source.character_style_array.clone
       @spacing = source.spacing.clone
     end

data/lib/ooxml_parser/docx_parser/{docx_data/document_structure.rb → document_structure.rb}

@@ -1,6 +1,5 @@
 # frozen_string_literal: true
 
-# noinspection RubyInstanceMethodNamingConvention
 require_relative 'document_structure/comments'
 require_relative 'document_structure/comments_extended'
 require_relative 'document_structure/docx_paragraph'

data/lib/ooxml_parser/{docx_parser/docx_parser.rb → docx_parser.rb}

@@ -1,8 +1,7 @@
 # frozen_string_literal: true
 
-require_relative '../common_parser/common_data/ooxml_document_object'
-require_relative '../common_parser/common_data/valued_child'
-require_relative 'docx_data/document_structure'
+require_relative 'common_parser/common_data/valued_child'
+require_relative 'docx_parser/document_structure'
 
 module OoxmlParser
   # Basic class for DocxParser

data/lib/ooxml_parser/pptx_parser/{pptx_data/presentation.rb → presentation.rb}

@@ -58,10 +58,9 @@ module OoxmlParser
           @slide_size = SlideSize.new(parent: self).parse(presentation_node_child)
         when 'sldIdLst'
           presentation_node_child.xpath('p:sldId').each do |silde_id_node|
-            id = nil
-            silde_id_node.attribute_nodes.select { |node| id = node.to_s if node.namespace && node.namespace.prefix == 'r' }
+            slide_id = silde_id_node.attr('r:id')
             @slides << Slide.new(parent: self,
-                                 xml_path: "#{OOXMLDocumentObject.root_subfolder}/#{OOXMLDocumentObject.get_link_from_rels(id)}")
+                                 xml_path: "#{OOXMLDocumentObject.root_subfolder}/#{OOXMLDocumentObject.get_link_from_rels(slide_id)}")
                             .parse
           end
         end

data/lib/ooxml_parser/{pptx_parser/pptx_parser.rb → pptx_parser.rb}

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'pptx_data/presentation'
+require_relative 'pptx_parser/presentation'
 
 module OoxmlParser
   # Basic class for parsing pptx

data/lib/ooxml_parser/version.rb

@@ -4,6 +4,6 @@ module OoxmlParser
   # This module holds the RuboCop version information.
   module Version
     # [String] Version of Gem
-    STRING = '0.23.0'
+    STRING = '0.26.0'
   end
 end