ooxml_parser 0.8.0 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bff9ef732546243f5b751041e9fb41602a4e0ca823f93a83f671975e881cf6fd
-  data.tar.gz: 3e5bc500fb572b0fa43297f6d85a0f47e1d35365caed9803441b81785808e83d
+  metadata.gz: 152de470eb7ecac05ca2d886b7c7113edb6a2c388fe29491b5b0c4341e771237
+  data.tar.gz: cf0aa14cc429393d88a2e3a39961242ab740c96a878d149ec74cdaade6fd2587
 SHA512:
-  metadata.gz: 93a6648cf7f5ce6a088d3c654c2c50b04afb363507e20ef8f2198ba35265310dfc44205819b32d635b997c589656bb87514fc5ab2007d2b898accf4d8fcb2b4b
-  data.tar.gz: 3e3f6e9c0a70516a176f5614294f8aecb02be45219c9a9c6799d3b3e75e7a2d7b6ff0a3680e6a8f18d8bbd6d8658740cac1157447b94659bd082a07ec9025a5e
+  metadata.gz: 34869710a5435a3d26c6b70dd42b1290cd80a1b7dff16582f3d4abaaa765877b69c58a9af5543b86cdbad78c27dd3849daf14f09e8bf0c8e5c4c5bfd3fdb0b8f
+  data.tar.gz: 538f12d23be8b548ef8bbcfd476f93f4c0926cfbe9c71d7101a97ccf040e8c238dece97f7c04d49bef6dd524e296795c3f1ada9b368016bf6864f9262cfd1dcc

data/lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart.rb

@@ -38,7 +38,7 @@ module OoxmlParser
       @legend = nil
       @axises = []
       @series = []
-      @parent = parent
+      super
     end
 
     # Parse properties of Chart
@@ -74,94 +74,101 @@ module OoxmlParser
     extend Gem::Deprecate
     deprecate :data, 'series points interface', 2020, 1
 
-    # Parse  Chart
-    # @param parent [OOOXMLDocumentObject] parent of chart
+    # Parse Chart data
     # @return [Chart] result of parsing
-    def self.parse(parent: nil)
-      chart = Chart.new(parent: parent)
-      chart_xml = chart.parse_xml(OOXMLDocumentObject.current_xml)
+    def parse
+      chart_xml = parse_xml(OOXMLDocumentObject.current_xml)
       chart_xml.xpath('*').each do |chart_node|
         case chart_node.name
         when 'chartSpace'
           chart_node.xpath('*').each do |chart_space_node_child|
             case chart_space_node_child.name
             when 'AlternateContent'
-              chart.alternate_content = AlternateContent.new(parent: chart).parse(chart_space_node_child)
+              @alternate_content = AlternateContent.new(parent: self).parse(chart_space_node_child)
             when 'spPr'
-              chart.shape_properties = DocxShapeProperties.new(parent: chart).parse(chart_space_node_child)
+              @shape_properties = DocxShapeProperties.new(parent: self).parse(chart_space_node_child)
             when 'chart'
               chart_space_node_child.xpath('*').each do |chart_node_child|
                 case chart_node_child.name
                 when 'plotArea'
                   chart_node_child.xpath('*').each do |plot_area_node_child|
-                    next unless chart.type.empty?
+                    next unless type.empty?
 
                     case plot_area_node_child.name
                     when 'barChart'
-                      chart.type = :bar
+                      @type = :bar
                       bar_dir_node = plot_area_node_child.xpath('c:barDir')
-                      chart.type = :column if bar_dir_node.first.attribute('val').value == 'col'
-                      chart.parse_properties(plot_area_node_child)
+                      @type = :column if bar_dir_node.first.attribute('val').value == 'col'
+                      parse_properties(plot_area_node_child)
                     when 'lineChart'
-                      chart.type = :line
-                      chart.parse_properties(plot_area_node_child)
+                      @type = :line
+                      parse_properties(plot_area_node_child)
                     when 'areaChart'
-                      chart.type = :area
-                      chart.parse_properties(plot_area_node_child)
+                      @type = :area
+                      parse_properties(plot_area_node_child)
                     when 'bubbleChart'
-                      chart.type = :bubble
-                      chart.parse_properties(plot_area_node_child)
+                      @type = :bubble
+                      parse_properties(plot_area_node_child)
                     when 'doughnutChart'
-                      chart.type = :doughnut
-                      chart.parse_properties(plot_area_node_child)
+                      @type = :doughnut
+                      parse_properties(plot_area_node_child)
                     when 'pieChart'
-                      chart.type = :pie
-                      chart.parse_properties(plot_area_node_child)
+                      @type = :pie
+                      parse_properties(plot_area_node_child)
                     when 'scatterChart'
-                      chart.type = :point
-                      chart.parse_properties(plot_area_node_child)
+                      @type = :point
+                      parse_properties(plot_area_node_child)
                     when 'radarChart'
-                      chart.type = :radar
-                      chart.parse_properties(plot_area_node_child)
+                      @type = :radar
+                      parse_properties(plot_area_node_child)
                     when 'stockChart'
