ooxml_parser 0.32.0 → 0.34.0

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.32.0'
+    STRING = '0.34.0'
   end
 end

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

@@ -5,11 +5,11 @@ module OoxmlParser
   class Location < OOXMLDocumentObject
     # @return [String] ref of location
     attr_reader :ref
-    # @return [True, False] first header row
+    # @return [Integer] first header row
     attr_reader :first_header_row
-    # @return [True, False] first data row
+    # @return [Integer] first data row
     attr_reader :first_data_row
-    # @return [True, False] first data column
+    # @return [Integer] first data column
     attr_reader :first_data_column
 
     # Parse `<location>` tag
@@ -21,11 +21,11 @@ module OoxmlParser
         when 'ref'
           @ref = value.value.to_s
         when 'firstHeaderRow'
-          @first_header_row = attribute_enabled?(value)
+          @first_header_row = value.value.to_i
         when 'firstDataRow'
-          @first_data_row = attribute_enabled?(value)
+          @first_data_row = value.value.to_i
         when 'firstDataCol'
-          @first_data_column = attribute_enabled?(value)
+          @first_data_column = value.value.to_i
         end
       end
       self

data/lib/ooxml_parser/xlsx_parser/workbook/style_sheet/cell_xfs/cell_style/protection.rb

@@ -21,9 +21,9 @@ module OoxmlParser
       node.attributes.each do |key, value|
         case key
         when 'locked'
-          @locked = attribute_enabled?(value)
+          @locked = boolean_attribute_value(value)
         when 'hidden'
-          @hidden = attribute_enabled?(value)
+          @hidden = boolean_attribute_value(value)
         end
       end
       self

data/lib/ooxml_parser/xlsx_parser/workbook/style_sheet/cell_xfs/xf.rb

@@ -93,15 +93,15 @@ module OoxmlParser
       node.attributes.each do |key, value|
         case key
         when 'applyFont'
-          @apply_font = attribute_enabled?(value)
+          @apply_font = boolean_attribute_value(value)
         when 'applyBorder'
-          @apply_border = attribute_enabled?(value)
+          @apply_border = boolean_attribute_value(value)
         when 'applyFill'
-          @apply_fill = attribute_enabled?(value)
+          @apply_fill = boolean_attribute_value(value)
         when 'applyNumberFormat'
-          @apply_number_format = attribute_enabled?(value)
+          @apply_number_format = boolean_attribute_value(value)
         when 'applyAlignment'
-          @apply_alignment = attribute_enabled?(value)
+          @apply_alignment = boolean_attribute_value(value)
         when 'fontId'
           @font_id = value.value.to_i
         when 'borderId'

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

@@ -18,7 +18,7 @@ module OoxmlParser
       node.attributes.each do |key, value|
         case key
         when 'date1904'
-          @date1904 = attribute_enabled?(value)
+          @date1904 = boolean_attribute_value(value)
         end
       end
       self

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

@@ -32,9 +32,9 @@ module OoxmlParser
       node.attributes.each do |key, value|
         case key
         when 'showGridLines'
-          @show_gridlines = attribute_enabled?(value)
+          @show_gridlines = boolean_attribute_value(value)
         when 'showRowColHeaders'
-          @show_row_column_headers = attribute_enabled?(value)
+          @show_row_column_headers = boolean_attribute_value(value)
         when 'topLeftCell'
           @top_left_cell = Coordinates.new.parse_string(value.value)
         when 'workbookViewId'

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

@@ -7,6 +7,8 @@ require_relative 'table_part/table_columns'
 module OoxmlParser
   # Class for `tablePart` data
   class TablePart < OOXMLDocumentObject
+    # @return [String] id of table part
+    attr_reader :id
     attr_accessor :name, :display_name, :reference, :autofilter, :columns
     # @return [ExtensionList] list of extensions
     attr_accessor :extension_list
@@ -19,7 +21,13 @@ module OoxmlParser
     # @param node [Nokogiri::XML:Element] node to parse
     # @return [TablePart] result of parsing
     def parse(node)
-      link_to_table_part_xml = root_object.get_link_from_rels(node.attribute('id').value)
+      node.attributes.each do |key, value|
+        case key
+        when 'id'
+          @id = value.value.to_s
+        end
+      end
+      link_to_table_part_xml = root_object.get_link_from_rels(@id)
       doc = parse_xml(root_object.unpacked_folder + link_to_table_part_xml.gsub('..', 'xl'))
       table_node = doc.xpath('xmlns:table').first
       table_node.attributes.each do |key, value|

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

@@ -39,9 +39,9 @@ module OoxmlParser
         when 'customWidth'
           @custom_width = option_enabled?(node, 'customWidth')
         when 'bestFit'
-          @best_fit = attribute_enabled?(value)
+          @best_fit = boolean_attribute_value(value)
         when 'hidden'
-          @hidden = attribute_enabled?(value)
+          @hidden = boolean_attribute_value(value)
         end
       end
       self

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

@@ -32,13 +32,13 @@ module OoxmlParser
       node.attributes.each do |key, value|
         case key
         when 'alignWithMargins'
-          @align_with_margins = attribute_enabled?(value)
+          @align_with_margins = boolean_attribute_value(value)
         when 'differentFirst'
