ooxml_parser 0.34.2 → 0.36.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eb6ab2462b53e26803ec7441c3f9b4a5217003952535f1f8578824d310c3aa78
-  data.tar.gz: 90610d1f3650f86f70f096060f3a5b20a2b54de950c36bc4cd7ef42bcc55ca77
+  metadata.gz: a8c7e158e72093d65c4d1b16f922e74a2247e56a59fee2f2927b78cc5f1db5f2
+  data.tar.gz: c492e2f255c1333576ace90867e0ef05901737e84be8419eea65afdac7704fcc
 SHA512:
-  metadata.gz: f71b9fd4e5156a6dd60335587a1164cddf107f2e99bdfbd413acaa59e1b55ed696ab63944254ad283860547710fe6a8346f56161fe503c61197388d11d7cff7b
-  data.tar.gz: 263fb808264d65c0ff6dfee7e8d1d3f88f9fe7f49233ac426a8447abbc57902d9fbe73ca29816b1e1e297cdd34e738449535a46fb4a63bfdbb2e32e0396de87e
+  metadata.gz: b4e27b723b95306eb10460667885db44490f774bc386ae8dc73868ef3ad41ccf5c71c3b48cec2f0187a6fc56926eb9fd966180b141bf46706666dfe3c5934627
+  data.tar.gz: 0b0fef55b19efde661e3c8440ba797fecc20c29465962d2cdd9daaf95c36b5149594d3376c6705a606ff8dac28cb9b9df5edb2abb77fa2b49e67af508025c40b

data/lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart/series/series_text.rb

@@ -5,7 +5,7 @@ module OoxmlParser
   # Class for parsing `c:tx` object
   class SeriesText < OOXMLDocumentObject
     # @return [NumberStringReference] String reference of series
-    attr_accessor :string
+    attr_accessor :reference
 
     # Parse Order
     # @param [Nokogiri::XML:Node] node with Order
@@ -13,11 +13,16 @@ module OoxmlParser
     def parse(node)
       node.xpath('*').each do |series_child|
         case series_child.name
-        when 'strRef'
-          @string = NumberStringReference.new(parent: self).parse(series_child)
+        when 'strRef', 'numRef'
+          @reference = NumberStringReference.new(parent: self).parse(series_child)
         end
       end
       self
     end
+
+    alias string reference
+
+    extend Gem::Deprecate
+    deprecate :string, 'reference', 2069, 1
   end
 end

data/lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart.rb

@@ -67,7 +67,7 @@ module OoxmlParser
           next unless val
           next if val.xpath('c:numRef').empty?
 
-          @data << ChartCellsRange.new(parent: self).parse(val.xpath('c:numRef').first).dup
+          @data << ChartCellsRange.new(parent: self).parse(val.xpath('c:numRef').first)
         when 'dLbls'
           @display_labels = DisplayLabelsProperties.new(parent: self).parse(chart_props_node_child)
         when 'varyColors'
@@ -86,77 +86,7 @@ module OoxmlParser
       chart_xml.xpath('*').each do |chart_node|
         case chart_node.name
         when 'chartSpace'
-          chart_node.xpath('*').each do |chart_space_node_child|
-            case chart_space_node_child.name
-            when 'AlternateContent'
-              @alternate_content = AlternateContent.new(parent: self).parse(chart_space_node_child)
-            when 'spPr'
-              @shape_properties = DocxShapeProperties.new(parent: self).parse(chart_space_node_child)
-            when 'chart'
-              chart_space_node_child.xpath('*').each do |chart_node_child|
-                case chart_node_child.name
-                when 'plotArea'
-                  chart_node_child.xpath('*').each do |plot_area_node_child|
-                    next unless type.empty?
-
-                    case plot_area_node_child.name
-                    when 'barChart'
-                      @type = :bar
-                      bar_dir_node = plot_area_node_child.xpath('c:barDir')
-                      @type = :column if bar_dir_node.first.attribute('val').value == 'col'
-                      parse_properties(plot_area_node_child)
-                    when 'lineChart'
-                      @type = :line
-                      parse_properties(plot_area_node_child)
-                    when 'areaChart'
-                      @type = :area
-                      parse_properties(plot_area_node_child)
-                    when 'bubbleChart'
-                      @type = :bubble
-                      parse_properties(plot_area_node_child)
-                    when 'doughnutChart'
-                      @type = :doughnut
-                      parse_properties(plot_area_node_child)
-                    when 'pieChart'
-                      @type = :pie
-                      parse_properties(plot_area_node_child)
-                    when 'scatterChart'
-                      @type = :point
-                      parse_properties(plot_area_node_child)
-                    when 'radarChart'
-                      @type = :radar
-                      parse_properties(plot_area_node_child)
-                    when 'stockChart'
-                      @type = :stock
-                      parse_properties(plot_area_node_child)
-                    when 'surface3DChart'
-                      @type = :surface_3d
-                      parse_properties(plot_area_node_child)
-                    when 'line3DChart'
-                      @type = :line_3d
-                      parse_properties(plot_area_node_child)
-                    when 'bar3DChart'
-                      @type = :bar_3d
-                      parse_properties(plot_area_node_child)
-                    when 'pie3DChart'
-                      @type = :pie_3d
-                      parse_properties(plot_area_node_child)
-                    end
-                  end
-                  parse_axis(chart_node_child)
-                  @plot_area = PlotArea.new(parent: self).parse(chart_node_child)
-                when 'title'
-                  @title = ChartAxisTitle.new(parent: self).parse(chart_node_child)
-                when 'legend'
-                  @legend = ChartLegend.new(parent: self).parse(chart_node_child)
-                when 'view3D'
-                  @view_3d = View3D.new(parent: self).parse(chart_node_child)
-                when 'pivotFmts'
-                  @pivot_formats = PivotFormats.new(parent: self).parse(chart_node_child)
-                end
-              end
-            end
-          end
+          parse_chart_space(chart_node)
         end
       end
       parse_relationships