-                      chart.type = :stock
-                      chart.parse_properties(plot_area_node_child)
+                      @type = :stock
+                      parse_properties(plot_area_node_child)
                     when 'surface3DChart'
-                      chart.type = :surface_3d
-                      chart.parse_properties(plot_area_node_child)
+                      @type = :surface_3d
+                      parse_properties(plot_area_node_child)
                     when 'line3DChart'
-                      chart.type = :line_3d
-                      chart.parse_properties(plot_area_node_child)
+                      @type = :line_3d
+                      parse_properties(plot_area_node_child)
                     when 'bar3DChart'
-                      chart.type = :bar_3d
-                      chart.parse_properties(plot_area_node_child)
+                      @type = :bar_3d
+                      parse_properties(plot_area_node_child)
                     when 'pie3DChart'
-                      chart.type = :pie_3d
-                      chart.parse_properties(plot_area_node_child)
+                      @type = :pie_3d
+                      parse_properties(plot_area_node_child)
                     end
                   end
-                  chart_node_child.xpath('*').each do |plot_area_node_child|
-                    case plot_area_node_child.name
-                    when 'catAx', 'valAx'
-                      chart.axises << ChartAxis.new(parent: chart).parse(plot_area_node_child)
-                    end
-                  end
-                  chart.plot_area = PlotArea.new(parent: chart).parse(chart_node_child)
+                  parse_axis(chart_node_child)
+                  @plot_area = PlotArea.new(parent: self).parse(chart_node_child)
                 when 'title'
-                  chart.title = ChartAxisTitle.new(parent: chart).parse(chart_node_child)
+                  @title = ChartAxisTitle.new(parent: self).parse(chart_node_child)
                 when 'legend'
-                  chart.legend = ChartLegend.new(parent: chart).parse(chart_node_child)
+                  @legend = ChartLegend.new(parent: self).parse(chart_node_child)
                 when 'view3D'
-                  chart.view_3d = View3D.new(parent: chart).parse(chart_node_child)
+                  @view_3d = View3D.new(parent: self).parse(chart_node_child)
                 when 'pivotFmts'
-                  chart.pivot_formats = PivotFormats.new(parent: chart).parse(chart_node_child)
+                  @pivot_formats = PivotFormats.new(parent: self).parse(chart_node_child)
                 end
               end
             end
           end
         end
       end
-      chart
+      self
+    end
+
+    private
+
+    # Perform parsing of axis info
+    # @param node [Nokogiri::XML:Element] node to parse
+    # @return [void]
+    def parse_axis(node)
+      node.xpath('*').each do |node_child|
+        case node_child.name
+        when 'catAx', 'valAx'
+          @axises << ChartAxis.new(parent: self).parse(node_child)
+        end
+      end
     end
   end
 end

data/lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart/pivot_formats.rb

@@ -8,8 +8,8 @@ module OoxmlParser
     attr_reader :pivot_formats_list
 
     def initialize(parent: nil)
-      @parent = parent
       @pivot_formats_list = []
+      super
     end
 
     # @return [Array, PivotFormat] accessor

data/lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart/plot_area/common_chart_data.rb

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

data/lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart/series/series_text/string_reference/number_string_cache.rb

@@ -13,7 +13,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @points = []
-      @parent = parent
+      super
     end
 
     # Parse Order

data/lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart_axis.rb

@@ -11,16 +11,12 @@ module OoxmlParser
     # @return [ValuedChild] the position of the tick labels
     attr_reader :tick_label_position
 
-    def initialize(title = ChartAxisTitle.new,
-                   display = true,
-                   major_grid_lines = false,
-                   minor_grid_lines = false,
-                   parent: nil)
-      @title = title
-      @display = display
-      @minor_grid_lines = minor_grid_lines
-      @major_grid_lines = major_grid_lines
-      @parent = parent
+    def initialize(params = {})
+      @title = params.fetch(:title, ChartAxisTitle.new)
+      @display = params.fetch(:display, true)
+      @minor_grid_lines = params.fetch(:minor_grid_lines, false)
+      @major_grid_lines = params.fetch(:major_grid_lines, false)
+      super(parent: params[:parent])
     end
 
     # Parse ChartAxis object

data/lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart_axis_title.rb

@@ -7,7 +7,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @elements = []
-      @parent = parent
+      super
     end
 
     # @return [Boolean] if chart title is visible

data/lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart_cells_range.rb

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

data/lib/ooxml_parser/common_parser/common_data/alternate_content/chart/chart_legend.rb

@@ -5,12 +5,10 @@ module OoxmlParser
   class ChartLegend < OOXMLDocumentObject
     attr_accessor :position, :overlay
 
-    def initialize(position = :right,
-                   overlay = false,
-                   parent: nil)
-      @position = position
-      @overlay = overlay
-      @parent = parent
+    def initialize(params = {})
+      @position = params.fetch(:position, :right)
+      @overlay = params.fetch(:overlay, false)
+      super(parent: params[:parent])
     end
 
     # Return combined data from @position and @overlay

data/lib/ooxml_parser/common_parser/common_data/alternate_content/chart/display_labels_properties.rb

