ooxml_parser 0.8.1 → 0.12.0

data/lib/ooxml_parser/common_parser/common_data/table/margins/paragraph_margins.rb

@@ -8,11 +8,7 @@ module OoxmlParser
                    left = OoxmlSize.new(0),
                    right = OoxmlSize.new(0),
                    parent: nil)
-      @top = top
-      @bottom = bottom
-      @left = left
-      @right = right
-      @parent = parent
+      super(true, top, bottom, left, right, parent: parent)
     end
 
     # Parse ParagraphMargins object

data/lib/ooxml_parser/common_parser/common_data/table/margins/table_margins.rb

@@ -11,7 +11,7 @@ module OoxmlParser
       @bottom = bottom
       @left = left
       @right = right
-      @parent = parent
+      super(parent: parent)
     end
 
     # TODO: Separate @is_default attribute and remove this method
@@ -29,7 +29,7 @@ module OoxmlParser
 
     # @return [String] result of convert of object to string
     def to_s
-      'Default: ' + is_default.to_s + ' top: ' + @top.to_s + ', bottom: ' + @bottom.to_s + ', left: ' + @left.to_s + ', right: ' + @right.to_s
+      "Default: #{is_default} top: #{@top}, bottom: #{@bottom}, left: #{@left}, right: #{@right}"
     end
 
     # Parse TableMargins object

data/lib/ooxml_parser/common_parser/common_data/table/properties/table_look.rb

@@ -15,7 +15,7 @@ module OoxmlParser
       @banding_column = false
       @no_horizontal_banding = false
       @no_horizontal_banding = false
-      @parent = parent
+      super
     end
 
     # Parse TableLook object

data/lib/ooxml_parser/common_parser/common_data/table/properties/table_style_properties.rb

@@ -23,7 +23,7 @@ module OoxmlParser
       @type = type
       @run_properties = nil
       @table_cell_properties = CellProperties.new
-      @parent = parent
+      super(parent: parent)
     end
 
     # Parse table style property

data/lib/ooxml_parser/common_parser/common_data/table/row/cell/cell.rb

@@ -9,7 +9,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @elements = []
-      @parent = parent
+      super
     end
 
     alias cell_properties properties

data/lib/ooxml_parser/common_parser/common_data/table/row/cell/grid_span.rb

@@ -10,15 +10,9 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @type = 'horizontal'
-      @parent = parent
+      super
     end
 
-    alias count_of_merged_cells value
-
-    extend Gem::Deprecate
-    deprecate :type, 'GridSpan always horizontal', 2069, 1
-    deprecate :count_of_merged_cells, 'value', 2069, 1
-
     # Parse Grid Span data
     # @param [Nokogiri::XML:Element] node with GridSpan data
     # @return [GridSpan] value of GridSpan

data/lib/ooxml_parser/common_parser/common_data/table/row/cell/properties/borders.rb

@@ -15,7 +15,7 @@ module OoxmlParser
       @between = BordersProperties.new
       @inner_horizontal = BordersProperties.new
       @inner_vertical = BordersProperties.new
-      @parent = parent
+      super
     end
 
     # Method to copy object

data/lib/ooxml_parser/common_parser/common_data/table/row/cell/properties/table_cell_line.rb

@@ -9,7 +9,7 @@ module OoxmlParser
     def initialize(fill = nil, line_join = nil, parent: nil)
       @fill = fill
       @line_join = line_join
-      @parent = parent
+      super(parent: parent)
     end
 
     # Parse TableCellLine object

data/lib/ooxml_parser/common_parser/common_data/table/row/row.rb

@@ -9,7 +9,7 @@ module OoxmlParser
 
     def initialize(cells = [], parent: nil)
       @cells = cells
-      @parent = parent
+      super(parent: parent)
     end
 
     alias table_row_height height

data/lib/ooxml_parser/common_parser/common_data/table/table_grid.rb

@@ -9,7 +9,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @columns = []
-      @parent = parent
+      super
     end
 
     # Compare this object to other

data/lib/ooxml_parser/common_parser/common_data/table/table_properties.rb

