ooxml_parser 0.26.0 → 0.29.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8d10481491c8a8bb901c8514f5a7c19ee3b6482e8fb943f39b9191dbd057d395
-  data.tar.gz: efbdbe106e2e88c584e428b8536cedb96972033434b5e1457f6ae2b31946cdd4
+  metadata.gz: ae537423c384b461a5c2eb77bfe60b692ab334e1bd6ae22cc928e28230302997
+  data.tar.gz: c8696409b7862346b631367d7fa014ceea48e18deb3a6b9832fbb4dcc57dab13
 SHA512:
-  metadata.gz: b553b7f055d43a6a355592ac8c2d28b085795b0faadf12531f119d4a1d15b1c7bcd45a5a661aad611799aa3286266469b88c12792bb4c3bba0b6c3fac2a0f54d
-  data.tar.gz: 1a68d32efafe9ee2921ffd6c75a794dd340a4b6d814e4aa7daa6348fb1246644a12b99a071df7e7e1bfe84de02f15c96a4068f6227008ec051a1932b0bdb01db
+  metadata.gz: 9b3655be06b3aa59bdb700ba359f0dffd6bbe54840978665870673edb2e7249c179807b102cc7b49a503c638b0508a3cb46f0183afa4be7a8b8baff93b3dbab6
+  data.tar.gz: 36b999f281320ca0792e6504060eb65ba0f97005ed82b131dea276f6b136e6a0cca0281a3ab4a0c67ce213fe31e26263a1603bc7cf4ac10a847e264e64ccd512

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

@@ -0,0 +1,46 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing Chart Style entry
+  class ChartStyleEntry < OOXMLDocumentObject
+    # @return [OOXMLShapeBodyProperties] body properties
+    attr_reader :body_properties
+    # @return [RunProperties] default run properties
+    attr_reader :default_run_properties
+    # @return [FillReference] effect reference
+    attr_reader :effect_reference
+    # @return [FillReference] fill reference
+    attr_reader :fill_reference
+    # @return [FontReference] font reference
+    attr_reader :font_reference
+    # @return [StyleMatrixReference] line style reference
+    attr_reader :line_style_reference
+    # @return [StyleMatrixReference] shape properties
+    attr_reader :shape_properties
+
+    # Parse Chart style entry
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [ChartStyleEntry] result of parsing
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'bodyPr'
+          @body_properties = OOXMLShapeBodyProperties.new(parent: self).parse(node_child)
+        when 'defRPr'
+          @default_run_properties = RunProperties.new(parent: self).parse(node_child)
+        when 'effectRef'
+          @effect_reference = StyleMatrixReference.new(parent: self).parse(node_child)
+        when 'fillRef'
+          @fill_reference = StyleMatrixReference.new(parent: self).parse(node_child)
+        when 'fontRef'
+          @font_reference = FontReference.new(parent: self).parse(node_child)
+        when 'lnRef'
+          @line_style_reference = StyleMatrixReference.new(parent: self).parse(node_child)
+        when 'spPr'
+          @shape_properties = DocxShapeProperties.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing marker layout
+  class MarkerLayout < OOXMLDocumentObject
+    # @return [Integer] size of marker
+    attr_reader :size
+    # @return [Symbol] symbol of marker
+    attr_reader :symbol
+
+    # Parse Marker Layout
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [MarkerLayout] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'size'
+          @size = value.value.to_i
+        when 'symbol'
+          @symbol = value.value.to_sym
+        end
+      end
+      self
+    end
+  end
+end

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

