write_xlsx 0.0.3 → 0.0.4

data/lib/write_xlsx/chart/area.rb

@@ -37,15 +37,12 @@ def write_chart_type
       # Write the <c:areaChart> element.
       #
       def write_area_chart
-        @writer.start_tag('c:areaChart')
-
-        # Write the c:grouping element.
-        write_grouping('standard')
-
-        # Write the series elements.
-        write_series
-
-        @writer.end_tag('c:areaChart')
+        @writer.tag_elements('c:areaChart') do
+          # Write the c:grouping element.
+          write_grouping('standard')
+          # Write the series elements.
+          write_series
+        end
       end
     end
   end

data/lib/write_xlsx/chart/bar.rb

@@ -39,29 +39,6 @@ def write_chart_type
         write_bar_chart
       end
 
-      #
-      # Write the <c:barChart> element.
-      #
-      def write_bar_chart
-        subtype = @subtype
-
-        subtype = 'percentStacked' if subtype == 'percent_stacked'
-
-        @writer.start_tag('c:barChart')
-
-        # Write the c:barDir element.
-        write_bar_dir
-
-        # Write the c:grouping element.
-        write_grouping(subtype)
-
-        # Write the series elements.
-        write_series
-
-        @writer.end_tag('c:barChart')
-      end
-
-
       #
       # Write the <c:barDir> element.
       #
@@ -79,27 +56,7 @@ def write_bar_dir
       # Write the series elements.
       #
       def write_series
-        # Write each series with subelements.
-        index = 0
-        @series.each do |series|
-          write_ser(index, series)
-          index += 1
-        end
-
-
-        # Write the c:marker element.
-        write_marker_value
-
-        # Write the c:overlap element.
-        write_overlap if @subtype =~ /stacked/
-
-        # Generate the axis ids.
-        add_axis_id
-        add_axis_id
-
-        # Write the c:axId element.
-        write_axis_id(@axis_ids[0])
-        write_axis_id(@axis_ids[1])
+        write_series_base {write_overlap if @subtype =~ /stacked/}
       end
 
 

data/lib/write_xlsx/chart/column.rb

@@ -42,32 +42,6 @@ def write_chart_type
         write_bar_chart
       end
 
-
-      ##############################################################################
-      #
-      # _write_bar_chart
-      #
-      # Write the <c:barChart> element.
-      #
-      def write_bar_chart
-        subtype = @subtype
-
-        subtype = 'percentStacked' if subtype == 'percent_stacked'
-
-        @writer.start_tag('c:barChart')
-
-        # Write the c:barDir element.
-        write_bar_dir
-
-        # Write the c:grouping element.
-        write_grouping(subtype)
-
-        # Write the series elements.
-        write_series
-
-        @writer.end_tag('c:barChart')
-      end
-
       #
       # Write the <c:barDir> element.
       #
@@ -86,26 +60,7 @@ def write_bar_dir
       # Write the series elements.
       #
       def write_series
-        # Write each series with subelements.
-        index = 0
-        @series.each do |series|
-          write_ser(index, series)
-          index += 1
-        end
-
-        # Write the c:marker element.
-        write_marker_value
-
-        # Write the c:overlap element.
-        write_overlap if @subtype =~ /stacked/
-
-        # Generate the axis ids.
-        add_axis_id
-        add_axis_id
-
-        # Write the c:axId element.
-        write_axis_id(@axis_ids[0])
-        write_axis_id(@axis_ids[1])
+        write_series_base {write_overlap if @subtype =~ /stacked/}
       end
 
       #

data/lib/write_xlsx/chart/line.rb

@@ -36,15 +36,12 @@ def write_chart_type
       # Write the <c:lineChart> element.
       #
       def write_line_chart
-        @writer.start_tag('c:lineChart')
-
-        # Write the c:grouping element.
-        write_grouping('standard')
-
-        # Write the series elements.
-        write_series
-
-        @writer.end_tag('c:lineChart')
+        @writer.tag_elements('c:lineChart') do
+          # Write the c:grouping element.
+          write_grouping('standard')
+          # Write the series elements.
+          write_series
+        end
       end
     end
   end

data/lib/write_xlsx/chart/pie.rb