@@ -40,7 +40,7 @@ module OoxmlParser
     def initialize(parent: nil)
       @jc = :left
       @table_borders = TableBorders.new
-      @parent = parent
+      super
     end
 
     # Parse TableProperties object

data/lib/ooxml_parser/common_parser/common_data/underline.rb

@@ -8,7 +8,7 @@ module OoxmlParser
     def initialize(style = :none, color = nil, parent: nil)
       @style = style == 'single' ? :single : style
       @color = color
-      @parent = parent
+      super(parent: parent)
     end
 
     # Compare this object to other

data/lib/ooxml_parser/common_parser/common_data/valued_child.rb

@@ -9,8 +9,8 @@ module OoxmlParser
     attr_reader :type
 
     def initialize(type = :string, parent: nil)
-      @parent = parent
       @type = type
+      super(parent: parent)
     end
 
     # Parse ValuedChild object

data/lib/ooxml_parser/common_parser/common_document_structure.rb

@@ -19,6 +19,7 @@ module OoxmlParser
       @default_font_size = params.fetch(:default_font_size, 18)
       @default_font_typeface = params.fetch(:default_font_typeface, 'Arial')
       @default_font_style = FontStyle.new
+      super(parent: nil)
     end
   end
 end

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

@@ -180,7 +180,7 @@ module OoxmlParser
             case element.name
             when 'p'
               child = element.child
-              unless child.nil? && doc_structure.elements.last.class == Table
+              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)
                 number += 1
                 doc_structure.elements << paragraph_style.dup
@@ -217,7 +217,7 @@ module OoxmlParser
     # Parse default style
     # @return [void]
     def parse_default_style
-      doc = parse_xml(OOXMLDocumentObject.path_to_folder + 'word/styles.xml')
+      doc = parse_xml("#{OOXMLDocumentObject.path_to_folder}word/styles.xml")
       doc.search('//w:style').each do |style|
         next if style.attribute('default').nil?
 

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

@@ -9,8 +9,8 @@ module OoxmlParser
 
     def initialize(params = {})
       @comments_array = []
-      @parent = params[:parent]
-      @file = params.fetch(:file, OOXMLDocumentObject.path_to_folder + 'word/comments.xml')
+      @file = params.fetch(:file, "#{OOXMLDocumentObject.path_to_folder}word/comments.xml")
+      super(parent: params[:parent])
     end
 
     # @return [Comment] accessor

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

@@ -11,7 +11,7 @@ module OoxmlParser
     def initialize(id = nil, paragraphs = [], parent: nil)
       @id = id
       @paragraphs = paragraphs
-      @parent = parent
+      super(parent: parent)
     end
 
     # Parse Comment object

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

@@ -6,7 +6,7 @@ module OoxmlParser
   class CommentsExtended < OOXMLDocumentObject
     def initialize(parent: nil)
       @comments_extended_array = []
-      @parent = parent
+      super
     end
 
     # @return [Array, CommentsExtended] accessor
@@ -17,7 +17,7 @@ module OoxmlParser
     # Parse CommentsExtended object
     # @return [CommentsExtended] result of parsing
     def parse
-      file_to_parse = OOXMLDocumentObject.path_to_folder + 'word/commentsExtended.xml'
+      file_to_parse = "#{OOXMLDocumentObject.path_to_folder}word/commentsExtended.xml"
       return nil unless File.exist?(file_to_parse)
 
       doc = parse_xml(file_to_parse)

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

@@ -12,7 +12,7 @@ module OoxmlParser
     def initialize(parent: nil)
       @color1 = nil
       @type = 'simple'
-      @parent = parent
+      super
     end
 
     # Parse DocumentBackground object

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

@@ -9,7 +9,7 @@ module OoxmlParser
     # Parse Settings object
     # @return [DocumentSettings] result of parsing
     def parse
-      settings_path = OOXMLDocumentObject.path_to_folder + 'word/settings.xml'
+      settings_path = "#{OOXMLDocumentObject.path_to_folder}word/settings.xml"
       return nil unless File.exist?(settings_path)
 
       doc = parse_xml(settings_path)

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

@@ -41,7 +41,7 @@ module OoxmlParser
     def initialize(parent: nil)
       @q_format = false
       @table_style_properties_list = []