@@ -0,0 +1,144 @@
+# frozen_string_literal: true
+
+require_relative 'chart_style_file/chart_style_entry'
+require_relative 'chart_style_file/marker_layout'
+module OoxmlParser
+  # Class for parsing Chart Style data from file
+  class ChartStyleFile < OOXMLDocumentObject
+    # @return [ChartStyleEntry] axis title entry
+    attr_reader :axis_title
+    # @return [ChartStyleEntry] axis category entry
+    attr_reader :category_axis
+    # @return [ChartStyleEntry] chart area entry
+    attr_reader :chart_area
+    # @return [ChartStyleEntry] data label entry
+    attr_reader :data_label
+    # @return [ChartStyleEntry] data label entry
+    attr_reader :data_label_callout
+    # @return [ChartStyleEntry] data point entry
+    attr_reader :data_point
+    # @return [ChartStyleEntry] data point 3d entry
+    attr_reader :data_point_3d
+    # @return [ChartStyleEntry] data point line entry
+    attr_reader :data_point_line
+    # @return [ChartStyleEntry] data point marker entry
+    attr_reader :data_point_marker
+    # @return [ChartStyleEntry] data point marker layout entry
+    attr_reader :data_point_marker_layout
+    # @return [ChartStyleEntry] data point wireframe entry
+    attr_reader :data_point_wireframe
+    # @return [ChartStyleEntry] data table entry
+    attr_reader :data_table
+    # @return [ChartStyleEntry] down bar entry
+    attr_reader :down_bar
+    # @return [ChartStyleEntry] drop line entry
+    attr_reader :drop_line
+    # @return [ChartStyleEntry] error bar entry
+    attr_reader :error_bar
+    # @return [ChartStyleEntry] floor entry
+    attr_reader :floor
+    # @return [ChartStyleEntry] gridline major entry
+    attr_reader :gridline_major
+    # @return [ChartStyleEntry] gridline minor entry
+    attr_reader :gridline_minor
+    # @return [ChartStyleEntry] high low line entry
+    attr_reader :high_low_line
+    # @return [ChartStyleEntry] leader line entry
+    attr_reader :leader_line
+    # @return [ChartStyleEntry] legend entry
+    attr_reader :legend
+    # @return [ChartStyleEntry] plot area entry
+    attr_reader :plot_area
+    # @return [ChartStyleEntry] plot area 3d entry
+    attr_reader :plot_area_3d
+    # @return [ChartStyleEntry] series axis entry
+    attr_reader :series_axis
+    # @return [ChartStyleEntry] series line entry
+    attr_reader :series_line
+    # @return [ChartStyleEntry] title entry
+    attr_reader :title
+    # @return [ChartStyleEntry] trend line entry
+    attr_reader :trend_line
+    # @return [ChartStyleEntry] trend line label entry
+    attr_reader :trend_line_label
+    # @return [ChartStyleEntry] up bar entry
+    attr_reader :up_bar
+    # @return [ChartStyleEntry] value axis entry
+    attr_reader :value_axis
+    # @return [ChartStyleEntry] wall entry
+    attr_reader :wall
+
+    # Parse Chart style file
+    # @return [ChartStyleFile] result of parsing
+    def parse(file)
+      xml = parse_xml(file)
+      xml.xpath('cs:chartStyle/*').each do |chart_node|
+        case chart_node.name
+        when 'axisTitle'
+          @axis_title = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'categoryAxis'
+          @category_axis = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'chartArea'
+          @chart_area = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'dataLabel'
+          @data_label = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'dataLabelCallout'
+          @data_label_callout = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'dataPoint'
+          @data_point = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'dataPoint3D'
+          @data_point_3d = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'dataPointLine'
+          @data_point_line = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'dataPointMarker'
+          @data_point_marker = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'dataPointMarkerLayout'
+          @data_point_marker_layout = MarkerLayout.new(parent: self).parse(chart_node)
+        when 'dataPointWireframe'
+          @data_point_wireframe = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'dataTable'
+          @data_table = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'downBar'
+          @down_bar = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'dropLine'
+          @drop_line = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'errorBar'
+          @error_bar = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'floor'
+          @floor = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'gridlineMajor'
+          @gridline_major = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'gridlineMinor'
+          @gridline_minor = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'hiLoLine'
+          @high_low_line = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'leaderLine'
+          @leader_line = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'legend'
+          @legend = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'plotArea'
+          @plot_area = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'plotArea3D'
+          @plot_area_3d = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'seriesAxis'
+          @series_axis = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'seriesLine'
+          @series_line = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'title'
+          @title = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'trendline'
+          @trend_line = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'trendlineLabel'
+          @trend_line_label = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'upBar'
+          @up_bar = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'valueAxis'
+          @value_axis = ChartStyleEntry.new(parent: self).parse(chart_node)
+        when 'wall'
+          @wall = ChartStyleEntry.new(parent: self).parse(chart_node)
+        end
+      end
+      self
+    end
+  end
+end

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