@@ -166,6 +96,76 @@ module OoxmlParser
 
     private
 
+    # Parse 'chartSpace' node
+    # @return [nil]
+    def parse_chart_space(chart_space_node)
+      chart_space_node.xpath('*').each do |chart_space_node_child|
+        case chart_space_node_child.name
+        when 'AlternateContent'
+          @alternate_content = AlternateContent.new(parent: self).parse(chart_space_node_child)
+        when 'spPr'
+          @shape_properties = DocxShapeProperties.new(parent: self).parse(chart_space_node_child)
+        when 'chart'
+          chart_space_node_child.xpath('*').each do |chart_node_child|
+            case chart_node_child.name
+            when 'plotArea'
+              chart_node_child.xpath('*').each do |plot_area_node_child|
+                next unless type.empty?
+
+                parse_chart_type(plot_area_node_child)
+                parse_properties(plot_area_node_child)
+              end
+              parse_axis(chart_node_child)
+              @plot_area = PlotArea.new(parent: self).parse(chart_node_child)
+            when 'title'
+              @title = ChartAxisTitle.new(parent: self).parse(chart_node_child)
+            when 'legend'
+              @legend = ChartLegend.new(parent: self).parse(chart_node_child)
+            when 'view3D'
+              @view_3d = View3D.new(parent: self).parse(chart_node_child)
+            when 'pivotFmts'
+              @pivot_formats = PivotFormats.new(parent: self).parse(chart_node_child)
+            end
+          end
+        end
+      end
+    end
+
+    # Parse chart type and properties
+    # @return [nil]
+    def parse_chart_type(plot_area_node_child)
+      case plot_area_node_child.name
+      when 'barChart'
+        @type = :bar
+        bar_dir_node = plot_area_node_child.xpath('c:barDir')
+        @type = :column if bar_dir_node.first.attribute('val').value == 'col'
+      when 'lineChart'
+        @type = :line
+      when 'areaChart'
+        @type = :area
+      when 'bubbleChart'
+        @type = :bubble
+      when 'doughnutChart'
+        @type = :doughnut
+      when 'pieChart'
+        @type = :pie
+      when 'scatterChart'
+        @type = :point
+      when 'radarChart'
+        @type = :radar
+      when 'stockChart'
+        @type = :stock
+      when 'surface3DChart'
+        @type = :surface_3d
+      when 'line3DChart'
+        @type = :line_3d
+      when 'bar3DChart'
+        @type = :bar_3d
+      when 'pie3DChart'
+        @type = :pie_3d
+      end
+    end
+
     # Perform parsing of axis info
     # @param node [Nokogiri::XML:Element] node to parse
     # @return [void]

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/shape_properties/docx_shape_properties/text_box.rb

@@ -2,20 +2,20 @@
 
 module OoxmlParser
   # Class for working with TextBox (w:txbxContent)
-  class TextBox
+  class TextBox < OOXMLDocumentObject
     # Parse TextBox List
     # @param [Nokogiri::XML:Node] node with TextBox
     # @return [Array] array of elements
-    def self.parse_list(node, parent: nil)
+    def parse_list(node)
       elements = []
       text_box_content_node = node.xpath('w:txbxContent').first
 
       text_box_content_node&.xpath('*')&.each_with_index do |textbox_element, i|
         case textbox_element.name
         when 'p'
-          DocumentStructure.default_paragraph_style = DocxParagraph.new
-          DocumentStructure.default_paragraph_style.spacing = Spacing.new(0, 0.35, 1.15, :multiple)
-          elements << DocumentStructure.default_paragraph_style.dup.parse(textbox_element, i, parent: parent)
+          textbox_paragraph = DocxParagraph.new
+          textbox_paragraph.spacing = Spacing.new(0, 0.35, 1.15, :multiple)
+          elements << textbox_paragraph.parse(textbox_element, i, parent: parent)
         when 'tbl'
           elements << Table.new(parent: parent).parse(textbox_element, i)
         end

data/lib/ooxml_parser/common_parser/common_data/alternate_content/picture/shape/old_docx_shape.rb

@@ -16,7 +16,7 @@ module OoxmlParser
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'textbox'
-          @text_box = TextBox.parse_list(node_child, parent: self)
+          @text_box = TextBox.new(parent: parent).parse_list(node_child)
         when 'imagedata'
           @file_reference = FileReference.new(parent: self).parse(node_child)
         when 'fill'

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

