ooxml_parser 0.30.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8264219a82e05f855d6e850703479fdfbb25b866ee5eb5705ac5171903fd7dd
-  data.tar.gz: e5ef8d6182d11e432c97bc8d63a1632f270c443acf17803b6abafc502ae0681a
+  metadata.gz: 682b6146d274c90e967ce9d494c4c6df0fafe597d9dc01fc27c3b8fa854630c2
+  data.tar.gz: a5f7c131398910ef896a0c0b21578083e02dbe84aa6d024bf4abd4e2fab2c1bb
 SHA512:
-  metadata.gz: d666854752d50ce5a26dd6c36fa78b801e34de2938eb10e6247ca11832979eea3b23a8fc8a838e272b64df9e13f0947a747dbe322ac008ec797cd0a836c22519
-  data.tar.gz: 81facb1e39faa54991524a2c3b3b613588c990d6cf02be6ac063b17c6971f0f08af0bc09a95cdae99a7a4eb50d1bb1a7278bc76377c0e496786b6f86335335f2
+  metadata.gz: df07e615fd1ecc0c4436072b978f6f6ba8959a83785d88fe2a1922417c94daef2227ae4914f34683e3f9542ca35e68de2652c5cf78b2a52cf828d6f46b850aa2
+  data.tar.gz: 0fce9c7ca3617ef27c67acc338f8e2eaa7a2220d98de3d4367d4b4bcf89f445a1982e58fe2e3f4ec6aa1bca48e8ed533f7bed9ad0a7d64244620f47dd241b4c3

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_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.31.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.rb

@@ -121,7 +121,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|

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.30.0
+  version: 0.31.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-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri