ooxml_parser 0.29.0 → 0.31.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ae537423c384b461a5c2eb77bfe60b692ab334e1bd6ae22cc928e28230302997
-  data.tar.gz: c8696409b7862346b631367d7fa014ceea48e18deb3a6b9832fbb4dcc57dab13
+  metadata.gz: 682b6146d274c90e967ce9d494c4c6df0fafe597d9dc01fc27c3b8fa854630c2
+  data.tar.gz: a5f7c131398910ef896a0c0b21578083e02dbe84aa6d024bf4abd4e2fab2c1bb
 SHA512:
-  metadata.gz: 9b3655be06b3aa59bdb700ba359f0dffd6bbe54840978665870673edb2e7249c179807b102cc7b49a503c638b0508a3cb46f0183afa4be7a8b8baff93b3dbab6
-  data.tar.gz: 36b999f281320ca0792e6504060eb65ba0f97005ed82b131dea276f6b136e6a0cca0281a3ab4a0c67ce213fe31e26263a1603bc7cf4ac10a847e264e64ccd512
+  metadata.gz: df07e615fd1ecc0c4436072b978f6f6ba8959a83785d88fe2a1922417c94daef2227ae4914f34683e3f9542ca35e68de2652c5cf78b2a52cf828d6f46b850aa2
+  data.tar.gz: 0fce9c7ca3617ef27c67acc338f8e2eaa7a2220d98de3d4367d4b4bcf89f445a1982e58fe2e3f4ec6aa1bca48e8ed533f7bed9ad0a7d64244620f47dd241b4c3

data/lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart.rb

@@ -82,7 +82,7 @@ module OoxmlParser
     # Parse Chart data
     # @return [Chart] result of parsing
     def parse
-      chart_xml = parse_xml(OOXMLDocumentObject.current_xml)
+      chart_xml = parse_xml(root_object.current_xml)
       chart_xml.xpath('*').each do |chart_node|
         case chart_node.name
         when 'chartSpace'
@@ -180,8 +180,8 @@ module OoxmlParser
 
     # Parse relationship of chart
     def parse_relationships
-      file_name = File.basename(OOXMLDocumentObject.current_xml)
-      relationship_file = "#{OOXMLDocumentObject.path_to_folder}" \
+      file_name = File.basename(root_object.current_xml)
+      relationship_file = "#{root_object.unpacked_folder}" \
                           '/word/charts/' \
                           "_rels/#{file_name}.rels"
 
@@ -198,7 +198,7 @@ module OoxmlParser
       return if chart_relationship.empty?
 
       chart_style_file = chart_relationship.first
-      style_file = "#{OOXMLDocumentObject.path_to_folder}" \
+      style_file = "#{root_object.unpacked_folder}" \
                    "/word/charts/#{chart_style_file}"
 
       @style = ChartStyleFile.new(parent: self).parse(style_file)

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/docx_graphic.rb

@@ -23,9 +23,9 @@ module OoxmlParser
           @data = DocxPicture.new(parent: self).parse(node_child)
         when 'chart'
           @type = :chart
-          OOXMLDocumentObject.add_to_xmls_stack("#{OOXMLDocumentObject.root_subfolder}/#{OOXMLDocumentObject.get_link_from_rels(node_child.attribute('id').value)}")
+          root_object.add_to_xmls_stack("#{root_object.root_subfolder}/#{root_object.get_link_from_rels(node_child.attribute('id').value)}")
           @data = Chart.new(parent: self).parse
-          OOXMLDocumentObject.xmls_stack.pop
+          root_object.xmls_stack.pop
         when 'wgp'
           @type = :group
           @data = ShapesGrouping.new(parent: self).parse(node_child)

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/picture/docx_blip/file_reference.rb

@@ -25,7 +25,7 @@ module OoxmlParser
       return self unless @resource_id
       return self if @resource_id.empty?
 
-      @path = OOXMLDocumentObject.get_link_from_rels(@resource_id)
+      @path = root_object.get_link_from_rels(@resource_id)
       if !@path || @path.empty?
         warn "Cant find path to media file by id: #{@resource_id}"
         return self
@@ -33,7 +33,7 @@ module OoxmlParser
       return self if @path == 'NULL'
       return self if @path.match?(URI::DEFAULT_PARSER.make_regexp)
 
-      full_path_to_file = OOXMLDocumentObject.path_to_folder + OOXMLDocumentObject.root_subfolder + @path.gsub('..', '')
+      full_path_to_file = root_object.unpacked_folder + root_object.root_subfolder + @path.gsub('..', '')
       if File.exist?(full_path_to_file)
         @content = if File.extname(@path) == '.xlsx'
                      parse_ole_xlsx(full_path_to_file)
@@ -52,14 +52,7 @@ module OoxmlParser
     # @param [String] full_path to file
     # @return [XLSXWorkbook]
     def parse_ole_xlsx(full_path)
