ooxml_parser 0.7.1 → 0.9.1

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

@@ -16,7 +16,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @level_list = []
-      @parent = parent
+      super
     end
 
     # Parse Abstract Numbering data

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/numbering/abstract_numbering/numbering_level.rb

@@ -26,8 +26,8 @@ module OoxmlParser
     attr_accessor :suffix
 
     def initialize(parent: nil)
-      @parent = parent
       @suffix = Suffix.new(parent: self)
+      super
     end
 
     # Parse Numbering Level data

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/numbering/abstract_numbering/numbering_level/suffix.rb

@@ -14,7 +14,7 @@ module OoxmlParser
     def initialize(value = :tab,
                    parent: nil)
       @value = value
-      @parent = parent
+      super(parent: parent)
     end
 
     # Parse Suffix

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

@@ -4,10 +4,12 @@ require_relative 'columns/column'
 module OoxmlParser
   # Class for data of Columns
   class Columns < OOXMLDocumentObject
+    # @return [Integer] count of columns
     attr_accessor :count
+    # @return [True, False] is columns are equal width
     attr_accessor :equal_width
-
     alias equal_width? equal_width
+    # @return [Array<Column>] list of colujmns
     attr_accessor :column_array
     # @return [Boolean] Draw Line Between Columns
     attr_reader :separator
@@ -17,6 +19,7 @@ module OoxmlParser
     def initialize(columns_count = 0)
       @count = columns_count
       @column_array = []
+      super(parent: nil)
     end
 
     # @return [Array, Column] accessor

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

@@ -7,6 +7,7 @@ module OoxmlParser
 
     def initialize
       @elements = []
+      super(parent: nil)
     end
 
     # Parse note data
@@ -26,10 +27,11 @@ module OoxmlParser
       doc.search(xpath_note).each do |ftr|
         number = 0
         ftr.xpath('*').each do |sub_element|
-          if sub_element.name == 'p'
+          case sub_element.name
+          when 'p'
             note.elements << params[:default_paragraph].dup.parse(sub_element, number, params[:default_character], parent: note)
             number += 1
-          elsif sub_element.name == 'tbl'
+          when 'tbl'
             note.elements << Table.new(parent: note).parse(sub_element, number)
             number += 1
           end

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

@@ -14,6 +14,7 @@ module OoxmlParser
       @footer = params[:footer]
       @gutter = params[:gutter]
       @parent = params[:parent]
+      super(parent: nil)
     end
 
     # Parse BordersProperties

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

@@ -18,7 +18,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @notes = []
-      @parent = parent
+      super
     end
 
     # Parse PageProperties data

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

@@ -9,11 +9,12 @@ module OoxmlParser
       @height = height
       @width = width
       @orientation = orientation
+      super(parent: nil)
     end
 
     # @return [String] convert to string
     def to_s
-      'Height: ' + @height.to_s + ' Width: ' + @width.to_s + ' Orientation: ' + @orientation.to_s
+      "Height: #{@height} Width: #{@width} Orientation: #{@orientation}"
     end
 
     # @return [True, False] compare dimensions of size, ignoring orientation

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

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

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

@@ -9,7 +9,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @list = []
-      @parent = parent
+      super
     end
 
     # Parse CommentAuthors object

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

@@ -9,7 +9,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @list = []
-      @parent = parent
+      super
     end
 
     # Parse PresentationComments object

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

@@ -12,6 +12,7 @@ module OoxmlParser
     def initialize(name = '', color_scheme = {})
       @name = name
       @color_scheme = color_scheme
+      super(parent: nil)
     end
 
     # Parse PresentationTheme

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

@@ -8,7 +8,7 @@ module OoxmlParser
     def initialize(type: '', color: nil, parent: nil)
       @type = type
       @color = color
-      @parent = parent
+      super(parent: parent)
     end
 
     # Compare ThemeColor with other object

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

@@ -3,8 +3,8 @@
 require_relative 'slide/presentation_alternate_content'
 require_relative 'slide/background'
 require_relative 'slide/common_slide_data'
-require_relative 'slide/connection_shape.rb'
-require_relative 'slide/presentation_notes.rb'
+require_relative 'slide/connection_shape'
+require_relative 'slide/presentation_notes'
 require_relative 'slide/graphic_frame/graphic_frame'
 require_relative 'slide/slide/shapes_grouping'
 require_relative 'slide/slide/timing'
@@ -24,8 +24,8 @@ module OoxmlParser
     attr_reader :note
 
     def initialize(parent: nil, xml_path: nil)
-      @parent = parent
       @xml_path = xml_path
+      super(parent: parent)
     end
 
     # @return [True, False] is slide with data

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

@@ -10,7 +10,7 @@ module OoxmlParser
 
     def initialize(type = nil, parent: nil)
       @type = type
-      @parent = parent
+      super(parent: parent)
     end
 
     # Parse Background object

data/lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide/common_slide_data/shape_tree.rb

@@ -8,7 +8,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @elements = []
-      @parent = parent
+      super
     end
 
     # Parse ShapeTree object

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

@@ -9,7 +9,7 @@ module OoxmlParser
 
     def initialize(graphic_data = [], parent: nil)
       @graphic_data = graphic_data
-      @parent = parent
+      super(parent: parent)
     end
 
     # Parse GraphicFrame object
@@ -31,7 +31,7 @@ module OoxmlParser
                   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(parent: self)
