write_xlsx 0.64.1 → 0.65.0

data/test/worksheet/test_write_row_element.rb

@@ -39,7 +39,7 @@ class TestWriteRow < Test::Unit::TestCase
   end
 
   def test_write_row_6_nil_nil_format
-    format = Writexlsx::Format.new({}, {}, :xf_index => 1)
+    format = Writexlsx::Format.new(Writexlsx::Formats.new, :xf_index => 1)
     @worksheet.__send__('write_row_element', 6, nil, nil, format)
     result = @worksheet.instance_variable_get(:@writer).string
     expected = '<row r="7" s="1" customFormat="1">'

data/test/worksheet/test_write_sheet_pr.rb

@@ -10,7 +10,7 @@ class TestWriteSheetPr < Test::Unit::TestCase
   end
 
   def test_write_sheet_pr_fit_page
-    @worksheet.instance_variable_get(:@print_style).fit_page = true
+    @worksheet.instance_variable_get(:@page_setup).fit_page = true
     @worksheet.__send__('write_sheet_pr')
     result = @worksheet.instance_variable_get(:@writer).string
     expected = '<sheetPr><pageSetUpPr fitToPage="1"/></sheetPr>'
@@ -26,7 +26,7 @@ class TestWriteSheetPr < Test::Unit::TestCase
   end
 
   def test_write_sheet_pr_fit_page_and_tab_color
-    @worksheet.instance_variable_get(:@print_style).fit_page = true
+    @worksheet.instance_variable_get(:@page_setup).fit_page = true
     @worksheet.tab_color = 'red'
     @worksheet.__send__('write_sheet_pr')
     result = @worksheet.instance_variable_get(:@writer).string

data/test/worksheet/test_write_sheet_view.rb

@@ -33,15 +33,6 @@ class TestWriteSheetView < Test::Unit::TestCase
     assert_equal(expected, result)
   end
 
-  def test_write_sheet_view_tab_selected_and_hide_gridlines_true
-    @worksheet.select
-    @worksheet.hide_gridlines(true)
-    @worksheet.__send__('write_sheet_view')
-    result = @worksheet.instance_variable_get(:@writer).string
-    expected = '<sheetView showGridLines="0" tabSelected="1" workbookViewId="0"/>'
-    assert_equal(expected, result)
-  end
-
   def test_write_sheet_view_tab_selected_and_hide_gridlines_false
     @worksheet.select
     @worksheet.hide_gridlines(false)

data/test/worksheet/test_write_url.rb

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+require 'write_xlsx/workbook'
+require 'write_xlsx/worksheet'
+require 'stringio'
+
+class TestWriteUrl < Test::Unit::TestCase
+  def setup
+    @workbook = WriteXLSX.new(StringIO.new)
+    @worksheet = @workbook.add_worksheet('')
+  end
+
+  def test_write_url_does_not_change_url
+    url = 'external:c:\temp\foo.xlsx#my_name'.freeze
+    assert_nothing_raised do
+      @worksheet.write_url('A1', url)
+    end
+  end
+end

data/test/worksheet/test_write_worksheet_attributes.rb

@@ -0,0 +1,21 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+require 'write_xlsx/workbook'
+require 'write_xlsx/worksheet'
+require 'stringio'
+
+class TestWriteWorksheetAttributes < Test::Unit::TestCase
+  def setup
+    @workbook = WriteXLSX.new(StringIO.new)
+    @worksheet = @workbook.add_worksheet('')
+  end
+
+  def test_write_worksheet_attributes
+    result = @worksheet.__send__('write_worksheet_attributes')
+    expected = [
+                'xmlns', "http://schemas.openxmlformats.org/spreadsheetml/2006/main",
+                'xmlns:r', "http://schemas.openxmlformats.org/officeDocument/2006/relationships"
+                ]
+    assert_equal(expected, result)
+  end
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: write_xlsx
 version: !ruby/object:Gem::Version
-  version: 0.64.1
+  version: 0.65.0
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-05 00:00:00.000000000 Z
+date: 2013-03-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rubyzip
@@ -96,6 +96,7 @@ files:
 - examples/hide_sheet.rb
 - examples/hyperlink1.rb
 - examples/indent.rb