-          @different_first = attribute_enabled?(value)
+          @different_first = boolean_attribute_value(value)
         when 'differentOddEven'
-          @different_odd_even = attribute_enabled?(value)
+          @different_odd_even = boolean_attribute_value(value)
         when 'scaleWithDoc'
-          @scale_with_document = attribute_enabled?(value)
+          @scale_with_document = boolean_attribute_value(value)
         end
 
         node.xpath('*').each do |node_child|

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

@@ -107,7 +107,8 @@ module OoxmlParser
             @merge << merge_node.attribute('ref').value.to_s
           end
         when 'drawing'
-          path_to_drawing = root_object.get_link_from_rels(worksheet_node_child.attribute('id').value)
+          @drawing = DocxDrawing.new(parent: self).parse(worksheet_node_child)
+          path_to_drawing = root_object.get_link_from_rels(@drawing.id)
           unless path_to_drawing.nil?
             root_object.add_to_xmls_stack(path_to_drawing)
             parse_drawing

data/lib/ooxml_parser/xlsx_parser/workbook.rb

@@ -129,7 +129,7 @@ module OoxmlParser
       @style_sheet = StyleSheet.new(parent: self).parse
       @doc.xpath('xmlns:workbook/xmlns:sheets/xmlns:sheet').each do |sheet|
         @sheets << Sheet.new(parent: self).parse(sheet)
-        file = @relationships.target_by_id(sheet.attribute('id').value)
+        file = @relationships.target_by_id(@sheets.last.id)
         if file.start_with?('worksheets')
           @worksheets << Worksheet.new(parent: self).parse(file)
           @worksheets.last.name = @sheets.last.name

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.32.0
+  version: 0.34.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-10-03 00:00:00.000000000 Z
+date: 2022-11-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -325,6 +325,7 @@ files:
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_run/run_properties.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_run/run_properties/outline.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_run/run_properties/position.rb
+- lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_run/run_properties/run_fonts.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_run/run_properties/run_spacing.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_run/run_properties/run_style.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_run/run_properties/shade.rb
@@ -372,6 +373,7 @@ files:
 - lib/ooxml_parser/docx_parser/document_structure/comments/comment.rb
 - lib/ooxml_parser/docx_parser/document_structure/comments_extended.rb
 - lib/ooxml_parser/docx_parser/document_structure/comments_extended/comment_extended.rb
+- lib/ooxml_parser/docx_parser/document_structure/default_style_helper.rb
 - lib/ooxml_parser/docx_parser/document_structure/document_background.rb
 - lib/ooxml_parser/docx_parser/document_structure/document_properties.rb
 - lib/ooxml_parser/docx_parser/document_structure/document_settings.rb
@@ -408,6 +410,7 @@ files:
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/docx_paragraph_helper.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/docx_paragraph_run.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/docx_paragraph_run/docx_paragraph_run_helpers.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/docx_paragraph_run/field_char.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/docx_paragraph_run/instruction_text.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/docx_paragraph_run/object.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/docx_paragraph_run/object/ole_object.rb
@@ -424,6 +427,15 @@ files:
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/inserted.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_content.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/checkbox.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/checkbox/checkbox_state.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/combobox.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/combobox/list_item.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/dropdown_list.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/form_properties.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/form_text_properties.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/form_text_properties/form_text_comb.rb
+- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/form_text_properties/form_text_format.rb
 - lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/structured_document_tag.rb
 - lib/ooxml_parser/docx_parser/document_structure/header_footer.rb
 - lib/ooxml_parser/docx_parser/document_structure/numbering.rb
@@ -442,6 +454,8 @@ files:
 - lib/ooxml_parser/docx_parser/document_structure/page_properties/note.rb
 - lib/ooxml_parser/docx_parser/document_structure/page_properties/page_margins.rb
 - lib/ooxml_parser/docx_parser/document_structure/page_properties/page_properties.rb
+- lib/ooxml_parser/docx_parser/document_structure/page_properties/page_properties/header_footer_reference.rb
+- lib/ooxml_parser/docx_parser/document_structure/page_properties/page_properties/page_borders.rb
 - lib/ooxml_parser/docx_parser/document_structure/page_properties/page_size.rb
 - lib/ooxml_parser/docx_parser/document_structure/styles.rb
 - lib/ooxml_parser/docx_parser/document_structure/styles/document_defaults.rb
@@ -469,6 +483,7 @@ files:
 - lib/ooxml_parser/pptx_parser/presentation/slide/common_slide_data/shape_tree.rb
 - lib/ooxml_parser/pptx_parser/presentation/slide/connection_shape.rb
 - lib/ooxml_parser/pptx_parser/presentation/slide/graphic_frame/graphic_frame.rb
+- lib/ooxml_parser/pptx_parser/presentation/slide/graphic_frame/graphic_frame/chart_reference.rb
 - lib/ooxml_parser/pptx_parser/presentation/slide/presentation_alternate_content.rb
 - lib/ooxml_parser/pptx_parser/presentation/slide/presentation_notes.rb
 - lib/ooxml_parser/pptx_parser/presentation/slide/slide/shapes_grouping.rb
@@ -610,7 +625,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.22
+rubygems_version: 3.3.25
 signing_key: 
 specification_version: 4
 summary: OoxmlParser Gem