ooxml_parser 0.1.2 → 0.2.0

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

@@ -0,0 +1,56 @@
+module OoxmlParser
+  class PageSize < OOXMLDocumentObject
+    attr_accessor :height, :width, :orientation
+
+    def initialize(height = nil, width = nil, orientation = :portrait)
+      @height = height
+      @width = width
+      @orientation = orientation
+    end
+
+    def to_s
+      'Height: ' + @height.to_s + ' Width: ' + @width.to_s + ' Orientation: ' + @orientation.to_s
+    end
+
+    # @return [True, False] compare dimensions of size, ignoring orientation
+    def same_dimensions?(other)
+      (@height == other.height) && (@width == other.width) ||
+        (@height == other.width) && (@width == other.height)
+    end
+
+    # @return [String] get human format name
+    def name
+      return 'US Letter' if same_dimensions?(PageSize.new(OoxmlSize.new(27.94, :centimeter), OoxmlSize.new(21.59, :centimeter)))
+      return 'US Legal' if same_dimensions?(PageSize.new(OoxmlSize.new(35.56, :centimeter), OoxmlSize.new(21.59, :centimeter)))
+      return 'A4' if same_dimensions?(PageSize.new(OoxmlSize.new(29.7, :centimeter), OoxmlSize.new(21.0, :centimeter)))
+      return 'A5' if same_dimensions?(PageSize.new(OoxmlSize.new(20.99, :centimeter), OoxmlSize.new(14.81, :centimeter)))
+      return 'B5' if same_dimensions?(PageSize.new(OoxmlSize.new(25.01, :centimeter), OoxmlSize.new(17.6, :centimeter)))
+      return 'Envelope #10' if same_dimensions?(PageSize.new(OoxmlSize.new(24.13, :centimeter), OoxmlSize.new(10.48, :centimeter)))
+      return 'Envelope DL' if same_dimensions?(PageSize.new(OoxmlSize.new(22.01, :centimeter), OoxmlSize.new(11.01, :centimeter)))
+      return 'Tabloid' if same_dimensions?(PageSize.new(OoxmlSize.new(43.17, :centimeter), OoxmlSize.new(27.94, :centimeter)))
+      return 'A3' if same_dimensions?(PageSize.new(OoxmlSize.new(42.01, :centimeter), OoxmlSize.new(29.7, :centimeter)))
+      return 'Tabloid Oversize' if same_dimensions?(PageSize.new(OoxmlSize.new(45.71, :centimeter), OoxmlSize.new(30.48, :centimeter)))
+      return 'ROC 16K' if same_dimensions?(PageSize.new(OoxmlSize.new(27.3, :centimeter), OoxmlSize.new(19.68, :centimeter)))
+      return 'Envelope Choukei 3' if same_dimensions?(PageSize.new(OoxmlSize.new(23.49, :centimeter), OoxmlSize.new(11.99, :centimeter)))
+      return 'Super B/A3' if same_dimensions?(PageSize.new(OoxmlSize.new(48.25, :centimeter), OoxmlSize.new(33.02, :centimeter)))
+      "Unknown page size: Height #{@height} Width #{@width}"
+    end
+
+    # Parse PageSize
+    # @param [Nokogiri::XML:Element] node with PageSize
+    # @return [PageSize] value of Size
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'orient'
+          @orientation = value.value.to_sym
+        when 'h'
+          @height = OoxmlSize.new(value.value.to_f)
+        when 'w'
+          @width = OoxmlSize.new(value.value.to_f)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/styles/document_defaults/paragraph_properties_default.rb

@@ -0,0 +1,20 @@
+module OoxmlParser
+  # Class for parsing `w:pPrDefault` tags
+  class ParagraphPropertiesDefault < OOXMLDocumentObject
+    # @return [ParagraphProperties] properties of run
+    attr_accessor :paragraph_properties
+
+    # Parse ParagraphPropertiesDefault object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [ParagraphPropertiesDefault] result of parsing
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'pPr'
+          @paragraph_properties = ParagraphProperties.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/styles/document_defaults/run_properties_default.rb

