writeexcel 0.6.19 → 1.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9f08faee160c80efda98d7e3f42d07aa547a92ca
-  data.tar.gz: d1e75487c065ad0ac74dc978aac6218c21621aa3
+  metadata.gz: 702289cea8e425bbac18a6d8f80c4576cbf20161
+  data.tar.gz: b1957b4f76a19077b31f11183f0a8bcec2ba4553
 SHA512:
-  metadata.gz: c6e152b9677247808da606c2bacb7f403b4c45f3f6f093ce6958a5de510d1bac8c81adb3f2e47591ffa79183f348db3c5f4429264c4d96abc81783eb6e6cb33f
-  data.tar.gz: 61d1223ff7e8884ec3a92d79b8ec6af8d0f15696d0f1958c4a0a45c813d2aee5deebe0b470d6028423562a518265fd1f224d17b850c451ad506a324f71f937e2
+  metadata.gz: d37342053b25ef225bbd72facd93e71058c401d6d002ad579e5b6265f78b2dce090dfd597f9a984e37824f2574997fabc8ec55c849467e0bba88c2443c278dec
+  data.tar.gz: 2a4e84a327faee73ffb11784a5cde5dd267bd998a508821509e713e104f87241b04b836472b3ca47f871368858c36a70f7a70c80c67d762066f937828c3d720d

data/README.rdoc

@@ -5,10 +5,7 @@ Write to a cross-platform Excel binary file.
 == Description
 
 This library is converted from Spreadsheet::WriteExcel module of Perl.
-http://search.cpan.org/~jmcnamara/Spreadsheet-WriteExcel-2.37/
-
-Some examples written in perl was successfully converted to Ruby. But
-this library written in Ruby has many bugs, I think.
+http://search.cpan.org/~jmcnamara/Spreadsheet-WriteExcel-2.38/
 
 Original description is below:
 
@@ -42,8 +39,8 @@ Or install it yourself as:
 
 == Usage
 
-See rdoc's WriteExcel class document or Reference http://writeexcel.web.fc2.com/ .
-You must save source file in UTF8 and run ruby with -Ku option or set $KCODE='u'.
+See Reference http://writeexcel.web.fc2.com/ .
+You must save source file in UTF8, and run ruby with -Ku option or set $KCODE='u' in Ruby 1.8.
 
 Example Code:
 
@@ -84,12 +81,10 @@ Example Code:
   * ignore. if write 0001, use string such as write(1,2, '0001')
 * and ......
 
-== Caution
-
-You must save source file in UTF8 and run ruby with -Ku option or set $KCODE='u'
-when use urf8 string data.
-
-== Recent Changes
+== Recent Change
+v1.0.0
+* Bug fix in Workbook#set_properties.
+s
 v0.6.19
 * Bug fix in Worksheet#write_url_internal
 

data/examples/properties.rb

@@ -1,4 +1,4 @@
-#!/usr/bin/ruby -w
+#!/usr/bin/ruby
 # -*- coding: utf-8 -*-
 
 ##############################################################################
@@ -15,7 +15,7 @@
 
 workbook  = WriteExcel.new('properties.xls')
 worksheet = workbook.add_worksheet
-bp =1
+
 workbook.set_properties(
     :title    => 'This is an example spreadsheet',
     :subject  => 'With document properties',

data/lib/writeexcel/col_info.rb

@@ -4,8 +4,6 @@ class Worksheet < BIFFWriter
   require 'writeexcel/helper'
 
   class ColInfo
-    attr_reader :level
-
     #
     #   new(firstcol, lastcol, width, [format, hidden, level, collapsed])
     #

data/lib/writeexcel/properties.rb

@@ -226,14 +226,16 @@ def pack_VT_FILETIME(localtime)       #:nodoc:
 
   epoch = DateTime.new(1601, 1, 1)
 
+  t = localtime.getgm
+
   datetime = DateTime.new(
-                localtime.year,
-                localtime.mon,
-                localtime.mday,
-                localtime.hour,
-                localtime.min,
-                localtime.sec,
-                localtime.usec
+                t.year,
+                t.mon,
+                t.mday,
+                t.hour,
+                t.min,
+                t.sec,
+                t.usec
               )
   bignum = (datetime - epoch) * 86400 * 1e7.to_i
   high, low = bignum.divmod 1 << 32

data/lib/writeexcel/storage_lite.rb

@@ -669,15 +669,18 @@ def _saveHeader(rh_info, iSBDcnt, iBBcnt, iPPScnt)
     iAllW = iAll
     iBdCntW  = iAllW / iBlCnt
     iBdCntW += 1 if iAllW % iBlCnt > 0
-    iBdCnt = 0
-    #0.1 Calculate BD count
-    iBlCnt -= 1 #the BlCnt is reduced in the count of the last sect is used for a pointer the next Bl
-    iBBleftover = iAll - i1stBdMax
-    if iAll >i1stBdMax
-      iBdCnt, iBdExL, iBBleftover = calc_idbcnt_idbexl_ibbleftover(iBBleftover, iBlCnt, iBdCnt, iBdExL)
+    iBdCnt = ((iAll + iBdCntW) / iBlCnt).to_i
+    iBdCnt += ((iAllW + iBdCntW) % iBlCnt) == 0 ? 0 : 1
+    if iBdCnt > i1stBdL
+      #0.1 Calculate BD count
+      iBlCnt -= 1 #the BlCnt is reduced in the count of the last sect is used for a pointer the next Bl
+      iBBleftover = iAll - i1stBdMax
+      if iAll >i1stBdMax
+        iBdCnt, iBdExL, iBBleftover = calc_idbcnt_idbexl_ibbleftover(iBBleftover, iBlCnt, iBdCnt, iBdExL)
+      end
+      iBdCnt += i1stBdL
+      #print "iBdCnt = iBdCnt \n"
     end
-    iBdCnt += i1stBdL
-    #print "iBdCnt = iBdCnt \n"
 
     #1.Save Header
     data = [
@@ -694,8 +697,8 @@ def _saveHeader(rh_info, iSBDcnt, iBBcnt, iPPScnt)
           [iBBcnt+iSBDcnt].pack("V"),        #ROOT START
           [0].pack("V"),
           [0x1000].pack("V"),
-          [0].pack("V"),                     #Small Block Depot
-          [1].pack("V")
+          [iSBDcnt == 0 ? -2 : 0].pack("V"),                     #Small Block Depot
+          [iSBDcnt].pack("V")
       ]
     file.write(
       ruby_18 { data.join('') } ||
@@ -805,9 +808,9 @@ def _savePpsSetPnt(pps_array, aList, rh_info)
       aWk = pps_array.dup
       #1.3.2 Devide a array into Previous,Next
       aPrev = aWk[0, iPos]
-      aWk[0..iPos-1] = nil
+      aWk[0..iPos-1] = []
       aNext = aWk[1, iCnt - iPos - 1]
-      aWk[1..(1 + iCnt - iPos -1 -1)] = nil
+      aWk[1..(1 + iCnt - iPos -1 -1)] = []
       pps_array[iPos].prev_pps = _savePpsSetPnt(aPrev, aList, rh_info)
       pps_array[iPos].next_pps = _savePpsSetPnt(aNext, aList, rh_info)
       pps_array[iPos].dir_pps  = _savePpsSetPnt(pps_array[iPos].child, aList, rh_info)
@@ -837,7 +840,7 @@ def _savePpsSetPnt2(pps_array, aList, rh_info)
 
       aWk = pps_array.dup
       aPrev = aWk[1, 1]
-      aWk[1..1] = nil
+      aWk[1..1] = []
       aNext = aWk[1..aWk.size]      #, $iCnt - $iPos -1);
       pps_array[iPos].prev_pps = _savePpsSetPnt2(pps_array, aList, rh_info)
       aList.push(pps_array[iPos])

data/lib/writeexcel/version.rb

@@ -1,5 +1,5 @@
 require 'writeexcel'
 
 class WriteExcel < Workbook
-  VERSION = "0.6.19"
+  VERSION = "1.0.0"
 end

data/test/test_21_escher.rb

@@ -492,14 +492,6 @@ def test_for_store_mso_split_menu_colors
     assert_equal(target, result, caption)
   end
 
-  ###############################################################################
-  #
-  # Unpack the binary data into a format suitable for printing in tests.
-  #
-  def unpack_record(data)
-    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
-  end
-
   def data_for_test
     return [
       [   'DggContainer',                 # Caption

data/test/test_22_mso_drawing_group.rb

@@ -739,12 +739,4 @@ def test_3_sheets_1024_and_1024_and_1_times_duplicate
 
   end
 =end
-  ###############################################################################
-  #
-  # Unpack the binary data into a format suitable for printing in tests.
-  #
-  def unpack_record(data)
-    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
-  end
-
 end

data/test/test_23_note.rb

@@ -54,13 +54,4 @@ def test_defined_author_name
     result = unpack_record(comment.store_note_record(obj_id))
     assert_equal(target, result, caption)
   end
-
-  ###############################################################################
-  #
-  # Unpack the binary data into a format suitable for printing in tests.
-  #
-  def unpack_record(data)
-    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
-  end
-
 end

data/test/test_24_txo.rb

@@ -71,13 +71,4 @@ def test_second_continue_record_after_txo
     result     = unpack_record(comment.__send__("store_txo_continue_2", formats))
     assert_equal(target, result, caption)
   end
-
-  ###############################################################################
-  #
-  # Unpack the binary data into a format suitable for printing in tests.
-  #
-  def unpack_record(data)
-    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
-  end
-
 end

data/test/test_30_validation_dval.rb

@@ -71,13 +71,4 @@ def test_3
     result     = unpack_record(@validations.__send__("dval_record", obj_id, dv_count))
     assert_equal(target, result, caption)
   end
-
-  ###############################################################################
-  #
-  # Unpack the binary data into a format suitable for printing in tests.
-  #
-  def unpack_record(data)
-    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
-  end
-
 end

data/test/test_31_validation_dv_strings.rb

@@ -120,13 +120,4 @@ def test_string_longer_than_32_characters_for_dialog_messages
     result     = unpack_record(@data_validation.__send__("pack_dv_string", string, max_length))
     assert_equal(target, result, caption)
   end
-
-  ###############################################################################
-  #
-  # Unpack the binary data into a format suitable for printing in tests.
-  #
-  def unpack_record(data)
-    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
-  end
-
 end

data/test/test_32_validation_dv_formula.rb

@@ -207,13 +207,4 @@ def test_pack_dv_formula_should_not_change_formula_string
 
     assert_equal('=SUM(A1:D1)', formula)
   end
-
-  ###############################################################################
-  #
-  # Unpack the binary data into a format suitable for printing in tests.
-  #
-  def unpack_record(data)
-    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
-  end
-
 end

data/test/test_40_property_types.rb

@@ -176,13 +176,4 @@ def test_pack_a_VT_FILETIME
     result     = unpack_record( pack_VT_FILETIME(filetime) )
     assert_equal(target, result, caption)
   end
-
-  ###############################################################################
-  #
-  # Unpack the binary data into a format suitable for printing in tests.
-  #
-  def unpack_record(data)
-    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
-  end
-
 end

data/test/test_41_properties.rb

@@ -223,13 +223,4 @@ def test_same_as_previous_plus_creation_date
     result     = unpack_record( create_summary_property_set(properties))
     assert_equal(target, result, caption)
   end
-
-  ###############################################################################
-  #
-  # Unpack the binary data into a format suitable for printing in tests.
-  #
-  def unpack_record(data)
-    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
-  end
-
 end

data/test/test_42_set_properties.rb

@@ -431,13 +431,4 @@ def test_same_as_previous_plus_creation_date
   workbook.close
 
   end
-
-  ###############################################################################
-  #
-  # Unpack the binary data into a format suitable for printing in tests.
-  #
-  def unpack_record(data)
-    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
-  end
-
 end

data/test/test_60_chart_generic.rb

@@ -567,8 +567,4 @@ def test_store_serauxtrend
     got = unpack_record(@chart.__send__("store_serauxtrend", *values))
     assert_equal(expected, got, caption)
   end
-
-  def unpack_record(data)
-    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
-  end
 end

data/test/test_63_chart_area_formats.rb

@@ -638,8 +638,4 @@ def get_plotarea_formats(chart)
 
     [line, area]
   end
-
-  def unpack_record(data)
-    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
-  end
 end

data/test/test_example_match.rb

@@ -3421,4 +3421,38 @@ def test_compatibility_mode_write_number
     # do assertion
     compare_file("#{PERL_OUTDIR}/compatibility_mode_write_number.xls", @file)
   end
+
+  def test_properties
+    workbook  = WriteExcel.new(@file)
+
+    #
+    # adjust @localtime to target xls file.
+    #
+    workbook.instance_variable_set(
+                                   :@localtime,
+                                   Time.local(2013, 5, 5, 22, 37, 42)
+                                   )
+
+    worksheet = workbook.add_worksheet
+
+    workbook.set_properties(
+                            :title    => 'This is an example spreadsheet',
+                            :subject  => 'With document properties',
+                            :author   => 'Hideo NAKAMURA',
+                            :manager  => 'John McNamara',
+                            :company  => 'Rubygem',
+                            :category => 'Example spreadsheets',
+                            :keywords => 'Sample, Example, Properties',
+                            :comments => 'Created with Ruby and WriteExcel'
+                            )
+
+
+    worksheet.set_column('A:A', 50)
+    worksheet.write('A1', 'Select File->Properties to see the file properties')
+
+    workbook.close
+
+    # do assertion
+    compare_file("#{PERL_OUTDIR}/properties.xls", @file)
+  end
 end

data/test/test_properties.rb

@@ -0,0 +1,34 @@
+# -*- coding: utf-8 -*-
+
+require 'helper'
+require 'stringio'
+
+class TestProperties < Test::Unit::TestCase
+  def setup
+    @workbook = WriteExcel.new(StringIO.new)
+  end
+
+  def test_pack_VT_FILETIME
+    assert_equal(
+                 '40 00 00 00 00 FD 2D ED CE 48 CE 01',
+                 unpack_record(pack_VT_FILETIME(Time.local(2013, 5, 4, 22, 54, 42)))
+                 )
+  end
+
+  def test_create_summary_property_set
+    assert_equal(
+                 'FE FF 00 00 05 01 02 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 00 01 00 00 00 E0 85 9F F2 F9 4F 68 10 AB 91 08 00 2B 27 B3 D9 30 00 00 00 08 01 00 00 07 00 00 00 01 00 00 00 40 00 00 00 02 00 00 00 48 00 00 00 03 00 00 00 70 00 00 00 04 00 00 00 94 00 00 00 05 00 00 00 AC 00 00 00 06 00 00 00 D0 00 00 00 0C 00 00 00 FC 00 00 00 02 00 00 00 E4 04 00 00 1E 00 00 00 1F 00 00 00 54 68 69 73 20 69 73 20 61 6E 20 65 78 61 6D 70 6C 65 20 73 70 72 65 61 64 73 68 65 65 74 00 00 1E 00 00 00 19 00 00 00 57 69 74 68 20 64 6F 63 75 6D 65 6E 74 20 70 72 6F 70 65 72 74 69 65 73 00 00 00 00 1E 00 00 00 0F 00 00 00 48 69 64 65 6F 20 4E 41 4B 41 4D 55 52 41 00 00 1E 00 00 00 1C 00 00 00 53 61 6D 70 6C 65 2C 20 45 78 61 6D 70 6C 65 2C 20 50 72 6F 70 65 72 74 69 65 73 00 1E 00 00 00 21 00 00 00 43 72 65 61 74 65 64 20 77 69 74 68 20 52 75 62 79 20 61 6E 64 20 57 72 69 74 65 45 78 63 65 6C 00 00 00 00 40 00 00 00 00 62 93 81 C5 48 CE 01',
+                 unpack_record(create_summary_property_set(
+                                       [
+                                        [1, "VT_I2", 1252],
+                                        [2, "VT_LPSTR", "This is an example spreadsheet"],
+                                        [3, "VT_LPSTR", "With document properties"],
+                                        [4, "VT_LPSTR", "Hideo NAKAMURA"],
+                                        [5, "VT_LPSTR", "Sample, Example, Properties"],
+                                        [6, "VT_LPSTR", "Created with Ruby and WriteExcel"],
+                                        [12, "VT_FILETIME", Time.local(2013, 5, 4, 21, 47, 16)]
+                                       ]
+                                             ))
+                 )
+  end
+end

data/test/test_storage_lite.rb

@@ -43,11 +43,6 @@ def test_ucs2asc
       assert_equal(str, result)
     end
   end
-
-  def unpack_record(data)
-    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
-  end
-
 end
 
 class TC_OLEStorageLitePPSFile < Test::Unit::TestCase
@@ -108,9 +103,4 @@ def test_append_stringio
       assert_equal(d, pps_file.read)
     end
   end
-
-  def unpack_record(data)
-    data.unpack('C*').map! {|c| sprintf("%02X", c) }.join(' ')
-  end
-
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: writeexcel
 version: !ruby/object:Gem::Version
-  version: 0.6.19
+  version: 1.0.0
 platform: ruby
 authors:
 - Hideo NAKAMURA
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-30 00:00:00.000000000 Z
+date: 2013-05-06 00:00:00.000000000 Z
 dependencies: []
 description: Multiple worksheets can be added to a workbook and formatting can be
   applied to cells. Text, numbers, formulas, hyperlinks and images can be written
@@ -209,6 +209,7 @@ files:
 - test/perl_output/outline_collapsed.xls
 - test/perl_output/panes.xls
 - test/perl_output/password_protection.xls
+- test/perl_output/properties.xls
 - test/perl_output/protection.xls
 - test/perl_output/regions.xls
 - test/perl_output/right_to_left.xls
@@ -269,6 +270,7 @@ files:
 - test/test_format.rb
 - test/test_formula.rb
 - test/test_ole.rb
+- test/test_properties.rb
 - test/test_storage_lite.rb
 - test/test_workbook.rb
 - test/test_worksheet.rb
@@ -364,6 +366,7 @@ test_files:
 - test/perl_output/outline_collapsed.xls
 - test/perl_output/panes.xls
 - test/perl_output/password_protection.xls
+- test/perl_output/properties.xls
 - test/perl_output/protection.xls
 - test/perl_output/regions.xls
 - test/perl_output/right_to_left.xls
@@ -424,6 +427,7 @@ test_files:
 - test/test_format.rb
 - test/test_formula.rb
 - test/test_ole.rb
+- test/test_properties.rb
 - test/test_storage_lite.rb
 - test/test_workbook.rb
 - test/test_worksheet.rb