@@ -5,6 +5,7 @@ require_relative 'chart_cells_range'
 require_relative 'chart_legend'
 require_relative 'chart_point'
 require_relative 'display_labels_properties'
+require_relative 'chart/chart_style_file'
 require_relative 'chart/pivot_formats'
 require_relative 'chart/plot_area'
 require_relative 'chart/series'
@@ -28,6 +29,10 @@ module OoxmlParser
     attr_reader :vary_colors
     # @return [View3D] properties of 3D view
     attr_accessor :view_3d
+    # @return [ChartStyle] style of current chart
+    attr_reader :style
+    # @return [Relationships] relationships of chart
+    attr_reader :relationships
 
     def initialize(parent: nil)
       @axis_ids = []
@@ -154,6 +159,8 @@ module OoxmlParser
           end
         end
       end
+      parse_relationships
+      parse_style
       self
     end
 
@@ -170,5 +177,31 @@ module OoxmlParser
         end
       end
     end
+
+    # Parse relationship of chart
+    def parse_relationships
+      file_name = File.basename(OOXMLDocumentObject.current_xml)
+      relationship_file = "#{OOXMLDocumentObject.path_to_folder}" \
+                          '/word/charts/' \
+                          "_rels/#{file_name}.rels"
+
+      return unless File.exist?(relationship_file)
+
+      @relationships = Relationships.new(parent: self)
+                                    .parse_file(relationship_file)
+    end
+
+    def parse_style
+      return unless @relationships
+
+      chart_relationship = @relationships.target_by_type('chartStyle')
+      return if chart_relationship.empty?
+
+      chart_style_file = chart_relationship.first
+      style_file = "#{OOXMLDocumentObject.path_to_folder}" \
+                   "/word/charts/#{chart_style_file}"
+
+      @style = ChartStyleFile.new(parent: self).parse(style_file)
+    end
   end
 end

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/picture/docx_blip/file_reference.rb

@@ -35,11 +35,31 @@ module OoxmlParser
 
       full_path_to_file = OOXMLDocumentObject.path_to_folder + OOXMLDocumentObject.root_subfolder + @path.gsub('..', '')
       if File.exist?(full_path_to_file)
-        @content = File.binread(full_path_to_file)
+        @content = if File.extname(@path) == '.xlsx'
+                     parse_ole_xlsx(full_path_to_file)
+                   else
+                     File.binread(full_path_to_file)
+                   end
       else
         warn "Couldn't find #{full_path_to_file} file on filesystem. Possible problem in original document"
       end
       self
     end
+
+    private
+
+    # Parse ole xlsx file
+    # @param [String] full_path to file
+    # @return [XLSXWorkbook]
+    def parse_ole_xlsx(full_path)
+      # TODO: Fix this ugly hack with global vars
+      #   by replacing all global variables
+      stack = OOXMLDocumentObject.xmls_stack
+      dir = OOXMLDocumentObject.path_to_folder
+      result = OoxmlParser::Parser.parse(full_path)
+      OOXMLDocumentObject.xmls_stack = stack
+      OOXMLDocumentObject.path_to_folder = dir
+      result
+    end
   end
 end

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

@@ -156,7 +156,10 @@ module OoxmlParser
     # @param scheme_color_node [Nokogiri::XML:Element] node to parse
     # @return [Color] result of parsing
     def parse_scheme_color(scheme_color_node)
