axlsx 2.0.1 → 2.1.0.pre

data/test/workbook/worksheet/tc_sheet_view.rb

@@ -197,11 +197,11 @@ class TestSheetView < Test::Unit::TestCase
 
     doc = Nokogiri::XML.parse(@ws.sheet_view.to_xml_string)
 
-    assert_equal(1, doc.xpath("//sheetView[@tabSelected='false']").size)
+    assert_equal(1, doc.xpath("//sheetView[@tabSelected=0]").size)
 
-    assert_equal(1, doc.xpath("//sheetView[@tabSelected='false'][@showWhiteSpace='false'][@showOutlineSymbols='false'][@showFormulas='false']
-        [@rightToLeft='false'][@windowProtection='false'][@showZeros='true'][@showRuler='true']
-        [@showRowColHeaders='true'][@showGridLines='true'][@defaultGridColor='true']
+    assert_equal(1, doc.xpath("//sheetView[@tabSelected=0][@showWhiteSpace=0][@showOutlineSymbols=0][@showFormulas=0]
+        [@rightToLeft=0][@windowProtection=0][@showZeros=1][@showRuler=1]
+        [@showRowColHeaders=1][@showGridLines=1][@defaultGridColor=1]
         [@zoomScale='100'][@workbookViewId='0'][@zoomScaleSheetLayoutView='0'][@zoomScalePageLayoutView='0']
         [@zoomScaleNormal='0'][@view='pageBreakPreview']").size)
   end

data/test/workbook/worksheet/tc_worksheet.rb

@@ -73,6 +73,15 @@ class TestWorksheet < Test::Unit::TestCase
     end
   end
 
+  def test_state
+    assert_equal(:visible, @ws.state)
+  end
+
+  def test_state_validation
+    assert_raise(ArgumentError) { @ws.state = :dead }
+    assert_nothing_raised { @ws.state = :very_hidden }
+  end
+
   def test_no_autowidth
     @ws.workbook.use_autowidth = false
     @ws.add_row [1,2,3,4]
@@ -260,7 +269,7 @@ class TestWorksheet < Test::Unit::TestCase
   def test_to_xml_string_fit_to_page
     @ws.page_setup.fit_to_width = 1
     doc = Nokogiri::XML(@ws.to_xml_string)
-    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:sheetPr/xmlns:pageSetUpPr[@fitToPage="true"]').size, 1)
+    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:sheetPr/xmlns:pageSetUpPr[@fitToPage=1]').size, 1)
   end
 
   def test_to_xml_string_dimensions
@@ -277,13 +286,13 @@ class TestWorksheet < Test::Unit::TestCase
   def test_to_xml_string_selected
     @ws.selected = true
     doc = Nokogiri::XML(@ws.to_xml_string)
-    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView[@tabSelected="true"]').size, 1)
+    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView[@tabSelected=1]').size, 1)
   end
 
   def test_to_xml_string_show_gridlines
     @ws.show_gridlines = false
     doc = Nokogiri::XML(@ws.to_xml_string)
-    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView[@showGridLines="false"]').size, 1)
+    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:sheetViews/xmlns:sheetView[@showGridLines=0]').size, 1)
   end
 
   def test_to_xml_string_auto_fit_data
@@ -350,7 +359,7 @@ class TestWorksheet < Test::Unit::TestCase
       po.horizontal_centered = true
     end
     doc = Nokogiri::XML(@ws.to_xml_string)
-    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:printOptions[@gridLines="true"][@horizontalCentered="true"]').size, 1)
+    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:printOptions[@gridLines=1][@horizontalCentered=1]').size, 1)
   end
 
   def test_to_xml_string_header_footer
@@ -360,7 +369,7 @@ class TestWorksheet < Test::Unit::TestCase
       hf.odd_header = 'Test Header'
     end
     doc = Nokogiri::XML(@ws.to_xml_string)
-    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:headerFooter[@differentFirst="false"][@differentOddEven="false"]').size, 1)
+    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:headerFooter[@differentFirst=0][@differentOddEven=0]').size, 1)
   end
 
   def test_to_xml_string_drawing
@@ -389,10 +398,13 @@ class TestWorksheet < Test::Unit::TestCase
   end
 
   def test_to_xml_string_with_illegal_chars
+    old = Axlsx::trust_input
+    Axlsx::trust_input = false
     nasties =  "\v\u2028\u0001\u0002\u0003\u0004\u0005\u0006\u0007\u0008\u001f"
     @ws.add_row [nasties]
     assert_equal(0, @ws.rows.last.cells.last.value.index("\v"))
-    assert_equal(nil,@ws.to_xml_string.index("\v"))
+    assert_equal(nil, @ws.to_xml_string.index("\v"))
+    Axlsx::trust_input = old
   end
 
   def test_to_xml_string_with_newlines
@@ -425,11 +437,11 @@ class TestWorksheet < Test::Unit::TestCase
     c = @ws.add_chart Axlsx::Pie3DChart
     assert_equal(@ws.relationships.size, 1, "multiple charts still only result in one relationship")
     c = @ws.add_comment :text => 'builder', :author => 'bob', :ref => @ws.rows.last.cells.last
-    assert_equal(@ws.relationships.size, 4, "adding a comment adds 3 relationships")
+    assert_equal(@ws.relationships.size, 3, "adding a comment adds 2 relationships")
     c = @ws.add_comment :text => 'not that is a comment!', :author => 'travis', :ref => "A1"
-    assert_equal(@ws.relationships.size, 4, "adding multiple comments in the same worksheet should not add any additional comment relationships")
+    assert_equal(@ws.relationships.size, 3, "adding multiple comments in the same worksheet should not add any additional comment relationships")
     c = @ws.add_pivot_table 'G5:G6', 'A1:D10'
-    assert_equal(@ws.relationships.size, 5, "adding a pivot table adds 1 relationship")
+    assert_equal(@ws.relationships.size, 4, "adding a pivot table adds 1 relationship")
   end
 
 
@@ -501,16 +513,43 @@ class TestWorksheet < Test::Unit::TestCase
 
   def test_auto_filter
     assert(@ws.auto_filter.range.nil?)
+    assert(@wb.defined_names.none?{|defined_name| defined_name.name=='_xlnm._FilterDatabase'})
     assert_raise(ArgumentError) { @ws.auto_filter = 123 }
     @ws.auto_filter.range = "A1:D9"
     assert_equal(@ws.auto_filter.range, "A1:D9")
+    @ws.to_xml_string
+    assert(@wb.defined_names.any?{|defined_name| defined_name.name=='_xlnm._FilterDatabase'})
   end
 
+  def test_auto_filter_assign
+    other_ws = @wb.add_worksheet
+
+    assert(@ws.auto_filter.range.nil?)
+    assert(other_ws.auto_filter.range.nil?)
+    assert(@wb.defined_names.none?{|defined_name| defined_name.name=='_xlnm._FilterDatabase'})
+    assert_raise(ArgumentError) { @ws.auto_filter = 123 }
+
+    @ws.auto_filter = "A1:D9"
+    assert_equal(@ws.auto_filter.range, "A1:D9")
+
+    other_ws.auto_filter = "A1:D2"
+    assert_equal(other_ws.auto_filter.range, "A1:D2")
+
+    @ws.to_xml_string
+    other_ws.to_xml_string
+
+    filter_database = @wb.defined_names.select{|defined_name| defined_name.name=='_xlnm._FilterDatabase'}
+    assert_equal(2, filter_database.size)
+    assert_equal(@ws.index, filter_database[0].local_sheet_id)
+    assert_equal(other_ws.index, filter_database[1].local_sheet_id)
+  end
+
+
   def test_sheet_pr_for_auto_filter
     @ws.auto_filter.range = 'A1:D9'
     @ws.auto_filter.add_column 0, :filters, :filter_items => [1]
     doc = Nokogiri::XML(@ws.to_xml_string)
-    assert(doc.xpath('//sheetPr[@filterMode="true"]'))
+    assert(doc.xpath('//sheetPr[@filterMode=1]'))
   end
 
   def test_outline_level_rows

metadata

@@ -1,106 +1,147 @@
 --- !ruby/object:Gem::Specification
 name: axlsx
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.1.0.pre
 platform: ruby
 authors:
 - Randy Morgan
+- Jurriaan Pruis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-09-13 00:00:00.000000000 Z
+date: 2015-03-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: 1.4.1
 - !ruby/object:Gem::Dependency
   name: rubyzip
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.7
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 1.1.7
 - !ruby/object:Gem::Dependency
   name: htmlentities
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.3.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 4.3.1
 - !ruby/object:Gem::Dependency
   name: yard
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: kramdown
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '>='
+    - - ">="
       - !ruby/object:Gem::Version
         version: '0'
 - !ruby/object:Gem::Dependency
   name: timecop
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ~>
+    - - "~>"
       - !ruby/object:Gem::Version
         version: 0.6.1
-description: |2
-      xlsx spreadsheet generation with charts, images, automated column width, customizable styles and full schema validation. Axlsx helps you create beautiful Office Open XML Spreadsheet documents ( Excel, Google Spreadsheets, Numbers, LibreOffice) without having to understand the entire ECMA specification. Check out the README for some examples of how easy it is. Best of all, you can validate your xlsx file before serialization so you know for sure that anything generated is going to load on your client's machine.
+description: "    xlsx spreadsheet generation with charts, images, automated column
+  width, customizable styles and full schema validation. Axlsx helps you create beautiful
+  Office Open XML Spreadsheet documents ( Excel, Google Spreadsheets, Numbers, LibreOffice)
+  without having to understand the entire ECMA specification. Check out the README
+  for some examples of how easy it is. Best of all, you can validate your xlsx file
+  before serialization so you know for sure that anything generated is going to load
+  on your client's machine.\n"
 email: digital.ipseity@gmail.com
 executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- ".yardopts"
+- ".yardopts_guide"
+- CHANGELOG.md
+- LICENSE
+- README.md
+- Rakefile
+- examples/2010_comments.rb
+- examples/IMAGE1UP.JPEG
+- examples/anchor_swapping.rb
+- examples/auto_filter.rb
+- examples/basic_charts.rb
+- examples/chart_colors.rb
+- examples/colored_links.rb
+- examples/conditional_formatting/example_conditional_formatting.rb
+- examples/conditional_formatting/getting_barred.rb
+- examples/conditional_formatting/hitting_the_high_notes.rb
+- examples/conditional_formatting/scaled_colors.rb
+- examples/conditional_formatting/stop_and_go.rb
+- examples/data_validation.rb
+- examples/example.rb
+- examples/extractive.rb
+- examples/image1.jpeg
+- examples/ios_preview.rb
+- examples/merge_cells.rb
+- examples/no_grid_with_borders.rb
+- examples/page_setup.rb
+- examples/pivot_table.rb
+- examples/pivot_test.rb
+- examples/sheet_protection.rb
+- examples/skydrive/real_example.rb
+- examples/split.rb
+- examples/styles.rb
+- examples/underline.rb
+- examples/wrap_text.rb
+- lib/axlsx.rb
 - lib/axlsx/content_type/abstract_content_type.rb
 - lib/axlsx/content_type/content_type.rb
 - lib/axlsx/content_type/default.rb
@@ -112,6 +153,8 @@ files:
 - lib/axlsx/drawing/axis.rb
 - lib/axlsx/drawing/bar_3D_chart.rb
 - lib/axlsx/drawing/bar_series.rb
+- lib/axlsx/drawing/bubble_chart.rb
+- lib/axlsx/drawing/bubble_series.rb
 - lib/axlsx/drawing/cat_axis.rb
 - lib/axlsx/drawing/chart.rb
 - lib/axlsx/drawing/d_lbls.rb
@@ -172,12 +215,15 @@ files:
 - lib/axlsx/util/serialized_attributes.rb
 - lib/axlsx/util/simple_typed_list.rb
 - lib/axlsx/util/storage.rb
+- lib/axlsx/util/string.rb
 - lib/axlsx/util/validators.rb
 - lib/axlsx/version.rb
 - lib/axlsx/workbook/defined_name.rb
 - lib/axlsx/workbook/defined_names.rb
 - lib/axlsx/workbook/shared_strings_table.rb
 - lib/axlsx/workbook/workbook.rb
+- lib/axlsx/workbook/workbook_view.rb
+- lib/axlsx/workbook/workbook_views.rb
 - lib/axlsx/workbook/worksheet/auto_filter/auto_filter.rb
 - lib/axlsx/workbook/worksheet/auto_filter/filter_column.rb
 - lib/axlsx/workbook/worksheet/auto_filter/filters.rb
@@ -213,6 +259,8 @@ files:
 - lib/axlsx/workbook/worksheet/print_options.rb
 - lib/axlsx/workbook/worksheet/protected_range.rb
 - lib/axlsx/workbook/worksheet/protected_ranges.rb
+- lib/axlsx/workbook/worksheet/rich_text.rb
+- lib/axlsx/workbook/worksheet/rich_text_run.rb
 - lib/axlsx/workbook/worksheet/row.rb
 - lib/axlsx/workbook/worksheet/row_breaks.rb
 - lib/axlsx/workbook/worksheet/selection.rb
@@ -230,7 +278,6 @@ files:
 - lib/axlsx/workbook/worksheet/worksheet_drawing.rb
 - lib/axlsx/workbook/worksheet/worksheet_hyperlink.rb
 - lib/axlsx/workbook/worksheet/worksheet_hyperlinks.rb
-- lib/axlsx.rb
 - lib/schema/dc.xsd
 - lib/schema/dcmitype.xsd
 - lib/schema/dcterms.xsd
@@ -266,36 +313,6 @@ files:
 - lib/schema/vml-wordprocessingDrawing.xsd
 - lib/schema/wml.xsd
 - lib/schema/xml.xsd
-- examples/2010_comments.rb
-- examples/anchor_swapping.rb
-- examples/auto_filter.rb
-- examples/basic_charts.rb
-- examples/chart_colors.rb
-- examples/colored_links.rb
-- examples/conditional_formatting/example_conditional_formatting.rb
-- examples/conditional_formatting/getting_barred.rb
-- examples/conditional_formatting/hitting_the_high_notes.rb
-- examples/conditional_formatting/scaled_colors.rb
-- examples/conditional_formatting/stop_and_go.rb
-- examples/data_validation.rb
-- examples/example.rb
-- examples/extractive.rb
-- examples/ios_preview.rb
-- examples/page_setup.rb
-- examples/pivot_table.rb
-- examples/sheet_protection.rb
-- examples/skydrive/real_example.rb
-- examples/styles.rb
-- examples/underline.rb
-- examples/wrap_text.rb
-- examples/image1.jpeg
-- LICENSE
-- README.md
-- Rakefile
-- CHANGELOG.md
-- .yardopts
-- .yardopts_guide
-- test/axlsx.qcachegrind
 - test/benchmark.rb
 - test/content_type/tc_content_type.rb
 - test/content_type/tc_default.rb
@@ -306,6 +323,8 @@ files:
 - test/drawing/tc_axis.rb
 - test/drawing/tc_bar_3D_chart.rb
 - test/drawing/tc_bar_series.rb
+- test/drawing/tc_bubble_chart.rb
+- test/drawing/tc_bubble_series.rb
 - test/drawing/tc_cat_axis.rb
 - test/drawing/tc_cat_axis_data.rb
 - test/drawing/tc_chart.rb
@@ -370,6 +389,7 @@ files:
 - test/workbook/tc_defined_name.rb
 - test/workbook/tc_shared_strings_table.rb
 - test/workbook/tc_workbook.rb
+- test/workbook/tc_workbook_view.rb
 - test/workbook/worksheet/auto_filter/tc_auto_filter.rb
 - test/workbook/worksheet/auto_filter/tc_filter_column.rb
 - test/workbook/worksheet/auto_filter/tc_filters.rb
@@ -394,6 +414,8 @@ files:
 - test/workbook/worksheet/tc_pivot_table_cache_definition.rb
 - test/workbook/worksheet/tc_print_options.rb
 - test/workbook/worksheet/tc_protected_range.rb
+- test/workbook/worksheet/tc_rich_text.rb
+- test/workbook/worksheet/tc_rich_text_run.rb
 - test/workbook/worksheet/tc_row.rb
 - test/workbook/worksheet/tc_selection.rb
 - test/workbook/worksheet/tc_sheet_calc_pr.rb
@@ -415,22 +437,21 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: 1.9.2
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.2
+rubygems_version: 2.4.5
 signing_key: 
 specification_version: 4
-summary: excel OOXML (xlsx) with charts, styles, images and autowidth columns.
+summary: Excel OOXML (xlsx) with charts, styles, images and autowidth columns.
 test_files:
-- test/axlsx.qcachegrind
 - test/benchmark.rb
 - test/content_type/tc_content_type.rb
 - test/content_type/tc_default.rb
@@ -441,6 +462,8 @@ test_files:
 - test/drawing/tc_axis.rb
 - test/drawing/tc_bar_3D_chart.rb
 - test/drawing/tc_bar_series.rb
+- test/drawing/tc_bubble_chart.rb
+- test/drawing/tc_bubble_series.rb
 - test/drawing/tc_cat_axis.rb
 - test/drawing/tc_cat_axis_data.rb
 - test/drawing/tc_chart.rb
@@ -505,6 +528,7 @@ test_files:
 - test/workbook/tc_defined_name.rb
 - test/workbook/tc_shared_strings_table.rb
 - test/workbook/tc_workbook.rb
+- test/workbook/tc_workbook_view.rb
 - test/workbook/worksheet/auto_filter/tc_auto_filter.rb
 - test/workbook/worksheet/auto_filter/tc_filter_column.rb
 - test/workbook/worksheet/auto_filter/tc_filters.rb
@@ -529,6 +553,8 @@ test_files:
 - test/workbook/worksheet/tc_pivot_table_cache_definition.rb
 - test/workbook/worksheet/tc_print_options.rb
 - test/workbook/worksheet/tc_protected_range.rb
+- test/workbook/worksheet/tc_rich_text.rb
+- test/workbook/worksheet/tc_rich_text_run.rb
 - test/workbook/worksheet/tc_row.rb
 - test/workbook/worksheet/tc_selection.rb
 - test/workbook/worksheet/tc_sheet_calc_pr.rb