axlsx 1.1.5 → 1.1.6

data/test/workbook/worksheet/tc_page_setup.rb

@@ -3,8 +3,8 @@ require 'tc_helper.rb'
 class TestPageSetup < Test::Unit::TestCase
 
   def setup
-    p = Axlsx::Package.new
-    ws = p.workbook.add_worksheet :name => "hmmm"
+    @p = Axlsx::Package.new
+    ws = @p.workbook.add_worksheet :name => "hmmm"
     @ps = ws.page_setup
   end
 
@@ -18,7 +18,14 @@ class TestPageSetup < Test::Unit::TestCase
   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)
+    page_setup = { :fit_to_height => 1,
+                   :fit_to_width => 2,
+                   :orientation => :landscape,
+                   :paper_height => "297mm",
+                   :paper_width => "210mm",
+                   :scale => 50 }
+
+    optioned = @p.workbook.add_worksheet(:name => 'optioned', :page_setup => page_setup).page_setup
     assert_equal(1, optioned.fit_to_height)
     assert_equal(2, optioned.fit_to_width)
     assert_equal(:landscape, optioned.orientation)
@@ -99,5 +106,16 @@ class TestPageSetup < Test::Unit::TestCase
     assert_nothing_raised { @ps.scale = 99 }
     assert_equal(99, @ps.scale)
   end
-
+  
+  def test_fit_to
+    fits = @ps.fit_to(:width => 1)
+    assert_equal([1, 9999], fits)
+    fits = @ps.fit_to :height => 1
+    assert_equal(fits, [9999,1])
+    fits = @ps.fit_to :height => 7, :width => 2
+    assert_equal(fits, [2, 7])
+    assert_raise(ArgumentError) { puts @ps.fit_to(:width => true)}
+    
+    
+  end
 end

data/test/workbook/worksheet/tc_row.rb

@@ -39,7 +39,7 @@ class TestRow < Test::Unit::TestCase
 
   def test_add_cell_autowidth_info
     width = @ws.send :calculate_width, 'this is the cell of cells', @ws.workbook.styles.fonts.first.sz
-    c = @row.add_cell("this is the cell of cells")
+    @row.add_cell("this is the cell of cells")
     assert_equal(@ws.column_info.last.width, width)
   end
 
@@ -66,6 +66,13 @@ class TestRow < Test::Unit::TestCase
     assert_equal(15, @row.height)
   end
 
+
+  def test_ph
+    assert_raise(ArgumentError) { @row.ph = -3 }
+    assert_nothing_raised { @row.ph = true }
+    assert_equal(true, @row.ph)
+  end
+
   def test_hidden
     assert_raise(ArgumentError) { @row.hidden = -3 }
     assert_nothing_raised { @row.hidden = true }
@@ -84,13 +91,18 @@ class TestRow < Test::Unit::TestCase
     assert_equal(2, @row.outlineLevel)
   end
 
- def test_to_xml_without_custom_height
+  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)
   end
 
   def test_to_xml_string
+    @row.height = 20
+    @row.s = 1
+    @row.outlineLevel = 2
+    @row.collapsed = true
+    @row.hidden = true
     r_s_xml = Nokogiri::XML(@row.to_xml_string(0, ''))
     assert_equal(r_s_xml.xpath(".//row[@r=1]").size, 1)
   end

data/test/workbook/worksheet/tc_sheet_protection.rb

