ooxml_parser 0.32.0 → 0.34.0

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/combobox.rb

@@ -0,0 +1,28 @@
+# frozen_string_literal: true
+
+require_relative 'combobox/list_item'
+module OoxmlParser
+  # Class for parsing `comboBox` tag
+  class ComboBox < OOXMLDocumentObject
+    # @return [Array<ListItem>] combobox items
+    attr_reader :list_items
+
+    def initialize(parent: nil)
+      @list_items = []
+      super
+    end
+
+    # Parse ComboBox object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [ComboBox] result of parsing
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'listItem'
+          @list_items << ListItem.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/dropdown_list.rb

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `dropDownList` tag
+  class DropdownList < OOXMLDocumentObject
+    # @return [Array<ListItem>] dropdown items
+    attr_reader :list_items
+
+    def initialize(parent: nil)
+      @list_items = []
+      super
+    end
+
+    # Parse DropdownList object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [DropdownList] result of parsing
+    def parse(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'listItem'
+          @list_items << ListItem.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/form_properties.rb

@@ -0,0 +1,48 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `formPr` tag
+  class FormProperties < OOXMLDocumentObject
+    # @return [String] field key
+    attr_reader :key
+    # @return [String] text of tooltip
+    attr_reader :help_text
+    # @return [True, False] specifies if field is required
+    attr_reader :required
+    # @return [Shade] shade of field
+    attr_reader :shade
+    # @return [BordersProperties] border of field
+    attr_reader :border
+
+    def initialize(parent: nil)
+      @required = false
+      super
+    end
+
+    # Parse FormProperties object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [FormProperties] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'key'
+          @key = value.value
+        when 'helpText'
+          @help_text = value.value
+        when 'required'
+          @required = boolean_attribute_value(value)
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'shd'
+          @shade = Shade.new(parent: self).parse(node_child)
+        when 'border'
+          @border = BordersProperties.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/form_text_properties/form_text_comb.rb

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `comb` tag
+  class FormTextComb < OOXMLDocumentObject
+    # @return [OoxmlSize] field width
+    attr_reader :width
+    # @return [Symbol] width rule
+    attr_reader :width_rule
+
+    # Parse FormTextComb object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [FormTextComb] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'width'
+          @width = OoxmlSize.new(value.value.to_f)
+        when 'wRule'
+          @width_rule = value.value.to_sym
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/form_text_properties/form_text_format.rb

@@ -0,0 +1,30 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `format` tag
+  class FormTextFormat < OOXMLDocumentObject
+    # @return [Symbol] format type
+    attr_reader :type
+    # @return [String] value for custom formats
+    attr_reader :value
+    # @return [String] allowed symbols
+    attr_reader :symbols
+
+    # Parse FormTextFormat object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [FormTextFormat] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'type'
+          @type = value.value.to_sym
+        when 'val'
+          @value = value.value
+        when 'symbols'
+          @symbols = value.value
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties/form_text_properties.rb

@@ -0,0 +1,45 @@
+# frozen_string_literal: true
+
+require_relative 'form_text_properties/form_text_comb'
+require_relative 'form_text_properties/form_text_format'
+module OoxmlParser
+  # Class for parsing `textFormPr` tag
+  class FormTextProperties < OOXMLDocumentObject
+    # @return [True, False] specifies if field is multiline
+    attr_reader :multiline
+    # @return [True, False] specifies if size of field should be autofit
+    attr_reader :autofit
+    # @return [FormTextComb] parameters of text justification
+    attr_reader :comb
+    # @return [ValuedChild] characters limit
+    attr_reader :maximum_characters
+    # @return [FormTextFormat] text format
+    attr_reader :format
+
+    # Parse FormTextProperties object
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [FormTextProperties] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'multiLine'
+          @multiline = boolean_attribute_value(value)
+        when 'autoFit'
+          @autofit = boolean_attribute_value(value)
+        end
+      end
+
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'comb'
+          @comb = FormTextComb.new(parent: self).parse(node_child)
+        when 'maxCharacters'
+          @maximum_characters = ValuedChild.new(:integer, parent: self).parse(node_child)
+        when 'format'
+          @format = FormTextFormat.new(parent: self).parse(node_child)
+        end
+      end
+      self
+    end
+  end
+end

data/lib/ooxml_parser/docx_parser/document_structure/docx_paragraph/sdt/sdt_properties.rb

@@ -1,5 +1,10 @@
 # frozen_string_literal: true
 
+require_relative 'sdt_properties/form_properties'
+require_relative 'sdt_properties/form_text_properties'
+require_relative 'sdt_properties/combobox'
+require_relative 'sdt_properties/dropdown_list'
+require_relative 'sdt_properties/checkbox'
 module OoxmlParser
   # Class for parsing `w:sdtPr` tags
   class SDTProperties < OOXMLDocumentObject
@@ -9,6 +14,16 @@ module OoxmlParser
     attr_reader :tag
     # @return [ValuedChild] Locking Setting
     attr_reader :lock
+    # @return [ComboBox] combobox
+    attr_reader :combobox
+    # @return [DropdownList] dropdown list
+    attr_reader :dropdown_list
+    # @return [CheckBox] checkbox
+    attr_reader :checkbox
+    # @return [FormProperties] form properties
+    attr_reader :form_properties
+    # @return [FormTextProperties] properties of text in form
+    attr_reader :form_text_properties
 
     # Parse SDTProperties object
     # @param node [Nokogiri::XML:Element] node to parse
@@ -22,6 +37,16 @@ module OoxmlParser
           @tag = ValuedChild.new(:string, parent: self).parse(node_child)
         when 'lock'
           @lock = ValuedChild.new(:symbol, parent: self).parse(node_child)
+        when 'comboBox'
+          @combobox = ComboBox.new(parent: self).parse(node_child)
+        when 'dropDownList'
+          @dropdown_list = DropdownList.new(parent: self).parse(node_child)
+        when 'checkbox'
+          @checkbox = CheckBox.new(parent: self).parse(node_child)
+        when 'formPr'
+          @form_properties = FormProperties.new(parent: self).parse(node_child)
+        when 'textFormPr'
+          @form_text_properties = FormTextProperties.new(parent: self).parse(node_child)
         end
       end
       self

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

@@ -147,10 +147,10 @@ module OoxmlParser
           @hyperlink = Hyperlink.new(parent: self).parse(node_child)
           character_style = default_character_style.dup
           character_style.parent = self
-          if node_child.attribute('id')
+          if @hyperlink.id
             character_style.link = Hyperlink.new(parent: character_style).parse(node_child)
-          elsif node_child.attribute('anchor')
-            character_style.link = node_child.attribute('anchor').value
+          elsif @hyperlink.anchor
+            character_style.link = @hyperlink.anchor
           end
           node_child.xpath('w:r').each do |r_tag|
             character_style.parse(r_tag, char_number, parent: self)
@@ -208,8 +208,9 @@ module OoxmlParser
         when 'numPr'
           @numbering = NumberingProperties.new(parent: self).parse(node_child)
         when 'jc'
-          @align = node_child.attribute('val').value.to_sym unless node_child.attribute('val').nil?
-          @align = :justify if node_child.attribute('val').value == 'both'
+          @justification_object = ValuedChild.new(:string, parent: self).parse(node_child)
+          @align = @justification_object.value.to_sym unless @justification_object.value.nil?
+          @align = :justify if @justification_object.value == 'both'
         when 'spacing'
           @valued_spacing = ParagraphSpacing.new(parent: self).parse(node_child)
           @spacing = @spacing.fetch_from_valued_spacing(@valued_spacing)

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

@@ -45,11 +45,23 @@ module OoxmlParser
     # @param [Nokogiri::XML:Node] node with HeaderFooter
     # @return [HeaderFooter] result of parsing
     def parse(node)
-      @id = node.attribute('id').value.to_i
+      node.attributes.each do |key, value|
+        case key
+        when 'id'
+          @id = value.value.to_i
+        end
+      end
       parse_type(node)
       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
+        footnote_id = nil
+        footnote.attributes.each do |key, value|
+          case key
+          when 'id'
+            footnote_id = value.value.to_i
+          end
+        end
+        next unless footnote_id == @id
 
         paragraph_number = 0
         footnote.xpath('w:p').each do |paragraph|

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

@@ -36,9 +36,9 @@ module OoxmlParser
         when 'num'
           @count = value.value.to_i
         when 'sep'
-          @separator = option_enabled?(node, 'sep')
+          @separator = boolean_attribute_value(value)
         when 'equalWidth'
-          @equal_width = option_enabled?(node, 'equalWidth')
+          @equal_width = boolean_attribute_value(value)
         when 'space'
           @space = OoxmlSize.new(value.value.to_f)
         end

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

@@ -13,15 +13,14 @@ module OoxmlParser
     # Parse note data
     # @param params [Hash] data to parse
     # @return [Note] result of parsing
-    def self.parse(params)
-      note = Note.new
-      note.type = params[:type]
-      note.assigned_to = params[:assigned_to]
-      note.parent = params[:parent]
-      doc = note.parse_xml(note.file_path(params[:target]))
-      if note.type.include?('footer')
+    def parse(params)
+      @type = params[:type]
+      @assigned_to = params[:assigned_to]
+      @parent = params[:parent]
+      doc = parse_xml(file_path(params[:target]))
+      if @type.include?('footer')
         xpath_note = '//w:ftr'
-      elsif note.type.include?('header')
+      elsif @type.include?('header')
         xpath_note = '//w:hdr'
       end
       doc.search(xpath_note).each do |ftr|
@@ -29,15 +28,15 @@ module OoxmlParser
         ftr.xpath('*').each do |sub_element|
           case sub_element.name
           when 'p'
-            note.elements << params[:default_paragraph].dup.parse(sub_element, number, params[:default_character], parent: note)
+            @elements << params[:default_paragraph].dup.parse(sub_element, number, params[:default_character], parent: self)
             number += 1
           when 'tbl'
-            note.elements << Table.new(parent: note).parse(sub_element, number)
+            @elements << Table.new(parent: self).parse(sub_element, number)
             number += 1
           end
         end
       end
-      note
+      self
     end
 
     # @param target [String] name of target

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

@@ -0,0 +1,27 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `w:headerReference`,
+  # `w:footerReference` object
+  class HeaderFooterReference < OOXMLDocumentObject
+    # @return [String] id of reference
+    attr_accessor :id
+    # @return [String] type of reference
+    attr_accessor :type
+
+    # Parse HeaderFooterReference
+    # @param [Nokogiri::XML:Node] node with HeaderFooterReference
+    # @return [HeaderFooterReference] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'id'
+          @id = value.to_s
+        when 'type'
+          @type = value.to_s
+        end
+      end
+      self
+    end
+  end
+end

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

@@ -0,0 +1,26 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `w:pgBorders` PageBorders object
+  class PageBorders < OOXMLDocumentObject
+    # @return [Symbol] display value
+    attr_reader :display
+    # @return [Symbol] offset from value
+    attr_reader :offset_from
+
+    # Parse PageBorders
+    # @param [Nokogiri::XML:Node] node with PageBorders
+    # @return [PageBorders] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'display'
+          @display = value.value.to_sym
+        when 'offsetFrom'
+          @offset_from = value.value.to_sym
+        end
+      end
+      self
+    end
+  end
+end

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

@@ -6,6 +6,9 @@ require_relative 'page_size'
 require_relative 'page_margins'
 require_relative 'columns'
 require_relative 'note'
+require_relative 'page_properties/header_footer_reference'
+require_relative 'page_properties/page_borders'
+
 module OoxmlParser
   # Class for data of PageProperties
   class PageProperties < OOXMLDocumentObject
@@ -30,9 +33,10 @@ module OoxmlParser
         when 'pgSz'
           @size = PageSize.new.parse(pg_size_subnode)
         when 'pgBorders'
+          page_borders_object = PageBorders.new(parent: self).parse(pg_size_subnode)
           page_borders = Borders.new
-          page_borders.display = pg_size_subnode.attribute('display').value.to_sym unless pg_size_subnode.attribute('display').nil?
-          page_borders.offset_from = pg_size_subnode.attribute('offsetFrom').value.to_sym unless pg_size_subnode.attribute('offsetFrom').nil?
+          page_borders.display = page_borders_object.display if page_borders_object.display
+          page_borders.offset_from = page_borders_object.offset_from if page_borders_object.offset_from
           pg_size_subnode.xpath('w:bottom').each do |bottom|
             page_borders.bottom = BordersProperties.new(parent: page_borders).parse(bottom)
           end
@@ -47,15 +51,18 @@ module OoxmlParser
           end
           @page_borders = page_borders
         when 'type'
-          @type = pg_size_subnode.attribute('val').value
+          @type_object = ValuedChild.new(:string, parent: self).parse(pg_size_subnode)
+          @type = @type_object.value
         when 'pgMar'
           @margins = PageMargins.new(parent: self).parse(pg_size_subnode)
         when 'pgNumType'
           @num_type = pg_size_subnode.attribute('fmt').value unless pg_size_subnode.attribute('fmt').nil?
         when 'formProt'
-          @form_prot = pg_size_subnode.attribute('val').value
+          form_prot_object = ValuedChild.new(:string, parent: self).parse(pg_size_subnode)
+          @form_prot = form_prot_object.value
         when 'textDirection'
-          @text_direction = pg_size_subnode.attribute('val').value
+          text_directon_object = ValuedChild.new(:string, parent: self).parse(pg_size_subnode)
+          @text_direction = text_directon_object.value
         when 'docGrid'
           @document_grid = DocumentGrid.new(parent: self).parse(pg_size_subnode)
         when 'titlePg'
@@ -63,14 +70,15 @@ module OoxmlParser
         when 'cols'
           @columns = Columns.new.parse(pg_size_subnode)
         when 'headerReference', 'footerReference'
-          target = root_object.get_link_from_rels(pg_size_subnode.attribute('id').value)
+          reference = HeaderFooterReference.new(parent: self).parse(pg_size_subnode)
+          target = root_object.get_link_from_rels(reference.id)
           root_object.add_to_xmls_stack("word/#{target}")
-          note = Note.parse(default_paragraph: default_paragraph,
-                            default_character: default_character,
-                            target: target,
-                            assigned_to: pg_size_subnode.attribute('type').value,
-                            type: File.basename(target).sub('.xml', ''),
-                            parent: self)
+          note = Note.new.parse(default_paragraph: default_paragraph,
+                                default_character: default_character,
+                                target: target,
+                                assigned_to: reference.type,
+                                type: File.basename(target).sub('.xml', ''),
+                                parent: self)
           @notes << note
           root_object.xmls_stack.pop
         when 'footnotePr'

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

@@ -5,11 +5,14 @@ module OoxmlParser
   class ParagraphPropertiesDefault < OOXMLDocumentObject
     # @return [ParagraphProperties] properties of run
     attr_accessor :paragraph_properties
+    # @return [Nokogiri::XML:Element] raw node of tag
+    attr_reader :raw_node
 
     # Parse ParagraphPropertiesDefault object
     # @param node [Nokogiri::XML:Element] node to parse
     # @return [ParagraphPropertiesDefault] result of parsing
     def parse(node)
+      @raw_node = node
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'pPr'

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

@@ -28,5 +28,11 @@ module OoxmlParser
       end
       self
     end
+
+    # @param [Symbol] type of style to get
+    # @return [DocumentStyle] default document style
+    def default_style(type)
+      styles.find { |style| style.type == type && style.default }
+    end
   end
 end

data/lib/ooxml_parser/docx_parser/document_structure.rb

@@ -2,6 +2,7 @@
 
 require_relative 'document_structure/comments'
 require_relative 'document_structure/comments_extended'
+require_relative 'document_structure/default_style_helper'
 require_relative 'document_structure/docx_paragraph'
 require_relative 'document_structure/document_background'
 require_relative 'document_structure/document_properties'
@@ -15,6 +16,7 @@ require_relative 'document_structure/styles'
 module OoxmlParser
   # Basic class for DocumentStructure
   class DocumentStructure < CommonDocumentStructure
+    include DefaultStyleHelper
     include DocumentStyleHelper
     include DocumentStructureHelpers
     # @return [Array<OOXMLDocumentObject>] list of elements
@@ -211,75 +213,6 @@ module OoxmlParser
       self
     end
 
-    # Parse default style
-    # @return [void]
-    def parse_default_style
-      doc = parse_xml("#{root_object.unpacked_folder}word/styles.xml")
-      doc.search('//w:style').each do |style|
-        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|
-            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|
-            DocumentStructure.default_run_style.parse_properties(character_pr_tag)
-          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|
-            DocumentStructure.default_run_style.parse_properties(character_pr_tag)
-          end
-        end
-      end
-      DocumentStructure.default_table_paragraph_style = DocumentStructure.default_paragraph_style.dup
-      DocumentStructure.default_table_paragraph_style.spacing = Spacing.new(0, 0, 1, :auto)
-      DocumentStructure.default_table_run_style = DocumentStructure.default_run_style.dup
-      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:rPr').each do |table_character_pr_tag|
-          DocumentStructure.default_table_run_style.parse_properties(table_character_pr_tag)
-        end
-      end
-    end
-
-    # Perform parsing styles.xml
-    def parse_styles
-      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)
-      DocumentStructure.default_table_run_style = DocxParagraphRun.new(parent: self)
-
-      return unless File.exist?(file)
-
-      doc = parse_xml(file)
-      # 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|
-          DocumentStructure.default_paragraph_style = DocxParagraph.new(parent: self).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|
-            DocumentStructure.default_run_style = DocxParagraphRun.new(parent: self).parse_properties(r_pr)
-          end
-        end
-      end
-      parse_default_style
-      @numbering = Numbering.new(parent: self).parse
-      @styles = Styles.new(parent: self).parse
-    end
-
     class << self
       attr_accessor :default_table_run_style, :default_table_paragraph_style, :default_paragraph_style, :default_run_style
     end

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