-      # TODO: Fix this ugly hack with global vars
-      #   by replacing all global variables
-      stack = OOXMLDocumentObject.xmls_stack
-      dir = OOXMLDocumentObject.path_to_folder
-      result = OoxmlParser::Parser.parse(full_path)
-      OOXMLDocumentObject.xmls_stack = stack
-      OOXMLDocumentObject.path_to_folder = dir
-      result
+      OoxmlParser::XlsxParser.parse_xlsx(full_path)
     end
   end
 end

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("#{OOXMLDocumentObject.path_to_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/hyperlink.rb

@@ -46,7 +46,7 @@ module OoxmlParser
           @url = Coordinates.new.parse_string(value.value)
         when 'id'
           @id = value.value
-          @url = OOXMLDocumentObject.get_link_from_rels(@id) unless @id.empty?
+          @url = root_object.get_link_from_rels(@id) unless @id.empty?
         when 'tooltip'
           @tooltip = value.value
         when 'ref'
@@ -80,7 +80,7 @@ module OoxmlParser
       else
         if meaningful_id?
           @action = :external_link
-          @url = OOXMLDocumentObject.get_link_from_rels(@id)
+          @url = root_object.get_link_from_rels(@id)
         end
       end
       self
@@ -98,7 +98,7 @@ module OoxmlParser
     def parse_url_for_slide_link
       return unless meaningful_id?
 
-      @url = OOXMLDocumentObject.get_link_from_rels(@id).scan(/\d+/).join.to_i
+      @url = root_object.get_link_from_rels(@id).scan(/\d+/).join.to_i
     end
   end
 end

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

@@ -28,6 +28,8 @@ module OoxmlParser
 
       instance_variables.each do |current_attribute|
         next if current_attribute == :@parent
+        next if instance_variable_get(current_attribute).is_a?(Nokogiri::XML::Element)
+
         return false unless instance_variable_get(current_attribute) == other.instance_variable_get(current_attribute)
       end
       true
@@ -47,96 +49,5 @@ module OoxmlParser
       end
       xml
     end
-
-    class << self
-      # @return [String] path to root subfolder
-      attr_accessor :root_subfolder
-      # @return [PresentationTheme] list of themes
-      attr_accessor :theme
-      # @return [Array<String>] stack of xmls
-      attr_accessor :xmls_stack
-      # @return [String] path to root folder
-      attr_accessor :path_to_folder
-
-      # Copy this file and rename to zip
-      # @param path [String] path to file
-      # @return [String] path to result zip
-      def copy_file_and_rename_to_zip(path)
-        file_name = File.basename(path)
-        tmp_folder = Dir.mktmpdir('ruby-ooxml-parser')
-        file_path = "#{tmp_folder}/#{file_name}"
-        FileUtils.rm_rf(tmp_folder) if File.directory?(tmp_folder)
-        FileUtils.mkdir_p(tmp_folder)
-        raise "Cannot find file by path #{path}" unless File.exist?(path)
-
-        FileUtils.cp path, tmp_folder
-        file_path
-      end
-
-      # Decrypt file protected with password
-      # @param path [String] path to file
-      # @param password [String] password to file
-      # @return [String] path to decrypted file
-      def decrypt_file(path, password)
-        file_name = File.basename(path)
-        tmp_folder = Dir.mktmpdir('ruby-ooxml-parser')
-        decrypted_path = "#{tmp_folder}/#{file_name}"
-        binary_password = password.encode('utf-16le').bytes.pack('c*').encode('binary')
-        OoxmlDecrypt::EncryptedFile.decrypt_to_file(path, binary_password, decrypted_path)
-
-        decrypted_path
-      end
-
-      # Unzip specified file
-      # @param path_to_file [String] path to zip file
-      # @param destination [String] folder to extract
-      # @return [void]
-      def unzip_file(path_to_file, destination)
-        Zip.warn_invalid_date = false
-        Zip::File.open(path_to_file) do |zip_file|
-          raise LoadError, "There is no files in zip #{path_to_file}" if zip_file.entries.empty?
-
-          zip_file.each do |file|
-            file_path = File.join(destination, file.name)
-            FileUtils.mkdir_p(File.dirname(file_path))
-            zip_file.extract(file, file_path) unless File.exist?(file_path)
-          end
-        end
-      end
-
-      # @return [String] dir to base of file
-      def dir
-        "#{OOXMLDocumentObject.path_to_folder}#{File.dirname(OOXMLDocumentObject.xmls_stack.last)}/"
-      end
-
-      # @return [String] path to current xml file
-      def current_xml
-        OOXMLDocumentObject.path_to_folder + OOXMLDocumentObject.xmls_stack.last
-      end
-
-      # Add file to parsing stack
-      # @param path [String] path of file to add to stack
-      # @return [void]
-      def add_to_xmls_stack(path)
-        OOXMLDocumentObject.xmls_stack << if path.include?('..')
-                                            "#{File.dirname(OOXMLDocumentObject.xmls_stack.last)}/#{path}"
-                                          elsif path.start_with?(OOXMLDocumentObject.root_subfolder)
-                                            path
-                                          else
-                                            OOXMLDocumentObject.root_subfolder + path
-                                          end
-      end
-
-      # Get link to file from rels file
-      # @param id [String] file to get
-      # @return [String] result
-      def get_link_from_rels(id)
-        rels_path = dir + "_rels/#{File.basename(OOXMLDocumentObject.xmls_stack.last)}.rels"
-        raise LoadError, "Cannot find .rels file by path: #{rels_path}" unless File.exist?(rels_path)
-
-        relationships = Relationships.new.parse_file(rels_path)
-        relationships.target_by_id(id)
-      end
-    end
   end
 end

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/common_parser/common_document_structure.rb

@@ -14,12 +14,50 @@ module OoxmlParser
     attr_accessor :default_font_style
     # @return [ContentTypes] data about content types
     attr_accessor :content_types
+    # @return [String] root sub-folder for object
+    attr_reader :root_subfolder
+    # @return [String] path to folder with unpacked document
+    attr_reader :unpacked_folder
+    # @return [Array<String>] list of xmls to parse
+    attr_accessor :xmls_stack
 
     def initialize(params = {})
       @default_font_size = params.fetch(:default_font_size, 18)
       @default_font_typeface = params.fetch(:default_font_typeface, 'Arial')
       @default_font_style = FontStyle.new
+      @unpacked_folder = params.fetch(:unpacked_folder, nil)
+      @xmls_stack = []
       super(parent: nil)
     end
+
+    # @return [String] path to current xml file
+    def current_xml
+      root_object.unpacked_folder + @xmls_stack.last
+    end
+
+    # Add file to parsing stack
+    # @param path [String] path of file to add to stack
+    # @return [void]
+    def add_to_xmls_stack(path)
+      @xmls_stack << if path.include?('..')
+                       "#{File.dirname(@xmls_stack.last)}/#{path}"
+                     elsif path.start_with?(@root_subfolder)
+                       path
+                     else
+                       @root_subfolder + path
+                     end
+    end
+
+    # Get link to file from rels file
+    # @param id [String] file to get
+    # @return [String] result
+    def get_link_from_rels(id)
+      dir = "#{unpacked_folder}#{File.dirname(@xmls_stack.last)}/"
+      rels_path = dir + "_rels/#{File.basename(@xmls_stack.last)}.rels"
+      raise LoadError, "Cannot find .rels file by path: #{rels_path}" unless File.exist?(rels_path)
+
+      relationships = Relationships.new.parse_file(rels_path)
+      relationships.target_by_id(id)
+    end
   end
 end

data/lib/ooxml_parser/common_parser/parser/ooxml_file.rb

@@ -0,0 +1,68 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for actions with OOXML file
+  class OoxmlFile
+    # @return [String] path to file
+    attr_reader :path
+
+    def initialize(path)
+      @path = path
+    end
+
+    # Copy this file and rename to zip
+    # @return [String] path to result zip
+    def copy_file_and_rename_to_zip
+      file_name = File.basename(@path)
+      tmp_folder = Dir.mktmpdir('ruby-ooxml-parser')
+      @zip_path = "#{tmp_folder}/#{file_name}"
+      FileUtils.rm_rf(tmp_folder) if File.directory?(tmp_folder)
+      FileUtils.mkdir_p(tmp_folder)
+      raise "Cannot find file by path #{@path}" unless File.exist?(@path)
+
+      FileUtils.cp path, tmp_folder
+    end
+
+    # @return [String] path to folder with zip
+    def path_to_folder
+      @zip_path.sub(File.basename(@zip_path), '')
+    end
+
+    # Unzip specified file
+    # @return [void]
+    def unzip
+      Zip.warn_invalid_date = false
+      Zip::File.open(@zip_path) do |zip_file|
+        raise LoadError, "There is no files in zip #{@zip_path}" if zip_file.entries.empty?
+
+        zip_file.each do |file|
+          file_path = File.join(path_to_folder, file.name)
+          FileUtils.mkdir_p(File.dirname(file_path))
+          zip_file.extract(file, file_path) unless File.exist?(file_path)
+        end
+      end
+    end
+
+    # @return [Symbol] file type recognized by folder structure
+    def format_by_folders
+      return :docx if Dir.exist?("#{path_to_folder}/word")
+      return :xlsx if Dir.exist?("#{path_to_folder}/xl")
+      return :pptx if Dir.exist?("#{path_to_folder}/ppt")
+
+      :zip
+    end
+
+    # Decrypt file protected with password
+    # @param password [String] password to file
+    # @return [OoxmlFile] path to decrypted file
+    def decrypt(password)
+      file_name = File.basename(@path)
+      tmp_folder = Dir.mktmpdir('ruby-ooxml-parser')
+      decrypted_path = "#{tmp_folder}/#{file_name}"
+      binary_password = password.encode('utf-16le').bytes.pack('c*').encode('binary')
+      OoxmlDecrypt::EncryptedFile.decrypt_to_file(@path, binary_password, decrypted_path)
+
+      OoxmlFile.new(decrypted_path)
+    end
+  end
+end

data/lib/ooxml_parser/common_parser/parser.rb

@@ -1,52 +1,46 @@
 # frozen_string_literal: true
 
 require_relative 'parser/encryption_checker'
+require_relative 'parser/ooxml_file'
 
 module OoxmlParser
   # Basic class for OoxmlParser
   class Parser
-    # Base method to yield parse document of any type
-    # @param path_to_file [String] file
-    # @return [CommonDocumentStructure] structure of doc
-    def self.parse_format(path_to_file)
-      return nil if EncryptionChecker.new(path_to_file).encrypted?
+    class << self
+      # Base method to yield parse document of any type
+      # @param [OoxmlFile] file with data
+      # @return [CommonDocumentStructure] structure of doc
+      def parse_format(file)
+        return nil if EncryptionChecker.new(file.path).encrypted?
 
-      path_to_zip_file = OOXMLDocumentObject.copy_file_and_rename_to_zip(path_to_file)
-      OOXMLDocumentObject.path_to_folder = path_to_zip_file.sub(File.basename(path_to_zip_file), '')
-      OOXMLDocumentObject.unzip_file(path_to_zip_file, OOXMLDocumentObject.path_to_folder)
-      model = yield
-      model.file_path = path_to_file if model
-      FileUtils.rm_rf(OOXMLDocumentObject.path_to_folder)
-      model
-    end
+        file.copy_file_and_rename_to_zip
+        file.unzip
+        model = yield(file)
+        model.file_path = file.path if model
+        FileUtils.rm_rf(file.path_to_folder)
+        model
+      end
 
-    # Base method to parse document of any type
-    # @param path_to_file [String] file
-    # @return [CommonDocumentStructure] structure of doc
-    def self.parse(path_to_file, password: nil)
-      path_to_file = OOXMLDocumentObject.decrypt_file(path_to_file, password) if password
-      Parser.parse_format(path_to_file) do
-        format = Parser.recognize_folder_format
-        case format
-        when :docx
-          DocumentStructure.new.parse
-        when :xlsx
-          XLSXWorkbook.new.parse
-        when :pptx
-          Presentation.new.parse
-        else
-          warn "#{path_to_file} is a simple zip file without OOXML content"
+      # Base method to parse document of any type
+      # @param path_to_file [String] file
+      # @return [CommonDocumentStructure] structure of doc
+      def parse(path_to_file, password: nil)
+        file = OoxmlFile.new(path_to_file)
+        file = file.decrypt(password) if password
+        Parser.parse_format(file) do |yielded_file|
+          format = yielded_file.format_by_folders
+          case format
+          when :docx
+            DocumentStructure.new(unpacked_folder: yielded_file.path_to_folder).parse
+          when :xlsx
+            XLSXWorkbook.new(unpacked_folder: yielded_file.path_to_folder).parse
+          when :pptx
+            Presentation.new(unpacked_folder: yielded_file.path_to_folder).parse
+          else
+            warn "#{path_to_file} is a simple zip file without OOXML content"
+          end
         end
       end
     end
-
-    # Recognize folder format
-    # @param directory [String] path to dirctory
-    # @return [Symbol] type of document
-    def self.recognize_folder_format(directory = OOXMLDocumentObject.path_to_folder)
-      return :docx if Dir.exist?("#{directory}/word")
-      return :xlsx if Dir.exist?("#{directory}/xl")
-      return :pptx if Dir.exist?("#{directory}/ppt")
-    end
   end
 end

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

@@ -9,8 +9,8 @@ module OoxmlParser
 
     def initialize(params = {})
       @comments_array = []
-      @file = params.fetch(:file, "#{OOXMLDocumentObject.path_to_folder}word/comments.xml")
       super(parent: params[:parent])
+      @file = params.fetch(:file, "#{root_object.unpacked_folder}word/comments.xml")
     end
 
     # @return [Comment] accessor

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

@@ -17,7 +17,7 @@ module OoxmlParser
     # Parse CommentsExtended object
     # @return [CommentsExtended] result of parsing
     def parse
-      file_to_parse = "#{OOXMLDocumentObject.path_to_folder}word/commentsExtended.xml"
+      file_to_parse = "#{root_object.unpacked_folder}word/commentsExtended.xml"
       return nil unless File.exist?(file_to_parse)
 
       doc = parse_xml(file_to_parse)

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

@@ -8,7 +8,7 @@ module OoxmlParser
     # Parse Document properties
     # @return [DocumentProperties]
     def parse
-      properties_file = "#{OOXMLDocumentObject.path_to_folder}docProps/app.xml"
+      properties_file = "#{root_object.unpacked_folder}docProps/app.xml"
       unless File.exist?(properties_file)
         warn "There is no 'docProps/app.xml' in docx. It may be some problem with it"
         return self

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

@@ -9,7 +9,7 @@ module OoxmlParser
     # Parse Settings object
     # @return [DocumentSettings] result of parsing
     def parse
-      settings_path = "#{OOXMLDocumentObject.path_to_folder}word/settings.xml"
+      settings_path = "#{root_object.unpacked_folder}word/settings.xml"
       return nil unless File.exist?(settings_path)
 
       doc = parse_xml(settings_path)

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

@@ -47,7 +47,7 @@ module OoxmlParser
     def parse(node)
       @id = node.attribute('id').value.to_i
       parse_type(node)
-      doc = parse_xml(OOXMLDocumentObject.path_to_folder + xml_path)
+      doc = parse_xml(root_object.unpacked_folder + xml_path)
       doc.search(xpath_for_search).each do |footnote|
         next unless footnote.attribute('id').value.to_i == @id
 

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

@@ -38,10 +38,10 @@ module OoxmlParser
     # Parse Numbering data
     # @return [Numbering] result of parse
     def parse
-      numbering_xml = "#{OOXMLDocumentObject.path_to_folder}word/numbering.xml"
+      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/docx_parser/document_structure/page_properties/note.rb

@@ -43,10 +43,10 @@ module OoxmlParser
     # @param target [String] name of target
     # @return [String] path to note xml file
     def file_path(target)
-      file = "#{OOXMLDocumentObject.path_to_folder}word/#{target}"
+      file = "#{root_object.unpacked_folder}word/#{target}"
       return file if File.exist?(file)
 
-      "#{OOXMLDocumentObject.path_to_folder}#{target}" unless File.exist?(file)
+      "#{root_object.unpacked_folder}#{target}" unless File.exist?(file)
     end
   end
 end

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

@@ -63,8 +63,8 @@ module OoxmlParser
         when 'cols'
           @columns = Columns.new.parse(pg_size_subnode)
         when 'headerReference', 'footerReference'
-          target = OOXMLDocumentObject.get_link_from_rels(pg_size_subnode.attribute('id').value)
-          OOXMLDocumentObject.add_to_xmls_stack("word/#{target}")
+          target = root_object.get_link_from_rels(pg_size_subnode.attribute('id').value)
+          root_object.add_to_xmls_stack("word/#{target}")
           note = Note.parse(default_paragraph: default_paragraph,
                             default_character: default_character,
                             target: target,
@@ -72,7 +72,7 @@ module OoxmlParser
                             type: File.basename(target).sub('.xml', ''),
                             parent: self)
           @notes << note
-          OOXMLDocumentObject.xmls_stack.pop
+          root_object.xmls_stack.pop
         when 'footnotePr'
           @footnote_properties = FootnoteProperties.new(parent: self).parse(pg_size_subnode)
         end

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

@@ -17,7 +17,7 @@ module OoxmlParser
     # Parse styles data
     # @return [Styles] result of parsing
     def parse
-      doc = parse_xml("#{OOXMLDocumentObject.path_to_folder}word/styles.xml")
+      doc = parse_xml("#{root_object.unpacked_folder}word/styles.xml")
       doc.xpath('w:styles/*').each do |node_child|
         case node_child.name
         when 'docDefaults'

data/lib/ooxml_parser/docx_parser/document_structure.rb

@@ -44,7 +44,7 @@ module OoxmlParser
     # @return [CommentsExtended] extended comments
     attr_accessor :comments_extended
 
-    def initialize
+    def initialize(params = {})
       @elements = []
       @notes = []
       @document_properties = DocumentProperties.new
@@ -158,17 +158,16 @@ module OoxmlParser
     # @return [DocumentStructure] parsed structure
     def parse
       @content_types = ContentTypes.new(parent: self).parse
-      OOXMLDocumentObject.root_subfolder = 'word/'
-      OOXMLDocumentObject.xmls_stack = []
+      @root_subfolder = 'word/'
       @comments = []
       DocumentStructure.default_paragraph_style = DocxParagraph.new
       DocumentStructure.default_run_style = DocxParagraphRun.new(parent: self)
-      @theme = PresentationTheme.parse('word/theme/theme1.xml')
-      @relationships = Relationships.new(parent: self).parse_file("#{OOXMLDocumentObject.path_to_folder}word/_rels/document.xml.rels")
+      @theme = PresentationTheme.new(parent: self).parse('word/theme/theme1.xml')
+      @relationships = Relationships.new(parent: self).parse_file("#{root_object.unpacked_folder}word/_rels/document.xml.rels")
       parse_styles
       number = 0
-      OOXMLDocumentObject.add_to_xmls_stack('word/document.xml')
-      doc = parse_xml(OOXMLDocumentObject.current_xml)
+      root_object.add_to_xmls_stack('word/document.xml')
+      doc = parse_xml(root_object.current_xml)
       doc.search('//w:document').each do |document|
         document.xpath('w:background').each do |background|
           @background = DocumentBackground.new(parent: self).parse(background)
@@ -201,12 +200,12 @@ module OoxmlParser
           end
         end
       end
-      OOXMLDocumentObject.xmls_stack.pop
+      root_object.xmls_stack.pop
       @document_properties = DocumentProperties.new(parent: self).parse
       @comments = Comments.new(parent: self).parse
       @comments_extended = CommentsExtended.new(parent: self).parse
       @comments_document = Comments.new(parent: self,
-                                        file: "#{OOXMLDocumentObject.path_to_folder}word/#{relationships.target_by_type('commentsDocument').first}")
+                                        file: "#{root_object.unpacked_folder}word/#{relationships.target_by_type('commentsDocument').first}")
                                    .parse
       @settings = DocumentSettings.new(parent: self).parse
       self
