ooxml_parser 0.30.0 → 0.32.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8264219a82e05f855d6e850703479fdfbb25b866ee5eb5705ac5171903fd7dd
-  data.tar.gz: e5ef8d6182d11e432c97bc8d63a1632f270c443acf17803b6abafc502ae0681a
+  metadata.gz: 7cf7caeb2bfc8c48e6727c5a35c8514e07cf85fe2f528e742dd96be9473b3318
+  data.tar.gz: 07e1d21315c8dcd83664019f93cc1992926e176024420bd9fcdbc4de0837f9dd
 SHA512:
-  metadata.gz: d666854752d50ce5a26dd6c36fa78b801e34de2938eb10e6247ca11832979eea3b23a8fc8a838e272b64df9e13f0947a747dbe322ac008ec797cd0a836c22519
-  data.tar.gz: 81facb1e39faa54991524a2c3b3b613588c990d6cf02be6ac063b17c6971f0f08af0bc09a95cdae99a7a4eb50d1bb1a7278bc76377c0e496786b6f86335335f2
+  metadata.gz: 743b318ed40ff1805d7c6db6f32532dca25c6452be286808fcd52e5992e41bfa0a36de2574fcc828984f4dee095a75ba80cfc2221c49ef923db1880092ff9d83
+  data.tar.gz: 781db58bd859d241763049196327cfed403d3eb2fbb5288e9018a05eabab1f69b4115783e43166817e08e8e13485c25d1ada81db0cede73b82af38d52c4ca493

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

@@ -21,7 +21,7 @@ module OoxmlParser
     # Parse ContentTypes object
     # @return [ContentTypes] result of parsing
     def parse
-      doc = Nokogiri::XML.parse(File.open("#{root_object.unpacked_folder}/[Content_Types].xml"))
+      doc = parse_xml("#{root_object.unpacked_folder}/[Content_Types].xml")
       node = doc.xpath('*').first
 
       node.xpath('*').each do |node_child|

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

@@ -3,6 +3,11 @@
 module OoxmlParser
   # Class for working with coordinates
   class Coordinates
+    # @return [Regexp] regexp for row name
+    ROW_REGEXP = /[a-z]/i.freeze
+    # @return [Regexp] regexp for column name
+    COLUMN_REGEXP = /\d/.freeze
+
     attr_accessor :row, :column, :list
 
     def initialize(row = nil, column = nil, list = nil)
@@ -30,10 +35,10 @@ module OoxmlParser
         range = arguments_string.split(':')
 
         difference = []
-        symbols_from = range.first.scan(/[a-zA-z]/).join
-        symbols_to = range.last.scan(/[a-zA-z]/).join
-        digits_from = range.first.scan(/[0-9]/).join
-        digits_to = range.last.scan(/[0-9]/).join
+        symbols_from = range.first.scan(ROW_REGEXP).join
+        symbols_to = range.last.scan(ROW_REGEXP).join
+        digits_from = range.first.scan(COLUMN_REGEXP).join
+        digits_to = range.last.scan(COLUMN_REGEXP).join
 
         difference[0] = [symbols_from, symbols_to] unless symbols_from == symbols_to
         difference[1] = [digits_from, digits_to] unless digits_from == digits_to

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing <buBlip> tag
+  class BulletImage < OOXMLDocumentObject
+    # @return [FileReference] image structure
+    attr_reader :file_reference
+
+    # Parse BulletImage object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [BulletImage] result of parsing
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'blip'
+          @file_reference = FileReference.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/common_parser/common_data/paragraph/{paragrpah_properties → paragraph_properties}/numbering_properties.rb

@@ -3,7 +3,7 @@
 module OoxmlParser
   # Class for parsing `numPr` tags
   class NumberingProperties < OOXMLDocumentObject
-    attr_accessor :size, :font, :symbol, :start_at, :type, :ilvl, :numbering_properties
+    attr_accessor :size, :font, :symbol, :start_at, :type, :image, :ilvl, :numbering_properties
 
     def initialize(ilvl = 0, parent: nil)
       @ilvl = ilvl

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

@@ -1,11 +1,12 @@
 # frozen_string_literal: true
 
