ooxml_parser 0.25.0 → 0.28.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 409ce77d24b38512604d5215a2bd6a54f887685db71cd9942c81935ef678f3b0
-  data.tar.gz: 4f7edddf4bab2d5d6ab9485754b333a2943d2df96fdcc933d671e820cd9dc70d
+  metadata.gz: ddd7d84f5f19a2b12fad76d455ebc614f9eb1b7a5c6f96f3585e649dc2569c4a
+  data.tar.gz: ca87a76367cb58ed7d02c7be6bcdb2ffe1e6635cccccff5a5ca33f44e44ed60b
 SHA512:
-  metadata.gz: aad06b0a4dd775d5efe4411d43b87ebda68fe05a5a15924fb6773d77169141284baaf8047eee042634a2e6145649ac0fce2e9aa143d401587434598eeff5f73d
-  data.tar.gz: c2ab404a2ab3f559a312da5953da7a668b4ae1c359ff790bc4b4d577ccbd453e4314844125cc64e144c884f9e187389586c98f085c4d27ca5837d8a1b9e61f9d
+  metadata.gz: 8e85e11b6a5faf18784cc9f3e9b216a1aad962aaf2be54f6dc35d1e3c8fbb73e9b4ed86270e796f01260fcdf2404729c2a36b5b9d133020916f142e12f32b903
+  data.tar.gz: 5e3c2129a515ce309a33e5f8c75847cde732a6ce4108f36bb8c3222d3b02f48b42bef3faa9eecaafc063f691e58d39e020f1eda3e44767b9452813ab8d3ca087

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/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/alternate_content/drawing/graphic/picture/docx_blip/file_reference.rb

@@ -35,7 +35,11 @@ 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'
+                     OoxmlParser::Parser.parse(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

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
 
@@ -154,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/docx_parser/document_structure/docx_paragraph/docx_paragraph_run.rb

@@ -1,6 +1,5 @@
 # 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'

data/lib/ooxml_parser/docx_parser/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'

data/lib/ooxml_parser/docx_parser/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/version.rb

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

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

@@ -3,7 +3,7 @@
 module OoxmlParser
   # Properties of XLSX column
   class XlsxColumnProperties < OOXMLDocumentObject
-    attr_accessor :from, :to, :width, :style
+    attr_accessor :style
     # @return [True, False] is width custom
     attr_accessor :custom_width
     # @return [True, False] Flag indicating if the
@@ -12,6 +12,14 @@ module OoxmlParser
     # @return [True, False] Flag indicating if the
     # specified column(s) is hidden
     attr_reader :hidden
+    # @return [Integer] First column affected by this 'column info' record.
+    attr_reader :min
+    # @return [Integer] Last column affected by this 'column info' record.
+    attr_reader :max
+    # @return [Float] width in pixel, as stored in xml structure
+    attr_reader :width_raw
+    # @return [Float] width, in readable format
+    attr_reader :width
 
     # Parse XlsxColumnProperties object
     # @param node [Nokogiri::XML:Element] node to parse
@@ -20,13 +28,14 @@ module OoxmlParser
       node.attributes.each do |key, value|
         case key
         when 'min'
-          @from = value.value.to_i
+          @min = value.value.to_i
         when 'max'
-          @to = value.value.to_i
+          @max = value.value.to_i
         when 'style'
           @style = root_object.style_sheet.cell_xfs.xf_array[value.value.to_i]
         when 'width'
-          @width = value.value.to_f - 0.7109375
+          @width_raw = value.value.to_f
+          @width = calculate_width(@width_raw)
         when 'customWidth'
           @custom_width = option_enabled?(node, 'customWidth')
         when 'bestFit'
@@ -38,6 +47,13 @@ module OoxmlParser
       self
     end
 
+    alias from min
+    alias to max
+
+    extend Gem::Deprecate
+    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
@@ -50,5 +66,17 @@ module OoxmlParser
       end
       columns
     end
+
+    private
+
+    # TODO: Currently width calculation use some magick number from old time ago
+    #   Actual formula is way more complicated and require data about
+    #   font max width for single character.
+    #   Read more in ECMA-376, §18.3.1.13
+    # @param [Float] value raw value for width
+    # @return [Float] width value
+    def calculate_width(value)
+      value - 0.7109375
+    end
   end
 end

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

@@ -12,6 +12,8 @@ module OoxmlParser
     attr_reader :style_index
     # @return [String] value of cell
     attr_reader :value
+    # @return [String] An A-1 style reference to a cell.
+    attr_reader :reference
     # @return [String] type of string
     attr_reader :type
 
@@ -31,6 +33,8 @@ module OoxmlParser
           @style_index = value.value.to_i
         when 't'
           @type = value.value.to_s
+        when 'r'
+          @reference = value.value.to_s
         end
       end
       node.xpath('*').each do |node_child|
@@ -60,6 +64,11 @@ module OoxmlParser
       @raw_text
     end
 
+    # @return [Coordinates] coordinates of cell
+    def coordinates
+      @coordinates ||= Coordinates.new.parse_string(@reference)
+    end
+
     private
 
     # @return [Nothing] parse text data

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

@@ -4,13 +4,19 @@ require_relative 'xlsx_row/xlsx_cell'
 module OoxmlParser
   # Single Row of XLSX
   class XlsxRow < OOXMLDocumentObject
-    attr_accessor :cells, :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 this <row> definition corresponds.
+    # @return [Integer] Indicates to which row in the sheet
+    #   this <row> definition corresponds.
     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 = []
       @cells = []
       super
     end
@@ -29,15 +35,36 @@ 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|
         case node_child.name
         when 'c'
-          @cells[Coordinates.new.parse_string(node_child.attribute('r').value.to_s).column_number.to_i - 1] = XlsxCell.new(parent: self).parse(node_child)
+          @cells_raw << XlsxCell.new(parent: self).parse(node_child)
         end
       end
       self
     end
+
+    # @return [Array<XlsxCell, nil>] list of cell in row, with nil,
+    #   if cell data is not stored in xml
+    def cells
+      return @cells if @cells.any?
+
+      cells_raw.each do |cell|
+        @cells[cell.coordinates.column_number.to_i - 1] = cell
+      end
+
+      @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.25.0
+  version: 0.28.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-07-28 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
@@ -605,7 +608,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.19
+rubygems_version: 3.3.21
 signing_key: 
 specification_version: 4
 summary: OoxmlParser Gem