ooxml_parser 0.9.0 → 0.12.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d8e3e91e0a460a222a1b728590f787326cc5dcccbb08ca49609dde048038592a
-  data.tar.gz: 75cafd238d3318956e9df7ae7101914d7ab66d7719ecbbb8eac7c6ad620330fd
+  metadata.gz: 70f22490ee51df42e0fcdab9b647c19ee44adcef3ad22a2af2ee68de346b8fcd
+  data.tar.gz: e7faaec854030bb9b6b435401c78d50f1421bbf12eac175c8772eba608b92ed6
 SHA512:
-  metadata.gz: e6f5ca51269103d59ebb7199dd98dd123dbc6b4a7d007f2a41a08ba7f26f3291433cb5d4188e0218e0d5d87b3066d9e4513b7ce75b3a49b4a74e18252acb465f
-  data.tar.gz: a155b362cb64c70a70a367fb99ec499c9b9eb282deeb1451f77a99efecae19a4f549f76178643889011e5dc3831eca2f02ff8cb6b9bbc619a4de3511aa86845c
+  metadata.gz: b3c1dadbed29dddce8f84bb2df7c09b50fa117608f66fb5f4895259618d7659e772cf7617de7e5ea7979d914800d589eff122a6022670daeaad73de1817b013c
+  data.tar.gz: bb7a942fbc164badb3b066bd5fea520f972b8821929f10027f3f4be9e91161cbe7d11f4f5c519559da51280db12d7aa9f487dd31a24179e2bb8846b167e25cae

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)
-          true
-        elsif (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
@@ -268,7 +264,7 @@ module OoxmlParser
         return Color.new(VALUE_FOR_NONE_COLOR, VALUE_FOR_NONE_COLOR, VALUE_FOR_NONE_COLOR) if str == 'none' || str == '' || str == 'transparent' || str.nil?
 
         split = if str.include?('RGB (') || str.include?('rgb(')
-                  str.gsub(/[(RGBrgb() )]/, '').split(',')
+                  str.gsub(/[(RGBrgb) ]/, '').split(',')
                 elsif str.include?('RGB ') || str.include?('rgb')
                   str.gsub(/RGB |rgb/, '').split(', ')
                 else

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

@@ -30,6 +30,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
@@ -74,9 +76,7 @@ module OoxmlParser
           @numbering.start_at = node_child.attribute('startAt').value if node_child.attribute('startAt')
         when 'framePr'
           @frame_properties = FrameProperties.new(parent: self).parse(node_child)
-        when 'tabs'
-          @tabs = Tabs.new(parent: self).parse(node_child)
-        when 'tabLst'
+        when 'tabs', 'tabLst'
           @tabs = Tabs.new(parent: self).parse(node_child)
         when 'ind'
           @indent = Indents.new(parent: self).parse(node_child)
@@ -88,6 +88,8 @@ module OoxmlParser
           @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/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/common_parser/common_data/table/margins/paragraph_margins.rb

@@ -8,11 +8,7 @@ module OoxmlParser
                    left = OoxmlSize.new(0),
                    right = OoxmlSize.new(0),
                    parent: nil)
-      @top = top
-      @bottom = bottom
-      @left = left
-      @right = right
-      super(parent: parent)
+      super(true, top, bottom, left, right, parent: parent)
     end
 
     # Parse ParagraphMargins object

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

@@ -180,7 +180,7 @@ module OoxmlParser
             case element.name
             when 'p'
               child = element.child
-              unless child.nil? && doc_structure.elements.last.class == Table
+              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)
                 number += 1
                 doc_structure.elements << paragraph_style.dup

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
@@ -41,7 +41,7 @@ module OoxmlParser
       @number = 0
       @bookmark_start = []
       @bookmark_end = []
-      @align = 'left'
+      @align = :left
       @spacing = Spacing.new
       @ind = Indents.new
       @character_style_array = []
@@ -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'
@@ -177,7 +177,7 @@ module OoxmlParser
         end
       end
       @number = par_number
-      character_styles_array.last.text = character_styles_array.last.text.rstrip if character_styles_array.last.class == DocxParagraphRun
+      character_styles_array.last.text = character_styles_array.last.text.rstrip if character_styles_array.last.instance_of?(DocxParagraphRun)
       @character_style_array = character_styles_array
       @parent = parent
       self
@@ -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'

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/pptx_parser/pptx_data/presentation/slide/slide_helper.rb

@@ -20,9 +20,7 @@ module OoxmlParser
       case object
       when :image
         elements.find { |e| e.is_a? DocxPicture }.properties.transform
-      when :chart
-        elements.find { |e| e.is_a? GraphicFrame }.transform
-      when :table
+      when :chart, :table
         elements.find { |e| e.is_a? GraphicFrame }.transform
       when :shape
         elements.find { |e| !e.shape_properties.preset.nil? }.shape_properties.transform

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.9.0'
+    STRING = '0.12.1'
   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
 
@@ -43,9 +47,10 @@ module OoxmlParser
         return row.cells[column.to_i - 1]
       elsif sheet.is_a?(String)
         @worksheets.each do |worksheet|
-          if worksheet.name == sheet
-            return worksheet.rows[row.to_i - 1].cells[column.to_i - 1] unless worksheet.rows[row.to_i - 1].nil?
-          end
+          next unless worksheet.name == sheet
+          next unless worksheet.rows[row.to_i - 1]
+
+          return worksheet.rows[row.to_i - 1].cells[column.to_i - 1]
         end
         return nil
       end
@@ -119,6 +124,7 @@ module OoxmlParser
         end
       end
       parse_pivot_cache
+      parse_pivot_table
       OOXMLDocumentObject.xmls_stack.pop
       self
     end
@@ -135,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)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.9.0
+  version: 0.12.1
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-08-20 00:00:00.000000000 Z
+date: 2021-02-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -18,118 +18,182 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.6'
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: ruby-filemagic
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.1'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: overcommit
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: parallel_tests
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
-    - - "<"
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.0'
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '13.0'
+        version: '13'
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '3'
 - !ruby/object:Gem::Dependency
   name: rubocop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.89.1
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.89.1
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rubocop-performance
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.7.1
+        version: '1'
 - !ruby/object:Gem::Dependency
   name: rubocop-rake
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rubocop-rspec
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.43.1
+        version: '2'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '2'
+- !ruby/object:Gem::Dependency
+  name: simplecov
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: 0.9.20
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 1.43.1
+        version: 0.9.20
 description: Parse OOXML files (docx, xlsx, pptx)
 email:
 - shockwavenn@gmail.com
@@ -423,8 +487,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
@@ -489,14 +565,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: '2.4'
+      version: '2.5'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.4
+rubygems_version: 3.2.9
 signing_key: 
 specification_version: 4
 summary: OoxmlParser Gem