axlsx 1.1.4 → 1.1.5

data/test/workbook/worksheet/tc_page_setup.rb

@@ -0,0 +1,103 @@
+require 'tc_helper.rb'
+
+class TestPageSetup < Test::Unit::TestCase
+
+  def setup
+    p = Axlsx::Package.new
+    ws = p.workbook.add_worksheet :name => "hmmm"
+    @ps = ws.page_setup
+  end
+
+  def test_initialize
+    assert_equal(nil, @ps.fit_to_height)
+    assert_equal(nil, @ps.fit_to_width)
+    assert_equal(nil, @ps.orientation)
+    assert_equal(nil, @ps.paper_height)
+    assert_equal(nil, @ps.paper_width)
+    assert_equal(nil, @ps.scale)
+  end
+
+  def test_initialize_with_options
+    optioned = Axlsx::PageSetup.new(:fit_to_height => 1, :fit_to_width => 2, :orientation => :landscape, :paper_height => "297mm", :paper_width => "210mm", :scale => 50)
+    assert_equal(1, optioned.fit_to_height)
+    assert_equal(2, optioned.fit_to_width)
+    assert_equal(:landscape, optioned.orientation)
+    assert_equal("297mm", optioned.paper_height)
+    assert_equal("210mm", optioned.paper_width)
+    assert_equal(50, optioned.scale)
+  end
+
+  def test_set_all_values
+    @ps.set(:fit_to_height => 1, :fit_to_width => 2, :orientation => :landscape, :paper_height => "297mm", :paper_width => "210mm", :scale => 50)
+    assert_equal(1, @ps.fit_to_height)
+    assert_equal(2, @ps.fit_to_width)
+    assert_equal(:landscape, @ps.orientation)
+    assert_equal("297mm", @ps.paper_height)
+    assert_equal("210mm", @ps.paper_width)
+    assert_equal(50, @ps.scale)
+  end
+
+  def test_set_some_values
+    @ps.set(:fit_to_width => 2, :orientation => :portrait)
+    assert_equal(2, @ps.fit_to_width)
+    assert_equal(:portrait, @ps.orientation)
+    assert_equal(nil, @ps.fit_to_height)
+    assert_equal(nil, @ps.paper_height)
+    assert_equal(nil, @ps.paper_width)
+    assert_equal(nil, @ps.scale)
+  end
+
+  def test_to_xml_all_values
+    @ps.set(:fit_to_height => 1, :fit_to_width => 2, :orientation => :landscape, :paper_height => "297mm", :paper_width => "210mm", :scale => 50)
+    doc = Nokogiri::XML.parse(@ps.to_xml_string)
+    assert_equal(1, doc.xpath(".//pageSetup[@fitToHeight='1'][@fitToWidth='2'][@orientation='landscape'][@paperHeight='297mm'][@paperWidth='210mm'][@scale='50']").size)
+  end
+
+  def test_to_xml_some_values
+    @ps.set(:orientation => :portrait)
+    doc = Nokogiri::XML.parse(@ps.to_xml_string)
+    assert_equal(1, doc.xpath(".//pageSetup[@orientation='portrait']").size)
+    assert_equal(0, doc.xpath(".//pageSetup[@fitToHeight]").size)
+    assert_equal(0, doc.xpath(".//pageSetup[@fitToWidth]").size)
+    assert_equal(0, doc.xpath(".//pageSetup[@paperHeight]").size)
+    assert_equal(0, doc.xpath(".//pageSetup[@paperWidth]").size)
+    assert_equal(0, doc.xpath(".//pageSetup[@scale]").size)
+  end
+
+  def test_fit_to_height
+    assert_raise(ArgumentError) { @ps.fit_to_height = 1.5 }
+    assert_nothing_raised { @ps.fit_to_height = 2 }
+    assert_equal(2, @ps.fit_to_height)
+  end
+
+  def test_fit_to_width
+    assert_raise(ArgumentError) { @ps.fit_to_width = false }
+    assert_nothing_raised { @ps.fit_to_width = 1 }
+    assert_equal(1, @ps.fit_to_width)
+  end
+
+  def test_orientation
+    assert_raise(ArgumentError) { @ps.orientation = "" }
+    assert_nothing_raised { @ps.orientation = :default }
+    assert_equal(:default, @ps.orientation)
+  end
+
+  def test_paper_height
+    assert_raise(ArgumentError) { @ps.paper_height = 99 }
+    assert_nothing_raised { @ps.paper_height = "11in" }
+    assert_equal("11in", @ps.paper_height)
+  end
+
+  def test_paper_width
+    assert_raise(ArgumentError) { @ps.paper_width = "22" }
+    assert_nothing_raised { @ps.paper_width = "29.7cm" }
+    assert_equal("29.7cm", @ps.paper_width)
+  end
+
+  def test_scale
+    assert_raise(ArgumentError) { @ps.scale = 50.5 }
+    assert_nothing_raised { @ps.scale = 99 }
+    assert_equal(99, @ps.scale)
+  end
+
+end

data/test/workbook/worksheet/tc_print_options.rb

@@ -0,0 +1,72 @@
+require 'tc_helper.rb'
+
+class TestPrintOptions < Test::Unit::TestCase
+
+  def setup
+    p = Axlsx::Package.new
+    ws = p.workbook.add_worksheet :name => "hmmm"
+    @po = ws.print_options
+  end
+
+  def test_initialize
+    assert_equal(false, @po.grid_lines)
+    assert_equal(false, @po.headings)
+    assert_equal(false, @po.horizontal_centered)
+    assert_equal(false, @po.vertical_centered)
+  end
+
+  def test_initialize_with_options
+    optioned = Axlsx::PrintOptions.new(:grid_lines => true, :headings => true, :horizontal_centered => true, :vertical_centered => true)
+    assert_equal(true, optioned.grid_lines)
+    assert_equal(true, optioned.headings)
+    assert_equal(true, optioned.horizontal_centered)
+    assert_equal(true, optioned.vertical_centered)
+  end
+
+  def test_set_all_values
+    @po.set(:grid_lines => true, :headings => true, :horizontal_centered => true, :vertical_centered => true)
+    assert_equal(true, @po.grid_lines)
+    assert_equal(true, @po.headings)
+    assert_equal(true, @po.horizontal_centered)
+    assert_equal(true, @po.vertical_centered)
+  end
+
+  def test_set_some_values
+    @po.set(:grid_lines => true, :headings => true)
+    assert_equal(true, @po.grid_lines)
+    assert_equal(true, @po.headings)
+    assert_equal(false, @po.horizontal_centered)
+    assert_equal(false, @po.vertical_centered)
+  end
+
+  def test_to_xml
+    @po.set(:grid_lines => true, :headings => true, :horizontal_centered => true, :vertical_centered => true)
+    doc = Nokogiri::XML.parse(@po.to_xml_string)
+    assert_equal(1, doc.xpath(".//printOptions[@gridLines='true'][@headings='true'][@horizontalCentered='true'][@verticalCentered='true']").size)
+  end
+
+  def test_grid_lines
+    assert_raise(ArgumentError) { @po.grid_lines = 99 }
+    assert_nothing_raised { @po.grid_lines = true }
+    assert_equal(@po.grid_lines, true)
+  end
+
+  def test_headings
+    assert_raise(ArgumentError) { @po.headings = 99 }
+    assert_nothing_raised { @po.headings = true }
+    assert_equal(@po.headings, true)
+  end
+
+  def test_horizontal_centered
+    assert_raise(ArgumentError) { @po.horizontal_centered = 99 }
+    assert_nothing_raised { @po.horizontal_centered = true }
+    assert_equal(@po.horizontal_centered, true)
+  end
+
+  def test_vertical_centered
+    assert_raise(ArgumentError) { @po.vertical_centered = 99 }
+    assert_nothing_raised { @po.vertical_centered = true }
+    assert_equal(@po.vertical_centered, true)
+  end
+
+end

data/test/workbook/worksheet/tc_row.rb

@@ -27,18 +27,6 @@ class TestRow < Test::Unit::TestCase
     r.cells.each { |c| assert_equal(c.style,1) }
   end
 
-  def test_nil_cells
-    row = @ws.add_row([nil,1,2,nil,4,5,nil])
-    r_s_xml = Nokogiri::XML(row.to_xml_string(0, ''))
-    assert_equal(r_s_xml.xpath(".//row/c").size, 4)
-  end
-
-  def test_nil_cell_r
-    row = @ws.add_row([nil,1,2,nil,4,5,nil])
-    r_s_xml = Nokogiri::XML(row.to_xml_string(0, ''))
-    assert_equal(r_s_xml.xpath(".//row/c").first['r'], 'B1')
-    assert_equal(r_s_xml.xpath(".//row/c").last['r'], 'F1')
-  end
 
   def test_index
     assert_equal(@row.index, @row.worksheet.rows.index(@row))
@@ -78,7 +66,25 @@ class TestRow < Test::Unit::TestCase
     assert_equal(15, @row.height)
   end
 
-  def test_to_xml_without_custom_height
+  def test_hidden
+    assert_raise(ArgumentError) { @row.hidden = -3 }
+    assert_nothing_raised { @row.hidden = true }
+    assert_equal(true, @row.hidden)
+  end
+
+  def test_collapsed
+    assert_raise(ArgumentError) { @row.collapsed = -3 }
+    assert_nothing_raised { @row.collapsed = true }
+    assert_equal(true, @row.collapsed)
+  end
+
+  def test_outlineLevel
+    assert_raise(ArgumentError) { @row.outlineLevel = -3 }
+    assert_nothing_raised { @row.outlineLevel = 2 }
+    assert_equal(2, @row.outlineLevel)
+  end
+
+ def test_to_xml_without_custom_height
     doc = Nokogiri::XML.parse(@row.to_xml_string(0))
     assert_equal(0, doc.xpath(".//row[@ht]").size)
     assert_equal(0, doc.xpath(".//row[@customHeight]").size)

data/test/workbook/worksheet/tc_worksheet.rb

@@ -25,6 +25,28 @@ class TestWorksheet < Test::Unit::TestCase
     end
   end
 
+  def test_page_setup
+    assert(@ws.page_setup.is_a? Axlsx::PageSetup)
+  end
+
+  def test_page_setup_yield
+    @ws.page_setup do |ps|
+      assert(ps.is_a? Axlsx::PageSetup)
+      assert(@ws.page_setup == ps)
+    end
+  end
+
+  def test_print_options
+    assert(@ws.print_options.is_a? Axlsx::PrintOptions)
+  end
+
+  def test_print_options_yield
+    @ws.print_options do |po|
+      assert(po.is_a? Axlsx::PrintOptions)
+      assert(@ws.print_options == po)
+    end
+  end
+
   def test_no_autowidth
     @ws.workbook.use_autowidth = false
     @ws.add_row [1,2,3,4]
@@ -33,16 +55,22 @@ class TestWorksheet < Test::Unit::TestCase
 
   def test_initialization_options
     page_margins = {:left => 2, :right => 2, :bottom => 2, :top => 2, :header => 2, :footer => 2}
-    optioned = @ws.workbook.add_worksheet(:name => 'bob', :page_margins => page_margins, :selected => true, :show_gridlines => false)
-    assert_equal(optioned.page_margins.left, page_margins[:left])
-    assert_equal(optioned.page_margins.right, page_margins[:right])
-    assert_equal(optioned.page_margins.top, page_margins[:top])
-    assert_equal(optioned.page_margins.bottom, page_margins[:bottom])
-    assert_equal(optioned.page_margins.header, page_margins[:header])
-    assert_equal(optioned.page_margins.footer, page_margins[:footer])
+    page_setup = {:fit_to_height => 1, :fit_to_width => 1, :orientation => :landscape, :paper_width => "210mm", :paper_height => "297mm", :scale => 80}
+    print_options = {:grid_lines => true, :headings => true, :horizontal_centered => true, :vertical_centered => true}
+    optioned = @ws.workbook.add_worksheet(:name => 'bob', :page_margins => page_margins, :page_setup => page_setup, :print_options => print_options, :selected => true, :show_gridlines => false)
+    page_margins.keys.each do |key|
+      assert_equal(page_margins[key], optioned.page_margins.send(key))
+    end
+    page_setup.keys.each do |key|
+      assert_equal(page_setup[key], optioned.page_setup.send(key))
+    end
+    print_options.keys.each do |key|
+      assert_equal(print_options[key], optioned.print_options.send(key))
+    end
     assert_equal(optioned.name, 'bob')
     assert_equal(optioned.selected, true)
     assert_equal(optioned.show_gridlines, false)
+
   end
 
 
@@ -222,6 +250,24 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:pageMargins[@left="9"][@right="7"]').size, 1)
   end
 
+  def test_to_xml_string_page_setup
+    @ws.page_setup do |ps|
+      ps.paper_width = "210mm"
+      ps.scale = 80
+    end
+    doc = Nokogiri::XML(@ws.to_xml_string)
+    assert_equal(doc.xpath('//xmlns:worksheet/xmlns:pageSetup[@paperWidth="210mm"][@scale="80"]').size, 1)
+  end
+
+  def test_to_xml_string_print_options
+    @ws.print_options do |po|
+      po.grid_lines = true
+      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)
+  end
+
   def test_to_xml_string_drawing
     c = @ws.add_chart Axlsx::Pie3DChart
     doc = Nokogiri::XML(@ws.to_xml_string)
@@ -258,6 +304,8 @@ class TestWorksheet < Test::Unit::TestCase
   # is generated in correct order.
   def test_valid_with_optional_elements
     @ws.page_margins.set :left => 9
+    @ws.page_setup.set :fit_to_width => 1
+    @ws.print_options.set :headings => true
     @ws.auto_filter = "A1:C3"
     @ws.merge_cells "A4:A5"
     @ws.add_chart Axlsx::Pie3DChart
@@ -274,11 +322,16 @@ class TestWorksheet < Test::Unit::TestCase
   end
 
   def test_relationships
+    @ws.add_row [1,2,3]
     assert(@ws.relationships.empty?, "No Drawing relationship until you add a chart")
     c = @ws.add_chart Axlsx::Pie3DChart
     assert_equal(@ws.relationships.size, 1, "adding a chart creates the relationship")
     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")
+    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")
   end
 
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: axlsx
 version: !ruby/object:Gem::Version
-  version: 1.1.4
+  version: 1.1.5
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-03 00:00:00.000000000 Z
+date: 2012-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2151927760 !ruby/object:Gem::Requirement
+  requirement: &2151818760 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2151927760
+  version_requirements: *2151818760
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2151926720 !ruby/object:Gem::Requirement
+  requirement: &2151817980 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.5
   type: :runtime
   prerelease: false
-  version_requirements: *2151926720
+  version_requirements: *2151817980
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151926120 !ruby/object:Gem::Requirement
+  requirement: &2151816780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,18 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *2151926120
+  version_requirements: *2151816780
+- !ruby/object:Gem::Dependency
+  name: cover_me
+  requirement: &2151815800 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: *2151815800
 description: ! '    xlsx generation with charts, images, automated column width, customizable
   styles and full schema validation. Axlsx excels at helping you generate beautiful
   Office Open XML Spreadsheet documents without having to understand the entire ECMA
@@ -105,6 +116,10 @@ files:
 - lib/axlsx/drawing/two_cell_anchor.rb
 - lib/axlsx/drawing/val_axis.rb
 - lib/axlsx/drawing/view_3D.rb
+- lib/axlsx/drawing/vml_drawing.rb
+- lib/axlsx/drawing/vml_drawing.rb~
+- lib/axlsx/drawing/vml_shape.rb
+- lib/axlsx/drawing/vml_shape.rb~
 - lib/axlsx/package.rb
 - lib/axlsx/rels/relationship.rb
 - lib/axlsx/rels/relationships.rb
@@ -150,6 +165,10 @@ files:
 - lib/axlsx/workbook/worksheet/col.rb~
 - lib/axlsx/workbook/worksheet/color_scale.rb
 - lib/axlsx/workbook/worksheet/color_scale.rb~
+- lib/axlsx/workbook/worksheet/comment.rb
+- lib/axlsx/workbook/worksheet/comment.rb~
+- lib/axlsx/workbook/worksheet/comments.rb
+- lib/axlsx/workbook/worksheet/comments.rb~
 - lib/axlsx/workbook/worksheet/conditional_formatting.rb
 - lib/axlsx/workbook/worksheet/conditional_formatting_rule.rb
 - lib/axlsx/workbook/worksheet/data_bar.rb
@@ -158,6 +177,8 @@ files:
 - lib/axlsx/workbook/worksheet/icon_set.rb
 - lib/axlsx/workbook/worksheet/icon_set.rb~
 - lib/axlsx/workbook/worksheet/page_margins.rb
+- lib/axlsx/workbook/worksheet/page_setup.rb
+- lib/axlsx/workbook/worksheet/print_options.rb
 - lib/axlsx/workbook/worksheet/row.rb
 - lib/axlsx/workbook/worksheet/shared_strings_table.rb~
 - lib/axlsx/workbook/worksheet/table.rb
@@ -202,40 +223,37 @@ files:
 - lib/schema/vml-wordprocessingDrawing.xsd
 - lib/schema/wml.xsd
 - lib/schema/xml.xsd
-- examples/#extractive.csv#
-- examples/#extractive.rb#
 - examples/chart_colors.rb
-- examples/chart_colors.rb~
 - examples/chart_colors.xlsx