@@ -43,18 +43,14 @@ def write_chart_type
       # Write the <c:pieChart> element.
       #
       def write_pie_chart
-        @writer.start_tag('c:pieChart')
-
-        # Write the c:varyColors element.
-        write_vary_colors
-
-        # Write the series elements.
-        write_series
-
-        # Write the c:firstSliceAng element.
-        write_first_slice_ang
-
-        @writer.end_tag('c:pieChart')
+        @writer.tag_elements('c:pieChart') do
+          # Write the c:varyColors element.
+          write_vary_colors
+          # Write the series elements.
+          write_series
+          # Write the c:firstSliceAng element.
+          write_first_slice_ang
+        end
       end
 
       #
@@ -64,15 +60,12 @@ def write_pie_chart
       # Write the <c:plotArea> element.
       #
       def write_plot_area
-        @writer.start_tag('c:plotArea')
-
-        # Write the c:layout element.
-        write_layout
-
-        # Write the subclass chart type element.
-        write_chart_type
-
-        @writer.end_tag('c:plotArea')
+        @writer.tag_elements('c:plotArea') do
+          # Write the c:layout element.
+          write_layout
+          # Write the subclass chart type element.
+          write_chart_type
+        end
       end
 
       #
@@ -116,21 +109,16 @@ def write_legend
 
         position = allowed[position]
 
-        @writer.start_tag('c:legend')
-
-        # Write the c:legendPos element.
-        write_legend_pos(position)
-
-        # Write the c:layout element.
-        write_layout
-
-        # Write the c:overlay element.
-        write_overlay if overlay != 0
-
-        # Write the c:txPr element. Over-ridden.
-        write_tx_pr_legend
-
-        @writer.end_tag('c:legend')
+        @writer.tag_elements('c:legend') do
+          # Write the c:legendPos element.
+          write_legend_pos(position)
+          # Write the c:layout element.
+          write_layout
+          # Write the c:overlay element.
+          write_overlay if overlay != 0
+          # Write the c:txPr element. Over-ridden.
+          write_tx_pr_legend
+        end
       end
 
       #
@@ -139,33 +127,26 @@ def write_legend
       def write_tx_pr_legend
         horiz = 0
 
-        @writer.start_tag('c:txPr')
-
-        # Write the a:bodyPr element.
-        write_a_body_pr(horiz)
-
-        # Write the a:lstStyle element.
-        write_a_lst_style
-
-        # Write the a:p element.
-        write_a_p_legend
-
-        @writer.end_tag('c:txPr')
+        @writer.tag_elements('c:txPr') do
+          # Write the a:bodyPr element.
+          write_a_body_pr(horiz)
+          # Write the a:lstStyle element.
+          write_a_lst_style
+          # Write the a:p element.
+          write_a_p_legend
+        end
       end
 
       #
       # Write the <a:p> element for legends.
       #
       def write_a_p_legend
-        @writer.start_tag('a:p')
-
-        # Write the a:pPr element.
-        write_a_p_pr_legend
-
-        # Write the a:endParaRPr element.
-        write_a_end_para_rpr
-
-        @writer.end_tag('a:p')
+        @writer.tag_elements('a:p') do
+          # Write the a:pPr element.
+          write_a_p_pr_legend
+          # Write the a:endParaRPr element.
+          write_a_end_para_rpr
+        end
       end
 
       #
@@ -176,12 +157,10 @@ def write_a_p_pr_legend
 
         attributes = ['rtl', rtl]
 
-        @writer.start_tag('a:pPr', attributes)
-
-        # Write the a:defRPr element.
-        write_a_def_rpr
-
-        @writer.end_tag('a:pPr')
+        @writer.tag_elements('a:pPr', attributes) do
+          # Write the a:defRPr element.
+          write_a_def_rpr
+        end
       end
 
       #

data/lib/write_xlsx/chart/scatter.rb

@@ -68,15 +68,12 @@ def write_scatter_chart
         # Add default formatting to the series data.
         modify_series_formatting
 
-        @writer.start_tag('c:scatterChart')
-
-        # Write the c:scatterStyle element.
-        write_scatter_style(style)
-
-        # Write the series elements.
-        write_series
-
-        @writer.end_tag('c:scatterChart')
+        @writer.tag_elements('c:scatterChart') do
+          # Write the c:scatterStyle element.
+          write_scatter_style(style)
+          # Write the series elements.
+          write_series
+        end
       end
 
       #