-      @parent = parent
+      super
     end
 
     # @return [String] result of convert of object to string

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

@@ -18,7 +18,7 @@ module OoxmlParser
   # Class for data of DocxParagraph
   class DocxParagraph < OOXMLDocumentObject
     include DocxParagraphHelper
-    attr_accessor :number, :bookmark_start, :bookmark_end, :align, :spacing, :background_color, :ind, :numbering,
+    attr_accessor :number, :bookmark_start, :bookmark_end, :align, :spacing, :ind, :numbering,
                   :character_style_array, :page_break, :borders, :keep_lines,
                   :contextual_spacing, :sector_properties, :page_numbering, :section_break, :style, :keep_next,
                   :orphan_control
@@ -41,7 +41,7 @@ module OoxmlParser
       @number = 0
       @bookmark_start = []
       @bookmark_end = []
-      @align = 'left'
+      @align = :left
       @spacing = Spacing.new
       @ind = Indents.new
       @character_style_array = []
@@ -52,7 +52,7 @@ module OoxmlParser
       @page_numbering = false
       @keep_next = false
       @orphan_control = true
-      @parent = parent
+      super
     end
 
     alias elements character_style_array
@@ -129,8 +129,8 @@ module OoxmlParser
         when 'bookmarkEnd'
           character_styles_array << BookmarkEnd.new(parent: self).parse(node_child)
         when 'pPr'
-          parse_paragraph_style(node_child, custom_character_style)
           @paragraph_properties = ParagraphProperties.new(parent: self).parse(node_child)
+          parse_paragraph_style(node_child, custom_character_style)
         when 'commentRangeStart'
           character_styles_array << CommentRangeStart.new(parent: self).parse(node_child)
         when 'commentRangeEnd'
@@ -177,7 +177,7 @@ module OoxmlParser
         end
       end
       @number = par_number
-      character_styles_array.last.text = character_styles_array.last.text.rstrip if character_styles_array.last.class == DocxParagraphRun
+      character_styles_array.last.text = character_styles_array.last.text.rstrip if character_styles_array.last.instance_of?(DocxParagraphRun)
       @character_style_array = character_styles_array
       @parent = parent
       self
@@ -206,10 +206,6 @@ module OoxmlParser
           @keep_next = true
         when 'contextualSpacing'
           @contextual_spacing = true
-        when 'shd'
-          background_color_string = node_child.attribute('fill').value
-          @background_color = Color.new(parent: self).parse_hex_string(background_color_string)
-          @background_color.set_style(node_child.attribute('val').value.to_sym) unless node_child.attribute('val').nil?
         when 'pStyle'
           parse_paragraph_style_xml(node_child.attribute('val').value, default_char_style)
         when 'ind'
@@ -247,7 +243,7 @@ module OoxmlParser
     # @param character_style [DocxParagraphRun] style to parse
     # @return [void]
     def parse_paragraph_style_xml(id, character_style)
-      doc = parse_xml(OOXMLDocumentObject.path_to_folder + 'word/styles.xml')
+      doc = parse_xml("#{OOXMLDocumentObject.path_to_folder}word/styles.xml")
       doc.search('//w:style').each do |style|
         next unless style.attribute('styleId').value == id
 

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

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

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/docx_formula/bar.rb

@@ -7,7 +7,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @position = :bottom
-      @parent = parent
+      super
     end
 
     # Parse Bar object

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/docx_formula/box.rb

@@ -7,7 +7,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @borders = false
-      @parent = parent
+      super
     end
 
     # Parse Box object

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/docx_formula/delimeter.rb

@@ -8,7 +8,7 @@ module OoxmlParser
     def initialize(parent: nil)
       @begin_character = '('
       @end_character = ')'
-      @parent = parent
+      super
     end
 
     # Parse Delimiter object

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/docx_formula/limit.rb

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

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/docx_formula/math_run/math_run_properties.rb

@@ -8,7 +8,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @break = false
-      @parent = parent
+      super
     end
 
     # Parse MathRunProperties

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/docx_formula/matrix.rb

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

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/docx_formula/matrix/matrix_row.rb