@@ -215,7 +214,7 @@ module OoxmlParser
     # Parse default style
     # @return [void]
     def parse_default_style
-      doc = parse_xml("#{OOXMLDocumentObject.path_to_folder}word/styles.xml")
+      doc = parse_xml("#{root_object.unpacked_folder}word/styles.xml")
       doc.search('//w:style').each do |style|
         next if style.attribute('default').nil?
 
@@ -256,7 +255,7 @@ module OoxmlParser
 
     # Perform parsing styles.xml
     def parse_styles
-      file = "#{OOXMLDocumentObject.path_to_folder}/word/styles.xml"
+      file = "#{root_object.unpacked_folder}/word/styles.xml"
       DocumentStructure.default_paragraph_style = DocxParagraph.new(parent: self)
       DocumentStructure.default_table_paragraph_style = DocxParagraph.new(parent: self)
       DocumentStructure.default_run_style = DocxParagraphRun.new(parent: self)

data/lib/ooxml_parser/docx_parser.rb

@@ -10,8 +10,9 @@ module OoxmlParser
     # @param path_to_file [String] file path
     # @return [DocumentStructure] result of parse
     def self.parse_docx(path_to_file)
-      Parser.parse_format(path_to_file) do
-        DocumentStructure.new.parse
+      file = OoxmlFile.new(path_to_file)
+      Parser.parse_format(file) do |yielded_file|
+        DocumentStructure.new(unpacked_folder: yielded_file.path_to_folder).parse
       end
     end
   end

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