@@ -0,0 +1,117 @@
+# encoding: UTF-8
+require 'tc_helper.rb'
+
+# <xsd:complexType name="CT_SheetProtection">
+# <xsd:attribute name="sheet" type="xsd:boolean" use="optional" default="false"/>
+# <xsd:attribute name="objects" type="xsd:boolean" use="optional" default="false"/>
+# <xsd:attribute name="scenarios" type="xsd:boolean" use="optional" default="false"/>
+# <xsd:attribute name="formatCells" type="xsd:boolean" use="optional" default="true"/>
+# <xsd:attribute name="formatColumns" type="xsd:boolean" use="optional" default="true"/>
+# <xsd:attribute name="formatRows" type="xsd:boolean" use="optional" default="true"/>
+# <xsd:attribute name="insertColumns" type="xsd:boolean" use="optional" default="true"/>
+# <xsd:attribute name="insertRows" type="xsd:boolean" use="optional" default="true"/>
+# <xsd:attribute name="insertHyperlinks" type="xsd:boolean" use="optional" default="true"/>
+# <xsd:attribute name="deleteColumns" type="xsd:boolean" use="optional" default="true"/>
+# <xsd:attribute name="deleteRows" type="xsd:boolean" use="optional" default="true"/>
+# <xsd:attribute name="selectLockedCells" type="xsd:boolean" use="optional" default="false"/>
+# <xsd:attribute name="sort" type="xsd:boolean" use="optional" default="true"/>
+# <xsd:attribute name="autoFilter" type="xsd:boolean" use="optional" default="true"/>
+# <xsd:attribute name="pivotTables" type="xsd:boolean" use="optional" default="true"/>
+# <xsd:attribute name="selectUnlockedCells" type="xsd:boolean" use="optional" default="false"/>
+# <xsd:attribute name="password" type="xsd:string" use="optional" default="nil"/>
+# </xsd:complexType>
+ 
+class TestSheetProtection < Test::Unit::TestCase
+  def setup
+    #inverse defaults
+    @boolean_options = { :sheet => false, :objects => true, :scenarios => true, :format_cells => false,
+                         :format_columns => false, :format_rows => false, :insert_columns => false, :insert_rows => false,
+                         :insert_hyperlinks => false, :delete_columns => false, :delete_rows => false, :select_locked_cells => true,
+                         :sort => false, :auto_filter => false, :pivot_tables => false, :select_unlocked_cells => true }
+
+    @string_options = { :password => nil }
+    
+    @options = @boolean_options.merge(@string_options)
+             
+    @sp = Axlsx::SheetProtection.new(@options)
+  end
+
+  def test_initialize
+    sp = Axlsx::SheetProtection.new
+    @boolean_options.each do |key, value|
+      assert_equal(!value, sp.send(key.to_sym), "initialized default #{key} should be #{!value}")
+      assert_equal(value, @sp.send(key.to_sym), "initialized options #{key} should be #{value}")
+    end
+  end
+
+  def test_boolean_attribute_validation
+    @boolean_options.each do |key, value|
+      assert_raise(ArgumentError, "#{key} must be boolean") { @sp.send("#{key}=".to_sym, 'A') }
+      assert_nothing_raised { @sp.send("#{key}=".to_sym, true) }
+      assert_nothing_raised { @sp.send("#{key}=".to_sym, true) }
+    end
+  end
+
+  def test_to_xml_string
+    @sp.password = 'fish' # -> CA3F
+    doc = Nokogiri::XML(@sp.to_xml_string)
+    @options.each do |key, value|
+      assert(doc.xpath("//sheetProtection[@#{key.to_s.gsub(/_(.)/){ $1.upcase }}='#{value}']")) 
+    end
+  end
+
+end
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+

data/test/workbook/worksheet/tc_worksheet.rb

@@ -180,10 +180,16 @@ class TestWorksheet < Test::Unit::TestCase
     end
     assert_equal(@ws.rows[1].cells[0].style, 0)
     assert_equal(@ws.rows[2].cells[1].style, 0)
+    @ws.row_style( 1..2, 1, :col_offset => 2)
+    @ws.rows[(1..2)].each do |r|
+      r.cells[(2..-1)].each do |c|
+        assert_equal(c.style, 1)
+      end
+    end
   end
 
   def test_to_xml_string_fit_to_page
-    @ws.fit_to_page = true
+    @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)
   end
@@ -194,6 +200,11 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:dimension[@ref="A1:C1"]').size, 1)
   end
 
+  def test_fit_to_page_assignation_does_nothing
+    @ws.fit_to_page = false
+    assert_equal(@ws.fit_to_page, false)
+  end
+
   def test_to_xml_string_selected
     @ws.selected = true
     doc = Nokogiri::XML(@ws.to_xml_string)
@@ -241,6 +252,12 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:mergeCells/xmlns:mergeCell[@ref="E1:F1"]').size, 1)
   end
 
+  def test_to_xml_string_sheet_protection
+    @ws.sheet_protection.password = 'fish'
+    doc = Nokogiri::XML(@ws.to_xml_string)
+    assert(doc.xpath('//sheetProtection'))
+  end
+
   def test_to_xml_string_page_margins
     @ws.page_margins do |pm|
       pm.left = 9
@@ -269,7 +286,7 @@ class TestWorksheet < Test::Unit::TestCase
   end
 
   def test_to_xml_string_drawing
-    c = @ws.add_chart Axlsx::Pie3DChart
+    @ws.add_chart Axlsx::Pie3DChart
     doc = Nokogiri::XML(@ws.to_xml_string)
     assert_equal(doc.xpath('//xmlns:worksheet/xmlns:drawing[@r:id="rId1"]').size, 1)
   end
@@ -336,7 +353,7 @@ class TestWorksheet < Test::Unit::TestCase
 
 
   def test_name_unique
-    assert_raise(ArgumentError, "worksheet name must be unique") { n = @ws.name; @ws.workbook.add_worksheet(:name=> @ws) }
+    assert_raise(ArgumentError, "worksheet name must be unique") { n = @ws.name; @ws.workbook.add_worksheet(:name=> n) }
   end
 
   def test_name_size
@@ -376,7 +393,15 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(@ws.merged_cells.size, 3)
     assert_equal(@ws.merged_cells.last, "A3:B3")
   end
