axlsx 1.1.5 → 1.1.6

data/test/doc_props/tc_app.rb

@@ -1,9 +1,39 @@
 require 'tc_helper.rb'
 
 class TestApp < Test::Unit::TestCase
+  def setup
+    options = {
+      :'Template' => 'Foo.xlt',
+      :'Manager' => 'Penny',
+      :'Company' => "Bob's Repair",
+      :'Pages' => 1,
+      :'Words' => 2,
+      :'Characters' => 7,
+      :'PresentationFormat' => 'any',
+      :'Lines' => 1,
+      :'Paragraphs' => 1,
+      :'Slides' => 4,
+      :'Notes' => 1,
+      :'TotalTime' => 2,
+      :'HidddenSlides' => 3,
+      :'MMClips' => 10,
+      :'ScaleCrop' => true,
+      :'LinksUpToDate' => true,
+      :'CharactersWithSpaces' => 9,
+      :'SharedDoc' => false,
+      :'HyperlinkBase' => 'foo',
+      :'HyperlInksChanged' => false, 
+      :'Application' => 'axlsx',
+      :'AppVersion' => '1.1.5',
+      :'DocSecurity' => 0
+      }
+
+    @app = Axlsx::App.new options
+
+  end
   def test_valid_document
     schema = Nokogiri::XML::Schema(File.open(Axlsx::APP_XSD))
-    doc = Nokogiri::XML(Axlsx::App.new.to_xml_string)
+    doc = Nokogiri::XML(@app.to_xml_string)
     errors = []
     schema.validate(doc).each do |error|
       errors << error

data/test/drawing/tc_axis.rb

@@ -2,7 +2,7 @@ require 'tc_helper.rb'
 
 class TestAxis < Test::Unit::TestCase
   def setup
-    @axis = Axlsx::Axis.new 12345, 54321
+    @axis = Axlsx::Axis.new 12345, 54321, :gridlines => false
   end
   def teardown
   end
@@ -13,7 +13,7 @@ class TestAxis < Test::Unit::TestCase
     assert_equal(@axis.tickLblPos, :nextTo, "tick label position default incorrect")
     assert_equal(@axis.crosses, :autoZero, "tick label position default incorrect")
     assert(@axis.scaling.is_a?(Axlsx::Scaling) && @axis.scaling.orientation == :minMax, "scaling default incorrect")
-    assert_raise(ArgumentError) { Axlsx::Axis.new -1234, 'abcd' }
+    assert_raise(ArgumentError) { Axlsx::Axis.new( -1234, 'abcd') }
   end
 
   def test_axis_position
@@ -48,5 +48,15 @@ class TestAxis < Test::Unit::TestCase
     assert_raise(ArgumentError, "requires valid gridlines") { @axis.gridlines = 'alice' }
     assert_nothing_raised("accepts valid crosses") { @axis.gridlines = false }
   end
+  
+  def test_to_xml_string
+    str  = '<?xml version="1.0" encoding="UTF-8"?>'
+    str << '<c:chartSpace xmlns:c="' << Axlsx::XML_NS_C << '" xmlns:a="' << Axlsx::XML_NS_A << '">'
+    doc = Nokogiri::XML(@axis.to_xml_string(str)) 
+    assert(doc.xpath('//a:noFill'))
+    assert(doc.xpath("//c:crosses[@val='#{@axis.crosses.to_s}']"))
+    assert(doc.xpath("//c:crossAx[@val='#{@axis.crossAx.to_s}']"))
+    assert(doc.xpath("//a:bodyPr[@rot='#{@axis.label_rotation.to_s}']"))
 
+  end
 end

data/test/drawing/tc_chart.rb

@@ -22,11 +22,16 @@ class TestChart < Test::Unit::TestCase
     @chart.title.text = 'wowzer'
     assert_equal(@chart.title.text, "wowzer", "the title text via a string")
     assert_equal(@chart.title.cell, nil, "the title cell is nil as we set the title with text.")
-    @chart.title.cell = @row.cells.first
+    @chart.title = @row.cells.first
     assert_equal(@chart.title.text, "one", "the title text was set via cell reference")
     assert_equal(@chart.title.cell, @row.cells.first)
   end
 
+  def test_to_from_marker_access
+    assert(@chart.to.is_a?(Axlsx::Marker))
+    assert(@chart.from.is_a?(Axlsx::Marker))
+  end
+
   def test_style
     assert_raise(ArgumentError) { @chart.style = 49 }
     assert_nothing_raised { @chart.style = 2 }