@@ -0,0 +1,20 @@
+module OoxmlParser
+  # Class for parsing `w:rPrDefault` tags
+  class RunPropertiesDefault < OOXMLDocumentObject
+    # @return [RunProperties] properties of run
+    attr_accessor :run_properties
+
+    # Parse RunPropertiesDefault object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [RunPropertiesDefault] result of parsing
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'rPr'
+          @run_properties = RunProperties.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+require_relative 'document_defaults/paragraph_properties_default'
+require_relative 'document_defaults/run_properties_default'
+module OoxmlParser
+  # Class for parsing `w:docDefaults` tags
+  class DocumentDefaults < OOXMLDocumentObject
+    # @return [RunPropertiesDefault] default properties of run
+    attr_accessor :run_properties_default
+    # @return [RunPropertiesDefault] default properties of run
+    attr_accessor :paragraph_properties_default
+
+    # Parse Bookmark object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [Bookmark] result of parsing
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'rPrDefault'
+          @run_properties_default = RunPropertiesDefault.new(parent: self).parse(node_child)
+        when 'pPrDefault'
+          @paragraph_properties_default = ParagraphPropertiesDefault.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

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

@@ -0,0 +1,19 @@
+require_relative 'styles/document_defaults'
+module OoxmlParser
+  # Class for parsing `styles.xml` file
+  class Styles < OOXMLDocumentObject
+    # @return [DocumentDefaults] defaults of document
+    attr_accessor :document_defaults
+
+    def parse
+      doc = Nokogiri::XML(File.open(OOXMLDocumentObject.path_to_folder + 'word/styles.xml'))
+      doc.xpath('w:styles/*').each do |node_child|
+        case node_child.name
+        when 'docDefaults'
+          @document_defaults = DocumentDefaults.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

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

@@ -3,23 +3,34 @@ require_relative 'document_structure/comment'
 require_relative 'document_structure/docx_paragraph'
 require_relative 'document_structure/document_background'
 require_relative 'document_structure/document_properties'
+require_relative 'document_structure/document_structure_helpers'
 require_relative 'document_structure/document_style'
 require_relative 'document_structure/header_footer'
+require_relative 'document_structure/numbering'
 require_relative 'document_structure/page_properties/page_properties'
+require_relative 'document_structure/document_settings'
+require_relative 'document_structure/styles'
 module OoxmlParser
   class DocumentStructure < CommonDocumentStructure
+    include DocumentStyleHelper
+    include DocumentStructureHelpers
     attr_accessor :elements, :page_properties, :notes, :background, :document_properties, :comments
 
     # @return [Array, DocumentStyle] array of document styles in current document
     attr_accessor :document_styles
+    # @return [Numbering] store numbering data
+    attr_accessor :numbering
+    # @return [Styles] styles of document
+    attr_accessor :styles
+    attr_accessor :theme_colors
+    # @return [DocumentSettings] settings
+    attr_accessor :settings
 
-    def initialize(elements = [], page_properties = nil, notes = [], background = nil, document_properties = DocumentProperties.new, comments = [])
-      @elements = elements
-      @page_properties = page_properties
-      @notes = notes
-      @background = background
-      @document_properties = document_properties
-      @comments = comments
+    def initialize
+      @elements = []
+      @notes = []
+      @document_properties = DocumentProperties.new
+      @comments = []
       @document_styles = []
     end
 
@@ -87,8 +98,8 @@ module OoxmlParser
 
     def recognize_numbering(location: :canvas, type: :simple, paragraph_number: 0)
       elements = element_by_description(location: location, type: type)
-      lvl_text = elements[paragraph_number].numbering.numbering_properties.ilvls[0].level_text
-      num_format = elements[paragraph_number].numbering.numbering_properties.ilvls[0].num_format
+      lvl_text = elements[paragraph_number].numbering.abstruct_numbering.level_list[0].text.value
+      num_format = elements[paragraph_number].numbering.abstruct_numbering.level_list[0].numbering_format.value
       [num_format, lvl_text]
     end
 
@@ -96,84 +107,73 @@ module OoxmlParser
       elements = element_by_description(location: location, type: type)
       set = []
       levels_count.times do |col|
-        set[0] = elements[col].numbering.numbering_properties.ilvls[col].num_format
-        set[1] = elements[col].numbering.numbering_properties.ilvls[col].level_text
+        set[0] = elements[col].numbering.abstruct_numbering.level_list[col].numbering_format.value
+        set[1] = elements[col].numbering.abstruct_numbering.level_list[col].text.value
       end
       set
     end
 
