ooxml_parser 0.10.0 → 0.13.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 728a4727e30c90aebf48cd417a9865dbf3726719e08bd20403b558377311105d
-  data.tar.gz: b73f86cce58d63354209f84fbe9d496301acb3d3b5ae7973639912d87b85b599
+  metadata.gz: e8d43b880b2291d11e75cf1107c546077d36d4123044cf71d0b85a5f7a62487b
+  data.tar.gz: 6690b7dad0c09b17ac772af66a6f614a8e68331c6ddb247597cf818887e4b16e
 SHA512:
-  metadata.gz: d985dddf15a50d7ec8796805009057f7149a3958a24e735279a9fcdc622156c1837662a56947a841d68958ac5eedb9afae7947eba48cf8929941def9e34c1832
-  data.tar.gz: '08ded5794f5a0745ee001b0a993d82c5790eb058d49436149ea13f65ebcd650da8e64cbbc9f8949a705a985d20b3e5d34f83552f264b441abd6a128923809013'
+  metadata.gz: c6c51d4331048c7250d9724da8c00354d235df4dbe8fad57cc81783133a4d0a030ce02056000afb4a5f5d13a91e4f8f28ce51d82f4d581b55da6902fe2927f1a
+  data.tar.gz: abc21e3b8151d29985cdb96a05e60eef69feb949fc6b12f24c225ba050d08ad021de39745250dbdef4920965dcca430473d0b3f089c4ca122ea790a612026ecc

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

@@ -94,13 +94,9 @@ module OoxmlParser
     # @return [True, False] result of comparision
     def ==(other)
       if other.is_a?(Color)
-        if ((@red == other.red) && (@green == other.green) && (@blue == other.blue)) ||
-           (none? && other.white?) ||
-           (white? && other.none?)
-          true
-        else
-          false
-        end
+        ((@red == other.red) && (@green == other.green) && (@blue == other.blue)) ||
+          (none? && other.white?) ||
+          (white? && other.none?)
       else
         false
       end
@@ -125,7 +121,7 @@ module OoxmlParser
       red = color_to_check.red
       green = color_to_check.green
       blue = color_to_check.blue
-      (self.red - red).abs < delta && (self.green - green).abs < delta && (self.blue - blue).abs < delta ? true : false
+      (self.red - red).abs < delta && (self.green - green).abs < delta && (self.blue - blue).abs < delta
     end
 
     # Apply tint to color

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

@@ -8,7 +8,7 @@ module OoxmlParser
     def parse_hex_string(hex_string)
       return self if %w[auto null].include?(hex_string)
 
