write_xlsx 0.80.0 → 0.81.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f7b091a25a820d796b03d56e1e599383281513d
-  data.tar.gz: 6253c7a5c2dc797c7924593d5e1747f721758899
+  metadata.gz: 2393c3aa40869f02381b920ea72227502bd095a6
+  data.tar.gz: f6e538f97000ba15bd3507db94117a9cca492459
 SHA512:
-  metadata.gz: d4b0e1065e775a4638f962cbb5aa7345a1859f0c4fda350af0119a20c02b1455a7208480d5098283ba83f9ab64e616eed61684a84af0822a7de4a9fe4436be17
-  data.tar.gz: 57547d50d45c5961e8827049a0132ff50d392b927f0add7ea5f4bf57974398538d87d4d8bb3ce3d3ed88c36b5bdd81d7379a887cb2382e834d6b3d417429088c
+  metadata.gz: ec5a9d30c96b3bd5043b8ee50773cca2b183869d0b9cb3c7a83fbed670baee1970ecdedcc1681d316cd3846515c9b376d2886ff5c95be318d04ad94f72ec1f27
+  data.tar.gz: faac0dcd09879f013e237a9333bbd4a109e1bcbe6c6eb03cc0d9765c9bde376ad2f907ee850b52f51f9df35625fa3ce3cc3c94d9529fb57b3a2273b4c294e393

data/Changes

@@ -1,4 +1,7 @@
 Change history of write_xlsx rubygem.
+2014-12-04 v0.81.0
+   Add chart axis line and fill properties.
+
 2014-11-30 v0.80.0
    Chart Data Label enhancements. Added number formatting, font handling
    (Excel::Writer::XLSX issue #106), separator (Same issue #107) and legend key.

data/lib/write_xlsx/chart/axis.rb

@@ -14,7 +14,7 @@ module Writexlsx
       attr_reader :log_base, :crossing, :position_axis, :label_position, :visible
       attr_reader :num_format_linked, :num_font, :layout, :interval_unit
       attr_reader :major_gridlines, :minor_gridlines, :reverse
-
+      attr_reader :line, :fill
       #
       # Convert user defined axis values into axis instance.
       #
@@ -25,7 +25,8 @@ module Writexlsx
         [
          :reverse, :min, :max, :minor_unit, :major_unit, :minor_unit_type,
          :major_unit_type, :log_base, :crossing, :position_axis, :label_position,
-         :num_format, :num_format_linked, :interval_unit, :major_tick_mark
+         :num_format, :num_format_linked, :interval_unit, :major_tick_mark,
+         :line, :fill
         ].each { |val| instance_variable_set("@#{val}", args[val]) }
         @visible           = args[:visible] || 1
 
@@ -34,6 +35,8 @@ module Writexlsx
         set_position_axis
         set_font_properties(args)
         set_axis_name_layout(args)
+        set_axis_line(args)
+        set_axis_fill(args)
       end
 
       #
@@ -116,6 +119,14 @@ module Writexlsx
       def set_axis_name_layout(args)
         @layout    = @chart.layout_properties(args[:name_layout], 1)
       end
+
+      def set_axis_line(args)
+        @line = @chart.line_properties(args[:line])
+      end
+
+      def set_axis_fill(args)
+        @fill = @chart.fill_properties(args[:fill])
+      end
     end
   end
 end

data/lib/write_xlsx/chart.rb

@@ -1137,6 +1137,9 @@ module Writexlsx
         # Write the c:tickLblPos element.
         write_tick_label_pos(x_axis.label_position)
 
+        # Write the c:spPr element for the axis line.
+        write_sp_pr(x_axis)
+
         # Write the axis font elements.
         write_axis_font(x_axis.num_font)
 
@@ -1204,9 +1207,12 @@ module Writexlsx
         # Write the c:majorTickMark element.
         write_major_tick_mark(y_axis.major_tick_mark)
 
-        # Write the tickLblPos element.
+        # Write the c:tickLblPos element.
         write_tick_label_pos(y_axis.label_position)
 
+        # Write the c:spPr element for the axis line.
+        write_sp_pr(y_axis)
+
         # Write the axis font elements.
         write_axis_font(y_axis.num_font)
 
@@ -1270,6 +1276,8 @@ module Writexlsx
 
         # Write the c:tickLblPos element.
         write_tick_label_pos(x_axis.label_position)
+        # Write the c:spPr element for the axis line.
+        write_sp_pr(x_axis)
         # Write the font elements.
         write_axis_font(x_axis.num_font)
         # Write the c:crossAx element.

data/lib/write_xlsx/version.rb

@@ -1,5 +1,5 @@
 require 'write_xlsx/workbook'
 
 class WriteXLSX < Writexlsx::Workbook
-  VERSION = "0.80.0"
+  VERSION = "0.81.0"
 end

data/test/regression/test_chart_axis35.rb

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartAxis35 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_axis35
+    @xlsx = 'chart_axis35.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(:type => 'column', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [63008128, 62522496])
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 9, 12, 15 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    chart.set_y_axis(:line => {:none => 1})
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                { 'xl/charts/chart1.xml' => ['<c:pageMargins'] }
+                                )
+  end
+end

data/test/regression/test_chart_axis36.rb

@@ -0,0 +1,44 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartAxis36 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_axis36
+    @xlsx = 'chart_axis36.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(:type => 'column', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [45501056, 47505792])
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 9, 12, 15 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    chart.set_x_axis(:line => {:none => 1})
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                { 'xl/charts/chart1.xml' => ['<c:pageMargins'] }
+                                )
+  end
+end

data/test/regression/test_chart_axis37.rb