+- examples/macros.rb
 - examples/merge1.rb
 - examples/merge2.rb
 - examples/merge3.rb
@@ -103,10 +104,12 @@ files:
 - examples/merge5.rb
 - examples/merge6.rb
 - examples/outline.rb
+- examples/outline_collapsed.rb
 - examples/panes.rb
 - examples/properties.rb
 - examples/protection.rb
 - examples/regions.rb
+- examples/republic.png
 - examples/rich_strings.rb
 - examples/right_to_left.rb
 - examples/shape1.rb
@@ -145,6 +148,7 @@ files:
 - lib/write_xlsx/compatibility.rb
 - lib/write_xlsx/drawing.rb
 - lib/write_xlsx/format.rb
+- lib/write_xlsx/formats.rb
 - lib/write_xlsx/package/app.rb
 - lib/write_xlsx/package/button.rb
 - lib/write_xlsx/package/comments.rb
@@ -160,13 +164,16 @@ files:
 - lib/write_xlsx/package/vml.rb
 - lib/write_xlsx/package/xml_writer_simple.rb
 - lib/write_xlsx/shape.rb
+- lib/write_xlsx/sheets.rb
 - lib/write_xlsx/sparkline.rb
 - lib/write_xlsx/utility.rb
 - lib/write_xlsx/version.rb
 - lib/write_xlsx/workbook.rb
 - lib/write_xlsx/worksheet.rb
 - lib/write_xlsx/worksheet/cell_data.rb
-- lib/write_xlsx/worksheet/print_style.rb
+- lib/write_xlsx/worksheet/data_validation.rb
+- lib/write_xlsx/worksheet/hyperlink.rb
+- lib/write_xlsx/worksheet/page_setup.rb
 - lib/write_xlsx/zip_file_utils.rb
 - test/chart/test_add_series.rb
 - test/chart/test_process_names.rb
@@ -469,6 +476,9 @@ files:
 - test/regression/test_chart_format16.rb
 - test/regression/test_chart_format17.rb
 - test/regression/test_chart_format18.rb
+- test/regression/test_chart_gap01.rb
+- test/regression/test_chart_gap02.rb
+- test/regression/test_chart_gap03.rb
 - test/regression/test_chart_gridlines01.rb
 - test/regression/test_chart_gridlines02.rb
 - test/regression/test_chart_gridlines03.rb
@@ -567,6 +577,7 @@ files:
 - test/regression/test_format02.rb
 - test/regression/test_format03.rb
 - test/regression/test_format04.rb
+- test/regression/test_format05.rb
 - test/regression/test_gridlines01.rb
 - test/regression/test_hyperlink01.rb
 - test/regression/test_hyperlink02.rb
@@ -641,6 +652,7 @@ files:
 - test/regression/test_rich_string09.rb
 - test/regression/test_rich_string10.rb
 - test/regression/test_rich_string11.rb
+- test/regression/test_rich_string12.rb
 - test/regression/test_row_col_format01.rb
 - test/regression/test_row_col_format02.rb
 - test/regression/test_row_col_format03.rb
@@ -806,6 +818,9 @@ files:
 - test/regression/xlsx_files/chart_format16.xlsx
 - test/regression/xlsx_files/chart_format17.xlsx
 - test/regression/xlsx_files/chart_format18.xlsx
+- test/regression/xlsx_files/chart_gap01.xlsx
+- test/regression/xlsx_files/chart_gap02.xlsx
+- test/regression/xlsx_files/chart_gap03.xlsx
 - test/regression/xlsx_files/chart_gridlines01.xlsx
 - test/regression/xlsx_files/chart_gridlines02.xlsx
 - test/regression/xlsx_files/chart_gridlines03.xlsx
@@ -903,6 +918,7 @@ files:
 - test/regression/xlsx_files/format02.xlsx
 - test/regression/xlsx_files/format03.xlsx
 - test/regression/xlsx_files/format04.xlsx
+- test/regression/xlsx_files/format05.xlsx
 - test/regression/xlsx_files/gridlines01.xlsx
 - test/regression/xlsx_files/hyperlink01.xlsx
 - test/regression/xlsx_files/hyperlink02.xlsx
@@ -977,6 +993,7 @@ files:
 - test/regression/xlsx_files/rich_string09.xlsx
 - test/regression/xlsx_files/rich_string10.xlsx
 - test/regression/xlsx_files/rich_string11.xlsx