@@ -28,7 +28,7 @@ module OoxmlParser
       node.xpath('*').each do |node_child|
         case node_child.name
         when 'pos'
-          @position = OOXMLCoordinates.parse(node_child, x_attr: 'x', y_attr: 'y')
+          @position = OOXMLCoordinates.new(parent: self).parse(node_child)
         when 'text'
           @text = node_child.text.to_s
         end

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

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module OoxmlParser
+  # Class for parsing `c:chart` object
+  class ChartReference < OOXMLDocumentObject
+    # @return [String] id of the chart
+    attr_reader :id
+
+    # Parse ChartReference
+    # @param [Nokogiri::XML:Node] node with ChartReference
+    # @return [ChartReference] result of parsing
+    def parse(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'id'
+          @id = value.value.to_s
+        end
+      end
+      self
+    end
+  end
+end

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

@@ -1,5 +1,7 @@
 # frozen_string_literal: true
 
+require_relative 'graphic_frame/chart_reference'
+
 module OoxmlParser
   # Class for parsing `graphicFrame`
   class GraphicFrame < OOXMLDocumentObject
@@ -30,7 +32,8 @@ module OoxmlParser
                 when 'tbl'
                   graphic_data << Table.new(parent: self).parse(graphic_node_child)
                 when 'chart'
-                  root_object.add_to_xmls_stack(root_object.get_link_from_rels(graphic_node_child.attribute('id').value))
+                  @chart_reference = ChartReference.new(parent: self).parse(graphic_node_child)
+                  root_object.add_to_xmls_stack(root_object.get_link_from_rels(@chart_reference.id))
                   graphic_data << Chart.new(parent: self).parse
                   root_object.xmls_stack.pop
                 when 'oleObj'