@@ -15,10 +15,10 @@ module OoxmlParser
     # Parse CommentAuthors object
     # @param file [Nokogiri::XML:Element] node to parse
     # @return [CommentAuthors] result of parsing
-    def parse(file = "#{OOXMLDocumentObject.path_to_folder}/#{OOXMLDocumentObject.root_subfolder}/commentAuthors.xml")
+    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

@@ -15,10 +15,10 @@ module OoxmlParser
     # Parse PresentationComments object
     # @param file [Nokogiri::XML:Element] node to parse
     # @return [PresentationComments] result of parsing
-    def parse(file = "#{OOXMLDocumentObject.path_to_folder}/#{OOXMLDocumentObject.root_subfolder}/comments/comment1.xml")
+    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/pptx_parser/presentation/presentation_theme.rb

@@ -9,46 +9,46 @@ module OoxmlParser
     # @return [FontScheme] font scheme
     attr_accessor :font_scheme
 
-    def initialize(name = '', color_scheme = {})
-      @name = name
-      @color_scheme = color_scheme
-      super(parent: nil)
+    def initialize(parent: nil)
+      @name = ''
+      @color_scheme = {}
+      super
     end
 
     # Parse PresentationTheme
     # @param file [String] path to file to parse
     # @return [PresentationTheme] result of parsing