@@ -34,16 +39,29 @@ class TestChart < Test::Unit::TestCase
   end
 
   def test_start_at
-    @chart.start_at 15,25
+    @chart.start_at 15, 25
     assert_equal(@chart.graphic_frame.anchor.from.col, 15)
     assert_equal(@chart.graphic_frame.anchor.from.row, 25)
-
+    @chart.start_at @row.cells.first
+    assert_equal(@chart.graphic_frame.anchor.from.col, 0)
+    assert_equal(@chart.graphic_frame.anchor.from.row, 0)
+    @chart.start_at [5,6]
+    assert_equal(@chart.graphic_frame.anchor.from.col, 5)
+    assert_equal(@chart.graphic_frame.anchor.from.row, 6)
+    
   end
 
   def test_end_at
     @chart.end_at 25, 90
     assert_equal(@chart.graphic_frame.anchor.to.col, 25)
     assert_equal(@chart.graphic_frame.anchor.to.row, 90)
+    @chart.end_at @row.cells.last
+    assert_equal(@chart.graphic_frame.anchor.to.col, 2)
+    assert_equal(@chart.graphic_frame.anchor.to.row, 0)
+    @chart.end_at [10,11]
+    assert_equal(@chart.graphic_frame.anchor.to.col, 10)
+    assert_equal(@chart.graphic_frame.anchor.to.row, 11)
+  
   end
 
   def test_add_series

data/test/drawing/tc_drawing.rb

@@ -32,7 +32,12 @@ class TestDrawing < Test::Unit::TestCase
     assert_equal(600, image.width)
     assert_equal(400, image.height)
   end
-
+  def test_add_two_cell_anchor_image
+     src = File.dirname(__FILE__) + "/../../examples/image1.jpeg"
+     image = @ws.add_image(:image_src => src, :start_at=>[0,0], :end_at => [15,0])
+    assert(@ws.drawing.anchors.last.is_a?(Axlsx::TwoCellAnchor))
+    assert(image.is_a?(Axlsx::Pic))
+  end
   def test_charts
     assert(@ws.drawing.charts.empty?)
     chart = @ws.add_chart(Axlsx::Pie3DChart, :title=>"bob", :start_at=>[0,0], :end_at=>[1,1])

data/test/drawing/tc_hyperlink.rb

@@ -19,11 +19,6 @@ class TestHyperlink < Test::Unit::TestCase
     assert_equal(@hyperlink.href, "http://axlsx.blogspot.com")
   end
 
-  def test_invalidUrl
-    assert_nothing_raised { @hyperlink.invalidUrl = "http://axlsx.blogspot.com" }
-    assert_equal(@hyperlink.invalidUrl, "http://axlsx.blogspot.com")
-  end
-
   def test_tgtFrame
     assert_nothing_raised { @hyperlink.tgtFrame = "http://axlsx.blogspot.com" }
     assert_equal(@hyperlink.tgtFrame, "http://axlsx.blogspot.com")

data/test/drawing/tc_pic.rb

@@ -6,7 +6,7 @@ class TestPic < Test::Unit::TestCase
     @p = Axlsx::Package.new
     ws = @p.workbook.add_worksheet
     @test_img =  File.dirname(__FILE__) + "/../../examples/image1.jpeg"
-    @image = ws.add_image :image_src => @test_img
+    @image = ws.add_image :image_src => @test_img, :hyperlink => 'https://github.com/randym', :tooltip => "What's up doc?"
   end
 
   def teardown
@@ -14,11 +14,31 @@ class TestPic < Test::Unit::TestCase
 
   def test_initialization
     assert_equal(@p.workbook.images.first, @image)
+    assert_equal(@image.file_name, 'image1.jpeg')
     assert_equal(@image.image_src, @test_img)
   end
 
+  def test_anchor_swapping
+    #swap from one cell to two cell when end_at is specified
+    assert(@image.anchor.is_a?(Axlsx::OneCellAnchor))
+    start_at = @image.anchor.from 
+    @image.end_at 10,5
+    assert(@image.anchor.is_a?(Axlsx::TwoCellAnchor))
+    assert_equal(start_at.col, @image.anchor.from.col)
+    assert_equal(start_at.row, @image.anchor.from.row)
+    assert_equal(10,@image.anchor.to.col)
+    assert_equal(5, @image.anchor.to.row)
+  
+    #swap from two cell to one cell when width or height are specified
+    @image.width = 200
+    assert(@image.anchor.is_a?(Axlsx::OneCellAnchor))
+    assert_equal(start_at.col, @image.anchor.from.col)
+    assert_equal(start_at.row, @image.anchor.from.row)
+    assert_equal(200, @image.width)
+  
+  end
   def test_hyperlink
