axlsx 1.0.15 → 1.0.16

data/lib/axlsx/workbook/worksheet/worksheet.rb

@@ -195,6 +195,7 @@ module Axlsx
       offset = options.delete(:row_offset) || 0
       @rows[(offset..-1)].each do |r| 
         cells = r.cells[index]
+        next unless cells
         if cells.is_a?(Array)
           cells.each { |c| c.style = style }
         else
@@ -255,7 +256,7 @@ module Axlsx
           xml.drawing :"r:id"=>"rId1" if @drawing          
         }
       end
-      builder.to_xml
+      builder.to_xml(:save_with => 0)
     end
 
     # The worksheet relationships. This is managed automatically by the worksheet

data/test/drawing/tc_hyperlink.rb

@@ -0,0 +1,70 @@
+require 'test/unit'
+require 'axlsx.rb'
+
+class TestHyperlink < Test::Unit::TestCase
+
+  def setup
+    @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, :hyperlink => "http://axlsx.blogspot.com"
+    @hyperlink = @image.hyperlink
+  end
+
+  def teardown
+  end
+
+
+  def test_href
+    assert_nothing_raised { @hyperlink.href = "http://axlsx.blogspot.com" }
+    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")
+  end
+
+  def test_tooltip
+    assert_nothing_raised { @hyperlink.tooltip = "http://axlsx.blogspot.com" }
+    assert_equal(@hyperlink.tooltip, "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_action
+    assert_nothing_raised { @hyperlink.action = "flee" }
+    assert_equal(@hyperlink.action, "flee")
+  end
+
+  def test_endSnd
+    assert_nothing_raised { @hyperlink.endSnd = "true" }
+    assert_raise(ArgumentError) {@hyperlink.endSnd = "bob"}
+    assert_equal(@hyperlink.endSnd, "true")
+  end
+
+  def test_highlightClick
+    assert_nothing_raised { @hyperlink.highlightClick = false }
+    assert_raise(ArgumentError) {@hyperlink.highlightClick = "bob"}
+    assert_equal(@hyperlink.highlightClick, false )
+  end
+
+  def test_id
+    assert_equal(@hyperlink.send(:id), 2)
+  end
+
+  def test_history
+    assert_nothing_raised { @hyperlink.history = false }
+    assert_raise(ArgumentError) {@hyperlink.history = "bob"}
+    assert_equal(@hyperlink.history, false )
+  end
+  
+end

data/test/drawing/tc_hyperlink.rb~

@@ -0,0 +1,71 @@
+require 'test/unit'
+require 'axlsx.rb'
+
+class TestPic < Test::Unit::TestCase
+
+  def setup
+    @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
+  end
+
+  def teardown
+  end
+
+  def test_initialization
+    assert_equal(@p.workbook.images.first, @image)
+    assert_equal(@image.image_src, @test_img)
+  end
+
+  def test_name
+    assert_raise(ArgumentError) { @image.name = 49 }
+    assert_nothing_raised { @image.name = "unknown" }
+    assert_equal(@image.name, "unknown")
+  end
+
+  def test_start_at
+    assert_raise(ArgumentError) { @image.start_at "a", 1 }
+    assert_nothing_raised { @image.start_at 6, 7 }
+    assert_equal(@image.anchor.from.col, 6)
+    assert_equal(@image.anchor.from.row, 7)
+  end
+
+  def test_width
+    assert_raise(ArgumentError) { @image.width = "a" }
+    assert_nothing_raised { @image.width = 600 }
+    assert_equal(@image.width, 600)   
+  end
+
+  def test_height
+    assert_raise(ArgumentError) { @image.height = "a" }
+    assert_nothing_raised { @image.height = 600 }
+    assert_equal(600, @image.height)   
+  end
+
+  def test_image_src
+    assert_raise(ArgumentError) { @image.image_src = 49 }
+    assert_raise(ArgumentError) { @image.image_src = 'Unknown' }
+    assert_raise(ArgumentError) { @image.image_src = __FILE__ }
+    assert_nothing_raised { @image.image_src = @test_img }
+    assert_equal(@image.image_src, @test_img)
+  end
+
+  def test_descr
+    assert_raise(ArgumentError) { @image.descr = 49 }
+    assert_nothing_raised { @image.descr = "test" }
+    assert_equal(@image.descr, "test")
+  end
+ 
+  def test_to_xml
+    schema = Nokogiri::XML::Schema(File.open(Axlsx::DRAWING_XSD))
+    doc = Nokogiri::XML(@image.anchor.drawing.to_xml)
+    errors = []
+    schema.validate(doc).each do |error|
+      errors.push error
+      puts error.message
+    end
+    assert(errors.empty?, "error free validation")
+  end  
+  
+end

data/test/drawing/tc_pic.rb

@@ -17,6 +17,12 @@ class TestPic < Test::Unit::TestCase
     assert_equal(@p.workbook.images.first, @image)
     assert_equal(@image.image_src, @test_img)
   end
+  
+  def test_hyperlink
+    assert_equal(@image.hyperlink, nil)
+    @image.hyperlink = "http://axlsx.blogspot.com"
+    assert_equal(@image.hyperlink.href, "http://axlsx.blogspot.com")
+  end
 
   def test_name
     assert_raise(ArgumentError) { @image.name = 49 }

data/test/rels/tc_relationship.rb

@@ -13,4 +13,9 @@ class TestRelationships < Test::Unit::TestCase
     assert_nothing_raised { Axlsx::Relationship.new Axlsx::WORKSHEET_R, 'target' }
   end
 
+  def test_target_mode
+    assert_raise(ArgumentError) { Axlsx::Relationship.new 'type', 'target', :target_mode => "FISH" }
+    assert_nothing_raised { Axlsx::Relationship.new( Axlsx::WORKSHEET_R, 'target', :target_mode => :External) }
+  end
+
 end

data/test/workbook/worksheet/tc_worksheet.rb

@@ -69,6 +69,13 @@ class TestWorksheet < Test::Unit::TestCase
     assert_equal(@ws.rows.first.cells[0].style, 0)
   end
 
+  def test_col_style_with_empty_column
+    @ws.add_row [1,2,3,4]
+    @ws.add_row [1]
+    @ws.add_row [1,2,3,4]
+    assert_nothing_raised {@ws.col_style(1, 1)}
+  end
+
   def test_cols
     @ws.add_row [1,2,3,4]
     @ws.add_row [1,2,3,4]

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: axlsx
 version: !ruby/object:Gem::Version
-  version: 1.0.15
+  version: 1.0.16
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-01-06 00:00:00.000000000 Z
+date: 2012-02-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2155999180 !ruby/object:Gem::Requirement
+  requirement: &2152839280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: 1.4.1
   type: :runtime
   prerelease: false
-  version_requirements: *2155999180
+  version_requirements: *2152839280
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &2155993560 !ruby/object:Gem::Requirement
+  requirement: &2152838780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.3.9
   type: :runtime
   prerelease: false
-  version_requirements: *2155993560
+  version_requirements: *2152838780
 - !ruby/object:Gem::Dependency
   name: i18n
-  requirement: &2153146240 !ruby/object:Gem::Requirement
+  requirement: &2152838320 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 0.6.0
   type: :runtime
   prerelease: false
-  version_requirements: *2153146240
+  version_requirements: *2152838320
 - !ruby/object:Gem::Dependency
   name: rmagick
-  requirement: &2153145780 !ruby/object:Gem::Requirement
+  requirement: &2152837860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,10 +54,10 @@ dependencies:
         version: 2.12.2
   type: :runtime
   prerelease: false
-  version_requirements: *2153145780
+  version_requirements: *2152837860
 - !ruby/object:Gem::Dependency
   name: rubyzip
-  requirement: &2153145320 !ruby/object:Gem::Requirement
+  requirement: &2152837400 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: '0.9'
   type: :runtime
   prerelease: false
-  version_requirements: *2153145320
+  version_requirements: *2152837400
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &2153144780 !ruby/object:Gem::Requirement
+  requirement: &2152836860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -76,10 +76,10 @@ dependencies:
         version: '0.9'
   type: :development
   prerelease: false
-  version_requirements: *2153144780
+  version_requirements: *2152836860
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153144400 !ruby/object:Gem::Requirement
+  requirement: &2152836480 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -87,10 +87,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153144400
+  version_requirements: *2152836480
 - !ruby/object:Gem::Dependency
   name: yard
-  requirement: &2153143940 !ruby/object:Gem::Requirement
+  requirement: &2152836020 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -98,10 +98,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153143940
+  version_requirements: *2152836020
 - !ruby/object:Gem::Dependency
   name: rdiscount
-  requirement: &2153143520 !ruby/object:Gem::Requirement
+  requirement: &2152835600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -109,7 +109,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2153143520
+  version_requirements: *2152835600
 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
@@ -136,6 +136,9 @@ files:
 - lib/axlsx/drawing/chart.rb
 - lib/axlsx/drawing/drawing.rb
 - lib/axlsx/drawing/graphic_frame.rb
+- lib/axlsx/drawing/hlink_click.rb~
+- lib/axlsx/drawing/hyperlink.rb
+- lib/axlsx/drawing/hyperlink.rb~
 - lib/axlsx/drawing/line_3D_chart.rb
 - lib/axlsx/drawing/line_series.rb
 - lib/axlsx/drawing/marker.rb
@@ -254,14 +257,14 @@ files:
 - test/drawing/tc_chart.rb
 - test/drawing/tc_drawing.rb
 - test/drawing/tc_graphic_frame.rb
+- test/drawing/tc_hyperlink.rb
+- test/drawing/tc_hyperlink.rb~
 - test/drawing/tc_line_3d_chart.rb
 - test/drawing/tc_line_series.rb
-- test/drawing/tc_line_series.tc~
 - test/drawing/tc_marker.rb
 - test/drawing/tc_one_cell_anchor.rb
 - test/drawing/tc_pic.rb
 - test/drawing/tc_picture_locking.rb
-- test/drawing/tc_picture_locking.rb~
 - test/drawing/tc_pie_3D_chart.rb
 - test/drawing/tc_pie_series.rb
 - test/drawing/tc_scaling.rb
@@ -337,14 +340,14 @@ test_files:
 - test/drawing/tc_chart.rb
 - test/drawing/tc_drawing.rb
 - test/drawing/tc_graphic_frame.rb
+- test/drawing/tc_hyperlink.rb
+- test/drawing/tc_hyperlink.rb~
 - test/drawing/tc_line_3d_chart.rb
 - test/drawing/tc_line_series.rb
-- test/drawing/tc_line_series.tc~
 - test/drawing/tc_marker.rb
 - test/drawing/tc_one_cell_anchor.rb
 - test/drawing/tc_pic.rb
 - test/drawing/tc_picture_locking.rb
-- test/drawing/tc_picture_locking.rb~
 - test/drawing/tc_pie_3D_chart.rb
 - test/drawing/tc_pie_series.rb
 - test/drawing/tc_scaling.rb

data/test/drawing/tc_line_series.tc~

@@ -1,34 +0,0 @@
-require 'test/unit'
-require 'axlsx.rb'
-
-class TestLineSeries < Test::Unit::TestCase
-
-  def setup
-    p = Axlsx::Package.new
-    @ws = p.workbook.add_worksheet :name=>"hmmm"
-    chart = @ws.drawing.add_chart Axlsx::Bar3DChart, :title => "fishery"
-    @series = chart.add_series :data=>[0,1,2], :labels=>["zero", "one", "two"], :title=>"bob"
-  end
-  
-  def test_initialize
-    assert_equal(@series.title, "bob", "series title has been applied")
-    assert_equal(@series.data, [0,1,2], "data option applied")
-    assert_equal(@series.labels, ["zero", "one","two"], "labels option applied")    
-    assert_equal(@series.shape, :box, "series shape has been applied")   
-  end
-
-  def test_data
-    assert_equal(@series.data, [0,1,2])
-  end
-
-  def test_labels
-    assert_equal(@series.labels, ["zero", "one", "two"])
-  end
-
-  def test_shape
-    assert_raise(ArgumentError, "require valid shape") { @series.shape = :teardropt }
-    assert_nothing_raised("allow valid shape") { @series.shape = :cone }
-    assert(@series.shape == :cone)
-  end
-
-end

data/test/drawing/tc_picture_locking.rb~

@@ -1,77 +0,0 @@
-require 'test/unit'
-require 'axlsx.rb'
-
-class TestPictureLocking < Test::Unit::TestCase
-  def setup    
-    @item = Axlsx::CellAlignment.new
-  end
-  def teardown
-  end
-  def test_initialiation
-    assert_equal(@item.horizontal, nil)
-    assert_equal(@item.vertical, nil)
-    assert_equal(@item.textRotation, nil)
-    assert_equal(@item.wrapText, nil)
-    assert_equal(@item.indent, nil)
-    assert_equal(@item.relativeIndent, nil)
-    assert_equal(@item.justifyLastLine, nil)
-    assert_equal(@item.shrinkToFit, nil)
-    assert_equal(@item.readingOrder, nil)
-
-  end
-
-  def test_horizontal
-    assert_raise(ArgumentError) { @item.horizontal = :red }
-    assert_nothing_raised { @item.horizontal = :left }
-    assert_equal(@item.horizontal, :left )
-  end
-
-  def test_vertical
-    assert_raise(ArgumentError) { @item.vertical = :red }
-    assert_nothing_raised { @item.vertical = :top }
-    assert_equal(@item.vertical, :top )
-  end
-
-  def test_textRotation
-    assert_raise(ArgumentError) { @item.textRotation = -1 }
-    assert_nothing_raised { @item.textRotation = 5 }
-    assert_equal(@item.textRotation, 5 )
-  end
-
-  def test_wrapText
-    assert_raise(ArgumentError) { @item.wrapText = -1 }
-    assert_nothing_raised { @item.wrapText = false }
-    assert_equal(@item.wrapText, false )
-  end
-
-  def test_indent
-    assert_raise(ArgumentError) { @item.indent = -1 }
-    assert_nothing_raised { @item.indent = 5 }
-    assert_equal(@item.indent, 5 )
-  end
-
-  def test_relativeIndent
-    assert_raise(ArgumentError) { @item.relativeIndent = :symbol }
-    assert_nothing_raised { @item.relativeIndent = 5 }
-    assert_equal(@item.relativeIndent, 5 )
-  end
-
-  def test_justifyLastLine
-    assert_raise(ArgumentError) { @item.justifyLastLine = -1 }
-    assert_nothing_raised { @item.justifyLastLine = true }
-    assert_equal(@item.justifyLastLine, true )
-  end
-
-  def test_shrinkToFit
-    assert_raise(ArgumentError) { @item.shrinkToFit = -1 }
-    assert_nothing_raised { @item.shrinkToFit = true }
-    assert_equal(@item.shrinkToFit, true )
-  end
-
-  def test_readingOrder
-    assert_raise(ArgumentError) { @item.readingOrder = -1 }
-    assert_nothing_raised { @item.readingOrder = 2 }
-    assert_equal(@item.readingOrder, 2 )
-  end
-
-end