ooxml_parser 0.36.0 → 0.37.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: a8c7e158e72093d65c4d1b16f922e74a2247e56a59fee2f2927b78cc5f1db5f2
-  data.tar.gz: c492e2f255c1333576ace90867e0ef05901737e84be8419eea65afdac7704fcc
+  metadata.gz: 87456a8bc9e65bfdc392bc011d85d926898a72fd1fd93b9df816ff9c17829e23
+  data.tar.gz: a1c31e373fe50d84c20a94921efa541b6aec385efb9985def44853c394a8f814
 SHA512:
-  metadata.gz: b4e27b723b95306eb10460667885db44490f774bc386ae8dc73868ef3ad41ccf5c71c3b48cec2f0187a6fc56926eb9fd966180b141bf46706666dfe3c5934627
-  data.tar.gz: 0b0fef55b19efde661e3c8440ba797fecc20c29465962d2cdd9daaf95c36b5149594d3376c6705a606ff8dac28cb9b9df5edb2abb77fa2b49e67af508025c40b
+  metadata.gz: bc5b0d1c069bd862ee61ee2043abe88e3862f509d12e3c5cdb1a3aabb6e40742ae4f16410911fd3a34d8babd21aa94c15bd4a072456b482f00e127a7c371a15d
+  data.tar.gz: 81cde9b66505385865c6a9c236e7c3bd49b7bb5265f260e8821675bff6e0df06c5b12fe190ba79d09f7c23c6158162d69963ba022a9746c7c67ed4880f991114

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

@@ -144,15 +144,15 @@ module OoxmlParser
           char_number += 1
         when 'hyperlink'
           @hyperlink = Hyperlink.new(parent: self).parse(node_child)
-          hyperlink_run = default_character_style.dup
-          hyperlink_run.parent = self
-          if @hyperlink.id
-            @hyperlink.parent = hyperlink_run
-            hyperlink_run.link = @hyperlink
-          elsif @hyperlink.anchor
-            hyperlink_run.link = @hyperlink.anchor
-          end
           node_child.xpath('w:r').each do |r_tag|
+            hyperlink_run = default_character_style.dup
+            hyperlink_run.parent = self
+            if @hyperlink.id
+              @hyperlink.parent = hyperlink_run
+              hyperlink_run.link = @hyperlink
+            elsif @hyperlink.anchor
+              hyperlink_run.link = @hyperlink.anchor
+            end
             hyperlink_run.parse(r_tag, char_number, parent: self)
             character_styles_array << hyperlink_run
             char_number += 1

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.36.0'
+    STRING = '0.37.0'
   end
 end

data/lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/data_fields/data_field.rb