-    assert_equal(@image.hyperlink, nil)
+    assert_equal(@image.hyperlink.href, "https://github.com/randym")
     @image.hyperlink = "http://axlsx.blogspot.com"
     assert_equal(@image.hyperlink.href, "http://axlsx.blogspot.com")
   end

data/test/drawing/tc_scatter_chart.rb

@@ -4,7 +4,7 @@ class TestScatterChart < Test::Unit::TestCase
   def setup
     @p = Axlsx::Package.new
     @chart = nil
-    ws = @p.workbook.add_worksheet do |sheet|
+    @p.workbook.add_worksheet do |sheet|
       sheet.add_row ["First",  1,  5,  7,  9]
       sheet.add_row ["",       1, 25, 49, 81]
       sheet.add_row ["Second", 5,  2, 14,  9]
@@ -22,6 +22,11 @@ class TestScatterChart < Test::Unit::TestCase
   def teardown
   end
 
+  def test_scatter_style
+    @chart.scatterStyle = :marker
+    assert(@chart.scatterStyle == :marker)
+    assert_raise(ArgumentError) { @chart.scatterStyle = :buckshot }
+  end
   def test_initialization
     assert_equal(@chart.scatterStyle, :lineMarker, "scatterStyle defualt incorrect")
     assert_equal(@chart.series_type, Axlsx::ScatterSeries, "series type incorrect")

data/test/drawing/tc_two_cell_anchor.rb

@@ -5,8 +5,7 @@ class TestTwoCellAnchor < Test::Unit::TestCase
   def setup
     p = Axlsx::Package.new
     @ws = p.workbook.add_worksheet
-    row = @ws.add_row ["one", 1, Time.now]
-    title = Axlsx::Title.new
+    @ws.add_row ["one", 1, Time.now]
     chart = @ws.add_chart Axlsx::Bar3DChart
     @anchor = chart.graphic_frame.anchor
   end

data/test/stylesheet/tc_styles.rb

@@ -19,7 +19,7 @@ class TestStyles < Test::Unit::TestCase
   end
   def test_add_style_border_hash
     border_count = @styles.borders.size
-    s = @styles.add_style :border => {:style => :thin, :color => "FFFF0000"}
+    @styles.add_style :border => {:style => :thin, :color => "FFFF0000"}
     assert_equal(@styles.borders.size, border_count + 1)
     assert_equal(@styles.borders.last.prs.last.color.rgb, "FFFF0000")
     assert_raise(ArgumentError) { @styles.add_style :border => {:color => "FFFF0000"} }
@@ -27,7 +27,7 @@ class TestStyles < Test::Unit::TestCase
   end
 
   def test_add_style_border_edges
-    s = @styles.add_style :border => { :style => :thin, :color => "0000FFFF", :edges => [:top, :bottom] }
+    @styles.add_style :border => { :style => :thin, :color => "0000FFFF", :edges => [:top, :bottom] }
     parts = @styles.borders.last.prs
     parts.each { |pr| assert_equal(pr.color.rgb, "0000FFFF", "Style is applied to #{pr.name} properly") }
     assert((parts.map { |pr| pr.name.to_s }.sort && ['bottom', 'top']).size == 2, "specify two edges, and you get two border prs")
@@ -44,7 +44,6 @@ class TestStyles < Test::Unit::TestCase
   def test_parse_num_fmt
     f_code = {:format_code => "YYYY/MM"}
     num_fmt = {:num_fmt => 5}
-    both = { :format_code => "#000", :num_fmt => 0 }
     assert_equal(@styles.parse_num_fmt_options, nil, 'noop if neither :format_code or :num_fmt exist')
     max = @styles.numFmts.map{ |nf| nf.numFmtId }.max
     @styles.parse_num_fmt_options(f_code)
@@ -181,7 +180,7 @@ class TestStyles < Test::Unit::TestCase
 
   def test_basic_add_style_dxf
     border_count = @styles.borders.size