-    def self.parse(file)
-      OOXMLDocumentObject.theme = PresentationTheme.new
-      OOXMLDocumentObject.add_to_xmls_stack(file)
-      unless File.exist?(OOXMLDocumentObject.current_xml)
-        OOXMLDocumentObject.xmls_stack.pop
+    def parse(file)
+      root_object.add_to_xmls_stack(file)
+      unless File.exist?(root_object.current_xml)
+        root_object.xmls_stack.pop
         return
       end
-      doc = OOXMLDocumentObject.theme.parse_xml(OOXMLDocumentObject.current_xml)
+      doc = parse_xml(root_object.current_xml)
+
       doc.xpath('a:theme').each do |theme_node|
-        OOXMLDocumentObject.theme.name = theme_node.attribute('name').value if theme_node.attribute('name')
+        @name = theme_node.attribute('name').value if theme_node.attribute('name')
         theme_node.xpath('a:themeElements/*').each do |theme_element_node|
           case theme_element_node.name
           when 'clrScheme'
             theme_element_node.xpath('*').each do |color_scheme_element|
-              OOXMLDocumentObject.theme.color_scheme[color_scheme_element.name.to_sym] = ThemeColor.new.parse(color_scheme_element)
+              @color_scheme[color_scheme_element.name.to_sym] = ThemeColor.new.parse(color_scheme_element)
             end
-            OOXMLDocumentObject.theme.color_scheme[:background1] = OOXMLDocumentObject.theme.color_scheme[:lt1]
-            OOXMLDocumentObject.theme.color_scheme[:background2] = OOXMLDocumentObject.theme.color_scheme[:lt2]
-            OOXMLDocumentObject.theme.color_scheme[:bg1] = OOXMLDocumentObject.theme.color_scheme[:lt1]
-            OOXMLDocumentObject.theme.color_scheme[:bg2] = OOXMLDocumentObject.theme.color_scheme[:lt2]
-            OOXMLDocumentObject.theme.color_scheme[:text1] = OOXMLDocumentObject.theme.color_scheme[:dk1]
-            OOXMLDocumentObject.theme.color_scheme[:text2] = OOXMLDocumentObject.theme.color_scheme[:dk2]
-            OOXMLDocumentObject.theme.color_scheme[:tx1] = OOXMLDocumentObject.theme.color_scheme[:dk1]
-            OOXMLDocumentObject.theme.color_scheme[:tx2] = OOXMLDocumentObject.theme.color_scheme[:dk2]
+            @color_scheme[:background1] = @color_scheme[:lt1]
+            @color_scheme[:background2] = @color_scheme[:lt2]
+            @color_scheme[:bg1] = @color_scheme[:lt1]
+            @color_scheme[:bg2] = @color_scheme[:lt2]
+            @color_scheme[:text1] = @color_scheme[:dk1]
+            @color_scheme[:text2] = @color_scheme[:dk2]
+            @color_scheme[:tx1] = @color_scheme[:dk1]
+            @color_scheme[:tx2] = @color_scheme[:dk2]
           when 'fontScheme'
