ooxml_parser 0.8.1 → 0.12.0

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/docx_paragraph_run/shape.rb

@@ -13,7 +13,7 @@ module OoxmlParser
       @type = type
       @properties = properties
       @elements = elements
-      @parent = parent
+      super(parent: parent)
     end
 
     # Parse Shape object
@@ -70,7 +70,7 @@ module OoxmlParser
     def value_to_hex(value)
       value.to_s
            .sub('#', '')
-           .split(' ')
+           .split
            .first
     end
   end

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/docx_paragraph_run/text_outline.rb

@@ -9,7 +9,7 @@ module OoxmlParser
     def initialize(parent: nil)
       @width = OoxmlSize.new(0)
       @color_scheme = :none
-      @parent = parent
+      super
     end
 
     # Parse TextOutline object

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

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

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

@@ -14,7 +14,7 @@ module OoxmlParser
       @left_indent = left_indent
       @right_indent = right_indent
       @hanging_indent = hanging_indent
-      @parent = parent
+      super(parent: parent)
     end
 
     alias first_line first_line_indent

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/sdt/sdt_content.rb

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

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

@@ -5,14 +5,11 @@ module OoxmlParser
   class StyleParametres < OOXMLDocumentObject
     attr_accessor :q_format, :hidden, :name
 
-    def initialize(name = nil,
-                   q_format = false,
-                   hidden = false,
-                   parent: nil)
-      @name = name
-      @q_format = q_format
-      @hidden = hidden
-      @parent = parent
+    def initialize(params = {})
+      @name = params[:name]
+      @q_format = params.fetch(:q_format, false)
+      @hidden = params.fetch(:hidden, false)
+      super(parent: params[:parent])
     end
 
     # Parse StyleParametres data

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

@@ -15,7 +15,7 @@ module OoxmlParser
     def initialize(type = :header, parent: nil)
       @type = type
       @elements = []
-      @parent = parent
+      super(parent: parent)
     end
 
     # @return [String] string for search of xpath

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

@@ -14,7 +14,7 @@ module OoxmlParser
     def initialize(parent: nil)
       @abstract_numbering_list = []
       @numbering_definition_list = []
-      @parent = parent
+      super
     end
 
     # Get properties by number id
@@ -38,7 +38,7 @@ module OoxmlParser
     # Parse Numbering data
     # @return [Numbering] result of parse
     def parse
-      numbering_xml = OOXMLDocumentObject.path_to_folder + 'word/numbering.xml'
+      numbering_xml = "#{OOXMLDocumentObject.path_to_folder}word/numbering.xml"
       return nil unless File.exist?(numbering_xml)
 
       node = parse_xml(File.open(numbering_xml))

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

@@ -19,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

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

@@ -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/slide_helper.rb

@@ -20,9 +20,7 @@ module OoxmlParser
       case object
       when :image
         elements.find { |e| e.is_a? DocxPicture }.properties.transform
-      when :chart
-        elements.find { |e| e.is_a? GraphicFrame }.transform
-      when :table
+      when :chart, :table
         elements.find { |e| e.is_a? GraphicFrame }.transform
       when :shape
         elements.find { |e| !e.shape_properties.preset.nil? }.shape_properties.transform

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/version.rb

@@ -4,6 +4,6 @@ module OoxmlParser
   # This module holds the RuboCop version information.
   module Version
     # [String] Version of Gem
-    STRING = '0.8.1'
+    STRING = '0.12.0'
   end
 end

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

@@ -2,6 +2,7 @@
 
 require_relative 'workbook/chartsheet'
 require_relative 'workbook/pivot_cache'
+require_relative 'workbook/pivot_table_definition'
 require_relative 'workbook/shared_string_table'
 require_relative 'workbook/style_sheet'
 require_relative 'workbook/worksheet'
@@ -21,10 +22,13 @@ module OoxmlParser
     attr_accessor :shared_strings_table
     # @return [Array<PivotCache>] list of pivot caches
     attr_accessor :pivot_caches
+    # @return [Array<PivotTableDefintion>] list of pivot table defitions
+    attr_accessor :pivot_table_definitions
 
     def initialize(params = {})
       @worksheets = []
       @pivot_caches = []
+      @pivot_table_definitions = []
       super
     end
 
@@ -43,9 +47,10 @@ module OoxmlParser
         return row.cells[column.to_i - 1]
       elsif sheet.is_a?(String)
         @worksheets.each do |worksheet|
-          if worksheet.name == sheet
-            return worksheet.rows[row.to_i - 1].cells[column.to_i - 1] unless worksheet.rows[row.to_i - 1].nil?
-          end
+          next unless worksheet.name == sheet
+          next unless worksheet.rows[row.to_i - 1]
+
+          return worksheet.rows[row.to_i - 1].cells[column.to_i - 1]
         end
         return nil
       end
@@ -119,6 +124,7 @@ module OoxmlParser
         end
       end
       parse_pivot_cache
+      parse_pivot_table
       OOXMLDocumentObject.xmls_stack.pop
       self
     end
@@ -135,5 +141,13 @@ module OoxmlParser
         @pivot_caches << PivotCache.new(parent: self).parse(pivot_cache)
       end
     end
+
+    # Perform parsing of pivot table
+    def parse_pivot_table
+      files = @content_types.by_type('application/vnd.openxmlformats-officedocument.spreadsheetml.pivotTable+xml')
+      files.each do |file|
+        @pivot_table_definitions << PivotTableDefinition.new(parent: self).parse(file.part_name)
+      end
+    end
   end
 end