-    s = @styles.add_style :border => {:style => :thin, :color => "FFFF0000"}, :type => :dxf
+    @styles.add_style :border => {:style => :thin, :color => "FFFF0000"}, :type => :dxf
     assert_equal(@styles.borders.size, border_count, "styles borders not affected")
     assert_equal(@styles.dxfs.last.border.prs.last.color.rgb, "FFFF0000")
     assert_raise(ArgumentError) { @styles.add_style :border => {:color => "FFFF0000"}, :type => :dxf }

data/test/stylesheet/tc_table_style.rb

@@ -13,6 +13,10 @@ class TestTableStyle < Test::Unit::TestCase
     assert_equal(@item.name, "fisher")
     assert_equal(@item.pivot, nil)
     assert_equal(@item.table, nil)
+    ts = Axlsx::TableStyle.new 'price', :pivot => true, :table => true
+    assert_equal(ts.name, 'price')
+    assert_equal(ts.pivot, true)
+    assert_equal(ts.table, true)
   end
 
   def test_name
@@ -33,4 +37,8 @@ class TestTableStyle < Test::Unit::TestCase
     assert_equal(@item.table, true)
   end
 
+  def test_to_xml_string
+    doc = Nokogiri::XML(@item.to_xml_string)
+    assert(doc.xpath("//tableStyle[@name='#{@item.name}']"))
+  end
 end

data/test/stylesheet/tc_table_style_element.rb

@@ -13,6 +13,10 @@ class TestTableStyleElement < Test::Unit::TestCase
     assert_equal(@item.type, nil)
     assert_equal(@item.size, nil)
     assert_equal(@item.dxfId, nil)
+    options = { :type => :headerRow, :size => 10, :dxfId => 1 }
+
+    tse = Axlsx::TableStyleElement.new options
+    options.each { |key, value| assert_equal(tse.send(key.to_sym), value) }
   end
 
   def test_type
@@ -32,5 +36,10 @@ class TestTableStyleElement < Test::Unit::TestCase
     assert_nothing_raised { @item.dxfId = 7 }
     assert_equal(@item.dxfId, 7)
   end
-
+  
+  def test_to_xml_string
+    doc = Nokogiri::XML(@item.to_xml_string)
+   @item.type = :headerRow
+    assert(doc.xpath("//tableStyleElement[@type='#{@item.type.to_s}']"))
+  end
 end

data/test/tc_package.rb

@@ -1,12 +1,16 @@
+# encoding: UTF-8
 require 'tc_helper.rb'
 
 class TestPackage < Test::Unit::TestCase
   def setup
     @package = Axlsx::Package.new
     ws = @package.workbook.add_worksheet
-    ws.add_row ['yes', 'we', 'can']
-    ws.add_comment :author => 'bob', :text => 'penny!', :ref => 'A1'
-    chart = ws.add_chart Axlsx::Pie3DChart
+    ws.add_row ['Can', 'we', 'build it?']
+    ws.add_row ['Yes!', 'We', 'can!']
+    ws.add_comment :author => 'alice', :text => 'Hi Bob', :ref => 'A12'
+    ws.add_comment :author => 'bob', :text => 'Hi Alice', :ref => 'F19'
+
+    chart = ws.add_chart Axlsx::Pie3DChart, :title => "これは？", :start_at => [0,3]
     chart.add_series :data=>[1,2,3], :labels=>["a", "b", "c"]
     @fname = 'axlsx_test_serialization.xlsx'
     img = File.expand_path('../../examples/image1.jpeg', __FILE__)
@@ -14,8 +18,19 @@ class TestPackage < Test::Unit::TestCase
       image.width=720
       image.height=666
       image.hyperlink.tooltip = "Labeled Link"
-      image.start_at 2, 2
+      image.start_at 5, 5
+    end
+    ws.add_image :image_src => File.expand_path('../../examples/image1.gif', __FILE__) do |image|
+      image.start_at 0, 20
+      image.width=360
+      image.height=333 
     end
+    ws.add_image :image_src => File.expand_path('../../examples/image1.png', __FILE__) do |image|
+      image.start_at 9, 20
+      image.width = 180
+      image.height = 167
+    end
+    ws.add_table 'A1:C1'
   end
 
   def test_use_autowidth
@@ -48,22 +63,22 @@ class TestPackage < Test::Unit::TestCase
   end
 
   def test_serialization
