ooxml_parser 0.27.0 → 0.30.0

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
@@ -156,67 +156,65 @@ module OoxmlParser
 
     # Parse docx file
     # @return [DocumentStructure] parsed structure
-    def self.parse
-      doc_structure = DocumentStructure.new
-      doc_structure.content_types = ContentTypes.new(parent: doc_structure).parse
-      OOXMLDocumentObject.root_subfolder = 'word/'
-      OOXMLDocumentObject.xmls_stack = []
+    def parse
+      @content_types = ContentTypes.new(parent: self).parse
+      @root_subfolder = 'word/'
       @comments = []
       DocumentStructure.default_paragraph_style = DocxParagraph.new
-      DocumentStructure.default_run_style = DocxParagraphRun.new(parent: doc_structure)
-      doc_structure.theme = PresentationTheme.parse('word/theme/theme1.xml')
-      doc_structure.relationships = Relationships.new(parent: self).parse_file("#{OOXMLDocumentObject.path_to_folder}word/_rels/document.xml.rels")
-      doc_structure.parse_styles
+      DocumentStructure.default_run_style = DocxParagraphRun.new(parent: self)
+      @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 = doc_structure.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|
-          doc_structure.background = DocumentBackground.new(parent: doc_structure).parse(background)
+          @background = DocumentBackground.new(parent: self).parse(background)
         end
         document.xpath('w:body').each do |body|
           body.xpath('*').each do |element|
             case element.name
             when 'p'
               child = element.child
-              unless child.nil? && doc_structure.elements.last.instance_of?(Table)
-                paragraph_style = DocumentStructure.default_paragraph_style.dup.parse(element, number, DocumentStructure.default_run_style, parent: doc_structure)
+              unless child.nil? && @elements.last.instance_of?(Table)
+                paragraph_style = DocumentStructure.default_paragraph_style.dup.parse(element, number, DocumentStructure.default_run_style, parent: self)
                 number += 1
-                doc_structure.elements << paragraph_style.dup
+                @elements << paragraph_style.dup
               end
             when 'tbl'
-              table = Table.new(parent: doc_structure).parse(element,
-                                                             number,
-                                                             TableProperties.new)
+              table = Table.new(parent: self).parse(element,
+                                                    number,
+                                                    TableProperties.new)
               number += 1
-              doc_structure.elements << table
+              @elements << table
             when 'sdt'
-              doc_structure.elements << StructuredDocumentTag.new(parent: doc_structure).parse(element)
+              @elements << StructuredDocumentTag.new(parent: self).parse(element)
             end
           end
           body.xpath('w:sectPr').each do |sect_pr|
-            doc_structure.page_properties = PageProperties.new(parent: doc_structure).parse(sect_pr,
-                                                                                            DocumentStructure.default_paragraph_style,
-                                                                                            DocumentStructure.default_run_style)
-            doc_structure.notes = doc_structure.page_properties.notes # keep copy of notes to compatibility with previous docx models
+            @page_properties = PageProperties.new(parent: self).parse(sect_pr,
+                                                                      DocumentStructure.default_paragraph_style,
+                                                                      DocumentStructure.default_run_style)
+            @notes = page_properties.notes # keep copy of notes to compatibility with previous docx models
           end
         end
       end
-      OOXMLDocumentObject.xmls_stack.pop
-      doc_structure.document_properties = DocumentProperties.new(parent: doc_structure).parse
-      doc_structure.comments = Comments.new(parent: doc_structure).parse
-      doc_structure.comments_extended = CommentsExtended.new(parent: doc_structure).parse
-      doc_structure.comments_document = Comments.new(parent: doc_structure,
-                                                     file: "#{OOXMLDocumentObject.path_to_folder}word/#{doc_structure.relationships.target_by_type('commentsDocument').first}")
-                                                .parse
-      doc_structure.settings = DocumentSettings.new(parent: doc_structure).parse
-      doc_structure
+      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: "#{root_object.unpacked_folder}word/#{relationships.target_by_type('commentsDocument').first}")
+                                   .parse
+      @settings = DocumentSettings.new(parent: self).parse
+      self
     end
 
     # 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?
 
@@ -257,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.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,7 +15,7 @@ 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))

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

@@ -15,7 +15,7 @@ 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))

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.27.0'
+    STRING = '0.30.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 = Nokogiri::XML.parse(File.open("#{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 = Nokogiri::XML.parse(File.open(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.27.0
+  version: 0.30.0
 platform: ruby
 authors:
 - ONLYOFFICE
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-08-31 00:00:00.000000000 Z
+date: 2022-09-09 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
@@ -423,7 +424,6 @@ files:
 - 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/structured_document_tag.rb
-- lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/style_parametres.rb
 - lib/ooxml_parser/docx_parser/document_structure/header_footer.rb
 - lib/ooxml_parser/docx_parser/document_structure/numbering.rb
 - lib/ooxml_parser/docx_parser/document_structure/numbering/abstract_numbering.rb
@@ -608,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