@@ -5,25 +5,19 @@ module OoxmlParser
   module ColorHelper
     # @return [String] value for auto string
     AUTO_STRING_VALUE = 'auto'
-    # @return [Regexp] regexp for hex string with 3 digits
-    REGEXP_THREE_DIGITS = /(.)(.)(.)/.freeze
-    # @return [Regexp] regexp for hex string with 6 digits
-    REGEXP_SIX_DIGITS = /(..)(..)(..)/.freeze
-    # @return [Regexp] regexp for hex string with 8 digits
-    REGEXP_EIGHT_DIGITS = /(..)(..)(..)(..)/.freeze
 
     # Parse string in hex
     # @param [String] hex_string with or without alpha-channel
     def parse_hex_string(hex_string)
-      return self if AUTO_STRING_VALUE == hex_string
+      return self if hex_string == AUTO_STRING_VALUE
 
       case hex_string.length
       when 3
-        @red, @green, @blue = hex_string.match(REGEXP_THREE_DIGITS).captures.map(&:hex)
+        @red, @green, @blue = hex_string.chars.map(&:hex)
       when 6
-        @red, @green, @blue = hex_string.match(REGEXP_SIX_DIGITS).captures.map(&:hex)
+        @red, @green, @blue = hex_string.unpack('A2A2A2').map(&:hex)
       when 8
-        @alpha_channel, @red, @green, @blue = hex_string.match(REGEXP_EIGHT_DIGITS).captures.map(&:hex)
+        @alpha_channel, @red, @green, @blue = hex_string.unpack('A2A2A2A2').map(&:hex)
       end
       self
     end

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

@@ -112,6 +112,16 @@ module OoxmlParser
       end
     end
 
+    # Check if other color is within delta with current color
+    # @param other [Color] color to compare
+    # @param delta [Integer] max delta for each of specters
+    # @return [True, False] result of comparison
+    def within_delta?(other, delta)
+      (red - other.red).abs < delta &&
+        (green - other.green).abs < delta &&
+        (blue - other.blue).abs < delta
+    end
+
     # To compare color, which look alike
     # @param [String or Color] color_to_check color to compare
     # @param [Integer] delta max delta for each of specters
@@ -128,9 +138,7 @@ module OoxmlParser
       return false if !none? && color_to_check.none?
       return true if self == color_to_check
 
-      (red - color_to_check.red).abs < delta &&
-        (green - color_to_check.green).abs < delta &&
-        (blue - color_to_check.blue).abs < delta
+      within_delta?(color_to_check, delta)
     end
 
     # Apply tint to color

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

@@ -47,6 +47,8 @@ module OoxmlParser
       return true if value.to_s == 'true'
       return false if value.to_s == '0'
       return false if value.to_s == 'false'
+
+      raise ArgumentError, "Invalid value for boolean attribute: #{value}"
     end
 
     # @return [Nokogiri::XML::Document] result of parsing xml via nokogiri

data/lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/spacing/{line_spacing.rb → spacing_valued_child.rb}

@@ -1,8 +1,8 @@
 # frozen_string_literal: true
 
 module OoxmlParser
-  # Class to describe spacing
-  class LineSpacing < OOXMLDocumentObject
+  # Class to describe spacing valued child
+  class SpacingValuedChild < OOXMLDocumentObject
     # @return [ValuedChild] spacing percent
     attr_reader :spacing_percent
     # @return [ValuedChild] spacing point
@@ -15,14 +15,23 @@ module OoxmlParser
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'spcPct'
-          @spacing_percent = ValuedChild.new(:integer, parent: self).parse(node_child)
+          @spacing_percent = ValuedChild.new(:float, parent: self).parse(node_child)
         when 'spcPts'
-          @spacing_points = ValuedChild.new(:integer, parent: self).parse(node_child)
+          @spacing_points = ValuedChild.new(:float, parent: self).parse(node_child)
         end
       end
       self
     end
 
+    # Convert to OoxmlSize
+    # @return [OoxmlSize]
+    def to_ooxml_size
+      return OoxmlSize.new(@spacing_percent.value, :one_1000th_percent) if @spacing_percent
+      return OoxmlSize.new(@spacing_points.value, :spacing_point) if @spacing_points
+
+      raise 'Unknown spacing child type'
+    end
+
     # @return [Symbol] rule used to determine line spacing
     def rule
       return :multiple if @spacing_percent

data/lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/spacing.rb

@@ -2,7 +2,7 @@
 
 # @author Pavel.Lobashov
 
-require_relative 'spacing/line_spacing'
+require_relative 'spacing/spacing_valued_child'
 module OoxmlParser
   # Class to describe spacing
   class Spacing
@@ -69,30 +69,18 @@ module OoxmlParser
     # @param [Nokogiri::XML:Element] node with Spacing
     # @return [Nothing]
     def parse(node)
-      node.xpath('*').each do |spacing_node_child|
-        case spacing_node_child.name
+      node.xpath('*').each do |node_child|
+        case node_child.name
         when 'lnSpc'
-          self.line = Spacing.parse_spacing_value(spacing_node_child)
-          @line_spacing = LineSpacing.new(parent: self).parse(spacing_node_child)
+          @line_spacing = SpacingValuedChild.new(parent: self).parse(node_child)
+          self.line = @line_spacing.to_ooxml_size
           self.line_rule = @line_spacing.rule
         when 'spcBef'