-    fname = 'axlsx_test_serialization.xlsx'
     assert_nothing_raised do
       begin
-         z= @package.serialize(@fname)
-         zf = Zip::ZipFile.open(@fname)
-         @package.send(:parts).each{ |part| zf.get_entry(part[:entry]) }
-         File.delete(@fname)
+        @package.serialize(@fname)
+        zf = Zip::ZipFile.open(@fname)
+        @package.send(:parts).each{ |part| zf.get_entry(part[:entry]) }
+        File.delete(@fname)
       rescue Errno::EACCES
-         puts "WARNING:: test_serialization requires write access."
+        puts "WARNING:: test_serialization requires write access."
       end
-     end
-   end
+    end
+  end
 
   def test_validation
     assert_equal(@package.validate.size, 0, @package.validate)
-    #how to test for failure? the internal validations on the models are so strict I cant break anthing.....
+    Axlsx::Workbook.send(:class_variable_set, :@@date1904, 9900)
+    assert(@package.validate.size > 0)
   end
 
   def test_parts
@@ -85,7 +100,7 @@ class TestPackage < Test::Unit::TestCase
 
 
     #no mystery parts
-    assert_equal(p.size, 15)
+    assert_equal(p.size, 18)
 
   end
 
@@ -113,11 +128,24 @@ class TestPackage < Test::Unit::TestCase
   def test_content_type_added_with_shared_strings
     @package.use_shared_strings = true
     ct = @package.send(:content_types)
-    assert(ct.select { |ct| ct.ContentType == Axlsx::SHARED_STRINGS_CT }.size == 1)
+    assert(ct.select { |type| type.ContentType == Axlsx::SHARED_STRINGS_CT }.size == 1)
   end
 
   def test_name_to_indices
     assert(Axlsx::name_to_indices('A1') == [0,0])
     assert(Axlsx::name_to_indices('A100') == [0,99], 'needs to axcept rows that contain 0')
   end
+
+  def test_to_stream
+    stream = @package.to_stream
+    assert(stream.is_a?(StringIO))
+    # this is just a roundabout guess for a package as it is build now
+    # in testing.
+    assert(stream.size > 80000)
+  end
+  
+  def test_encrypt
+    # this is no where near close to ready yet
+    assert(@package.encrypt('your_mom.xlsxl', 'has a password') == false)
+  end
 end

data/test/util/tc_simple_typed_list.rb

@@ -61,5 +61,18 @@ class TestSimpleTypedList < Test::Unit::TestCase
     assert_nothing_raised { @list.delete 0 }
     assert_nothing_raised { @list.delete 9 }
   end
+  
+  def test_delete
+    @list.push 1
+    assert(@list.size == 1)
+    @list.delete 1
+    assert(@list.empty?)
+  end
 
+  def test_equality
+    @list.push 1
+    @list.push 2
+    assert_equal(@list, [1,2])
+    
+  end
 end

data/test/util/tc_validators.rb

@@ -8,15 +8,15 @@ class TestValidators < Test::Unit::TestCase
   def test_validators
     #unsigned_int
     assert_nothing_raised { Axlsx.validate_unsigned_int 1 }
-    assert_nothing_raised { Axlsx.validate_unsigned_int +1 }
-    assert_raise(ArgumentError) { Axlsx.validate_unsigned_int -1 }
-    assert_raise(ArgumentError) { Axlsx.validate_unsigned_int '1' }
+    assert_nothing_raised { Axlsx.validate_unsigned_int(+1) }
+    assert_raise(ArgumentError) { Axlsx.validate_unsigned_int(-1)}
+    assert_raise(ArgumentError) { Axlsx.validate_unsigned_int('1') }
 
     #int
-    assert_nothing_raised { Axlsx.validate_int 1 }
-    assert_nothing_raised { Axlsx.validate_int -1 }
-    assert_raise(ArgumentError) { Axlsx.validate_int 'a' }
-    assert_raise(ArgumentError) { Axlsx.validate_int Array }
+    assert_nothing_raised { Axlsx.validate_int(1) }
+    assert_nothing_raised { Axlsx.validate_int(-1) }
+    assert_raise(ArgumentError) { Axlsx.validate_int('a')}
+    assert_raise(ArgumentError) { Axlsx.validate_int(Array) }
 
     #boolean (as 0 or 1, :true, :false, true, false, or "true," "false")
     [0,1,:true, :false, true, false, "true", "false"].each do |v|