@@ -0,0 +1,47 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing <dataField> tag
+  class DataField < OOXMLDocumentObject
+    # @return [Integer] index of the base field for the ShowDataAs calculation
+    attr_accessor :base_field
+    # @return [Integer] index of the base item for the ShowDataAs calculation
+    attr_accessor :base_item
+    # @return [Integer] index of the field in the pivotCacheRecords
+    attr_accessor :field
+    # @return [String] name of the data field
+    attr_reader :name
+    # @return [Integer] index of the number format applied to data field
+    attr_accessor :number_format_id
+    # @return [ExtensionList] list of extensions
+    attr_accessor :extension_list
+
+    # Parse `<dataField>` tag
+    # # @param [Nokogiri::XML:Element] node with DataField data
+    # @return [DataField]
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'baseField'
+          @base_field = value.value.to_i
+        when 'baseItem'
+          @base_item = value.value.to_i
+        when 'fld'
+          @field = value.value.to_i
+        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 'extLst'
+          @extension_list = ExtensionList.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/data_fields.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative 'data_fields/data_field'
+
+module OoxmlParser
+  # Class for parsing <dataFields> tag
+  class DataFields < OOXMLDocumentObject
+    # @return [Integer] count
+    attr_reader :count
+    # @return [Array<DataField>] list of DataField object
+    attr_reader :data_field
+
+    def initialize(parent: nil)
+      @data_field = []
+      super
+    end
+
+    # @return [DataField] accessor
+    def [](key)
+      @data_field[key]
+    end
+
+    # Parse `<dataFields>` tag
+    # @param [Nokogiri::XML:Element] node with dataFields data
+    # @return [DataFields]
+    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 'dataField'
+          @data_field << DataField.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/page_fields/page_field.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing <pageField> tag
+  class PageField < OOXMLDocumentObject
+    # @return [Integer] index of the field
+    attr_accessor :field
+    # @return [Integer]  index of the OLAP hierarchy
+    attr_reader :hierarchy
+
+    # Parse `<pageField>` tag
+    # # @param [Nokogiri::XML:Element] node with PageField data
+    # @return [PageField]
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'fld'
+          @field = value.value.to_i
+        when 'hier'
+          @hierarchy = value.value.to_i
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/page_fields.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative 'page_fields/page_field'
+
+module OoxmlParser
+  # Class for parsing <pageFields> tag
+  class PageFields < OOXMLDocumentObject
+    # @return [Integer] count
+    attr_reader :count
+    # @return [Array<PageField>] list of PageField object
+    attr_reader :page_field
+
+    def initialize(parent: nil)
+      @page_field = []
+      super
+    end
+
+    # @return [PageField] accessor
+    def [](key)
+      @page_field[key]
+    end
+
+    # Parse `<pageFields>` tag
+    # @param [Nokogiri::XML:Element] node with pageFields data
+    # @return [PageFields]
+    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 'pageField'
+          @page_field << PageField.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/row_fields/field.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing <field> tag
+  class Field < OOXMLDocumentObject
+    # @return [Integer] the index to a pivotField item value
+    attr_accessor :field_index
+
+    # Parse `<field>` tag
+    # # @param [Nokogiri::XML:Element] node with Field data
+    # @return [Field]
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'x'
+          @field_index = value.value.to_i
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/row_fields.rb

@@ -0,0 +1,43 @@
+# frozen_string_literal: true
+
+require_relative 'row_fields/field'
+
+module OoxmlParser
+  # Class for parsing <rowFields> tag
+  class RowFields < OOXMLDocumentObject
+    # @return [Integer] count
+    attr_reader :count
+    # @return [Array<Field>] list of Field object
+    attr_reader :fields
+
+    def initialize(parent: nil)
+      @fields = []
+      super
+    end
+
+    # @return [Field] accessor
+    def [](key)
+      @fields[key]
+    end
+
+    # Parse `<rowFields>` tag
+    # @param [Nokogiri::XML:Element] node with rowFields data
+    # @return [RowFields]
+    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 'field'
+          @fields << Field.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

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

@@ -4,6 +4,9 @@ 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'
+require_relative 'pivot_table_definition/data_fields'
+require_relative 'pivot_table_definition/page_fields'
+require_relative 'pivot_table_definition/row_fields'
 
 module OoxmlParser
   # Class for parsing <PivotTableDefinition> tag
@@ -50,6 +53,14 @@ module OoxmlParser
     attr_reader :row_items
     # @return [PivotTableStyleInfo] style info
     attr_reader :style_info
+    # @return [DataFields] data fields
+    attr_reader :data_fields
+    # @return [PageFields] page fields
+    attr_reader :page_fields
+    # @return [RowFields] row fields
+    attr_reader :row_fields
+    # @return [RowFields] column fields
+    attr_reader :column_fields
 
     # Parse PivotTableDefinition object
     # @param [String] file path
@@ -106,6 +117,14 @@ module OoxmlParser
           @column_items = ColumnRowItems.new(parent: self).parse(node_child)
         when 'pivotTableStyleInfo'
           @style_info = PivotTableStyleInfo.new(parent: self).parse(node_child)