-    # Return document style by its name
-    # @param name [String] name of style
-    # @return [DocumentStyle, nil]
-    def document_style_by_name(name)
-      @document_styles.each do |style|
-        return style if style.name == name
-      end
-      nil
-    end
-
-    # Check if style exists in current document
-    # @param name [String] name of style
-    # @return [True, False]
-    def style_exist?(name)
-      !document_style_by_name(name).nil?
-    end
-
     def self.parse
+      doc_structure = DocumentStructure.new
       OOXMLDocumentObject.root_subfolder = 'word/'
       OOXMLDocumentObject.xmls_stack = []
-      OOXMLDocumentObject.namespace_prefix = 'w'
       @comments = []
-      @default_paragraph = DocxParagraph.new
-      @default_character = DocxParagraphRun.new
-      @default_table_properties = TableProperties.new
-      PresentationTheme.parse('word/theme/theme1.xml')
+      DocumentStructure.default_paragraph_style = DocxParagraph.new
+      DocumentStructure.default_run_style = DocxParagraphRun.new
+      doc_structure.theme_colors = PresentationTheme.parse('word/theme/theme1.xml')
       OOXMLDocumentObject.add_to_xmls_stack('word/styles.xml')
       doc = Nokogiri::XML(File.open(OOXMLDocumentObject.current_xml))
+      # TODO: Remove this old way parsing in favor of doc_structure.styles.document_defaults
       doc.search('//w:docDefaults').each do |doc_defaults|
         doc_defaults.xpath('w:pPrDefault').each do |p_pr_defaults|
-          @default_paragraph = DocxParagraph.parse(p_pr_defaults, 0)
+          DocumentStructure.default_paragraph_style = DocxParagraph.new.parse(p_pr_defaults, 0)
         end
         doc_defaults.xpath('w:rPrDefault').each do |r_pr_defaults|
           r_pr_defaults.xpath('w:rPr').each do |r_pr|
-            @default_character = DocxParagraphRun.parse(r_pr, DocxParagraphRun.new)
+            DocumentStructure.default_run_style = DocxParagraphRun.new.parse_properties(r_pr)
           end
         end
       end
       parse_default_style
-      doc_structure = DocumentStructure.new
-      doc_structure.document_styles = DocumentStyle.parse_list
+      doc_structure.numbering = Numbering.new(parent: doc_structure).parse
+      doc_structure.document_styles = DocumentStyle.parse_list(doc_structure)
+      doc_structure.styles = Styles.new(parent: doc_structure).parse
       number = 0
       OOXMLDocumentObject.add_to_xmls_stack('word/document.xml')
       doc = Nokogiri::XML(File.open(OOXMLDocumentObject.current_xml))
       doc.search('//w:document').each do |document|
         document.xpath('w:background').each do |background|
-          doc_structure.background = DocumentBackground.parse(background)
+          doc_structure.background = DocumentBackground.new(parent: doc_structure).parse(background)
         end
         document.xpath('w:body').each do |body|
           body.xpath('*').each do |element|
             if element.name == 'p'
               child = element.child
               unless child.nil? && doc_structure.elements.last.class == Table
-                paragraph_style = DocxParagraph.parse(element, number, @default_paragraph, @default_character)
+                paragraph_style = DocumentStructure.default_paragraph_style.copy.parse(element, number, DocumentStructure.default_run_style, parent: doc_structure)
                 number += 1
                 doc_structure.elements << paragraph_style.copy
               end
             elsif element.name == 'tbl'
-              table = Table.parse(element, number, TableProperties.new, DocumentStructure.default_table_paragraph_style, DocumentStructure.default_table_run_style)
+              table = Table.new(parent: doc_structure).parse(element,
+                                                             number,
+                                                             TableProperties.new)
               number += 1
               doc_structure.elements << table
             end
           end
           body.xpath('w:sectPr').each do |sect_pr|
-            doc_structure.page_properties = PageProperties.parse(sect_pr, @default_paragraph, @default_character)
+            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
           end
         end
       end
       OOXMLDocumentObject.xmls_stack.pop