-          self.before = Spacing.parse_spacing_value(spacing_node_child)
+          @spacing_before = SpacingValuedChild.new(parent: self).parse(node_child)
+          self.before = @spacing_before.to_ooxml_size
         when 'spcAft'
-          self.after = Spacing.parse_spacing_value(spacing_node_child)
-        end
-      end
-    end
-
-    # Parse values of spacing number
-    # @param [Nokogiri::XML:Element] node with Spacing
-    # @return [Float] value of spacing number
-    def self.parse_spacing_value(node)
-      node.xpath('*').each do |spacing_node_child|
-        case spacing_node_child.name
-        when 'spcPct'
-          return OoxmlSize.new(spacing_node_child.attribute('val').value.to_f, :one_1000th_percent)
-        when 'spcPts'
-          return OoxmlSize.new(spacing_node_child.attribute('val').value.to_f, :spacing_point)
+          @spacing_after = SpacingValuedChild.new(parent: self).parse(node_child)
+          self.after = @spacing_after.to_ooxml_size
         end
       end
     end

data/lib/ooxml_parser/common_parser/common_data/table/row/cell/cell.rb

@@ -36,10 +36,10 @@ module OoxmlParser
         when 'tcPr'
           @properties = CellProperties.new(parent: self).parse(node_child)
         when 'p'
-          @elements << DocumentStructure.default_table_paragraph_style.dup.parse(node_child,
-                                                                                 0,
-                                                                                 DocumentStructure.default_table_run_style,
-                                                                                 parent: self)
+          @elements << root_object.default_table_paragraph_style.dup.parse(node_child,
+                                                                           0,
+                                                                           root_object.default_table_run_style,
+                                                                           parent: self)
         when 'sdt'
           @elements << StructuredDocumentTag.new(parent: self).parse(node_child)
         when 'tbl'

data/lib/ooxml_parser/common_parser/common_data/table/row/cell/properties/border.rb

@@ -13,7 +13,7 @@ module OoxmlParser
       node.attributes.each do |key, value|
         case key
         when 'style'
-          @style = value_to_symbol(value)
+          @style = value_to_symbol(value) unless value.value == 'none'
         end
       end
 

data/lib/ooxml_parser/common_parser/common_document_structure.rb

@@ -27,6 +27,7 @@ module OoxmlParser
       @default_font_style = FontStyle.new
       @unpacked_folder = params.fetch(:unpacked_folder, nil)
       @xmls_stack = []
+      @relationships_cache = {}
       super(parent: nil)
     end
 
@@ -56,8 +57,17 @@ module OoxmlParser
       rels_path = dir + "_rels/#{File.basename(@xmls_stack.last)}.rels"
       raise LoadError, "Cannot find .rels file by path: #{rels_path}" unless File.exist?(rels_path)
 
-      relationships = Relationships.new.parse_file(rels_path)
-      relationships.target_by_id(id)
+      cache_relationships(rels_path)
+      @relationships_cache[rels_path].target_by_id(id)
+    end
+
+    private
+
+    # Store relationships to cache
+    def cache_relationships(rels_path)
+      return if @relationships_cache.key?(rels_path)
+
+      @relationships_cache[rels_path] = Relationships.new.parse_file(rels_path)
     end
   end
 end

data/lib/ooxml_parser/docx_parser/document_structure/default_style_helper.rb

@@ -9,19 +9,19 @@ module OoxmlParser
       parse_default_style_paragraph_properties
       parse_default_style_run_properties
       parse_default_character_style
-      DocumentStructure.default_table_paragraph_style = DocumentStructure.default_paragraph_style.dup
-      DocumentStructure.default_table_paragraph_style.spacing = Spacing.new(0, 0, 1, :auto)
-      DocumentStructure.default_table_run_style = DocumentStructure.default_run_style.dup
+      root_object.default_table_paragraph_style = root_object.default_paragraph_style.dup
+      root_object.default_table_paragraph_style.spacing = Spacing.new(0, 0, 1, :auto)
+      root_object.default_table_run_style = root_object.default_run_style.dup
       parse_default_table_style
     end
 
     # Perform parsing styles.xml
     def parse_styles
       file = "#{root_object.unpacked_folder}/word/styles.xml"
-      DocumentStructure.default_paragraph_style = DocxParagraph.new(parent: self)
-      DocumentStructure.default_table_paragraph_style = DocxParagraph.new(parent: self)
-      DocumentStructure.default_run_style = DocxParagraphRun.new(parent: self)
-      DocumentStructure.default_table_run_style = DocxParagraphRun.new(parent: self)
+      root_object.default_paragraph_style = DocxParagraph.new(parent: self)
+      root_object.default_table_paragraph_style = DocxParagraph.new(parent: self)
+      root_object.default_run_style = DocxParagraphRun.new(parent: self)
+      root_object.default_table_run_style = DocxParagraphRun.new(parent: self)
 
       return unless File.exist?(file)
 
@@ -29,18 +29,18 @@ module OoxmlParser
       @numbering = Numbering.new(parent: self).parse
 
       if @styles&.document_defaults&.paragraph_properties_default