+- test/regression/xlsx_files/rich_string12.xlsx
 - test/regression/xlsx_files/row_col_format01.xlsx
 - test/regression/xlsx_files/row_col_format02.xlsx
 - test/regression/xlsx_files/row_col_format03.xlsx
@@ -1062,6 +1079,7 @@ files:
 - test/worksheet/test_parse_filter_expression.rb
 - test/worksheet/test_position_object.rb
 - test/worksheet/test_repeat_formula.rb
+- test/worksheet/test_set_column.rb
 - test/worksheet/test_sparkline_01.rb
 - test/worksheet/test_sparkline_02.rb
 - test/worksheet/test_sparkline_03.rb
@@ -1093,6 +1111,7 @@ files:
 - test/worksheet/test_write_filter.rb
 - test/worksheet/test_write_filter_column.rb
 - test/worksheet/test_write_filters.rb
+- test/worksheet/test_write_formula_does_not_change_formula_string.rb
 - test/worksheet/test_write_header_footer.rb
 - test/worksheet/test_write_hyperlink.rb
 - test/worksheet/test_write_legacy_drawing.rb
@@ -1124,7 +1143,8 @@ files:
 - test/worksheet/test_write_sheet_view8.rb
 - test/worksheet/test_write_sheet_view9.rb
 - test/worksheet/test_write_tab_color.rb
-- test/worksheet/test_write_worksheet.rb
+- test/worksheet/test_write_url.rb
+- test/worksheet/test_write_worksheet_attributes.rb
 - write_xlsx.gemspec
 homepage: http://github.com/cxn03651/write_xlsx#readme
 licenses: []
@@ -1451,6 +1471,9 @@ test_files:
 - test/regression/test_chart_format16.rb
 - test/regression/test_chart_format17.rb
 - test/regression/test_chart_format18.rb
+- test/regression/test_chart_gap01.rb
+- test/regression/test_chart_gap02.rb
+- test/regression/test_chart_gap03.rb
 - test/regression/test_chart_gridlines01.rb
 - test/regression/test_chart_gridlines02.rb
 - test/regression/test_chart_gridlines03.rb
@@ -1549,6 +1572,7 @@ test_files:
 - test/regression/test_format02.rb
 - test/regression/test_format03.rb
 - test/regression/test_format04.rb
+- test/regression/test_format05.rb
 - test/regression/test_gridlines01.rb
 - test/regression/test_hyperlink01.rb
 - test/regression/test_hyperlink02.rb
@@ -1623,6 +1647,7 @@ test_files:
 - test/regression/test_rich_string09.rb
 - test/regression/test_rich_string10.rb
 - test/regression/test_rich_string11.rb
+- test/regression/test_rich_string12.rb
 - test/regression/test_row_col_format01.rb
 - test/regression/test_row_col_format02.rb
 - test/regression/test_row_col_format03.rb
@@ -1788,6 +1813,9 @@ test_files:
 - test/regression/xlsx_files/chart_format16.xlsx
 - test/regression/xlsx_files/chart_format17.xlsx
 - test/regression/xlsx_files/chart_format18.xlsx
+- test/regression/xlsx_files/chart_gap01.xlsx
+- test/regression/xlsx_files/chart_gap02.xlsx
+- test/regression/xlsx_files/chart_gap03.xlsx
 - test/regression/xlsx_files/chart_gridlines01.xlsx
 - test/regression/xlsx_files/chart_gridlines02.xlsx
 - test/regression/xlsx_files/chart_gridlines03.xlsx
@@ -1885,6 +1913,7 @@ test_files:
 - test/regression/xlsx_files/format02.xlsx
 - test/regression/xlsx_files/format03.xlsx
 - test/regression/xlsx_files/format04.xlsx
+- test/regression/xlsx_files/format05.xlsx
 - test/regression/xlsx_files/gridlines01.xlsx
 - test/regression/xlsx_files/hyperlink01.xlsx
 - test/regression/xlsx_files/hyperlink02.xlsx
@@ -1959,6 +1988,7 @@ test_files:
 - test/regression/xlsx_files/rich_string09.xlsx
 - test/regression/xlsx_files/rich_string10.xlsx
 - test/regression/xlsx_files/rich_string11.xlsx