@@ -0,0 +1,46 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartAxis37 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_axis37
+    @xlsx = 'chart_axis37.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(:type => 'column', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [46032384, 48088960 ])
+
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 9, 12, 15 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    chart.set_x_axis(:line => {:color => 'yellow'})
+    chart.set_y_axis(:line => {:color => 'red'   })
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                { 'xl/charts/chart1.xml' => ['<c:pageMargins'] }
+                                )
+  end
+end

data/test/regression/test_chart_axis38.rb

@@ -0,0 +1,48 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartAxis38 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_axis38
+    @xlsx = 'chart_axis38.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(:type => 'column', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [45642496, 45644416])
+
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 9, 12, 15 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(:values => '=Sheet1!$A$1:$A$5')
+    chart.add_series(:values => '=Sheet1!$B$1:$B$5')
+    chart.add_series(:values => '=Sheet1!$C$1:$C$5')
+
+    chart.set_y_axis(
+                     :line => {:color => 'yellow'},
+                     :fill => {:color => 'red'}
+                     )
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                { 'xl/charts/chart1.xml' => ['<c:pageMargins'] }
+                                )
+  end
+end

data/test/regression/test_chart_axis39.rb

@@ -0,0 +1,51 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+
+class TestRegressionChartAxis39 < Test::Unit::TestCase
+  def setup
+    setup_dir_var
+  end
+
+  def teardown
+    File.delete(@xlsx) if File.exist?(@xlsx)
+  end
+
+  def test_chart_axis39
+    @xlsx = 'chart_axis39.xlsx'
+    workbook    = WriteXLSX.new(@xlsx)
+    worksheet   = workbook.add_worksheet
+    chart       = workbook.add_chart(:type => 'scatter', :embedded => 1)
+
+    # For testing, copy the randomly generated axis ids in the target xlsx file.
+    chart.instance_variable_set(:@axis_ids, [45884928, 45883392])
+
+    data = [
+            [ 1, 2, 3, 4,  5 ],
+            [ 2, 4, 6, 8,  10 ],
+            [ 3, 6, 9, 12, 15 ]
+           ]
+
+    worksheet.write('A1', data)
+
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$B$1:$B$5'
+                     )
+    chart.add_series(
+                     :categories => '=Sheet1!$A$1:$A$5',
+                     :values     => '=Sheet1!$C$1:$C$5'
+                     )
+
+    chart.set_x_axis(:line => {:none => 1})
+    chart.set_y_axis(:line => {:none => 1})
+
+    worksheet.insert_chart('E9', chart)
+
+    workbook.close
+    compare_xlsx_for_regression(File.join(@regression_output, @xlsx),
+                                @xlsx,
+                                nil,
+                                { 'xl/charts/chart1.xml' => ['<c:pageMargins'] }
+                                )
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.80.0
+  version: 0.81.0
 platform: ruby
 authors:
 - Hideo NAKAMURA
@@ -419,6 +419,11 @@ files:
 - test/regression/test_chart_axis32.rb
 - test/regression/test_chart_axis33.rb
 - test/regression/test_chart_axis34.rb
+- test/regression/test_chart_axis35.rb
+- test/regression/test_chart_axis36.rb
+- test/regression/test_chart_axis37.rb
+- test/regression/test_chart_axis38.rb
+- test/regression/test_chart_axis39.rb
 - test/regression/test_chart_bar01.rb
 - test/regression/test_chart_bar02.rb
 - test/regression/test_chart_bar03.rb
@@ -949,6 +954,11 @@ files:
 - test/regression/xlsx_files/chart_axis32.xlsx
 - test/regression/xlsx_files/chart_axis33.xlsx
 - test/regression/xlsx_files/chart_axis34.xlsx
+- test/regression/xlsx_files/chart_axis35.xlsx
+- test/regression/xlsx_files/chart_axis36.xlsx
+- test/regression/xlsx_files/chart_axis37.xlsx
+- test/regression/xlsx_files/chart_axis38.xlsx
+- test/regression/xlsx_files/chart_axis39.xlsx
 - test/regression/xlsx_files/chart_bar01.xlsx
 - test/regression/xlsx_files/chart_bar02.xlsx
 - test/regression/xlsx_files/chart_bar03.xlsx
@@ -1802,6 +1812,11 @@ test_files:
 - test/regression/test_chart_axis32.rb
 - test/regression/test_chart_axis33.rb
 - test/regression/test_chart_axis34.rb
+- test/regression/test_chart_axis35.rb
+- test/regression/test_chart_axis36.rb
+- test/regression/test_chart_axis37.rb
+- test/regression/test_chart_axis38.rb
+- test/regression/test_chart_axis39.rb
 - test/regression/test_chart_bar01.rb
 - test/regression/test_chart_bar02.rb
 - test/regression/test_chart_bar03.rb
@@ -2332,6 +2347,11 @@ test_files:
 - test/regression/xlsx_files/chart_axis32.xlsx
 - test/regression/xlsx_files/chart_axis33.xlsx
 - test/regression/xlsx_files/chart_axis34.xlsx
+- test/regression/xlsx_files/chart_axis35.xlsx
+- test/regression/xlsx_files/chart_axis36.xlsx
+- test/regression/xlsx_files/chart_axis37.xlsx
+- test/regression/xlsx_files/chart_axis38.xlsx
+- test/regression/xlsx_files/chart_axis39.xlsx
 - test/regression/xlsx_files/chart_bar01.xlsx
 - test/regression/xlsx_files/chart_bar02.xlsx
 - test/regression/xlsx_files/chart_bar03.xlsx