-            OOXMLDocumentObject.theme.font_scheme = FontScheme.new(parent: self).parse(theme_element_node)
+            @font_scheme = FontScheme.new(parent: self).parse(theme_element_node)
           end
         end
       end
-      OOXMLDocumentObject.xmls_stack.pop
-      OOXMLDocumentObject.theme
+      root_object.xmls_stack.pop
+      self
     end
   end
 end

data/lib/ooxml_parser/pptx_parser/presentation/slide/graphic_frame/graphic_frame.rb

@@ -30,9 +30,9 @@ module OoxmlParser
                 when 'tbl'
                   graphic_data << Table.new(parent: self).parse(graphic_node_child)
                 when 'chart'
-                  OOXMLDocumentObject.add_to_xmls_stack(OOXMLDocumentObject.get_link_from_rels(graphic_node_child.attribute('id').value))
+                  root_object.add_to_xmls_stack(root_object.get_link_from_rels(graphic_node_child.attribute('id').value))
                   graphic_data << Chart.new(parent: self).parse
-                  OOXMLDocumentObject.xmls_stack.pop
+                  root_object.xmls_stack.pop
                 when 'oleObj'
                   graphic_data << OleObject.new(parent: self).parse(graphic_node_child)
                 end

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

@@ -51,9 +51,9 @@ module OoxmlParser
     # Parse Slide object
     # @return [Slide] result of parsing
     def parse
-      OOXMLDocumentObject.add_to_xmls_stack(@xml_path)
+      root_object.add_to_xmls_stack(@xml_path)
       @name = File.basename(@xml_path, '.*')
-      node = parse_xml(OOXMLDocumentObject.current_xml)
+      node = parse_xml(root_object.current_xml)
       node.xpath('//p:sld/*').each do |node_child|
         case node_child.name
         when 'cSld'
@@ -66,8 +66,8 @@ module OoxmlParser
           @alternate_content = PresentationAlternateContent.new(parent: self).parse(node_child)
         end
       end
-      OOXMLDocumentObject.xmls_stack.pop
-      @relationships = Relationships.new(parent: self).parse_file("#{OOXMLDocumentObject.path_to_folder}#{File.dirname(@xml_path)}/_rels/#{@name}.xml.rels")
+      root_object.xmls_stack.pop
+      @relationships = Relationships.new(parent: self).parse_file("#{root_object.unpacked_folder}#{File.dirname(@xml_path)}/_rels/#{@name}.xml.rels")
       parse_note
       self
     end
@@ -79,7 +79,7 @@ module OoxmlParser
       notes_target = @relationships.target_by_type('notes')
       return nil if notes_target.empty?
 
-      @note = PresentationNotes.new(parent: self).parse("#{OOXMLDocumentObject.path_to_folder}#{File.dirname(@xml_path)}/#{notes_target.first}")
+      @note = PresentationNotes.new(parent: self).parse("#{root_object.unpacked_folder}#{File.dirname(@xml_path)}/#{notes_target.first}")
     end
   end
 end

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

@@ -10,7 +10,7 @@ module OoxmlParser
     # @param file [String] path to file to parse
     # @return [SlideLayoutFile] result of parsing
     def parse(file)
-      OOXMLDocumentObject.add_to_xmls_stack(file.gsub(OOXMLDocumentObject.path_to_folder, ''))
+      root_object.add_to_xmls_stack(file.gsub(root_object.unpacked_folder, ''))
       doc = parse_xml(file)
       doc.xpath('p:sldLayout/*').each do |node_child|
         case node_child.name
@@ -18,7 +18,7 @@ module OoxmlParser
           @common_slide_data = CommonSlideData.new(parent: self).parse(node_child)
         end
       end
-      OOXMLDocumentObject.xmls_stack.pop
+      root_object.xmls_stack.pop
       self
     end
   end

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

@@ -5,7 +5,7 @@ module OoxmlParser
   module SlideLayoutsHelper
     # @return [Array<String>] list of slide layouts files
     def slide_layouts_files
-      Dir["#{OOXMLDocumentObject.path_to_folder}ppt/slideLayouts/*.xml"]
+      Dir["#{root_object.unpacked_folder}ppt/slideLayouts/*.xml"]
     end
 
     private

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

@@ -10,7 +10,7 @@ module OoxmlParser
     # @param file [String] path to file to parse
     # @return [SlideMasterFile] result of parsing
     def parse(file)
-      OOXMLDocumentObject.add_to_xmls_stack(file.gsub(OOXMLDocumentObject.path_to_folder, ''))
+      root_object.add_to_xmls_stack(file.gsub(root_object.unpacked_folder, ''))
       doc = parse_xml(file)
       doc.xpath('p:sldMaster/*').each do |node_child|
         case node_child.name
@@ -18,7 +18,7 @@ module OoxmlParser
           @common_slide_data = CommonSlideData.new(parent: self).parse(node_child)
         end
       end
-      OOXMLDocumentObject.xmls_stack.pop
+      root_object.xmls_stack.pop
       self
     end
   end

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

@@ -5,7 +5,7 @@ module OoxmlParser
   module SlideMastersHelper
     # @return [Array<String>] list of slide masters files
     def slide_masters_files
-      Dir["#{OOXMLDocumentObject.path_to_folder}ppt/slideMasters/*.xml"]
+      Dir["#{root_object.unpacked_folder}ppt/slideMasters/*.xml"]
     end
 
     private

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

@@ -14,7 +14,7 @@ module OoxmlParser
     # Parse TableStyles object
     # @param file [Nokogiri::XML:Element] node to parse
     # @return [TableStyles] result of parsing
-    def parse(file = "#{OOXMLDocumentObject.path_to_folder}/#{OOXMLDocumentObject.root_subfolder}/tableStyles.xml")
+    def parse(file = "#{root_object.unpacked_folder}/#{root_object.root_subfolder}/tableStyles.xml")
       return nil unless File.exist?(file)
 
       document = parse_xml(file)