-        DocumentStructure.default_paragraph_style = DocxParagraph.new(parent: self)
-                                                                 .parse(@styles.document_defaults
-                                                                               .paragraph_properties_default
-                                                                               .raw_node, 0)
+        root_object.default_paragraph_style = DocxParagraph.new(parent: self)
+                                                           .parse(@styles.document_defaults
+                                                                         .paragraph_properties_default
+                                                                         .raw_node, 0)
       end
       if @styles&.document_defaults&.run_properties_default&.run_properties
-        DocumentStructure.default_run_style = DocxParagraphRun.new(parent: self)
-                                                              .parse_properties(@styles
-                                                                                  .document_defaults
-                                                                                  .run_properties_default
-                                                                                  .run_properties
-                                                                                  .raw_node)
+        root_object.default_run_style = DocxParagraphRun.new(parent: self)
+                                                        .parse_properties(@styles
+                                                                            .document_defaults
+                                                                            .run_properties_default
+                                                                            .run_properties
+                                                                            .raw_node)
       end
       parse_default_style
     end
@@ -50,16 +50,16 @@ module OoxmlParser
     def parse_default_style_paragraph_properties
       return unless @styles&.default_style(:paragraph)&.paragraph_properties_node
 
-      DocxParagraph.new.parse_paragraph_style(@styles.default_style(:paragraph)
-                                                     .paragraph_properties_node,
-                                              DocumentStructure.default_run_style)
+      DocxParagraph.new(parent: self).parse_paragraph_style(@styles.default_style(:paragraph)
+                                                                   .paragraph_properties_node,
+                                                            root_object.default_run_style)
     end
 
     def parse_default_style_run_properties
       return unless @styles&.default_style(:paragraph)&.run_properties_node
 