-      doc_structure.document_properties = DocumentProperties.parse
+      doc_structure.document_properties = DocumentProperties.new(parent: doc_structure).parse
       doc_structure.comments = Comment.parse_list
+      doc_structure.settings = DocumentSettings.new(parent: doc_structure).parse
       doc_structure
     end
 
@@ -183,31 +183,25 @@ module OoxmlParser
         next if style.attribute('default').nil?
         if (style.attribute('default').value == '1' || style.attribute('default').value == 'on' || style.attribute('default').value == 'true') && style.attribute('type').value == 'paragraph'
           style.xpath('w:pPr').each do |paragraph_pr_tag|
-            DocxParagraph.parse_paragraph_style(paragraph_pr_tag, @default_paragraph, @default_character)
+            DocumentStructure.default_paragraph_style = DocxParagraph.new.parse_paragraph_style(paragraph_pr_tag, DocumentStructure.default_run_style)
           end
           style.xpath('w:rPr').each do |character_pr_tag|
-            DocxParagraphRun.parse(character_pr_tag, @default_character, @default_character)
+            DocumentStructure.default_run_style.parse_properties(character_pr_tag, DocumentStructure.default_run_style)
           end
         elsif (style.attribute('default').value == '1' || style.attribute('default').value == 'on' || style.attribute('default').value == 'true') && style.attribute('type').value == 'character'
           style.xpath('w:rPr').each do |character_pr_tag|
-            DocxParagraphRun.parse(character_pr_tag, @default_character, @default_character)
+            DocumentStructure.default_run_style.parse_properties(character_pr_tag, DocumentStructure.default_run_style)
           end
         end
       end
-      DocumentStructure.default_table_paragraph_style = @default_paragraph.copy
+      DocumentStructure.default_table_paragraph_style = DocumentStructure.default_paragraph_style.copy
       DocumentStructure.default_table_paragraph_style.spacing = Spacing.new(0, 0, 1, :auto)
-      DocumentStructure.default_table_run_style = @default_character.copy
+      DocumentStructure.default_table_run_style = DocumentStructure.default_run_style.copy
       doc.search('//w:style').each do |style|
         next if style.attribute('default').nil?
         next unless (style.attribute('default').value == '1' || style.attribute('default').value == 'on' || style.attribute('default').value == 'true') && style.attribute('type').value == 'table'
-        style.xpath('w:tblPr').each do |table_pr_tag|
-          @default_table_properties = TableProperties.parse(table_pr_tag)
-        end
-        style.xpath('w:pPr').each do |table_paragraph_pr_tag|
-          DocxParagraph.parse_paragraph_style(table_paragraph_pr_tag, DocumentStructure.default_table_paragraph_style, DocumentStructure.default_table_run_style)
-        end
         style.xpath('w:rPr').each do |table_character_pr_tag|
-          DocxParagraphRun.parse(table_character_pr_tag, DocumentStructure.default_table_run_style, @default_character)
+          DocumentStructure.default_table_run_style.parse_properties(table_character_pr_tag, DocumentStructure.default_run_style)
         end
       end
     end
@@ -216,6 +210,7 @@ module OoxmlParser
       attr_accessor :default_table_run_style
       attr_accessor :default_table_paragraph_style
       attr_accessor :default_paragraph_style
+      attr_accessor :default_run_style
     end
   end
 end

data/lib/ooxml_parser/docx_parser/docx_parser.rb

@@ -1,10 +1,11 @@
 require_relative '../common_parser/common_data/ooxml_document_object'
+require_relative '../common_parser/common_data/valued_child'
 require_relative 'docx_data/document_structure'
 
 module OoxmlParser
   class DocxParser
     def self.parse_docx(path_to_file)
-      Parser.parse(path_to_file) do
+      Parser.parse_format(path_to_file) do
         DocumentStructure.parse
       end
     end

data/lib/ooxml_parser/pptx_parser/pptx_data/presentation/presentation_comment.rb

@@ -12,7 +12,7 @@ module OoxmlParser
       comment_node.xpath('*').each do |comment_node_child|
         case comment_node_child.name
         when 'pos'