-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'
+require_relative 'paragraph_properties/numbering_properties'
+require_relative 'paragraph_properties/paragraph_borders'
+require_relative 'paragraph_properties/paragraph_spacing'
+require_relative 'paragraph_properties/paragraph_style_ref'
+require_relative 'paragraph_properties/spacing'
+require_relative 'paragraph_properties/tabs'
+require_relative 'paragraph_properties/bullet_image'
 module OoxmlParser
   # Class for data for ParagraphProperties
   class ParagraphProperties < OOXMLDocumentObject
@@ -74,6 +75,8 @@ module OoxmlParser
           @numbering.font = node_child.attribute('typeface').value
         when 'buChar'
           @numbering.symbol = node_child.attribute('char').value
+        when 'buBlip'
+          @numbering.image = BulletImage.new(parent: self).parse(node_child)
         when 'buAutoNum'
           @numbering.type = node_child.attribute('type').value.to_sym
           @numbering.start_at = node_child.attribute('startAt').value if node_child.attribute('startAt')

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

@@ -47,6 +47,8 @@ module OoxmlParser
     attr_accessor :shade
     # @return [RunStyle] run style
     attr_accessor :run_style
+    # @return [ValuedChild] ligatures type
+    attr_reader :ligatures
 
     def initialize(params = {})
       @font_name = params.fetch(:font_name, '')
@@ -124,6 +126,8 @@ module OoxmlParser
           @shade = Shade.new(parent: self).parse(node_child)
         when 'rStyle'
           @run_style = RunStyle.new(parent: self).parse(node_child)
+        when 'ligatures'
+          @ligatures = ValuedChild.new(:symbol, parent: self).parse(node_child)
         end
       end
       @font_color = DocxColorScheme.new(parent: self).parse(node)

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

@@ -41,7 +41,7 @@ module OoxmlParser
       numbering_xml = "#{root_object.unpacked_folder}word/numbering.xml"
       return nil unless File.exist?(numbering_xml)
 
-      node = parse_xml(File.open(numbering_xml))
+      node = parse_xml(numbering_xml)
       node.xpath('w:numbering/*').each do |numbering_child_node|
         case numbering_child_node.name
         when 'abstractNum'

data/lib/ooxml_parser/pptx_parser/presentation/comment_authors.rb

@@ -18,7 +18,7 @@ module OoxmlParser
     def parse(file = "#{root_object.unpacked_folder}/#{root_object.root_subfolder}/commentAuthors.xml")
       return nil unless File.exist?(file)
 
-      document = parse_xml(File.open(file))
+      document = parse_xml(file)
       node = document.xpath('*').first
 
       node.xpath('*').each do |node_child|

data/lib/ooxml_parser/pptx_parser/presentation/presentation_comments.rb

@@ -18,7 +18,7 @@ module OoxmlParser
     def parse(file = "#{root_object.unpacked_folder}/#{root_object.root_subfolder}/comments/comment1.xml")
       return nil unless File.exist?(file)
 
-      document = parse_xml(File.open(file))
+      document = parse_xml(file)
       node = document.xpath('*').first
 
       node.xpath('*').each do |node_child|

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.30.0'
+    STRING = '0.32.0'
   end
 end

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

@@ -55,7 +55,7 @@ module OoxmlParser
     # @param [String] file path
     # @return [PivotTableDefinition] result of parsing
     def parse(file)
-      doc = Nokogiri::XML.parse(File.open("#{root_object.unpacked_folder}/#{file}"))
+      doc = parse_xml("#{root_object.unpacked_folder}/#{file}")
       node = doc.xpath('//xmlns:pivotTableDefinition').first
       node.attributes.each do |key, value|
         case key

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing <workbookPr> tag
+  class WorkbookProperties < OOXMLDocumentObject
+    # @return [True, False] Specifies if 1904 date system is used in workbook
+    attr_reader :date1904
+
+    def initialize(parent: nil)
+      @date1904 = false
+      super
+    end
+
+    # Parse WorkbookProperties data
+    # @param [Nokogiri::XML:Element] node with WorkbookProperties data
+    # @return [WorkbookProperties] value of WorkbookProperties
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'date1904'
+          @date1904 = attribute_enabled?(value)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/xlsx_parser/workbook.rb