-      char_array = hex_string.split(//)
+      char_array = hex_string.chars
       case char_array.length
       when 3
         @red = char_array[0].hex

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

@@ -34,5 +34,12 @@ module OoxmlParser
       end
       self
     end
+
+    # Get content definition by type
+    # @param [String] type of definition
+    # @return [Object] resulting objects
+    def by_type(type)
+      @content_types_list.select { |item| item.content_type == type }
+    end
   end
 end

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

@@ -23,8 +23,8 @@ module OoxmlParser
         end
         string = string.split('!').last
         if coordinates?(string)
-          coordinates.row = string.scan(/[0-9]/).join('').to_i
-          coordinates.column = string.scan(/[A-Z]/).join('')
+          coordinates.row = string.scan(/[0-9]/).join.to_i
+          coordinates.column = string.scan(/[A-Z]/).join
         end
         coordinates
       end

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

@@ -76,7 +76,7 @@ module OoxmlParser
         @action = :last_slide
       when 'ppaction://hlinksldjump'
         @action = :slide
-        @url = OOXMLDocumentObject.get_link_from_rels(@id).scan(/\d+/).join('').to_i
+        @url = OOXMLDocumentObject.get_link_from_rels(@id).scan(/\d+/).join.to_i
       else
         if @id && !@id.empty?
           @action = :external_link

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

@@ -3,6 +3,7 @@
 require_relative 'paragrpah_properties/numbering_properties'
 require_relative 'paragrpah_properties/paragraph_borders'
 require_relative 'paragrpah_properties/paragraph_spacing'
+require_relative 'paragrpah_properties/paragraph_stlye_ref'
 require_relative 'paragrpah_properties/spacing'
 require_relative 'paragrpah_properties/tabs'
 module OoxmlParser
@@ -17,6 +18,8 @@ module OoxmlParser
     attr_accessor :run_properties
     # @return [Borders] borders of paragraph
     attr_accessor :paragraph_borders
+    # @return [ParagraphStyleRef] Referenced Paragraph Style
+    attr_accessor :paragraph_style_ref
     # @return [True, False] Specifies that the paragraph
     # (or at least part of it) should be rendered on
     # the same page as the next paragraph when possible
@@ -30,6 +33,8 @@ module OoxmlParser
     attr_accessor :contextual_spacing
     # @return [Symbol] The alignment or justification to be applied to a paragraph
     attr_accessor :justification
+    # @return [Shade] Shade property
+    attr_accessor :shade
 
     def initialize(numbering = NumberingProperties.new, parent: nil)
       @numbering = numbering
@@ -82,10 +87,14 @@ module OoxmlParser
           @run_properties = RunProperties.new(parent: self).parse(node_child)
         when 'pBdr'
           @paragraph_borders = ParagraphBorders.new(parent: self).parse(node_child)
+        when 'pStyle'
+          @paragraph_style_ref = ParagraphStyleRef.new(parent: self).parse(node_child)
         when 'keepNext'
           @keep_next = true
         when 'sectPr'
           @section_properties = PageProperties.new(parent: self).parse(node_child, @parent, DocxParagraphRun.new)
+        when 'shd'
+          @shade = Shade.new(parent: self).parse(node_child)
         when 'spacing'
           @spacing = ParagraphSpacing.new(parent: self).parse(node_child)
         when 'jc'

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

@@ -43,5 +43,18 @@ module OoxmlParser
       end
       self
     end
+
+    # Helper method to get background color
+    # @return [OoxmlParser::Color]
+    def to_background_color
+      return nil unless fill
+
+      background_color = fill
+      background_color.set_style(value) if value
+      background_color
+    end
+
+    extend Gem::Deprecate
+    deprecate :to_background_color, 'use shade direct methods', 2077, 1
   end
 end

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `pStyle` tags
+  class ParagraphStyleRef < OOXMLDocumentObject
+    # @return [Integer] value of ParagraphStyleRef
+    attr_reader :value
+
+    # Parse ParagraphStyleRef object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [ParagraphStyleRef] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'val'
+          @value = value.value.to_s
+        end
+      end
+      self
+    end
+
+    # @return [ParagraphStyle] which was referenced
+    def referenced_style
+      root_object.document_style_by_id(value)
+    end
+  end
+end

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

@@ -33,14 +33,10 @@ module OoxmlParser
       other.line_rule = :multiple if other.line_rule == :auto
       self.line_rule = line_rule.to_sym if line_rule.instance_of?(String)
 
-      if @before == other.before &&
-         @after == other.after &&
-         @line == other.line &&
-         @line_rule.to_s == other.line_rule.to_s
-        true
-      else
-        false
-      end
+      @before == other.before &&
+        @after == other.after &&
+        @line == other.line &&
+        @line_rule.to_s == other.line_rule.to_s
     end
 
     # @return [String] result of convert of object to string

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

@@ -18,7 +18,7 @@ module OoxmlParser
   # Class for data of DocxParagraph
   class DocxParagraph < OOXMLDocumentObject
     include DocxParagraphHelper
-    attr_accessor :number, :bookmark_start, :bookmark_end, :align, :spacing, :background_color, :ind, :numbering,
+    attr_accessor :number, :bookmark_start, :bookmark_end, :align, :spacing, :ind, :numbering,
                   :character_style_array, :page_break, :borders, :keep_lines,
                   :contextual_spacing, :sector_properties, :page_numbering, :section_break, :style, :keep_next,
                   :orphan_control
@@ -129,8 +129,8 @@ module OoxmlParser
         when 'bookmarkEnd'
           character_styles_array << BookmarkEnd.new(parent: self).parse(node_child)
         when 'pPr'
-          parse_paragraph_style(node_child, custom_character_style)
           @paragraph_properties = ParagraphProperties.new(parent: self).parse(node_child)
+          parse_paragraph_style(node_child, custom_character_style)
         when 'commentRangeStart'
           character_styles_array << CommentRangeStart.new(parent: self).parse(node_child)
         when 'commentRangeEnd'
@@ -206,10 +206,6 @@ module OoxmlParser
           @keep_next = true
         when 'contextualSpacing'
           @contextual_spacing = true
-        when 'shd'
-          background_color_string = node_child.attribute('fill').value
-          @background_color = Color.new(parent: self).parse_hex_string(background_color_string)
-          @background_color.set_style(node_child.attribute('val').value.to_sym) unless node_child.attribute('val').nil?
         when 'pStyle'
           parse_paragraph_style_xml(node_child.attribute('val').value, default_char_style)
         when 'ind'
@@ -273,11 +269,5 @@ module OoxmlParser
       nil
     end
     deprecate :sdt, 'nonempty_runs[i]', 2020, 1
-
-    # @return [OoxmlParser::FrameProperties] Return frame properties
-    def frame_properties
-      paragraph_properties.frame_properties
-    end
-    deprecate :frame_properties, 'paragraph_properties.frame_properties', 2020, 1
   end
 end

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

@@ -9,5 +9,12 @@ module OoxmlParser
 
       root_object.comments_extended.by_id(@paragraph_id)
     end
+
+    # Temp method to return background color
+    # Need to be compatible with older versions
+    # @return [OoxmlParser::Color]
+    def background_color
+      paragraph_properties.shade.to_background_color
+    end
   end
 end

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

@@ -11,7 +11,7 @@ module OoxmlParser
   # Class for working with DocxParagraphRun
   class DocxParagraphRun < OOXMLDocumentObject
     include DocxParagraphRunHelpers
-    attr_accessor :number, :font, :vertical_align, :size, :font_color, :background_color, :font_style, :text, :drawings,
+    attr_accessor :number, :font, :vertical_align, :size, :font_color, :font_style, :text, :drawings,
                   :link, :highlight, :effect, :caps, :w,
                   :position, :em, :spacing, :break, :touch, :shape, :footnote, :endnote, :fld_char, :style,
                   :comments, :alternate_content, :page_number, :text_outline, :text_fill
@@ -22,6 +22,8 @@ module OoxmlParser
     attr_accessor :run_properties
     # @return [RunObject] object of run
     attr_accessor :object
+    # @return [Shade] shade properties
+    attr_accessor :shade
 
     def initialize(parent: nil)
       @number = 0

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/docx_paragraph_run/docx_paragraph_run_helpers.rb

@@ -53,10 +53,7 @@ module OoxmlParser
         when 'color'
           parse_color_tag(node_child)
         when 'shd'
-          self.background_color = node_child.attribute('fill').value
-          unless node_child.attribute('fill').value == 'auto' || node_child.attribute('fill').value == '' || node_child.attribute('fill').value == 'null'
-            self.background_color = Color.new(parent: self).parse_hex_string(node_child.attribute('fill').value)
-          end
+          @shade = Shade.new(parent: self).parse(node_child)
         when 'u', 'uCs'
           parse_underline(node_child)
         when 'strike'
@@ -68,6 +65,13 @@ module OoxmlParser
       self
     end
 
+    # Temp method to return background color
+    # Need to be compatible with older versions
+    # @return [OoxmlParser::Color]
+    def background_color
+      shade.to_background_color
+    end
+
     private
 
     # Parse `color` tag

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

@@ -70,7 +70,7 @@ module OoxmlParser
     def value_to_hex(value)
       value.to_s
            .sub('#', '')
-           .split(' ')
+           .split
            .first
     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.10.0'
+    STRING = '0.13.0'
   end
 end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook.rb

@@ -2,6 +2,7 @@
 
 require_relative 'workbook/chartsheet'
 require_relative 'workbook/pivot_cache'
+require_relative 'workbook/pivot_table_definition'
 require_relative 'workbook/shared_string_table'
 require_relative 'workbook/style_sheet'
 require_relative 'workbook/worksheet'
@@ -21,10 +22,13 @@ module OoxmlParser
     attr_accessor :shared_strings_table
     # @return [Array<PivotCache>] list of pivot caches
     attr_accessor :pivot_caches
+    # @return [Array<PivotTableDefintion>] list of pivot table defitions
+    attr_accessor :pivot_table_definitions
 
     def initialize(params = {})
       @worksheets = []
       @pivot_caches = []
+      @pivot_table_definitions = []
       super
     end
 
@@ -120,6 +124,7 @@ module OoxmlParser
         end
       end
       parse_pivot_cache
+      parse_pivot_table
       OOXMLDocumentObject.xmls_stack.pop
       self
     end
@@ -136,5 +141,13 @@ module OoxmlParser
         @pivot_caches << PivotCache.new(parent: self).parse(pivot_cache)
       end
     end
+
+    # Perform parsing of pivot table
+    def parse_pivot_table
+      files = @content_types.by_type('application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml')
+      files.each do |file|
+        @pivot_table_definitions << PivotTableDefinition.new(parent: self).parse(file.part_name)
+      end
+    end
   end
 end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_cache/pivot_cache_definition.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
 require_relative 'pivot_cache_definition/cache_source'
+require_relative 'pivot_cache_definition/cache_fields'
+
 module OoxmlParser
   # Class for parsing <pivotCacheDefinition> file
   class PivotCacheDefinition < OOXMLDocumentObject
@@ -8,6 +10,8 @@ module OoxmlParser
     attr_reader :id
     # @return [CacheSource] source of pivot cache
     attr_reader :cache_source
+    # @return [CacheFields] fields of pivot cache
+    attr_reader :cache_fields
 
     # Parse PivotCacheDefinition file
     # @param file [String] path to file
@@ -29,6 +33,8 @@ module OoxmlParser
         case node_child.name
         when 'cacheSource'
           @cache_source = CacheSource.new(parent: self).parse(node_child)
+        when 'cacheFields'
+          @cache_fields = CacheFields.new(parent: self).parse(node_child)
         end
       end
       self

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_cache/pivot_cache_definition/cache_fields.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative 'cache_fields/cache_field'
+
+module OoxmlParser
+  # Class for parsing <cacheFields> tag
+  class CacheFields < OOXMLDocumentObject
+    # @return [Integer] count
+    attr_reader :count
+    # @return [Array<CacheField>] list of CacheField object
+    attr_reader :cache_field
+
+    def initialize(parent: nil)
+      @cache_field = []
+      super
+    end
+
+    # @return [CacheField] accessor
+    def [](key)
+      @cache_field[key]
+    end
+
+    # Parse `<cacheFields>` tag
+    # @param [Nokogiri::XML:Element] node with cacheFields data
+    # @return [cacheFields]
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'count'
+          @count = value.value.to_i
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'cacheField'
+          @cache_field << CacheField.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_cache/pivot_cache_definition/cache_fields/cache_field.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require_relative 'cache_field/shared_items'
+
+module OoxmlParser
+  # Class for parsing <cacheField> tag
+  class CacheField < OOXMLDocumentObject
+    # @return [String] name of field
+    attr_reader :name
+    # @return [Integer] number format id
+    attr_reader :number_format_id
+    # @return [SharedItems] shared items
+    attr_reader :shared_items
+
+    # Parse `<cacheField>` tag
+    # # @param [Nokogiri::XML:Element] node with WorksheetSource data
+    # @return [CacheField]
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'name'
+          @name = value.value.to_s
+        when 'numFmtId'
+          @number_format_id = value.value.to_i
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'sharedItems'
+          @shared_items = SharedItems.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_cache/pivot_cache_definition/cache_fields/cache_field/shared_items.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing <sharedItems> tag
+  class SharedItems < OOXMLDocumentObject
+    # @return [True, False] is contains_semi_mixed_types
+    attr_reader :contains_semi_mixed_types
+    # @return [True, False] is contains_string
+    attr_reader :contains_string
+    # @return [True, False] is contains_number
+    attr_reader :contains_number
+    # @return [True, False] is contains_integer
+    attr_reader :contains_integer
+    # @return [Integer] min value
+    attr_reader :min_value
+    # @return [Integer] max value
+    attr_reader :max_value
+
+    # Parse `<sharedItems>` tag
+    # # @param [Nokogiri::XML:Element] node with WorksheetSource data
+    # @return [sharedItems]
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'containsSemiMixedTypes'
+          @contains_semi_mixed_types = attribute_enabled?(value)
+        when 'containsString'
+          @contains_string = attribute_enabled?(value)
+        when 'containsNumber'
+          @contains_number = attribute_enabled?(value)
+        when 'containsInteger'
+          @contains_integer = attribute_enabled?(value)
+        when 'minValue'
+          @min_value = value.value.to_i
+        when 'maxValue'
+          @max_value = value.value.to_i
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition.rb

@@ -0,0 +1,114 @@
+# frozen_string_literal: true
+
+require_relative 'pivot_table_definition/column_row_items'
+require_relative 'pivot_table_definition/location'
+require_relative 'pivot_table_definition/pivot_fields'
+require_relative 'pivot_table_definition/pivot_table_style_info'
+
+module OoxmlParser
+  # Class for parsing <PivotTableDefinition> tag
+  class PivotTableDefinition < OOXMLDocumentObject
+    # @return [String] name of table
+    attr_reader :name
+    # @return [Integer] id of cache
+    attr_reader :cache_id
+    # @return [True, False] should number formats be applied
+    attr_reader :apply_number_formats
+    # @return [True, False] should border formats be applied
+    attr_reader :apply_border_formats
+    # @return [True, False] should font formats be applied
+    attr_reader :apply_font_formats
+    # @return [True, False] should pattern formats be applied
+    attr_reader :apply_pattern_formats
+    # @return [True, False] should alignment formats be applied
+    attr_reader :apply_alignment_formats
+    # @return [True, False] should width height formats be applied
+    attr_reader :apply_width_height_formats
+    # @return [True, False] should auto formatting be used
+    attr_reader :use_auto_formatting
+    # @return [True, False] should item print titles
+    attr_reader :item_print_titles
+    # @return [String] data caption
+    attr_reader :data_caption
+    # @return [Integer] creation version
+    attr_reader :created_version
+    # @return [Integer] indent
+    attr_reader :indent
+    # @return [True, False] outline
+    attr_reader :outline
+    # @return [True, False] outline data
+    attr_reader :outline_data
+    # @return [True, False] is there multiple fields filters
+    attr_reader :multiple_field_filters
+    # @return [Location] location data
+    attr_reader :location
+    # @return [PivotFields] pivot fields
+    attr_reader :pivot_fields
+    # @return [ColumnRowItems] column items
+    attr_reader :column_items
+    # @return [ColumnRowItems] row items
+    attr_reader :row_items
+    # @return [PivotTableStyleInfo] style info
+    attr_reader :style_info
+
+    # Parse PivotTableDefinition object
+    # @param [String] file path
+    # @return [PivotTableDefinition] result of parsing
+    def parse(file)
+      doc = Nokogiri::XML.parse(File.open("#{OOXMLDocumentObject.path_to_folder}/#{file}"))
+      node = doc.xpath('//xmlns:pivotTableDefinition').first
+      node.attributes.each do |key, value|
+        case key
+        when 'name'
+          @name = value.value.to_s
+        when 'cacheId'
+          @cache_id = value.value.to_i
+        when 'applyNumberFormats'
+          @apply_number_formats = attribute_enabled?(value)
+        when 'applyBorderFormats'
+          @apply_border_formats = attribute_enabled?(value)
+        when 'applyFontFormats'
+          @apply_font_formats = attribute_enabled?(value)
+        when 'applyPatternFormats'
+          @apply_pattern_formats = attribute_enabled?(value)
+        when 'applyAlignmentFormats'
+          @apply_alignment_formats = attribute_enabled?(value)
+        when 'applyWidthHeightFormats'
+          @apply_width_height_formats = attribute_enabled?(value)
+        when 'useAutoFormatting'
+          @use_auto_formatting = attribute_enabled?(value)
+        when 'itemPrintTitles'
+          @item_print_titles = attribute_enabled?(value)
+        when 'dataCaption'
+          @data_caption = value.value.to_s
+        when 'createdVersion'
+          @created_version = value.value.to_i
+        when 'indent'
+          @indent = value.value.to_i
+        when 'outline'
+          @outline = attribute_enabled?(value)
+        when 'outlineData'
+          @outline_data = attribute_enabled?(value)
+        when 'multipleFieldFilters'
+          @multiple_field_filters = attribute_enabled?(value)
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'location'
+          @location = Location.new(parent: self).parse(node_child)
+        when 'pivotFields'
+          @pivot_fields = PivotFields.new(parent: self).parse(node_child)
+        when 'rowItems'
+          @row_items = ColumnRowItems.new(parent: self).parse(node_child)
+        when 'colItems'
+          @column_items = ColumnRowItems.new(parent: self).parse(node_child)
+        when 'pivotTableStyleInfo'
+          @style_info = PivotTableStyleInfo.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition/column_row_items.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative 'column_row_items/column_row_item'
+
+module OoxmlParser
+  # Class for parsing <rowItems> and <colItems> tag
+  class ColumnRowItems < OOXMLDocumentObject
+    # @return [Integer] count of items
+    attr_reader :count
+    # @return [Array<RowColumnItem>] list of RowColumnItem object
+    attr_reader :items
+
+    def initialize(parent: nil)
+      @items = []
+      super
+    end
+
+    # @return [RowColumnItem] accessor
+    def [](key)
+      @items[key]
+    end
+
+    # Parse `<cacheField>` tag
+    # # @param [Nokogiri::XML:Element] node with WorksheetSource data
+    # @return [CacheField]
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'count'
+          @count = value.value.to_i
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'i'
+          @items << ColumnRowItem.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition/column_row_items/column_row_item.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing <i> tag
+  class ColumnRowItem < OOXMLDocumentObject
+    # @return [Symbol] type of item
+    attr_reader :type
+
+    # Parse `<location>` tag
+    # @param [Nokogiri::XML:Element] node with location data
+    # @return [Location]
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 't'
+          @type = value.value.to_sym
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition/location.rb

@@ -0,0 +1,34 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing <location> tag
+  class Location < OOXMLDocumentObject
+    # @return [String] ref of location
+    attr_reader :ref
+    # @return [True, False] first header row
+    attr_reader :first_header_row
+    # @return [True, False] first data row
+    attr_reader :first_data_row
+    # @return [True, False] first data column
+    attr_reader :first_data_column
+
+    # Parse `<location>` tag
+    # @param [Nokogiri::XML:Element] node with location data
+    # @return [Location]
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'ref'
+          @ref = value.value.to_s
+        when 'firstHeaderRow'
+          @first_header_row = attribute_enabled?(value)
+        when 'firstDataRow'
+          @first_data_row = attribute_enabled?(value)
+        when 'firstDataCol'
+          @first_data_column = attribute_enabled?(value)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition/pivot_fields.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative 'pivot_fields/pivot_field'
+
+module OoxmlParser
+  # Class for parsing <pivotFields> tag
+  class PivotFields < OOXMLDocumentObject
+    # @return [Integer] count
+    attr_reader :count
+    # @return [Array<PivotField>] list of PivotField object
+    attr_reader :pivot_field
+
+    def initialize(parent: nil)
+      @pivot_field = []
+      super
+    end
+
+    # @return [PivotField] accessor
+    def [](key)
+      @pivot_field[key]
+    end
+
+    # Parse `<pivotFields>` tag
+    # @param [Nokogiri::XML:Element] node with pivotFields data
+    # @return [PivotFields]
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'count'
+          @count = value.value.to_i
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'pivotField'
+          @pivot_field << PivotField.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition/pivot_fields/pivot_field.rb

@@ -0,0 +1,37 @@
+# frozen_string_literal: true
+
+require_relative 'pivot_field/items'
+
+module OoxmlParser
+  # Class for parsing <pivotField> tag
+  class PivotField < OOXMLDocumentObject
+    # @return [String] axis value
+    attr_reader :axis
+    # @return [True, False] should show all
+    attr_reader :show_all
+    # @return [Items] contain item
+    attr_reader :items
+
+    # Parse `<pivotField>` tag
+    # # @param [Nokogiri::XML:Element] node with PivotField data
+    # @return [PivotField]
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'axis'
+          @axis = value.value.to_s
+        when 'showAll'
+          @show_all = attribute_enabled?(value)
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'items'
+          @items = Items.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition/pivot_fields/pivot_field/items.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative 'items/item'
+
+module OoxmlParser
+  # Class for parsing <items> tag
+  class Items < OOXMLDocumentObject
+    # @return [Integer] count
+    attr_reader :count
+    # @return [Array<Item>] list of items
+    attr_reader :items
+
+    def initialize(parent: nil)
+      @items = []
+      super
+    end
+
+    # @return [Item] accessor
+    def [](key)
+      @items[key]
+    end
+
+    # Parse `<items>` tag
+    # @param [Nokogiri::XML:Element] node with items data
+    # @return [Items]
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'count'
+          @count = value.value.to_i
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'item'
+          @items << Item.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition/pivot_fields/pivot_field/items/item.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing <item> tag
+  class Item < OOXMLDocumentObject
+    # @return [Integer] index of item
+    attr_reader :index
+    # @return [Symbol] type of item
+    attr_reader :type
+
+    # Parse `<item>` tag
+    # # @param [Nokogiri::XML:Element] node with Item data
+    # @return [item]
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'x'
+          @index = value.value.to_i
+        when 't'
+          @type = value.value.to_sym
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition/pivot_table_style_info.rb

@@ -0,0 +1,42 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing <pivotTableStyleInfo> tag
+  class PivotTableStyleInfo < OOXMLDocumentObject
+    # @return [String] name of style
+    attr_reader :name
+    # @return [True, False] show row header
+    attr_reader :show_row_header
+    # @return [True, False] show column header
+    attr_reader :show_column_header
+    # @return [True, False] show row stripes
+    attr_reader :show_row_stripes
+    # @return [True, False] show column stripes
+    attr_reader :show_column_stripes
+    # @return [True, False] show last column
+    attr_reader :show_last_column
+
+    # Parse `<pivotTableStyleInfo>` tag
+    # @param [Nokogiri::XML:Element] node with PivotTableStyleInfo data
+    # @return [PivotTableStyleInfo]
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'name'
+          @name = value.value.to_s
+        when 'showRowHeaders'
+          @show_row_header = attribute_enabled?(value)
+        when 'showColHeaders'
+          @show_column_header = attribute_enabled?(value)
+        when 'showRowStripes'
+          @show_row_stripes = attribute_enabled?(value)
+        when 'showColStripes'
+          @show_column_stripes = attribute_enabled?(value)
+        when 'showLastColumn'
+          @show_last_column = attribute_enabled?(value)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/style_sheet/fills/fill.rb

@@ -22,7 +22,7 @@ module OoxmlParser
       node.attributes.each do |key, value|
         case key
         when 'color2'
-          @color2 = Color.new(parent: self).parse_hex_string(value.value.split(' ').first.delete('#'))
+          @color2 = Color.new(parent: self).parse_hex_string(value.value.split.first.delete('#'))
         when 'id'
           @id = value.value.to_s
           @file = FileReference.new(parent: self).parse(node)

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part/extension_list/extension.rb

@@ -1,10 +1,13 @@
 # frozen_string_literal: true
 
+require_relative 'extension/data_validations'
 require_relative 'extension/sparkline_groups'
 require_relative 'extension/x14_table'
 module OoxmlParser
   # Class for `ext` data
   class Extension < OOXMLDocumentObject
+    # @return [DataValidations] list of data validations
+    attr_accessor :data_validations
     # @return [X14Table] table data in x14 namespace
     attr_accessor :table
     # @return [SparklineGroups] list of groups
@@ -16,6 +19,8 @@ module OoxmlParser
     def parse(node)
       node.xpath('*').each do |column_node|
         case column_node.name
+        when 'dataValidations'
+          @data_validations = DataValidations.new(parent: self).parse(column_node)
         when 'table'
           @table = X14Table.new(parent: self).parse(column_node)
         when 'sparklineGroups'

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part/extension_list/extension/data_validations.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+require_relative 'data_validations/data_validation'
+
+module OoxmlParser
+  # Class for `dataValidations` data
+  class DataValidations < OOXMLDocumentObject
+    # @return [Integer] count of validations
+    attr_reader :count
+    # @return [Array<DataValidation>] list of data validations
+    attr_reader :data_validations
+    # @return [Boolean] is prompts disabled
+    attr_reader :disable_prompts
+
+    def initialize(parent: nil)
+      @data_validations = []
+      super
+    end
+
+    # @return [SparklineGroup] accessor
+    def [](key)
+      data_validations[key]
+    end
+
+    # Parse DataValidations data
+    # @param [Nokogiri::XML:Element] node with DataValidations data
+    # @return [DataValidations] value of DataValidations data
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'count'
+          @count = value.value.to_i
+        when 'disablePrompts'
+          @disable_prompts = attribute_enabled?(value)
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'dataValidation'
+          @data_validations << DataValidation.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part/extension_list/extension/data_validations/data_validation.rb

@@ -0,0 +1,88 @@
+# frozen_string_literal: true
+
+require_relative 'data_validation/data_validation_formula'
+module OoxmlParser
+  # Class for `dataValidation` data
+  class DataValidation < OOXMLDocumentObject
+    # @return [Boolean] should blank entries be valid
+    attr_reader :allow_blank
+    # @return [String] Specifies the message text of the error alert
+    attr_reader :error
+    # @return [Symbol] Type of error
+    attr_reader :error_style
+    # @return [String] The text of the title bar of the error alert
+    attr_reader :error_title
+    # @return [DataValidationFormula] first formula of data validation
+    attr_reader :formula1
+    # @return [DataValidationFormula] second formula of data validation
+    attr_reader :formula2
+    # @return [Symbol] Input Method Editor (IME) mode
+    attr_reader :ime_mode
+    # @return [Symbol] Relational operator used with this data validation
+    attr_reader :operator
+    # @return [String] Message text of the input prompt
+    attr_reader :prompt
+    # @return [String] Text of the title bar of the input prompt
+    attr_reader :prompt_title
+    # @return [String] Ranges to which data validation is applied
+    attr_reader :reference_sequence
+    # @return [Symbol] Specifies whether to display the drop-down combo box
+    attr_reader :show_dropdown
+    # @return [Symbol] Specifies whether to display the input prompt
+    attr_reader :show_input_message
+    # @return [Symbol] Specifies whether to display error alert message
+    attr_reader :show_error_message
+    # @return [Symbol] Type of validation
+    attr_reader :type
+    # @return [String] UID of validation
+    attr_reader :uid
+
+    # Parse DataValidation data
+    # @param [Nokogiri::XML:Element] node with DataValidation data
+    # @return [DataValidation] value of DataValidation data
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'allowBlank'
+          @allow_blank = attribute_enabled?(value)
+        when 'error'
+          @error = value.value.to_s
+        when 'errorStyle'
+          @error_style = value.value.to_sym
+        when 'errorTitle'
+          @error_title = value.value.to_s
+        when 'imeMode'
+          @ime_mode = value.value.to_sym
+        when 'operator'
+          @operator = value.value.to_sym
+        when 'type'
+          @type = value.value.to_sym
+        when 'prompt'
+          @prompt = value.value.to_s
+        when 'promptTitle'
+          @prompt_title = value.value.to_s
+        when 'showDropDown'
+          @show_dropdown = attribute_enabled?(value)
+        when 'showInputMessage'
+          @show_input_message = attribute_enabled?(value)
+        when 'showErrorMessage'
+          @show_error_message = attribute_enabled?(value)
+        when 'uid'
+          @uid = value.value.to_s
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'formula1'
+          @formula1 = DataValidationFormula.new(parent: self).parse(node_child)
+        when 'formula2'
+          @formula2 = DataValidationFormula.new(parent: self).parse(node_child)
+        when 'sqref'
+          @reference_sequence = node_child.text
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part/extension_list/extension/data_validations/data_validation/data_validation_formula.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for `x14:formula1` or `x14:formula2` data
+  class DataValidationFormula < OOXMLDocumentObject
+    # @return [Formula] value of formula
+    attr_reader :formula
+
+    # Parse DataValidationFormula data
+    # @param [Nokogiri::XML:Element] node with DataValidationFormula data
+    # @return [DataValidationFormula] value of DataValidationFormula data
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'f'
+          @formula = Formula.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.10.0
+  version: 0.13.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-11-15 00:00:00.000000000 Z
+date: 2021-05-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -321,6 +321,7 @@ files:
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragrpah_properties/numbering_properties.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragrpah_properties/paragraph_borders.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragrpah_properties/paragraph_spacing.rb
+- lib/ooxml_parser/common_parser/common_data/paragraph/paragrpah_properties/paragraph_stlye_ref.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragrpah_properties/spacing.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragrpah_properties/spacing/line_spacing.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragrpah_properties/tabs.rb
@@ -487,8 +488,20 @@ files:
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/chartsheet.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_cache.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_cache/pivot_cache_definition.rb
+- lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_cache/pivot_cache_definition/cache_fields.rb
+- lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_cache/pivot_cache_definition/cache_fields/cache_field.rb
+- lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_cache/pivot_cache_definition/cache_fields/cache_field/shared_items.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_cache/pivot_cache_definition/cache_source.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_cache/pivot_cache_definition/cache_source/worksheet_source.rb
+- lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition.rb
+- lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition/column_row_items.rb
+- lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition/column_row_items/column_row_item.rb
+- lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition/location.rb
+- lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition/pivot_fields.rb
+- lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition/pivot_fields/pivot_field.rb
+- lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition/pivot_fields/pivot_field/items.rb
+- lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition/pivot_fields/pivot_field/items/item.rb
+- lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/pivot_table_definition/pivot_table_style_info.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/shared_string_table.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/shared_string_table/string_index.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/style_sheet.rb
@@ -522,6 +535,9 @@ files:
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part/autofilter/filter_column/custom_filters/custom_filter.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part/extension_list.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part/extension_list/extension.rb
+- lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part/extension_list/extension/data_validations.rb
+- lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part/extension_list/extension/data_validations/data_validation.rb
+- lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part/extension_list/extension/data_validations/data_validation/data_validation_formula.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part/extension_list/extension/sparkline_groups.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part/extension_list/extension/sparkline_groups/sparkline_group.rb
 - lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/worksheet/table_part/extension_list/extension/x14_table.rb
@@ -560,7 +576,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.1.6
 signing_key: 
 specification_version: 4
 summary: OoxmlParser Gem