+                  graphic_data << Chart.new(parent: self).parse
                   OOXMLDocumentObject.xmls_stack.pop
                 when 'oleObj'
                   graphic_data << OleObject.new(parent: self).parse(graphic_node_child)

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

@@ -8,7 +8,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @elements = elements
-      @parent = parent
+      super
     end
 
     # Parse PresentationAlternateContent object

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

@@ -7,7 +7,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @elements = []
-      @parent = parent
+      super
     end
 
     # Parse ShapesGrouping object

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

@@ -10,7 +10,7 @@ module OoxmlParser
       @time_node_list = []
       @build_list = []
       @extension_list = []
-      @parent = parent
+      super
     end
 
     # Parse Timing object

data/lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide/slide/timing/set_time_node/behavior/behavior.rb

@@ -8,7 +8,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @attribute_name_list = []
-      @parent = parent
+      super
     end
 
     # Parse Behavior object

data/lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide/slide/timing/set_time_node/behavior/target_element.rb

@@ -8,7 +8,7 @@ module OoxmlParser
     def initialize(type = '', id = '', parent: nil)
       @type = type
       @id = id
-      @parent = parent
+      super(parent: parent)
     end
 
     # Parse TargetElement object

data/lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide/slide/timing/time_node.rb

@@ -12,7 +12,7 @@ module OoxmlParser
       @type = type
       @previous_conditions_list = []
       @next_conditions_list = []
-      @parent = parent
+      super(parent: parent)
     end
 
     # Parse TimeNode

data/lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide/slide/timing/time_node/common_timing/condition_list.rb

@@ -8,7 +8,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @list = []
-      @parent = parent
+      super
     end
 
     # Parse ConditionList object

data/lib/ooxml_parser/pptx_parser/pptx_data/presentation/slide/transition/transition/sound_action/sound.rb

@@ -10,7 +10,7 @@ module OoxmlParser
     def initialize(path = '', name = '', parent: nil)
       @path = path
       @name = name
-      @parent = parent
+      super(parent: parent)
     end
 
     # Parse Sound

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

@@ -8,7 +8,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @table_style_list = []
-      @parent = parent
+      super
     end
 
     # Parse TableStyles object

data/lib/ooxml_parser/pptx_parser/pptx_parser.rb

@@ -1,6 +1,6 @@
 # frozen_string_literal: true
 
-require_relative 'pptx_data/presentation.rb'
+require_relative 'pptx_data/presentation'
 
 module OoxmlParser
   # Basic class for parsing pptx

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.7.1'
+    STRING = '0.9.1'
   end
 end

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

@@ -8,7 +8,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @sheet_views = []
-      @parent = parent
+      super
     end
 
     # Parse Chartsheet object

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/shared_string_table.rb

@@ -13,7 +13,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @string_indexes = []
-      @parent = parent
+      super
     end
 
     # Parse Shared string table file

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/style_sheet.rb

@@ -23,7 +23,7 @@ module OoxmlParser
       @number_formats = NumberFormats.new(parent: self)
       @fonts = Fonts.new(parent: self)
       @fills = Fills.new(parent: self)
-      @parent = parent
+      super
     end
 
     # Parse StyleSheet object

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/style_sheet/cell_xfs.rb

@@ -11,7 +11,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @xf_array = []
-      @parent = parent
+      super
     end
 
     # Parse CellXfs data

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/style_sheet/cell_xfs/cell_style/alignment.rb

@@ -5,11 +5,11 @@ module OoxmlParser
   class XlsxAlignment < OOXMLDocumentObject
     attr_accessor :horizontal, :vertical, :wrap_text, :text_rotation
 
-    def initialize(horizontal = :left, vertical = :bottom, wrap_text = false, parent: nil)
-      @horizontal = horizontal
-      @vertical = vertical
-      @wrap_text = wrap_text
-      @parent = parent
+    def initialize(params = {})
+      @horizontal = params.fetch(:horizontal, :left)
+      @vertical = params.fetch(:vertical, :bottom)
+      @wrap_text = params.fetch(:wrap_text, false)
+      super(parent: params[:parent])
     end
 
     # Parse XlsxAlignment object

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/style_sheet/cell_xfs/xf.rb

@@ -80,7 +80,7 @@ module OoxmlParser
     def initialize(parent: nil)
       @numerical_format = 'General'
       @alignment = XlsxAlignment.new
-      @parent = parent
+      super
     end
 
     # Parse Xf object

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/style_sheet/fills.rb

@@ -9,7 +9,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @fills_array = []
-      @parent = parent
+      super
     end
 
     # @return [Array, Fill] accessor

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/style_sheet/fonts.rb

@@ -9,7 +9,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @fonts_array = []
-      @parent = parent
+      super
     end
 
     # @return [Array<Font>] accessor

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/style_sheet/fonts/font.rb

@@ -10,7 +10,7 @@ module OoxmlParser
     def initialize(parent: nil)
       @name = 'Calibri'
       @size = 11
-      @parent = parent
+      super
     end
 
     # Parse Font object

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/style_sheet/number_formats.rb

@@ -9,7 +9,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @number_formats_array = []
-      @parent = parent
+      super
     end
 
     # Parse NumberFormats data

data/lib/ooxml_parser/xlsx_parser/xlsx_data/view_model/workbook/style_sheet/xlsx_borders.rb

@@ -11,7 +11,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @borders_array = []
-      @parent = parent
+      super
     end
 
     # Parse XlsxBorders data