+- test/regression/xlsx_files/rich_string12.xlsx
 - test/regression/xlsx_files/row_col_format01.xlsx
 - test/regression/xlsx_files/row_col_format02.xlsx
 - test/regression/xlsx_files/row_col_format03.xlsx
@@ -2044,6 +2074,7 @@ test_files:
 - test/worksheet/test_parse_filter_expression.rb
 - test/worksheet/test_position_object.rb
 - test/worksheet/test_repeat_formula.rb
+- test/worksheet/test_set_column.rb
 - test/worksheet/test_sparkline_01.rb
 - test/worksheet/test_sparkline_02.rb
 - test/worksheet/test_sparkline_03.rb
@@ -2075,6 +2106,7 @@ test_files:
 - test/worksheet/test_write_filter.rb
 - test/worksheet/test_write_filter_column.rb
 - test/worksheet/test_write_filters.rb
+- test/worksheet/test_write_formula_does_not_change_formula_string.rb
 - test/worksheet/test_write_header_footer.rb
 - test/worksheet/test_write_hyperlink.rb
 - test/worksheet/test_write_legacy_drawing.rb
@@ -2106,4 +2138,5 @@ test_files:
 - test/worksheet/test_write_sheet_view8.rb
 - test/worksheet/test_write_sheet_view9.rb
 - test/worksheet/test_write_tab_color.rb
-- test/worksheet/test_write_worksheet.rb
+- test/worksheet/test_write_url.rb
+- test/worksheet/test_write_worksheet_attributes.rb

data/lib/write_xlsx/worksheet/print_style.rb

@@ -1,51 +0,0 @@
-# -*- encoding: utf-8 -*-
-
-module Writexlsx
-  class Worksheet
-    class PrintStyle # :nodoc:
-      attr_accessor :margin_left, :margin_right, :margin_top, :margin_bottom  # :nodoc:
-      attr_accessor :margin_header, :margin_footer                            # :nodoc:
-      attr_accessor :repeat_rows, :repeat_cols, :print_area                   # :nodoc:
-      attr_accessor :hbreaks, :vbreaks, :scale                                # :nodoc:
-      attr_accessor :fit_page, :fit_width, :fit_height, :page_setup_changed   # :nodoc:
-      attr_accessor :across                                                   # :nodoc:
-      attr_accessor :orientation  # :nodoc:
-
-      def initialize # :nodoc:
-        @margin_left = 0.7
-        @margin_right = 0.7
-        @margin_top = 0.75
-        @margin_bottom = 0.75
-        @margin_header = 0.3
-        @margin_footer = 0.3
-        @repeat_rows   = ''
-        @repeat_cols   = ''
-        @print_area    = ''
-        @hbreaks = []
-        @vbreaks = []
-        @scale = 100
-        @fit_page = false
-        @fit_width  = nil
-        @fit_height = nil
-        @page_setup_changed = false
-        @across = false
-        @orientation = true
-      end
-
-      def attributes    # :nodoc:
-        [
-         'left',   @margin_left,
-         'right',  @margin_right,
-         'top',    @margin_top,
-         'bottom', @margin_bottom,
-         'header', @margin_header,
-         'footer', @margin_footer
-        ]
-      end
-
-      def orientation?
-        !!@orientation
-      end
-    end
-  end
-end

data/test/worksheet/test_write_worksheet.rb

@@ -1,19 +0,0 @@
-# -*- coding: utf-8 -*-
-require 'helper'
-require 'write_xlsx/workbook'
-require 'write_xlsx/worksheet'
-require 'stringio'
-
-class TestWriteWorksheet < Test::Unit::TestCase
-  def setup
-    @workbook = WriteXLSX.new(StringIO.new)
-    @worksheet = @workbook.add_worksheet('')
-  end
-
-  def test_write_worksheet
-    @worksheet.__send__('write_worksheet')
-    result = @worksheet.instance_variable_get(:@writer).string
-    expected = '<worksheet xmlns="http://schemas.openxmlformats.org/spreadsheetml/2006/main" xmlns:r="http://schemas.openxmlformats.org/officeDocument/2006/relationships">'
-    assert_equal(expected, result)
-  end
-end