data/lib/ooxml_parser/pptx_parser/presentation.rb

@@ -43,11 +43,10 @@ module OoxmlParser
     # @return [Presentation] parsed presentation
     def parse
       @content_types = ContentTypes.new(parent: self).parse
-      OOXMLDocumentObject.root_subfolder = 'ppt/'
-      OOXMLDocumentObject.xmls_stack = []
-      OOXMLDocumentObject.add_to_xmls_stack('ppt/presentation.xml')
-      doc = parse_xml(OOXMLDocumentObject.current_xml)
-      @theme = PresentationTheme.parse('ppt/theme/theme1.xml')
+      @root_subfolder = 'ppt/'
+      root_object.add_to_xmls_stack('ppt/presentation.xml')
+      doc = parse_xml(root_object.current_xml)
+      @theme = PresentationTheme.new(parent: self).parse('ppt/theme/theme1.xml')
       @table_styles = TableStyles.new(parent: self).parse
       @comment_authors = CommentAuthors.new(parent: self).parse
       @comments = PresentationComments.new(parent: self).parse
@@ -60,13 +59,13 @@ module OoxmlParser
           presentation_node_child.xpath('p:sldId').each do |silde_id_node|
             slide_id = silde_id_node.attr('r:id')
             @slides << Slide.new(parent: self,
-                                 xml_path: "#{OOXMLDocumentObject.root_subfolder}/#{OOXMLDocumentObject.get_link_from_rels(slide_id)}")
+                                 xml_path: "#{root_object.root_subfolder}/#{root_object.get_link_from_rels(slide_id)}")
                             .parse
           end
         end
       end
-      OOXMLDocumentObject.xmls_stack.pop
-      @relationships = Relationships.new(parent: self).parse_file("#{OOXMLDocumentObject.path_to_folder}/ppt/_rels/presentation.xml.rels")
+      root_object.xmls_stack.pop
+      @relationships = Relationships.new(parent: self).parse_file("#{root_object.unpacked_folder}/ppt/_rels/presentation.xml.rels")
       parse_slide_layouts
       parse_slide_masters
       self

data/lib/ooxml_parser/pptx_parser.rb

@@ -9,8 +9,9 @@ module OoxmlParser
     # @param path_to_file [String] file path
     # @return [Presentation] result of parse
     def self.parse_pptx(path_to_file)
-      Parser.parse_format(path_to_file) do
-        Presentation.new.parse
+      file = OoxmlFile.new(path_to_file)
+      Parser.parse_format(file) do |yielded_file|
+        Presentation.new(unpacked_folder: yielded_file.path_to_folder).parse
       end
     end
   end

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.29.0'
+    STRING = '0.31.0'
   end
 end

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

@@ -15,8 +15,8 @@ module OoxmlParser
     # @param file [String] file to parse
     # @return [Chartsheet] result of parsing
     def parse(file)
-      OOXMLDocumentObject.add_to_xmls_stack(OOXMLDocumentObject.root_subfolder + file)
-      doc = parse_xml(OOXMLDocumentObject.current_xml)
+      root_object.add_to_xmls_stack(root_object.root_subfolder + file)
+      doc = parse_xml(root_object.current_xml)
       node = doc.xpath('//xmlns:chartsheet').first
       node.xpath('*').each do |node_child|
         case node_child.name
@@ -26,7 +26,7 @@ module OoxmlParser
           end
         end
       end
-      OOXMLDocumentObject.xmls_stack.pop
+      root_object.xmls_stack.pop
       self
     end
   end

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

@@ -33,7 +33,7 @@ module OoxmlParser
     # @return [PivotCacheDefinition] pivot cache definition for current pivot cache
     def parse_pivot_cache_definition
       definition_file = root_object.relationships.target_by_id(id)