+        when 'dataFields'
+          @data_fields = DataFields.new(parent: self).parse(node_child)
+        when 'pageFields'
+          @page_fields = PageFields.new(parent: self).parse(node_child)
+        when 'rowFields'
+          @row_fields = RowFields.new(parent: self).parse(node_child)
+        when 'colFields'
+          @column_fields = RowFields.new(parent: self).parse(node_child)
         end
       end
       self

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for `x14:dataField` data
+  class X14DataField < OOXMLDocumentObject
+    # @return [Symbol] pivot show as type
+    attr_reader :pivot_show_as
+
+    # Parse X14DataField data
+    # @param [Nokogiri::XML:Element] node with X14DataField data
+    # @return [X14Table] value of X14DataField data
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'pivotShowAs'
+          @pivot_show_as = value.value.to_sym
+        end
+      end
+      self
+    end
+  end
+end

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

@@ -4,6 +4,7 @@ require_relative 'extension/data_validations'
 require_relative 'extension/sparkline_groups'
 require_relative 'extension/x14_table'
 require_relative 'extension/conditional_formattings'
+require_relative 'extension/x14_data_field'
 module OoxmlParser
   # Class for `ext` data
   class Extension < OOXMLDocumentObject
@@ -15,6 +16,8 @@ module OoxmlParser
     attr_accessor :table
     # @return [SparklineGroups] list of groups
     attr_reader :sparkline_groups
+    # @return [X14DataField] pivot data field in x14 namespace
+    attr_accessor :data_field
 
     # Parse Extension data
     # @param [Nokogiri::XML:Element] node with Extension data
@@ -30,6 +33,8 @@ module OoxmlParser
           @table = X14Table.new(parent: self).parse(column_node)
         when 'sparklineGroups'
           @sparkline_groups = SparklineGroups.new(parent: self).parse(column_node)
+        when 'dataField'
+          @data_field = X14DataField.new(parent: self).parse(column_node)
         end
       end
       self

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.36.0
+  version: 0.37.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-05-10 00:00:00.000000000 Z
+date: 2023-06-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -54,146 +54,6 @@ dependencies:
     - - "~>"
       - !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: '4'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '4'
-- !ruby/object:Gem::Dependency
-  name: rake
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '13'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        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: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: rubocop-performance
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1'
-- !ruby/object:Gem::Dependency
-  name: rubocop-rake
-  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: rubocop-rspec
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        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: 0.9.20
 description: Parse OOXML files (docx, xlsx, pptx)
 email:
 - shockwavenn@gmail.com
@@ -524,12 +384,18 @@ files:
 - lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition.rb
 - lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/column_row_items.rb
 - lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/column_row_items/column_row_item.rb
+- lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/data_fields.rb
+- lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/data_fields/data_field.rb
 - lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/location.rb
+- lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/page_fields.rb
+- lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/page_fields/page_field.rb
 - lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/pivot_fields.rb
 - lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/pivot_fields/pivot_field.rb
 - lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/pivot_fields/pivot_field/items.rb
 - lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/pivot_fields/pivot_field/items/item.rb
 - lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/pivot_table_style_info.rb
+- lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/row_fields.rb
+- lib/ooxml_parser/xlsx_parser/workbook/pivot_table_definition/row_fields/field.rb
 - lib/ooxml_parser/xlsx_parser/workbook/shared_string_table.rb
 - lib/ooxml_parser/xlsx_parser/workbook/shared_string_table/string_index.rb
 - lib/ooxml_parser/xlsx_parser/workbook/sheet.rb
@@ -587,6 +453,7 @@ files:
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/extension_list/extension/sparkline_groups/sparkline_group.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/extension_list/extension/sparkline_groups/sparkline_group/sparklines.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/extension_list/extension/sparkline_groups/sparkline_group/sparklines/sparkline.rb
+- lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/extension_list/extension/x14_data_field.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/extension_list/extension/x14_table.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/table_columns.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/table_part/table_columns/table_column.rb
@@ -627,7 +494,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.13
+rubygems_version: 3.4.14
 signing_key: 
 specification_version: 4
 summary: OoxmlParser Gem