spreadsheet 0.6.7 → 0.6.8

data/History.txt

@@ -1,3 +1,8 @@
+=== 0.6.8 / 20.01.2012
+
+* adds the fix to allow the writing of empty rows, by ClemensP.
+* Test also by ClemensP.
+
 === 0.6.7 / 18.01.2012
 
 * http://dev.ywesee.com/wiki.php/Gem/Spreadsheet points point 2.

data/lib/spreadsheet.rb

@@ -42,7 +42,7 @@ module Spreadsheet
 
   ##
   # The version of Spreadsheet you are using.
-  VERSION = '0.6.7'
+  VERSION = '0.6.8'
 
   ##
   # Default client Encoding. Change this value if your application uses a

data/lib/spreadsheet/excel/writer/worksheet.rb

@@ -756,14 +756,18 @@ and minimal code that generates this warning. Thanks!
              else
                height * TWIPS
              end
-    # TODO: Row spacing
-    data = [
+
+    attrs = [
       row.idx,
       row.first_used,
       row.first_unused,
       height,
-      opts,
-    ].pack binfmt(:row)
+      opts]
+
+    return if attrs.any?(&:nil?)
+
+    # TODO: Row spacing
+    data = attrs.pack binfmt(:row)
     write_op opcode(:row), data
   end
   def write_rowblock block

data/test/excel/writer/worksheet.rb

@@ -7,34 +7,49 @@ require 'spreadsheet/excel/writer/worksheet'
 module Spreadsheet
   module Excel
     module Writer
-class TestWorksheet < Test::Unit::TestCase
-  def test_need_number
-    sheet = Worksheet.new nil, nil
-    assert_equal false, sheet.need_number?(10)
-    assert_equal false, sheet.need_number?(114.55)
-    assert_equal false, sheet.need_number?(0.1)
-    assert_equal false, sheet.need_number?(0.01)
-    assert_equal false, sheet.need_number?(0 / 0.0) # NaN
-    assert_equal true, sheet.need_number?(0.001)
-    assert_equal true, sheet.need_number?(10000000.0)
-  end
-  def test_write_merged_cells
-    # top/bottom/left/right cell of test range 1/2
-    r1t, r1b, r1l, r1r = 0, 0, 0, 1
-    r2t, r2b, r2l, r2r = 1, 2, 0, 0
-    book = Spreadsheet::Workbook.new
-    sheet = book.create_worksheet
-    sheet.merge_cells(r1t, r1l, r1b, r1r)
-    sheet.merge_cells(r2t, r2l, r2b, r2r)
-    assert_equal [[r1t, r1b, r1l, r1r], [r2t, r2b, r2l, r2r]], sheet.merged_cells
-    io = StringIO.new
-    book.write(io)
-    book2 = Spreadsheet.open(io)
-    sheet2 = book2.worksheet(0)
-    sheet2[0,0] # trigger read_worksheet
-    assert_equal [[r1t, r1b, r1l, r1r], [r2t, r2b, r2l, r2r]], sheet2.merged_cells
-  end
-end
+     class TestWorksheet < Test::Unit::TestCase
+        def test_need_number
+          sheet = Worksheet.new nil, nil
+          assert_equal false, sheet.need_number?(10)
+          assert_equal false, sheet.need_number?(114.55)
+          assert_equal false, sheet.need_number?(0.1)
+          assert_equal false, sheet.need_number?(0.01)
+          assert_equal false, sheet.need_number?(0 / 0.0) # NaN
+          assert_equal true, sheet.need_number?(0.001)
+          assert_equal true, sheet.need_number?(10000000.0)
+        end
+
+        class RowMock
+          attr_accessor :idx, :first_used, :first_unused, :height, :outline_level
+
+          def initialize
+            @idx, @first_used, @first_unused, @height, @outline_level = 0,0,0,0,1
+          end
+
+          def method_missing name, *args
+            nil
+          end
+        end
+
+        def test_write_row_should_not_write_if_the_row_has_no_used_columns
+          sheet = Worksheet.new nil, nil
+          row = RowMock.new
+          row.first_used = nil
+
+          sheet.write_row row
+
+          assert_equal '', sheet.data
+        end
+
+        def test_write_row_should_write_if_any_column_is_used
+          sheet = Worksheet.new nil, nil
+          row = RowMock.new
+
+          sheet.write_row row
+
+          assert_equal false, sheet.data.empty?
+        end
+      end
     end
   end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: spreadsheet
 version: !ruby/object:Gem::Version 
-  hash: 9
+  hash: 23
   prerelease: 
   segments: 
   - 0
   - 6
-  - 7
-  version: 0.6.7
+  - 8
+  version: 0.6.8
 platform: ruby
 authors: 
 - Masaomi Hatakeyama, Zeno R.R. Davatz
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2012-01-18 00:00:00 Z
+date: 2012-01-20 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: ruby-ole