-      color = root_object.theme.color_scheme[scheme_color_node.attribute('val').value.to_sym].color
+      color_scheme_color = root_object.theme.color_scheme[scheme_color_node.attribute('val').value.to_sym]
+      return unless color_scheme_color
+
+      color = color_scheme_color.color
       hls = color.to_hsl
       scheme_name = nil
       scheme_color_node.xpath('*').each do |scheme_color_node_child|

data/lib/ooxml_parser/common_parser/parser.rb

@@ -29,7 +29,7 @@ module OoxmlParser
         format = Parser.recognize_folder_format
         case format
         when :docx
-          DocumentStructure.parse
+          DocumentStructure.new.parse
         when :xlsx
           XLSXWorkbook.new.parse
         when :pptx

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

@@ -21,8 +21,12 @@ module OoxmlParser
     attr_accessor :next_style
     # @return [DocxParagraphRun] run properties
     attr_accessor :run_properties
+    # @return [Nokogiri::XML:Node] run properties node
+    attr_accessor :run_properties_node
     # @return [DocxParagraph] run properties
     attr_accessor :paragraph_properties
+    # @return [Nokogiri::XML:Node] paragraph properties node
+    attr_accessor :paragraph_properties_node
     # @return [TableProperties] properties of table
     attr_accessor :table_properties
     # @return [Array, TableStyleProperties] list of table style properties
@@ -76,9 +80,11 @@ module OoxmlParser
         when 'next'
           @next_style = subnode.attribute('val').value
         when 'rPr'
-          @run_properties = DocxParagraphRun.new(parent: self).parse_properties(subnode)
+          @run_properties_node = subnode
+          @run_properties = DocxParagraphRun.new(parent: self).parse_properties(@run_properties_node)
         when 'pPr'
-          @paragraph_properties = ParagraphProperties.new(parent: self).parse(subnode)
+          @paragraph_properties_node = subnode
+          @paragraph_properties = ParagraphProperties.new(parent: self).parse(@paragraph_properties_node)
         when 'tblPr'
           @table_properties = TableProperties.new(parent: self).parse(subnode)
         when 'trPr'

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

@@ -12,7 +12,6 @@ require_relative 'docx_paragraph/inserted'
 require_relative 'docx_paragraph/structured_document_tag'
 require_relative 'docx_paragraph/frame_properties'
 require_relative 'docx_paragraph/docx_formula'
-require_relative 'docx_paragraph/style_parametres'
 module OoxmlParser
   # Class for data of DocxParagraph
   class DocxParagraph < OOXMLDocumentObject
@@ -202,7 +201,8 @@ module OoxmlParser
         when 'contextualSpacing'
           @contextual_spacing = true
         when 'pStyle'
-          parse_paragraph_style_xml(node_child.attribute('val').value, default_char_style)
+          @paragraph_style_ref = ParagraphStyleRef.new(parent: self).parse(node_child)
+          fill_style_data(default_char_style)
         when 'ind'
           @ind = DocumentStructure.default_paragraph_style.ind.dup.parse(node_child)
         when 'numPr'
@@ -229,24 +229,13 @@ module OoxmlParser
       self
     end
 
-    # Parse style xml
-    # @param id [String] id of style to parse
+    # Fill data from styles
     # @param character_style [DocxParagraphRun] style to parse
     # @return [void]
-    def parse_paragraph_style_xml(id, character_style)
-      doc = parse_xml("#{OOXMLDocumentObject.path_to_folder}word/styles.xml")
-      doc.search('//w:style').each do |style|
-        next unless style.attribute('styleId').value == id
-
-        style.xpath('w:pPr').each do |p_pr|
-          parse_paragraph_style(p_pr, character_style)
-          @style = StyleParametres.new(parent: self).parse(style)
-        end
-        style.xpath('w:rPr').each do |r_pr|
-          character_style.parse_properties(r_pr)
-        end
-        break
-      end
+    def fill_style_data(character_style)
+      @style = root_object.document_style_by_id(@paragraph_style_ref.value)
+      parse_paragraph_style(@style.paragraph_properties_node, character_style) if @style.paragraph_properties_node
+      character_style.parse_properties(@style.run_properties_node) if @style.run_properties_node
     end
 
     extend Gem::Deprecate

data/lib/ooxml_parser/docx_parser/document_structure.rb

@@ -156,61 +156,60 @@ module OoxmlParser
 
     # Parse docx file
     # @return [DocumentStructure] parsed structure
-    def self.parse
-      doc_structure = DocumentStructure.new
-      doc_structure.content_types = ContentTypes.new(parent: doc_structure).parse
+    def parse
+      @content_types = ContentTypes.new(parent: self).parse
       OOXMLDocumentObject.root_subfolder = 'word/'
       OOXMLDocumentObject.xmls_stack = []
       @comments = []
       DocumentStructure.default_paragraph_style = DocxParagraph.new
-      DocumentStructure.default_run_style = DocxParagraphRun.new(parent: doc_structure)
-      doc_structure.theme = PresentationTheme.parse('word/theme/theme1.xml')
-      doc_structure.relationships = Relationships.new(parent: self).parse_file("#{OOXMLDocumentObject.path_to_folder}word/_rels/document.xml.rels")
-      doc_structure.parse_styles
+      DocumentStructure.default_run_style = DocxParagraphRun.new(parent: self)
+      @theme = PresentationTheme.parse('word/theme/theme1.xml')
+      @relationships = Relationships.new(parent: self).parse_file("#{OOXMLDocumentObject.path_to_folder}word/_rels/document.xml.rels")
+      parse_styles
       number = 0
       OOXMLDocumentObject.add_to_xmls_stack('word/document.xml')
-      doc = doc_structure.parse_xml(OOXMLDocumentObject.current_xml)
+      doc = parse_xml(OOXMLDocumentObject.current_xml)
       doc.search('//w:document').each do |document|
         document.xpath('w:background').each do |background|
-          doc_structure.background = DocumentBackground.new(parent: doc_structure).parse(background)
+          @background = DocumentBackground.new(parent: self).parse(background)
         end
         document.xpath('w:body').each do |body|
           body.xpath('*').each do |element|
             case element.name
             when 'p'
               child = element.child
-              unless child.nil? && doc_structure.elements.last.instance_of?(Table)
-                paragraph_style = DocumentStructure.default_paragraph_style.dup.parse(element, number, DocumentStructure.default_run_style, parent: doc_structure)
+              unless child.nil? && @elements.last.instance_of?(Table)
+                paragraph_style = DocumentStructure.default_paragraph_style.dup.parse(element, number, DocumentStructure.default_run_style, parent: self)
                 number += 1
-                doc_structure.elements << paragraph_style.dup
+                @elements << paragraph_style.dup
               end
             when 'tbl'
-              table = Table.new(parent: doc_structure).parse(element,
-                                                             number,
-                                                             TableProperties.new)
+              table = Table.new(parent: self).parse(element,
+                                                    number,
+                                                    TableProperties.new)
               number += 1
-              doc_structure.elements << table
+              @elements << table
             when 'sdt'
-              doc_structure.elements << StructuredDocumentTag.new(parent: doc_structure).parse(element)
+              @elements << StructuredDocumentTag.new(parent: self).parse(element)
             end
           end
           body.xpath('w:sectPr').each do |sect_pr|
-            doc_structure.page_properties = PageProperties.new(parent: doc_structure).parse(sect_pr,
-                                                                                            DocumentStructure.default_paragraph_style,
-                                                                                            DocumentStructure.default_run_style)
-            doc_structure.notes = doc_structure.page_properties.notes # keep copy of notes to compatibility with previous docx models
+            @page_properties = PageProperties.new(parent: self).parse(sect_pr,
+                                                                      DocumentStructure.default_paragraph_style,
+                                                                      DocumentStructure.default_run_style)
+            @notes = page_properties.notes # keep copy of notes to compatibility with previous docx models
           end
         end
       end
       OOXMLDocumentObject.xmls_stack.pop
