spreadsheet 0.6.5.8 → 0.6.5.9

data/History.txt

@@ -1,3 +1,10 @@
+=== 0.6.5.9 / 7.9.2011
+
+* Fixed a frozen string bug thanks to dblock (Daniel Doubrovkine),
+* dblock@dblock.org
+
+  * https://github.com/dblock/spreadsheet/commit/164dcfbb24097728f1a7453702c270107e725b7c
+
 === 0.6.5.8 / 30.8.2011
 
 * This patch is about adding a sheet_count method to workbook so that it returns

data/Manifest.txt

@@ -52,6 +52,7 @@ test/data/test_version_excel5.xls
 test/data/test_version_excel95.xls
 test/data/test_version_excel97.xls
 test/excel/row.rb
+test/excel/writer/workbook.rb
 test/excel/writer/worksheet.rb
 test/font.rb
 test/integration.rb

data/lib/spreadsheet.rb

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

data/lib/spreadsheet/encodings.rb

@@ -1,17 +1,25 @@
+#!/usr/bin/env ruby
+# encoding: utf-8
+# Spreadsheet::Encoding -- spreadheet -- 07.09.2011 -- mhatakeyama@ywesee.com
+# Spreadsheet::Encoding -- spreadheet -- 03.07.2009 -- hwyss@ywesee.com
+
 module Spreadsheet
   ##
   # Methods for Encoding-conversions. You should not need to use any of these.
   module Encodings
     if RUBY_VERSION >= '1.9'
       def client string, internal='UTF-16LE'
+        string = string.dup
         string.force_encoding internal
         string.encode Spreadsheet.client_encoding
       end
       def internal string, client=Spreadsheet.client_encoding
+        string = string.dup
         string.force_encoding client
         string.encode('UTF-16LE').force_encoding('ASCII-8BIT')
       end
       def utf8 string, client=Spreadsheet.client_encoding
+        string = string.dup
         string.force_encoding client
         string.encode('UTF-8')
       end
@@ -19,16 +27,19 @@ module Spreadsheet
       require 'iconv'
       @@iconvs = {}
       def client string, internal='UTF-16LE'
+        string = string.dup
         key = [Spreadsheet.client_encoding, internal]
         iconv = @@iconvs[key] ||= Iconv.new(Spreadsheet.client_encoding, internal)
         iconv.iconv string
       end
       def internal string, client=Spreadsheet.client_encoding
+        string = string.dup
         key = ['UTF-16LE', client]
         iconv = @@iconvs[key] ||= Iconv.new('UTF-16LE', client)
         iconv.iconv string
       end
       def utf8 string, client=Spreadsheet.client_encoding
+        string = string.dup
         key = ['UTF-8', client]
         iconv = @@iconvs[key] ||= Iconv.new('UTF-8', client)
         iconv.iconv string

data/test/excel/writer/workbook.rb

@@ -0,0 +1,23 @@
+#!/usr/bin/env ruby
+# Excel::Writer::TestWorkbook -- Spreadsheet -- 20.07.2011 -- vanderhoorn@gmail.com
+
+$: << File.expand_path('../../../lib', File.dirname(__FILE__))
+
+require 'test/unit'
+require 'spreadsheet'
+
+module Spreadsheet
+  module Excel
+    module Writer
+      class TestWorkbook < Test::Unit::TestCase
+        def test_sanitize_worksheets
+          book = Spreadsheet::Excel::Workbook.new
+          assert_instance_of Excel::Workbook, book
+          assert_equal book.worksheets.size, 0
+          workbook_writer = Excel::Writer::Workbook.new book
+          assert_nothing_raised { workbook_writer.sanitize_worksheets book.worksheets }
+        end
+      end
+    end
+  end
+end

data/test/excel/writer/worksheet.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# Excel::Writer::TestWorksheet -- Spreadsheet -- 20.07.2007 -- zdavatz@ywesee.com
+# Excel::Writer::TestWorksheet -- Spreadheet -- 21.11.2007 -- hwyss@ywesee.com
 
 require 'test/unit'
 require 'spreadsheet/excel/writer/worksheet'

data/test/integration.rb

@@ -1,6 +1,7 @@
 #!/usr/bin/env ruby
 # encoding: utf-8
-# TestIntegration -- Spreadsheet -- 08.10.2007 -- hwyss@ywesee.com
+# TestIntegration -- spreadheet -- 07.09.2011 -- mhatakeyama@ywesee.com
+# TestIntegration -- spreadheet -- 08.10.2007 -- hwyss@ywesee.com
 
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 
@@ -1294,6 +1295,17 @@ module Spreadsheet
       end
     end
 =end
+    def test_write_frozen_string
+      Spreadsheet.client_encoding = 'UTF-16LE'
+      book = Spreadsheet::Workbook.new
+      path = File.join @var, 'test_write_workbook.xls'
+      sheet1 = book.create_worksheet
+      str1 = "Frozen String.".freeze
+      sheet1[0,0] = str1
+      sheet1.row(0).push str1
+      assert_nothing_raised do 
+        book.write path
+      end
+    end
   end
 end
-

data/test/worksheet.rb

@@ -1,5 +1,5 @@
 #!/usr/bin/env ruby
-# TestWorksheet -- Spreadsheet -- 30.09.2008 -- hwyss@ywesee.com
+# TestWorksheet -- Spreadheet -- 30.09.2008 -- hwyss@ywesee.com
 
 $: << File.expand_path('../lib', File.dirname(__FILE__))
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification 
 name: spreadsheet
 version: !ruby/object:Gem::Version 
-  hash: 123
+  hash: 121
   prerelease: 
   segments: 
   - 0
   - 6
   - 5
-  - 8
-  version: 0.6.5.8
+  - 9
+  version: 0.6.5.9
 platform: ruby
 authors: 
 - Masaomi Hatakeyama, Zeno R.R. Davatz
@@ -16,7 +16,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-08-30 00:00:00 +02:00
+date: 2011-09-07 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -123,6 +123,7 @@ files:
 - test/data/test_version_excel95.xls
 - test/data/test_version_excel97.xls
 - test/excel/row.rb
+- test/excel/writer/workbook.rb
 - test/excel/writer/worksheet.rb
 - test/font.rb
 - test/integration.rb