@@ -7,7 +7,7 @@ module OoxmlParser
 
     def initialize(columns_count = 1, parent: nil)
       @columns = Array.new(columns_count)
-      @parent = parent
+      super(parent: parent)
     end
   end
 end

data/lib/ooxml_parser/docx_parser/docx_data/document_structure/docx_paragraph/docx_formula/radical.rb

@@ -7,7 +7,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @degree = 2
-      @parent = parent
+      super
     end
 
     # Parse Radical object

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

@@ -9,5 +9,12 @@ module OoxmlParser
 
       root_object.comments_extended.by_id(@paragraph_id)
     end
+
+    # Temp method to return background color
+    # Need to be compatible with older versions
+    # @return [OoxmlParser::Color]
+    def background_color
+      paragraph_properties.shade.to_background_color
+    end
   end
 end

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

@@ -38,7 +38,7 @@ module OoxmlParser
       @break = false
       @comments = []
       @page_number = false
-      @parent = parent
+      super
     end
 
     # Constructor for copy of object

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

@@ -51,33 +51,14 @@ module OoxmlParser
         when 'smallCaps'
           self.caps = :small_caps if option_enabled?(node_child)
         when 'color'
-          node_child.attributes.each do |key, value|
-            case key
-            when 'val'
-              self.font_color = Color.new(parent: self).parse_hex_string(value.value)
-            when 'themeColor'
-              if root_object.theme && root_object.theme.color_scheme[value.value.to_sym]
-                break if value.value == 'text2' || value.value == 'background2' || value.value.include?('accent') # Don't know why. Just works
-
-                self.font_color = root_object.theme.color_scheme[value.value.to_sym].color.dup
-              end
-            when 'themeShade'
-              font_color.calculate_with_shade!(value.value.hex.to_f / 255.0)
-            when 'themeTint'
-              font_color.calculate_with_tint!(1.0 - (value.value.hex.to_f / 255.0))
-            end
-          end
+          parse_color_tag(node_child)
         when 'shd'
           self.background_color = node_child.attribute('fill').value
           unless node_child.attribute('fill').value == 'auto' || node_child.attribute('fill').value == '' || node_child.attribute('fill').value == 'null'
             self.background_color = Color.new(parent: self).parse_hex_string(node_child.attribute('fill').value)
           end
         when 'u', 'uCs'
-          font_style.underlined = Underline.new
-          if option_enabled?(node_child)
-            font_style.underlined.style = node_child.attribute('val').value
-            font_style.underlined.color = Color.new(parent: font_style.underlined).parse_hex_string(node_child.attribute('color').value) unless node_child.attribute('color').nil?
-          end
+          parse_underline(node_child)
         when 'strike'
           font_style.strike = :single if option_enabled?(node_child)
         when 'dstrike'
@@ -86,5 +67,41 @@ module OoxmlParser
       end
       self
     end
+
+    private
+
+    # Parse `color` tag
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [nil]
+    def parse_color_tag(node)
+      node.attributes.each do |key, value|
+        case key
+        when 'val'
+          self.font_color = Color.new(parent: self).parse_hex_string(value.value)
+        when 'themeColor'
+          if root_object.theme && root_object.theme.color_scheme[value.value.to_sym]
+            break if value.value == 'text2' || value.value == 'background2' || value.value.include?('accent') # Don't know why. Just works
+
+            self.font_color = root_object.theme.color_scheme[value.value.to_sym].color.dup
+          end
+        when 'themeShade'
+          font_color.calculate_with_shade!(value.value.hex.to_f / 255.0)
+        when 'themeTint'
+          font_color.calculate_with_tint!(1.0 - (value.value.hex.to_f / 255.0))
+        end
+      end
+    end
+
+    # Parse `u` or `uCs` tag
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [nil]
+    def parse_underline(node)
+      font_style.underlined = Underline.new
+
+      return unless option_enabled?(node)
+
+      font_style.underlined.style = node.attribute('val').value
+      font_style.underlined.color = Color.new(parent: font_style.underlined).parse_hex_string(node.attribute('color').value) unless node.attribute('color').nil?
+    end
   end
 end