-      doc_structure.document_properties = DocumentProperties.new(parent: doc_structure).parse
-      doc_structure.comments = Comments.new(parent: doc_structure).parse
-      doc_structure.comments_extended = CommentsExtended.new(parent: doc_structure).parse
-      doc_structure.comments_document = Comments.new(parent: doc_structure,
-                                                     file: "#{OOXMLDocumentObject.path_to_folder}word/#{doc_structure.relationships.target_by_type('commentsDocument').first}")
-                                                .parse
-      doc_structure.settings = DocumentSettings.new(parent: doc_structure).parse
-      doc_structure
+      @document_properties = DocumentProperties.new(parent: self).parse
+      @comments = Comments.new(parent: self).parse
+      @comments_extended = CommentsExtended.new(parent: self).parse
+      @comments_document = Comments.new(parent: self,
+                                        file: "#{OOXMLDocumentObject.path_to_folder}word/#{relationships.target_by_type('commentsDocument').first}")
+                                   .parse
+      @settings = DocumentSettings.new(parent: self).parse
+      self
     end
 
     # Parse default style

data/lib/ooxml_parser/docx_parser.rb

@@ -11,7 +11,7 @@ module OoxmlParser
     # @return [DocumentStructure] result of parse
     def self.parse_docx(path_to_file)
       Parser.parse_format(path_to_file) do
-        DocumentStructure.parse
+        DocumentStructure.new.parse
       end
     end
   end

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.26.0'
+    STRING = '0.29.0'
   end
 end

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

@@ -4,7 +4,7 @@ require_relative 'xlsx_row/xlsx_cell'
 module OoxmlParser
   # Single Row of XLSX
   class XlsxRow < OOXMLDocumentObject
-    attr_accessor :height, :style, :hidden
+    attr_accessor :height, :hidden
     # @return [True, False] true if the row height has been manually set.
     attr_accessor :custom_height
     # @return [Integer] Indicates to which row in the sheet
@@ -12,6 +12,8 @@ module OoxmlParser
     attr_accessor :index
     # @return [Array<Cells>] cells of row, as in xml structure
     attr_reader :cells_raw
+    # @return [Integer] index of style of row
+    attr_reader :style_index
 
     def initialize(parent: nil)
       @cells_raw = []
@@ -33,6 +35,8 @@ module OoxmlParser
           @hidden = option_enabled?(node, 'hidden')
         when 'r'
           @index = value.value.to_i
+        when 's'
+          @style_index = value.value.to_i
         end
       end
       node.xpath('*').each do |node_child|
@@ -55,5 +59,12 @@ module OoxmlParser
 
       @cells
     end
+
+    # @return [Xf, nil] style of row or `nil` if not applied
+    def style
+      return nil unless @style_index
+
+      root_object.style_sheet.cell_xfs.xf_array[@style_index]
+    end
   end
 end

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

@@ -17,7 +17,7 @@ module OoxmlParser
   # Properties of worksheet
   class Worksheet < OOXMLDocumentObject
     include WorksheetHelper
-    attr_accessor :name, :rows, :merge, :charts, :hyperlinks, :drawings, :comments, :columns, :sheet_format_properties,
+    attr_accessor :name, :merge, :charts, :hyperlinks, :drawings, :comments, :columns, :sheet_format_properties,
                   :autofilter, :table_parts, :sheet_views
     # @return [String] xml name of sheet
     attr_accessor :xml_name
@@ -39,11 +39,14 @@ module OoxmlParser
     attr_reader :sheet_protection
     # @return [Array<ProtectedRange>] list of protected ranges
     attr_reader :protected_ranges
+    # @return [Array<Row>] rows in sheet, as in xml structure
+    attr_reader :rows_raw
 
     def initialize(parent: nil)
       @columns = []
       @name = ''
       @rows = []
+      @rows_raw = []
       @merge = []
       @charts = []
       @hyperlinks = []