-- examples/colored_series_data.xlsx
 - examples/conditional_formatting/example_conditional_formatting.rb
 - examples/conditional_formatting/getting_barred.rb
 - examples/conditional_formatting/getting_barred.xlsx
 - examples/conditional_formatting/hitting_the_high_notes.rb
 - examples/conditional_formatting/scaled_colors.rb
 - examples/conditional_formatting/stop_and_go.rb
-- examples/example.csv
+- examples/doc/_index.html
+- examples/doc/class_list.html
+- examples/doc/css/common.css
+- examples/doc/css/full_list.css
+- examples/doc/css/style.css
+- examples/doc/file_list.html
+- examples/doc/frames.html
+- examples/doc/index.html
+- examples/doc/js/app.js
+- examples/doc/js/full_list.js
+- examples/doc/js/jquery.js
+- examples/doc/method_list.html
+- examples/doc/top-level-namespace.html
 - examples/example.rb
 - examples/example.xlsx
 - examples/example_streamed.xlsx
-- examples/extractive.csv
-- examples/extractive.csv~
 - examples/extractive.rb
-- examples/extractive.rb~
-- examples/extractive.xlsx
 - examples/image1.gif
 - examples/image1.jpeg
 - examples/image1.jpg
 - examples/image1.png
-- examples/no-use_autowidth.xlsx
 - examples/sample.png
-- examples/shared_strings_example.xlsx
 - examples/skydrive/real_example.rb
-- examples/stack.rb
-- examples/stack.rb~
-- examples/stack.xlsx
-- examples/~$chart_colors.xlsx
-- examples/~$extractive.xlsx
 - LICENSE
 - README.md
 - Rakefile
@@ -285,6 +303,9 @@ files:
 - test/drawing/tc_two_cell_anchor.rb
 - test/drawing/tc_val_axis.rb
 - test/drawing/tc_view_3D.rb
+- test/drawing/tc_vml_drawing.rb
+- test/drawing/tc_vml_drawing.rb~
+- test/drawing/tc_vml_shape.rb
 - test/profile.rb
 - test/rels/tc_relationship.rb
 - test/rels/tc_relationships.rb
@@ -322,6 +343,8 @@ files:
 - test/workbook/worksheet/tc_col.rb~
 - test/workbook/worksheet/tc_color_scale.rb
 - test/workbook/worksheet/tc_color_scale.rb~
+- test/workbook/worksheet/tc_comment.rb
+- test/workbook/worksheet/tc_comments.rb
 - test/workbook/worksheet/tc_conditional_formatting.rb
 - test/workbook/worksheet/tc_data_bar.rb
 - test/workbook/worksheet/tc_data_bar.rb~
@@ -329,6 +352,8 @@ files:
 - test/workbook/worksheet/tc_icon_set.rb
 - test/workbook/worksheet/tc_icon_set.rb~
 - test/workbook/worksheet/tc_page_margins.rb
+- test/workbook/worksheet/tc_page_setup.rb
+- test/workbook/worksheet/tc_print_options.rb
 - test/workbook/worksheet/tc_row.rb
 - test/workbook/worksheet/tc_worksheet.rb
 homepage: https://github.com/randym/axlsx
@@ -400,6 +425,9 @@ test_files:
 - test/drawing/tc_two_cell_anchor.rb
 - test/drawing/tc_val_axis.rb
 - test/drawing/tc_view_3D.rb
+- test/drawing/tc_vml_drawing.rb
+- test/drawing/tc_vml_drawing.rb~
+- test/drawing/tc_vml_shape.rb
 - test/profile.rb
 - test/rels/tc_relationship.rb
 - test/rels/tc_relationships.rb
@@ -437,6 +465,8 @@ test_files:
 - test/workbook/worksheet/tc_col.rb~
 - test/workbook/worksheet/tc_color_scale.rb
 - test/workbook/worksheet/tc_color_scale.rb~
+- test/workbook/worksheet/tc_comment.rb
+- test/workbook/worksheet/tc_comments.rb
 - test/workbook/worksheet/tc_conditional_formatting.rb
 - test/workbook/worksheet/tc_data_bar.rb
 - test/workbook/worksheet/tc_data_bar.rb~
@@ -444,6 +474,8 @@ test_files:
 - test/workbook/worksheet/tc_icon_set.rb
 - test/workbook/worksheet/tc_icon_set.rb~
 - test/workbook/worksheet/tc_page_margins.rb
+- test/workbook/worksheet/tc_page_setup.rb
+- test/workbook/worksheet/tc_print_options.rb
 - test/workbook/worksheet/tc_row.rb
 - test/workbook/worksheet/tc_worksheet.rb
 has_rdoc: axlsx