@@ -85,39 +82,28 @@ def write_scatter_chart
       # Write the <c:ser> element.
       #
       def write_ser(index, series)
-        @writer.start_tag('c:ser')
-
-        # Write the c:idx element.
-        write_idx(index)
-
-        # Write the c:order element.
-        write_order(index)
-
-        # Write the series name.
-        write_series_name(series)
-
-        # Write the c:spPr element.
-        write_sp_pr(series)
-
-        # Write the c:marker element.
-        write_marker(series[:_marker])
-
-        # Write the c:dLbls element.
-        write_d_lbls(series[:_labels])
-
-        # Write the c:trendline element.
-        write_trendline(series[:_trendline])
-
-        # Write the c:xVal element.
-        write_x_val(series)
-
-        # Write the c:yVal element.
-        write_y_val(series)
-
-        # Write the c:smooth element.
-        write_c_smooth
-
-        @writer.end_tag('c:ser')
+        @writer.tag_elements('c:ser') do
+          # Write the c:idx element.
+          write_idx(index)
+          # Write the c:order element.
+          write_order(index)
+          # Write the series name.
+          write_series_name(series)
+          # Write the c:spPr element.
+          write_sp_pr(series)
+          # Write the c:marker element.
+          write_marker(series[:_marker])
+          # Write the c:dLbls element.
+          write_d_lbls(series[:_labels])
+          # Write the c:trendline element.
+          write_trendline(series[:_trendline])
+          # Write the c:xVal element.
+          write_x_val(series)
+          # Write the c:yVal element.
+          write_y_val(series)
+          # Write the c:smooth element.
+          write_c_smooth
+        end
       end
 
       #
@@ -127,72 +113,32 @@ def write_ser(index, series)
       # Write the <c:plotArea> element.
       #
       def write_plot_area
-        @writer.start_tag('c:plotArea')
-
-        # Write the c:layout element.
-        write_layout
-
-        # Write the subclass chart type element.
-        write_chart_type
-
-        # Write the c:catAx element.
-        write_cat_val_axis('b', 1)
-
-        # Write the c:catAx element.
-        @horiz_val_axis = 1
-        write_val_axis('l')
-
-        @writer.end_tag('c:plotArea')
+        @writer.tag_elements('c:plotArea') do
+          # Write the c:layout element.
+          write_layout
+          # Write the subclass chart type element.
+          write_chart_type
+          # Write the c:catAx element.
+          write_cat_val_axis('b', 1)
+          # Write the c:catAx element.
+          @horiz_val_axis = 1
+
+          write_val_axis('l')
+        end
       end
 
       #
       # Write the <c:xVal> element.
       #
       def write_x_val(series)
-        formula = series[:_categories]
-        data_id = series[:_cat_data_id]
-        data    = @formula_data[data_id]
-
-        @writer.start_tag('c:xVal')
-
-        # Check the type of cached data.
-        type = get_data_type(data)
-
-        # TODO. Can a scatter plot have non-numeric data.
-
-        if type == 'str'
-          # Write the c:numRef element.
-          write_str_ref(formula, data, type)
-        else
-          # Write the c:numRef element.
-          write_num_ref(formula, data, type)
-        end
-
-        @writer.end_tag('c:xVal')
+        write_val_base(series[:_categories], series[:_cat_data_id], 'c:xVal')
       end
 
       #
       # Write the <c:yVal> element.
       #
       def write_y_val(series)
-        formula = series[:_values]
-        data_id = series[:_val_data_id]
-        data    = @formula_data[data_id]
-
-        @writer.start_tag('c:yVal')
-
-        # Check the type of cached data.
-        type = get_data_type(data)
-
-        if type == 'str'
-          # Write the c:numRef element.
-          write_str_ref(formula, data, type)
-        else
-          # Write the c:numRef element.
-          write_num_ref(formula, data, type)
-        end
-
-        @writer.end_tag('c:yVal')
+        write_val_base(series[:_values], series[:_val_data_id], 'c:yVal')
       end
 
       #