-      DocumentStructure.default_run_style
-                       .parse_properties(@styles.default_style(:paragraph)
+      root_object.default_run_style
+                 .parse_properties(@styles.default_style(:paragraph)
                                                 .run_properties_node)
     end
 
@@ -67,8 +67,8 @@ module OoxmlParser
     def parse_default_character_style
       return unless @styles&.default_style(:character)&.run_properties_node
 
-      DocumentStructure.default_run_style
-                       .parse_properties(@styles.default_style(:character)
+      root_object.default_run_style
+                 .parse_properties(@styles.default_style(:character)
                                                 .run_properties_node)
     end
 
@@ -76,9 +76,9 @@ module OoxmlParser
     def parse_default_table_style
       return unless @styles&.default_style(:table)&.run_properties_node
 
-      DocumentStructure.default_table_run_style
-                       .parse_properties(@styles.default_style(:table)
-                                                .run_properties_node)
+      root_object.default_table_run_style
+                 .parse_properties(@styles.default_style(:table)
+                                          .run_properties_node)
     end
   end
 end

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

@@ -38,7 +38,7 @@ module OoxmlParser
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'textbox'
-          @elements = TextBox.parse_list(node_child, parent: self)
+          @elements = TextBox.new(parent: parent).parse_list(node_child)
         end
       end
       self

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

@@ -109,7 +109,6 @@ module OoxmlParser
       custom_character_style = default_character_style.dup
       custom_character_style.parent = self
       char_number = 0
-      comments = []
       node.attributes.each do |key, value|
         case key
         when 'paraId'
@@ -136,27 +135,26 @@ module OoxmlParser
           @page_numbering = true if field_simple.page_numbering?
           character_styles_array += field_simple.runs
         when 'r'
-          character_style = custom_character_style.dup
+          run = custom_character_style.dup
           node_child.xpath('w:instrText').each do |insrt_text|
             @page_numbering = true if insrt_text.text.include?('PAGE')
           end
-          character_style.parse(node_child, char_number, parent: self)
-          character_style.comments = comments.dup
-          character_styles_array << character_style.dup
-          character_styles_array.last.shape = character_style.shape if character_style.shape
+          run.parse(node_child, char_number, parent: self)
+          character_styles_array << run
           char_number += 1
         when 'hyperlink'
           @hyperlink = Hyperlink.new(parent: self).parse(node_child)
-          character_style = default_character_style.dup
-          character_style.parent = self
+          hyperlink_run = default_character_style.dup
+          hyperlink_run.parent = self
           if @hyperlink.id
-            character_style.link = Hyperlink.new(parent: character_style).parse(node_child)
+            @hyperlink.parent = hyperlink_run
+            hyperlink_run.link = @hyperlink
           elsif @hyperlink.anchor
-            character_style.link = @hyperlink.anchor
+            hyperlink_run.link = @hyperlink.anchor
           end
           node_child.xpath('w:r').each do |r_tag|
-            character_style.parse(r_tag, char_number, parent: self)
-            character_styles_array << character_style.dup
+            hyperlink_run.parse(r_tag, char_number, parent: self)
+            character_styles_array << hyperlink_run
             char_number += 1
           end
           node_child.xpath('w:fldSimple').each do |simple_field|
@@ -206,7 +204,7 @@ module OoxmlParser
           @paragraph_style_ref = ParagraphStyleRef.new(parent: self).parse(node_child)
           fill_style_data(default_char_style)
         when 'ind'
-          @ind = DocumentStructure.default_paragraph_style.instance_variable_get(:@ind).dup.parse(node_child)
+          @ind = root_object.default_paragraph_style.instance_variable_get(:@ind).dup.parse(node_child)
         when 'numPr'
           @numbering = NumberingProperties.new(parent: self).parse(node_child)
         when 'jc'
@@ -218,14 +216,7 @@ module OoxmlParser
           @spacing = @spacing.fetch_from_valued_spacing(@valued_spacing)
         when 'sectPr'
           @sector_properties = PageProperties.new(parent: self).parse(node_child, self, default_char_style)
-          @section_break = case @sector_properties.type
-                           when 'oddPage'
-                             'Odd page'
-                           when 'continuous'
-                             'Current Page'
-                           else
-                             'Next Page'
-                           end
+          @section_break ||= @sector_properties.section_break
         end
       end
       @parent = parent

data/lib/ooxml_parser/docx_parser/document_structure/header_footer.rb

@@ -65,7 +65,7 @@ module OoxmlParser
 
         paragraph_number = 0
         footnote.xpath('w:p').each do |paragraph|
-          @elements << DocumentStructure.default_paragraph_style.dup.parse(paragraph, paragraph_number, DocumentStructure.default_run_style, parent: self)
+          @elements << root_object.default_paragraph_style.dup.parse(paragraph, paragraph_number, root_object.default_run_style, parent: self)
           paragraph_number += 1
         end
       end

data/lib/ooxml_parser/docx_parser/document_structure/page_properties/note.rb

@@ -5,11 +5,23 @@ module OoxmlParser
   class Note < OOXMLDocumentObject
     attr_accessor :type, :elements, :assigned_to
 
-    def initialize
+    def initialize(type: 'unknown')
       @elements = []
+      @type = type
       super(parent: nil)
     end
 
+    # @return [String] xpath for note in xml object
+    def note_base_xpath
+      @note_base_xpath ||= if @type.include?('footer')
+                             '//w:ftr'
+                           elsif @type.include?('header')
+                             '//w:hdr'
+                           else
+                             raise NameError, "Unknown note type: #{@type}"
+                           end
+    end
+
     # Parse note data
     # @param params [Hash] data to parse
     # @return [Note] result of parsing
@@ -18,12 +30,7 @@ module OoxmlParser
       @assigned_to = params[:assigned_to]
       @parent = params[:parent]
       doc = parse_xml(file_path(params[:target]))
-      if @type.include?('footer')
-        xpath_note = '//w:ftr'
-      elsif @type.include?('header')
-        xpath_note = '//w:hdr'
-      end
-      doc.search(xpath_note).each do |ftr|
+      doc.search(note_base_xpath).each do |ftr|
         number = 0
         ftr.xpath('*').each do |sub_element|
           case sub_element.name

data/lib/ooxml_parser/docx_parser/document_structure/page_properties/page_properties.rb

@@ -19,9 +19,10 @@ module OoxmlParser
     # @return [True, False] Specifies whether the section should have a different header and footer for its first page
     attr_reader :title_page
 
-    def initialize(parent: nil)
+    def initialize(parent: nil, type: nil)
       @notes = []
-      super
+      @type = type
+      super(parent: parent)
     end
 
     # Parse PageProperties data
@@ -87,5 +88,17 @@ module OoxmlParser
       end
       self
     end
+
+    # @return [String] type of section break
+    def section_break
+      @section_break ||= case type
+                         when 'oddPage'
+                           'Odd page'
+                         when 'continuous'
+                           'Current Page'
+                         else
+                           'Next Page'
+                         end
+    end
   end
 end

data/lib/ooxml_parser/docx_parser/document_structure.rb

@@ -45,6 +45,14 @@ module OoxmlParser
     attr_accessor :comments_document
     # @return [CommentsExtended] extended comments
     attr_accessor :comments_extended
+    # @return [DocxParagraph] default paragraph style
+    attr_accessor :default_paragraph_style
+    # @return [DocxParagraphRun] default run style
+    attr_accessor :default_run_style
+    # @return [DocxParagraph] default table paragraph style
+    attr_accessor :default_table_paragraph_style
+    # @return [DocxParagraphRun] default table run style
+    attr_accessor :default_table_run_style
 
     def initialize(params = {})
       @elements = []
@@ -162,8 +170,8 @@ module OoxmlParser
       @content_types = ContentTypes.new(parent: self).parse
       @root_subfolder = 'word/'
       @comments = []
-      DocumentStructure.default_paragraph_style = DocxParagraph.new
-      DocumentStructure.default_run_style = DocxParagraphRun.new(parent: self)
+      @default_paragraph_style = DocxParagraph.new
+      @default_run_style = DocxParagraphRun.new(parent: self)
       @theme = PresentationTheme.new(parent: self).parse('word/theme/theme1.xml')
       @relationships = Relationships.new(parent: self).parse_file("#{root_object.unpacked_folder}word/_rels/document.xml.rels")
       parse_styles
@@ -180,7 +188,7 @@ module OoxmlParser
             when 'p'
               child = element.child
               unless child.nil? && @elements.last.instance_of?(Table)
-                paragraph_style = DocumentStructure.default_paragraph_style.dup.parse(element, number, DocumentStructure.default_run_style, parent: self)
+                paragraph_style = default_paragraph_style.dup.parse(element, number, default_run_style, parent: self)
                 number += 1
                 @elements << paragraph_style.dup
               end
@@ -196,8 +204,8 @@ module OoxmlParser
           end
           body.xpath('w:sectPr').each do |sect_pr|
             @page_properties = PageProperties.new(parent: self).parse(sect_pr,
-                                                                      DocumentStructure.default_paragraph_style,
-                                                                      DocumentStructure.default_run_style)
+                                                                      default_paragraph_style,
+                                                                      default_run_style)
             @notes = page_properties.notes # keep copy of notes to compatibility with previous docx models
           end
         end
@@ -212,9 +220,5 @@ module OoxmlParser
       @settings = DocumentSettings.new(parent: self).parse
       self
     end
-
-    class << self
-      attr_accessor :default_table_run_style, :default_table_paragraph_style, :default_paragraph_style, :default_run_style
-    end
   end
 end

data/lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/{time_node → time_node_list/time_node}/common_timing.rb

@@ -3,14 +3,14 @@
 require_relative 'common_timing/condition_list'
 module OoxmlParser
   # Class for data of CommonTiming
-  class CommonTiming
+  class CommonTiming < OOXMLDocumentObject
     attr_accessor :id, :duration, :restart, :children, :start_conditions, :end_conditions
 
     def initialize(parent: nil)
       @children = []
       @start_conditions = []
       @end_conditions = []
-      @parent = parent
+      super(parent: parent)
     end
 
     # Parse CommonTiming object
@@ -35,7 +35,7 @@ module OoxmlParser
         when 'endCondLst'
           @end_conditions = ConditionList.new(parent: self).parse(node_child)
         when 'childTnLst'
-          @children = TimeNode.parse_list(node_child)
+          @children = TimeNodeList.new(parent: self).parse(node_child).elements
         end
       end
       self

data/lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/{time_node.rb → time_node_list/time_node.rb}

@@ -29,31 +29,5 @@ module OoxmlParser
       end
       self
     end
-
-    # Parse list of timing nodes
-    # @param timing_list_node [Nokogiri::XML::Element] node to parse
-    # @return [Array<TimeNode>] list of nodes
-    def self.parse_list(timing_list_node)
-      timings = []
-      timing_list_node.xpath('*').each do |time_node|
-        case time_node.name
-        when 'par'
-          timings << TimeNode.new(:parallel, parent: timings).parse(time_node)
-        when 'seq'
-          timings << TimeNode.new(:sequence, parent: timings).parse(time_node)
-        when 'anim'
-          timings << TimeNode.new(:animate, parent: timings).parse(time_node)
-        when 'set'
-          timings << SetTimeNode.new(parent: timings).parse(time_node)
-        when 'animEffect'
-          timings << AnimationEffect.new(parent: timings).parse(time_node)
-        when 'video'
-          timings << :video
-        when 'audio'
-          timings << TimeNode.new(:audio, parent: timings).parse(time_node)
-        end
-      end
-      timings
-    end
   end
 end

data/lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/time_node_list.rb

@@ -0,0 +1,40 @@
+# frozen_string_literal: true
+
+require_relative 'time_node_list/time_node'
+module OoxmlParser
+  # Class for parsing TimeNodeList object <p:tnLst>
+  class TimeNodeList < OOXMLDocumentObject
+    # @return [Array<Object>] list of elements
+    attr_reader :elements
+
+    def initialize(parent: nil)
+      @elements = []
+      super
+    end
+
+    # Parse TimeNodeList
+    # @param node [Nokogiri::XML::Element] node to parse
+    # @return [TimeNodeList] value of TimeNodeList
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'par'
+          @elements << TimeNode.new(:parallel, parent: self).parse(node_child)
+        when 'seq'
+          @elements << TimeNode.new(:sequence, parent: self).parse(node_child)
+        when 'anim'
+          @elements << TimeNode.new(:animate, parent: self).parse(node_child)
+        when 'set'
+          @elements << SetTimeNode.new(parent: self).parse(node_child)
+        when 'animEffect'
+          @elements << AnimationEffect.new(parent: self).parse(node_child)
+        when 'video'
+          @elements << :video
+        when 'audio'
+          @elements << TimeNode.new(:audio, parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'timing/time_node'
+require_relative 'timing/time_node_list'
 module OoxmlParser
   # Class for parsing `timing`
   class Timing < OOXMLDocumentObject
@@ -20,7 +20,7 @@ module OoxmlParser
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'tnLst'
-          @time_node_list = TimeNode.parse_list(node_child)
+          @time_node_list = TimeNodeList.new(parent: self).parse(node_child).elements
         end
       end
       self

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.34.2'
+    STRING = '0.36.0'
   end
 end

data/lib/ooxml_parser/xlsx_parser/workbook/worksheet/{xlsx_column_properties.rb → xlsx_columns/xlsx_column_properties.rb}

@@ -54,19 +54,6 @@ module OoxmlParser
     deprecate :from, 'min', 2099, 1
     deprecate :to, 'max', 2099, 1
 
-    # Parse list of XlsxColumnProperties
-    # @param columns_width_node [Nokogiri::XML:Element] node to parse
-    # @param parent [OOXMLDocumentObject] parent of result objects
-    # @return [Array<XlsxColumnProperties>] list of XlsxColumnProperties
-    def self.parse_list(columns_width_node, parent: nil)
-      columns = []
-      columns_width_node.xpath('xmlns:col').each do |col_node|
-        col = XlsxColumnProperties.new(parent: parent).parse(col_node)
-        columns << col
-      end
-      columns
-    end
-
     private
 
     # TODO: Currently width calculation use some magick number from old time ago

data/lib/ooxml_parser/xlsx_parser/workbook/worksheet/xlsx_columns.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require_relative 'xlsx_columns/xlsx_column_properties'
+module OoxmlParser
+  # Class for parsing XlsxColumns object <cols>
+  class XlsxColumns < OOXMLDocumentObject
+    # @return [Array<XlsxColumnProperties>] list of elements
+    attr_reader :elements
+
+    def initialize(parent: nil)
+      @elements = []
+      super
+    end
+
+    # Parse XlsxColumns
+    # @param node [Nokogiri::XML::Element] node to parse
+    # @return [XlsxColumns] value of TimeNodeList
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'col'
+          @elements << XlsxColumnProperties.new(parent: parent).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/workbook/worksheet.rb

@@ -7,7 +7,7 @@ require_relative 'worksheet/sheet_format_properties'
 require_relative 'worksheet/sheet_view'
 require_relative 'worksheet/table_part'
 require_relative 'worksheet/worksheet_helper'
-require_relative 'worksheet/xlsx_column_properties'
+require_relative 'worksheet/xlsx_columns'
 require_relative 'worksheet/xlsx_drawing'
 require_relative 'worksheet/xlsx_row'
 require_relative 'worksheet/xlsx_header_footer'
@@ -119,7 +119,7 @@ module OoxmlParser
             @hyperlinks << Hyperlink.new(parent: self).parse(hyperlink_node).dup
           end
         when 'cols'
-          @columns = XlsxColumnProperties.parse_list(worksheet_node_child, parent: self)
+          @columns = XlsxColumns.new(parent: self).parse(worksheet_node_child).elements
         when 'autoFilter'
           @autofilter = Autofilter.new(parent: self).parse(worksheet_node_child)
         when 'tableParts'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.34.2
+  version: 0.36.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-11-30 00:00:00.000000000 Z
+date: 2023-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -74,14 +74,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3'
+        version: '4'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -318,7 +318,7 @@ files:
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/paragraph_spacing.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/paragraph_style_ref.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/spacing.rb
-- lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/spacing/line_spacing.rb
+- lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/spacing/spacing_valued_child.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/tabs.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/tabs/tab.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_run.rb
@@ -488,14 +488,15 @@ files:
 - lib/ooxml_parser/pptx_parser/presentation/slide/presentation_notes.rb
 - lib/ooxml_parser/pptx_parser/presentation/slide/slide/shapes_grouping.rb
 - lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing.rb
-- lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/animation_effect/animation_effect.rb
-- lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/set_time_node/behavior/behavior.rb
-- lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/set_time_node/behavior/target_element.rb
-- lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/set_time_node/set_time_node.rb
-- lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/time_node.rb
-- lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/time_node/common_timing.rb
-- lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/time_node/common_timing/codition_list/condition.rb
-- lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/time_node/common_timing/condition_list.rb
+- lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/time_node_list.rb
+- lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/time_node_list/animation_effect/animation_effect.rb
+- lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/time_node_list/set_time_node/behavior/behavior.rb
+- lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/time_node_list/set_time_node/behavior/target_element.rb
+- lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/time_node_list/set_time_node/set_time_node.rb
+- lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/time_node_list/time_node.rb
+- lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/time_node_list/time_node/common_timing.rb
+- lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/time_node_list/time_node/common_timing/codition_list/condition.rb
+- lib/ooxml_parser/pptx_parser/presentation/slide/slide/timing/time_node_list/time_node/common_timing/condition_list.rb
 - lib/ooxml_parser/pptx_parser/presentation/slide/slide_helper.rb
 - lib/ooxml_parser/pptx_parser/presentation/slide/transition/transition.rb
 - lib/ooxml_parser/pptx_parser/presentation/slide/transition/transition/sound_action.rb
@@ -591,7 +592,8 @@ files:
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/table_columns/table_column.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/table_style_info.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/worksheet_helper.rb
-- lib/ooxml_parser/xlsx_parser/workbook/worksheet/xlsx_column_properties.rb
+- lib/ooxml_parser/xlsx_parser/workbook/worksheet/xlsx_columns.rb
+- lib/ooxml_parser/xlsx_parser/workbook/worksheet/xlsx_columns/xlsx_column_properties.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/xlsx_drawing.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/xlsx_drawing/client_data.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/xlsx_drawing/xlsx_drawing_position_parameters.rb
@@ -618,14 +620,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.6'
+      version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.26
+rubygems_version: 3.4.13
 signing_key: 
 specification_version: 4
 summary: OoxmlParser Gem