-          comment.position = OOXMLShift.parse(comment_node_child, 'x', 'y', 1)
+          comment.position = OOXMLCoordinates.parse(comment_node_child, x_attr: 'x', y_attr: 'y')
         when 'text'
           comment.text = comment_node_child.text.to_s
         end

data/lib/ooxml_parser/pptx_parser/pptx_data/presentation/presentation_helpers.rb

@@ -0,0 +1,13 @@
+module OoxmlParser
+  # method to help to work with Presentation
+  module PresentationHelpers
+    # @return [True, false] if structure contain any user data
+    def with_data?
+      return true if @slides.length > 1
+      @slides.each do |current_slide|
+        return true if current_slide.with_data?
+      end
+      false
+    end
+  end
+end

data/lib/ooxml_parser/pptx_parser/pptx_data/presentation/presentation_theme/theme_color.rb

@@ -1,10 +1,11 @@
 module OoxmlParser
-  class ThemeColor
+  # Class for parsing ThemeColor tags
+  class ThemeColor < OOXMLDocumentObject
     attr_accessor :type, :value, :color
 
-    def initialize(type = '', color = nil)
-      @type = type
-      @color = color
+    def initialize(parent: nil)
+      @type = ''
+      @parent = parent
     end
 
     def ==(other)
@@ -21,20 +22,22 @@ module OoxmlParser
       end
     end
 
-    def self.parse(color_node)
-      theme_color = ThemeColor.new
+    # Parse ThemeColor
+    # @param node [Nokogiri::XML::Element] node to parse
+    # @return [ThemeColor] result of parsing
+    def parse(color_node)
       color_node.xpath('*').each do |color_node_child|
         case color_node_child.name
         when 'sysClr'
-          theme_color.type = :system
-          theme_color.value = color_node_child.attribute('val').value
-          theme_color.color = Color.from_int16(color_node_child.attribute('lastClr').value.to_s) unless color_node_child.attribute('lastClr').nil?
+          @type = :system
+          @value = color_node_child.attribute('val').value
+          @color = Color.new(parent: self).parse_hex_string(color_node_child.attribute('lastClr').value.to_s) unless color_node_child.attribute('lastClr').nil?
         when 'srgbClr'
-          theme_color.type = :rgb
-          theme_color.color = Color.from_int16(color_node_child.attribute('val').value.to_s)
+          @type = :rgb
+          @color = Color.new(parent: self).parse_hex_string(color_node_child.attribute('val').value.to_s)
         end
       end
-      theme_color
+      self
     end
   end
 end

data/lib/ooxml_parser/pptx_parser/pptx_data/presentation/presentation_theme.rb

@@ -22,7 +22,7 @@ module OoxmlParser
           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.parse(color_scheme_element)
+              OOXMLDocumentObject.theme.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]

data/lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide/background/background_properties/stretch.rb

@@ -0,0 +1,11 @@
+module OoxmlParser
+  # Class for parsing `stretch` tag
+  class Stretch < OOXMLDocumentObject
+    # Parse Stretch object
+    # @param _node [Nokogiri::XML:Element] node to parse
+    # @return [Stretch] result of parsing
+    def parse(_node)
+      self
+    end
+  end
+end

data/lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide/background/background_properties.rb

@@ -0,0 +1,21 @@
+require_relative 'background_properties/stretch'
+module OoxmlParser
+  # Class for parsing `bgPr` tag
+  class BackgroundProperties < OOXMLDocumentObject
+    # @return [BlipFill]
+    attr_accessor :blip_fill
+
+    # Parse BackgroundProperties object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [BackgroundProperties] result of parsing
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'blipFill'
+          @blip_fill = BlipFill.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

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

@@ -1,19 +1,32 @@
+require_relative 'background/background_properties'
 module OoxmlParser
+  # Class for parsing `bg` tag
   class Background < OOXMLDocumentObject
     attr_accessor :fill, :shade_to_title
+    # @return [BackgroundProperties] properties
+    attr_accessor :properties
 
     def initialize(type = nil)
       @type = type
     end
 
-    def self.parse(background_node)
-      background = Background.new
-      background_properties_node = background_node.xpath('p:bgPr').first
+    # Parse Background object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [Background] result of parsing
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'bgPr'
+          @properties = BackgroundProperties.new(parent: self).parse(node_child)
+        end
+      end
+
+      background_properties_node = node.xpath('p:bgPr').first
       if background_properties_node