@@ -11,10 +11,10 @@ module OoxmlParser
     # @return [True, False] is label is deleted
     attr_reader :delete
 
-    def initialize(show_legend_key = false, show_values = false, parent: nil)
-      @show_legend_key = show_legend_key
-      @show_values = show_values
-      @parent = parent
+    def initialize(params = {})
+      @show_legend_key = params.fetch(:show_legend_key, false)
+      @show_values = params.fetch(:show_values, false)
+      super(parent: params[:parent])
     end
 
     # Parse DisplayLabelsProperties object

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/docx_drawing.rb

@@ -16,7 +16,7 @@ module OoxmlParser
 
     def initialize(properties = DocxDrawingProperties.new, parent: nil)
       @properties = properties
-      @parent = parent
+      super(parent: parent)
     end
 
     # Parse DocxDrawing

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/drawing_properties/docx_wrap_drawing.rb

@@ -7,7 +7,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @wrap_text = :none
-      @parent = parent
+      super
     end
 
     # Parse DocxWrapDrawing object

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/drawing_properties/ooxml_coordinates.rb

@@ -20,7 +20,7 @@ module OoxmlParser
 
     # @return [String] result of convert of object to string
     def to_s
-      '(' + @x.to_s + '; ' + @y.to_s + ')'
+      "(#{@x}; #{@y})"
     end
 
     # Compare two OOXMLCoordinates objects

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/docx_graphic.rb

@@ -24,7 +24,7 @@ module OoxmlParser
         when 'chart'
           @type = :chart
           OOXMLDocumentObject.add_to_xmls_stack("#{OOXMLDocumentObject.root_subfolder}/#{OOXMLDocumentObject.get_link_from_rels(node_child.attribute('id').value)}")
-          @data = Chart.parse(parent: self)
+          @data = Chart.new(parent: self).parse
           OOXMLDocumentObject.xmls_stack.pop
         when 'wgp'
           @type = :group

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/ooxml_text_box.rb

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

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/shape_style.rb

@@ -16,10 +16,6 @@ module OoxmlParser
     # @return [LineReference] line reference
     attr_reader :line_reference
 
-    def initialize(parent: nil)
-      @parent = parent
-    end
-
     # Parse ShapeStyle object
     # @param node [Nokogiri::XML:Element] node to parse
     # @return [ShapeStyle] result of parsing

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/shape_style/effect_reference.rb

@@ -8,10 +8,6 @@ module OoxmlParser
     # @return [Color] scheme color of EffectReference
     attr_reader :scheme_color
 
-    def initialize(parent: nil)
-      @parent = parent
-    end
-
     # Parse EffectReference object
     # @param node [Nokogiri::XML:Element] node to parse
     # @return [EffectReference] result of parsing

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/shape_style/fill_reference.rb

@@ -8,10 +8,6 @@ module OoxmlParser
     # @return [Color] scheme color of FillReference
     attr_reader :scheme_color
 
-    def initialize(parent: nil)
-      @parent = parent
-    end
-
     # Parse FillReference object
     # @param node [Nokogiri::XML:Element] node to parse
     # @return [FillReference] result of parsing

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/shape_style/font_reference.rb

@@ -8,10 +8,6 @@ module OoxmlParser
     # @return [Color] scheme color of FontReference
     attr_reader :scheme_color
 
-    def initialize(parent: nil)
-      @parent = parent
-    end
-
     # Parse FontReference object
     # @param node [Nokogiri::XML:Element] node to parse
     # @return [FontReference] result of parsing

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/shape_style/line_reference.rb

@@ -8,10 +8,6 @@ module OoxmlParser
     # @return [Color] scheme color of LineReference
     attr_reader :scheme_color
 
-    def initialize(parent: nil)
-      @parent = parent
-    end
-
     # Parse LineReference object
     # @param node [Nokogiri::XML:Element] node to parse
     # @return [LineReference] result of parsing

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/docx_shape/text_body.rb

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

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/shape_properties/color/docx_color_scheme.rb

@@ -8,7 +8,7 @@ module OoxmlParser
     def initialize(parent: nil)
       @color = Color.new
       @type = :unknown
-      @parent = parent
+      super
     end
 
     # Parse DocxColorScheme object

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/shape_properties/custom_geometry/docx_custom_geometry/docx_shape_line_path.rb

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

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/shape_properties/custom_geometry/docx_custom_geometry/docx_shape_line_path/docx_shape_line_element.rb

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

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/shape_properties/custom_geometry/ooxml_custom_geometry.rb

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

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/shape_properties/docx_shape_line.rb

@@ -13,7 +13,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @width = OoxmlSize.new(0)
-      @parent = parent
+      super
     end
 
     # @return [Integer] stroke size of object

data/lib/ooxml_parser/common_parser/common_data/alternate_content/drawing/graphic/shape/shape_properties/docx_shape_properties.rb

@@ -29,7 +29,7 @@ module OoxmlParser
 
     def initialize(parent: nil)
       @line = DocxShapeLine.new
-      @parent = parent
+      super
     end
 
     # Parse DocxShapeProperties object