-      full_file_path = "#{OOXMLDocumentObject.path_to_folder}/xl/#{definition_file}"
+      full_file_path = "#{root_object.unpacked_folder}/xl/#{definition_file}"
       @pivot_cache_definition = PivotCacheDefinition.new(parent: root_object)
                                                     .parse(full_file_path)
     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("#{OOXMLDocumentObject.path_to_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/style_sheet.rb

@@ -32,7 +32,7 @@ module OoxmlParser
     # Parse StyleSheet object
     # @return [StyleSheet] result of parsing
     def parse
-      doc = parse_xml("#{OOXMLDocumentObject.path_to_folder}/#{OOXMLDocumentObject.root_subfolder}/styles.xml")
+      doc = parse_xml("#{root_object.unpacked_folder}/#{root_object.root_subfolder}/styles.xml")
       doc.root.xpath('*').each do |node_child|
         case node_child.name
         when 'numFmts'

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

@@ -19,8 +19,8 @@ module OoxmlParser
     # @param node [Nokogiri::XML:Element] node to parse
     # @return [TablePart] result of parsing
     def parse(node)
-      link_to_table_part_xml = OOXMLDocumentObject.get_link_from_rels(node.attribute('id').value)
-      doc = parse_xml(OOXMLDocumentObject.path_to_folder + link_to_table_part_xml.gsub('..', 'xl'))
+      link_to_table_part_xml = root_object.get_link_from_rels(node.attribute('id').value)
+      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|
         case key

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

@@ -61,9 +61,9 @@ module OoxmlParser
     # Perform parsing of relationships
     # @return [nil]
     def parse_relationships
-      OOXMLDocumentObject.add_to_xmls_stack("#{OOXMLDocumentObject.root_subfolder}/worksheets/_rels/#{@xml_name}.rels")
-      @relationships = Relationships.new(parent: self).parse_file(OOXMLDocumentObject.current_xml) if File.exist?(OOXMLDocumentObject.current_xml)
-      OOXMLDocumentObject.xmls_stack.pop
+      root_object.add_to_xmls_stack("#{root_object.root_subfolder}/worksheets/_rels/#{@xml_name}.rels")
+      @relationships = Relationships.new(parent: self).parse_file(root_object.current_xml) if File.exist?(root_object.current_xml)
+      root_object.xmls_stack.pop
     end
 
     # @return [True, false] if structure contain any user data
@@ -79,7 +79,7 @@ module OoxmlParser
 
     # Parse list of drawings in file
     def parse_drawing
-      drawing_node = parse_xml(OOXMLDocumentObject.current_xml)
+      drawing_node = parse_xml(root_object.current_xml)
       drawing_node.xpath('xdr:wsDr/*').each do |drawing_node_child|
         @drawings << XlsxDrawing.new(parent: self).parse(drawing_node_child)
       end
@@ -91,8 +91,8 @@ module OoxmlParser
     def parse(path_to_xml_file)
       @xml_name = File.basename path_to_xml_file
       parse_relationships
-      OOXMLDocumentObject.add_to_xmls_stack("#{OOXMLDocumentObject.root_subfolder}/worksheets/#{File.basename(path_to_xml_file)}")
-      doc = parse_xml(OOXMLDocumentObject.current_xml)
+      root_object.add_to_xmls_stack("#{root_object.root_subfolder}/worksheets/#{File.basename(path_to_xml_file)}")
+      doc = parse_xml(root_object.current_xml)
       sheet = doc.search('//xmlns:worksheet').first
       sheet.xpath('*').each do |worksheet_node_child|
         case worksheet_node_child.name
@@ -107,11 +107,11 @@ module OoxmlParser
             @merge << merge_node.attribute('ref').value.to_s
           end
         when 'drawing'
-          path_to_drawing = OOXMLDocumentObject.get_link_from_rels(worksheet_node_child.attribute('id').value)
+          path_to_drawing = root_object.get_link_from_rels(worksheet_node_child.attribute('id').value)
           unless path_to_drawing.nil?
-            OOXMLDocumentObject.add_to_xmls_stack(path_to_drawing)
+            root_object.add_to_xmls_stack(path_to_drawing)
             parse_drawing
-            OOXMLDocumentObject.xmls_stack.pop
+            root_object.xmls_stack.pop
           end
         when 'hyperlinks'
           worksheet_node_child.xpath('xmlns:hyperlink').each do |hyperlink_node|
@@ -150,7 +150,7 @@ module OoxmlParser
         end
       end
       parse_comments
-      OOXMLDocumentObject.xmls_stack.pop
+      root_object.xmls_stack.pop
       self
     end
 
@@ -175,7 +175,7 @@ module OoxmlParser
       comments_target = relationships.target_by_type('comment')
       return if comments_target.empty?
 
-      comments_file = "#{OOXMLDocumentObject.path_to_folder}/#{OOXMLDocumentObject.root_subfolder}/#{comments_target.first.gsub('..', '')}"
+      comments_file = "#{root_object.unpacked_folder}/#{root_object.root_subfolder}/#{comments_target.first.gsub('..', '')}"
       @comments = ExcelComments.new(parent: self).parse(comments_file)
     end
   end

data/lib/ooxml_parser/xlsx_parser/workbook.rb

@@ -109,7 +109,7 @@ module OoxmlParser
       shared_strings_target = relationships.target_by_type('sharedString')
       return if shared_strings_target.empty?
 
-      shared_string_file = "#{OOXMLDocumentObject.path_to_folder}/xl/#{shared_strings_target.first}"
+      shared_string_file = "#{root_object.unpacked_folder}/xl/#{shared_strings_target.first}"
       @shared_strings_table = SharedStringTable.new(parent: self).parse(shared_string_file)
     end
 
@@ -117,13 +117,12 @@ module OoxmlParser
     # @return [XLSXWorkbook]
     def parse
       @content_types = ContentTypes.new(parent: self).parse
-      @relationships = Relationships.new(parent: self).parse_file("#{OOXMLDocumentObject.path_to_folder}xl/_rels/workbook.xml.rels")
+      @relationships = Relationships.new(parent: self).parse_file("#{root_object.unpacked_folder}xl/_rels/workbook.xml.rels")
       parse_shared_strings
-      OOXMLDocumentObject.xmls_stack = []
-      OOXMLDocumentObject.root_subfolder = 'xl/'
-      OOXMLDocumentObject.add_to_xmls_stack('xl/workbook.xml')
-      @doc = Nokogiri::XML.parse(File.open(OOXMLDocumentObject.current_xml))
-      @theme = PresentationTheme.parse("xl/#{link_to_theme_xml}") if link_to_theme_xml
+      @root_subfolder = 'xl/'
+      root_object.add_to_xmls_stack('xl/workbook.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|
         @sheets << Sheet.new(parent: self).parse(sheet)
@@ -139,7 +138,7 @@ module OoxmlParser
       parse_pivot_table
       parse_defined_names
       parse_workbook_protection
-      OOXMLDocumentObject.xmls_stack.pop
+      root_object.xmls_stack.pop
       self
     end
 

data/lib/ooxml_parser/xlsx_parser.rb

@@ -9,8 +9,9 @@ module OoxmlParser
     # @param path_to_file [String] file path
     # @return [XLSXWorkbook] result of parse
     def self.parse_xlsx(path_to_file)
-      Parser.parse_format(path_to_file) do
-        XLSXWorkbook.new.parse
+      file = OoxmlFile.new(path_to_file)
+      Parser.parse_format(file) do |yielded_file|
+        XLSXWorkbook.new(unpacked_folder: yielded_file.path_to_folder).parse
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ooxml_parser
 version: !ruby/object:Gem::Version
-  version: 0.29.0
+  version: 0.31.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-09-05 00:00:00.000000000 Z
+date: 2022-09-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -363,6 +363,7 @@ files:
 - lib/ooxml_parser/common_parser/common_document_structure.rb
 - lib/ooxml_parser/common_parser/parser.rb
 - lib/ooxml_parser/common_parser/parser/encryption_checker.rb
+- lib/ooxml_parser/common_parser/parser/ooxml_file.rb
 - lib/ooxml_parser/configuration.rb
 - lib/ooxml_parser/docx_parser.rb
 - lib/ooxml_parser/docx_parser/document_structure.rb
@@ -607,7 +608,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.21
+rubygems_version: 3.3.22
 signing_key: 
 specification_version: 4
 summary: OoxmlParser Gem