@@ -4,6 +4,7 @@ require_relative 'workbook/chartsheet'
 require_relative 'workbook/pivot_cache'
 require_relative 'workbook/pivot_table_definition'
 require_relative 'workbook/defined_name'
+require_relative 'workbook/workbook_properties'
 require_relative 'workbook/workbook_protection'
 require_relative 'workbook/shared_string_table'
 require_relative 'workbook/style_sheet'
@@ -31,6 +32,8 @@ module OoxmlParser
     attr_accessor :pivot_table_definitions
     # @return [Array<DefinedName>] list of defined names
     attr_reader :defined_names
+    # @return [WorkbookProperties] workbook properties
+    attr_reader :workbook_properties
     # @return [WorkbookProtection] protection of workbook structure
     attr_reader :workbook_protection
 
@@ -121,7 +124,7 @@ module OoxmlParser
       parse_shared_strings
       @root_subfolder = 'xl/'
       root_object.add_to_xmls_stack('xl/workbook.xml')
-      @doc = Nokogiri::XML.parse(File.open(root_object.current_xml))
+      @doc = parse_xml(root_object.current_xml)
       @theme = PresentationTheme.new(parent: self).parse("xl/#{link_to_theme_xml}") if link_to_theme_xml
       @style_sheet = StyleSheet.new(parent: self).parse
       @doc.xpath('xmlns:workbook/xmlns:sheets/xmlns:sheet').each do |sheet|
@@ -137,6 +140,7 @@ module OoxmlParser
       parse_pivot_cache
       parse_pivot_table
       parse_defined_names
+      parse_workbook_properties
       parse_workbook_protection
       root_object.xmls_stack.pop
       self
@@ -170,6 +174,14 @@ module OoxmlParser
       end
     end
 
+    # Perform parsing of workbook properties
+    def parse_workbook_properties
+      workbook_properties = @doc.search('//xmlns:workbookPr').first
+      return nil unless workbook_properties
+
+      @workbook_properties = WorkbookProperties.new(parent: self).parse(workbook_properties)
+    end
+
     # Perform parsing of workbook protection
     def parse_workbook_protection
       workbook_protection = @doc.search('//xmlns:workbookProtection').first

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.32.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-09 00:00:00.000000000 Z
+date: 2022-10-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -312,6 +312,15 @@ files:
 - lib/ooxml_parser/common_parser/common_data/ooxml_document_object/ooxml_object_attribute_helper.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties.rb
+- lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/bullet_image.rb
+- lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/numbering_properties.rb
+- lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/paragraph_borders.rb
+- lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/paragraph_spacing.rb
+- lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/paragraph_style_ref.rb
+- lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/spacing.rb
+- lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/spacing/line_spacing.rb
+- lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/tabs.rb
+- lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_properties/tabs/tab.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_run.rb
 - 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
@@ -321,14 +330,6 @@ files:
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_run/run_properties/shade.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_run/run_properties/size.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/paragraph_run/text.rb
-- 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
-- lib/ooxml_parser/common_parser/common_data/paragraph/paragrpah_properties/tabs/tab.rb
 - lib/ooxml_parser/common_parser/common_data/paragraph/text_field.rb
 - lib/ooxml_parser/common_parser/common_data/relationships.rb
 - lib/ooxml_parser/common_parser/common_data/relationships/relationship.rb
@@ -532,6 +533,7 @@ files:
 - lib/ooxml_parser/xlsx_parser/workbook/style_sheet/xlsx_borders.rb
 - lib/ooxml_parser/xlsx_parser/workbook/style_sheet/xlsx_borders/xlsx_border.rb
 - lib/ooxml_parser/xlsx_parser/workbook/workbook_helpers.rb
+- lib/ooxml_parser/xlsx_parser/workbook/workbook_properties.rb
 - lib/ooxml_parser/xlsx_parser/workbook/workbook_protection.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet.rb
 - lib/ooxml_parser/xlsx_parser/workbook/worksheet/excel_comments.rb