writeexcel 0.6.10 → 0.6.11

data/README.rdoc

@@ -76,6 +76,9 @@ You must save source file in UTF8 and run ruby with -Ku option or set $KCODE='u'
 when use urf8 string data.
 
 == Recent Changes
+v0.6.11
+* Bug fix issue 15. Worksheet#write_comment on the same row overwrite other comments.
+
 v0.6.10
 * Bug fix. method missing split_string_setup() in shared_string_table.rb. see https://github.com/cxn03651/writeexcel/pull/13
 

data/VERSION

@@ -1 +1 @@
-0.6.10
+0.6.11

data/lib/writeexcel/comments.rb

@@ -9,7 +9,11 @@ class Worksheet < BIFFWriter
     end
 
     def <<(item)
-      @items[item.row] = { item.col => item }
+      if @items[item.row]
+        @items[item.row][item.col] = item
+      else
+        @items[item.row] = { item.col => item }
+      end
     end
 
     def array
@@ -109,7 +113,7 @@ class Worksheet < BIFFWriter
         ruby_19 { comment_author.force_encoding('BINARY') + "\0".force_encoding('BINARY') }
 
       # Pack the record.
-      data    = [row, col, comment_visible, obj_id, num_chars, comment_author_enc].pack("vvvvvC")
+      data    = [@row, @col, comment_visible, obj_id, num_chars, comment_author_enc].pack("vvvvvC")
 
       length  = data.bytesize + comment_author.bytesize
       header  = [record, length].pack("vv")

data/lib/writeexcel/compatibility.rb

@@ -35,12 +35,6 @@ class String #:nodoc:
       self[0]
     end
   end
-
-  unless "".respond_to?(:ascii_only?)
-    def ascii_only?
-      !!(self =~ /[^!"#\$%&'\(\)\*\+,\-\.\/\:\;<=>\?@0-9A-Za-z_\[\\\]\{\}^` ~\0\n]/)
-    end
-  end
 end
 
 unless File.respond_to?(:binread)

data/lib/writeexcel/image.rb

@@ -204,7 +204,7 @@ module Writeexcel
     end
 
     def images_child_msodrawing_record(spid, image_id, vertices)
-      data = @worksheet.store_mso_sp_container(76) + store_mso_sp(75, spid, 0x0A00)
+      data = @worksheet.store_mso_sp_container(76) + @worksheet.store_mso_sp(75, spid, 0x0A00)
       spid = spid + 1
       data += @worksheet.store_mso_opt_image(image_id)    +
         @worksheet.store_mso_client_anchor(2, *vertices)  +