-        background.shade_to_title = OOXMLDocumentObject.option_enabled?(background_properties_node, 'shadeToTitle')
-        background.fill = PresentationFill.parse(background_properties_node)
+        @shade_to_title = attribute_enabled?(background_properties_node, 'shadeToTitle')
+        @fill = PresentationFill.new(parent: self).parse(background_properties_node)
       end
-      background
+      self
     end
   end
 end

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

@@ -1,34 +1,45 @@
 module OoxmlParser
+  # Class for parsing `graphicFrame`
   class GraphicFrame < OOXMLDocumentObject
     attr_accessor :properties, :transform, :graphic_data
+    # @return [NonVisualShapeProperties] non visual properties
+    attr_accessor :non_visual_properties
 
     def initialize(graphic_data = [])
       @graphic_data = graphic_data
     end
 
-    def self.parse(graphic_frame_node)
-      graphic_frame = GraphicFrame.new
-      graphic_frame_node.xpath('*').each do |graphic_frame_node_child|
-        case graphic_frame_node_child.name
-        when 'nvGraphicFramePr'
+    # Parse GraphicFrame object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [GraphicFrame] result of parsing
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
         when 'xfrm'
-          graphic_frame.transform = TransformEffect.parse(graphic_frame_node_child)
+          @transform = DocxShapeSize.new(parent: self).parse(node_child)
         when 'graphic'
           graphic_data = []
-          graphic_frame_node_child.xpath('a:graphicData/*').each do |graphic_node_child|
-            case graphic_node_child.name
-            when 'tbl'
-              graphic_data << Table.parse(graphic_node_child)
-            when 'chart'
-              OOXMLDocumentObject.add_to_xmls_stack(OOXMLDocumentObject.get_link_from_rels(graphic_node_child.attribute('id').value))
-              graphic_data << Chart.parse
-              OOXMLDocumentObject.xmls_stack.pop
+          node_child.xpath('*').each do |node_child_child|
+            case node_child_child.name
+            when 'graphicData'
+              node_child_child.xpath('*').each do |graphic_node_child|
+                case graphic_node_child.name
+                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))
+                  graphic_data << Chart.parse
+                  OOXMLDocumentObject.xmls_stack.pop
+                end
+              end
             end
           end
-          graphic_frame.graphic_data = graphic_data
+          @graphic_data = graphic_data
+        when 'nvGraphicFramePr'
+          @non_visual_properties = NonVisualShapeProperties.new(parent: self).parse(node_child)
         end
       end
-      graphic_frame
+      self
     end
   end
 end

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

@@ -1,25 +1,29 @@
 require_relative 'transition/transition'
 module OoxmlParser
+  # Class for parsing `AlternateContent`
   class PresentationAlternateContent < OOXMLDocumentObject
     attr_accessor :transition, :timing, :elements
 
-    def initialize(elements = [])
+    def initialize(parent: nil)
       @elements = elements
+      @parent = parent
     end
 
-    def self.parse(alternate_content_node)
-      alternate_content = PresentationAlternateContent.new
-      alternate_content_node.xpath('mc:Choice/*', 'xmlns:mc' => 'http://schemas.openxmlformats.org/markup-compatibility/2006').each do |choice_node_child|
-        case choice_node_child.name
+    # Parse PresentationAlternateContent object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [PresentationAlternateContent] result of parsing
+    def parse(node)
+      node.xpath('mc:Choice/*', 'xmlns:mc' => 'http://schemas.openxmlformats.org/markup-compatibility/2006').each do |node_child|
+        case node_child.name
         when 'timing'
-          alternate_content.timing = Timing.parse(choice_node_child)
+          @timing = Timing.new(parent: self).parse(node_child)
         when 'transition'
-          alternate_content.transition = Transition.parse(choice_node_child)
+          @transition = Transition.new(parent: self).parse(node_child)
         when 'sp'
-          alternate_content.elements << PresentationShape.parse(choice_node_child)
+          @elements << DocxShape.new(parent: self).parse(node_child)
         end
       end
-      alternate_content
+      self
     end
   end
 end