-
+  
+  def test_merge_cells_sorts_correctly_by_row_when_given_array
+    10.times do |i|
+      @ws.add_row [i]
+    end
+    @ws.merge_cells [@ws.rows[8].cells.first, @ws.rows[9].cells.first]
+    assert_equal "A9:A10", @ws.merged_cells.first
+  end
+  
   def test_auto_filter
     assert(@ws.auto_filter.nil?)
     assert_raise(ArgumentError) { @ws.auto_filter = 123 }

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: axlsx
 version: !ruby/object:Gem::Version
-  version: 1.1.5
+  version: 1.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-05-13 00:00:00.000000000 Z
+date: 2012-05-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2151818760 !ruby/object:Gem::Requirement
+  requirement: &2151817600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2151818760
+  version_requirements: *2151817600
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2151817980 !ruby/object:Gem::Requirement
+  requirement: &2151816420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 0.9.5
   type: :runtime
   prerelease: false
-  version_requirements: *2151817980
+  version_requirements: *2151816420
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2151816780 !ruby/object:Gem::Requirement
+  requirement: &2151814900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.8.7
   type: :runtime
   prerelease: false
-  version_requirements: *2151816780
+  version_requirements: *2151814900
 - !ruby/object:Gem::Dependency
   name: cover_me
-  requirement: &2151815800 !ruby/object:Gem::Requirement
+  requirement: &2151814060 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2151815800
+  version_requirements: *2151814060
 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
@@ -173,6 +173,7 @@ files:
 - lib/axlsx/workbook/worksheet/conditional_formatting_rule.rb
 - lib/axlsx/workbook/worksheet/data_bar.rb
 - lib/axlsx/workbook/worksheet/data_bar.rb~
+- lib/axlsx/workbook/worksheet/data_validation.rb
 - lib/axlsx/workbook/worksheet/date_time_converter.rb
 - lib/axlsx/workbook/worksheet/icon_set.rb
 - lib/axlsx/workbook/worksheet/icon_set.rb~
@@ -181,6 +182,7 @@ files:
 - 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/sheet_protection.rb
 - lib/axlsx/workbook/worksheet/table.rb
 - lib/axlsx/workbook/worksheet/table.rb~
 - lib/axlsx/workbook/worksheet/worksheet.rb
@@ -231,6 +233,7 @@ files:
 - 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/doc/_index.html
 - examples/doc/class_list.html
 - examples/doc/css/common.css
@@ -247,13 +250,27 @@ files:
 - examples/example.rb
 - examples/example.xlsx
 - examples/example_streamed.xlsx
+- examples/examples_saved.xlsx
 - examples/extractive.rb
+- examples/fish.xlsx
 - examples/image1.gif
 - examples/image1.jpeg
 - examples/image1.jpg
 - examples/image1.png
+- examples/no-use_autowidth.xlsx
+- examples/pareto.rb
+- examples/pareto.xlsx
+- examples/pie_chart.rb
+- examples/pie_chart.xlsx
+- examples/pie_chart_saved.xlsx
 - examples/sample.png
+- examples/shared_strings_example.xlsx
+- examples/sheet_protection.rb
+- examples/sheet_protection.xlsx
 - examples/skydrive/real_example.rb
+- examples/two_cell_anchor_image.rb
+- examples/two_cell_anchor_image.xlsx
+- examples/~$pie_chart_saved.xlsx
 - LICENSE
 - README.md
 - Rakefile
@@ -348,6 +365,7 @@ files:
 - test/workbook/worksheet/tc_conditional_formatting.rb
 - test/workbook/worksheet/tc_data_bar.rb
 - test/workbook/worksheet/tc_data_bar.rb~
+- test/workbook/worksheet/tc_data_validation.rb
 - test/workbook/worksheet/tc_date_time_converter.rb
 - test/workbook/worksheet/tc_icon_set.rb
 - test/workbook/worksheet/tc_icon_set.rb~
@@ -355,6 +373,7 @@ files:
 - test/workbook/worksheet/tc_page_setup.rb
 - test/workbook/worksheet/tc_print_options.rb
 - test/workbook/worksheet/tc_row.rb
+- test/workbook/worksheet/tc_sheet_protection.rb
 - test/workbook/worksheet/tc_worksheet.rb
 homepage: https://github.com/randym/axlsx
 licenses: []
@@ -470,6 +489,7 @@ test_files:
 - test/workbook/worksheet/tc_conditional_formatting.rb
 - test/workbook/worksheet/tc_data_bar.rb
 - test/workbook/worksheet/tc_data_bar.rb~
+- test/workbook/worksheet/tc_data_validation.rb
 - test/workbook/worksheet/tc_date_time_converter.rb
 - test/workbook/worksheet/tc_icon_set.rb
 - test/workbook/worksheet/tc_icon_set.rb~
@@ -477,5 +497,6 @@ test_files:
 - test/workbook/worksheet/tc_page_setup.rb
 - test/workbook/worksheet/tc_print_options.rb
 - test/workbook/worksheet/tc_row.rb
+- test/workbook/worksheet/tc_sheet_protection.rb
 - test/workbook/worksheet/tc_worksheet.rb
 has_rdoc: axlsx