@@ -65,7 +68,7 @@ module OoxmlParser
 
     # @return [True, false] if structure contain any user data
     def with_data?
-      return true unless @rows.empty?
+      return true unless @rows_raw.empty?
       return true unless default_columns?
       return true unless @drawings.empty?
       return true unless @charts.empty?
@@ -95,13 +98,10 @@ module OoxmlParser
         case worksheet_node_child.name
         when 'sheetData'
           worksheet_node_child.xpath('xmlns:row').each do |row_node|
-            @rows[row_node.attribute('r').value.to_i - 1] = XlsxRow.new(parent: self).parse(row_node)
-            @rows[row_node.attribute('r').value.to_i - 1].style = root_object.style_sheet.cell_xfs.xf_array[row_node.attribute('s').value.to_i] if row_node.attribute('s')
+            @rows_raw << XlsxRow.new(parent: self).parse(row_node)
           end
         when 'sheetFormatPr'
-          if !worksheet_node_child.attribute('defaultColWidth').nil? && !worksheet_node_child.attribute('defaultRowHeight').nil?
-            @sheet_format_properties = SheetFormatProperties.new(parent: self).parse(worksheet_node_child)
-          end
+          @sheet_format_properties = SheetFormatProperties.new(parent: self).parse(worksheet_node_child)
         when 'mergeCells'
           worksheet_node_child.xpath('xmlns:mergeCell').each do |merge_node|
             @merge << merge_node.attribute('ref').value.to_s
@@ -154,6 +154,18 @@ module OoxmlParser
       self
     end
 
+    # @return [Array<XlsxRow, nil>] list of rows, with nil,
+    #   if row data is not stored in xml
+    def rows
+      return @rows if @rows.any?
+
+      rows_raw.each do |row|
+        @rows[row.index - 1] = row
+      end
+
+      @rows
+    end
+
     private
 
     # Do work for parsing shared comments file

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.26.0
+  version: 0.29.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-22 00:00:00.000000000 Z
+date: 2022-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -210,6 +210,9 @@ files:
 - lib/ooxml_parser/common_parser/common_data/alternate_content/alternate_content/choice/math_text.rb
 - lib/ooxml_parser/common_parser/common_data/alternate_content/alternate_content/choice/math_text/math_paragraph.rb
 - lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart.rb
+- lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart/chart_style_file.rb
+- lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart/chart_style_file/chart_style_entry.rb
+- lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart/chart_style_file/marker_layout.rb
 - lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart/pivot_formats.rb
 - lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart/pivot_formats/pivot_format.rb
 - lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart/plot_area.rb
@@ -420,7 +423,6 @@ files:
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_content.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/structured_document_tag.rb
-- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/style_parametres.rb
 - lib/ooxml_parser/docx_parser/document_structure/header_footer.rb
 - lib/ooxml_parser/docx_parser/document_structure/numbering.rb
 - lib/ooxml_parser/docx_parser/document_structure/numbering/abstract_numbering.rb
@@ -605,7 +607,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.20
+rubygems_version: 3.3.21
 signing_key: 
 specification_version: 4
 summary: OoxmlParser Gem

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

@@ -1,30 +0,0 @@
-# frozen_string_literal: true
-
-module OoxmlParser
-  # Style Parameter Data
-  class StyleParametres < OOXMLDocumentObject
-    attr_accessor :q_format, :hidden, :name
-
-    def initialize(params = {})
-      @name = params[:name]
-      @q_format = params.fetch(:q_format, false)
-      @hidden = params.fetch(:hidden, false)
-      super(parent: params[:parent])
-    end
-
-    # Parse StyleParametres data
-    # @param [Nokogiri::XML:Element] node with StyleParametres data
-    # @return [StyleParametres] value of Columns data
-    def parse(node)
-      node.xpath('*').each do |node_child|
-        case node_child.name
-        when 'name'
-          @name = node_child.attribute('val').value
-        when 'qFormat'
-          @q_format = option_enabled?(node_child)
-        end
-      end
-      self
-    end
-  end
-end