writeexcel 0.5.0 → 0.6.0

data/lib/writeexcel/format.rb

@@ -23,6 +23,7 @@ require 'writeexcel/colors'
 module Writeexcel
 
 class Format < Colors
+  NonAscii = /[^!"#\$%&'\(\)\*\+,\-\.\/\:\;<=>\?@0-9A-Za-z_\[\\\]\{\}^` ~\0\n]/
 
   ###############################################################################
   #
@@ -369,12 +370,20 @@ class Format < Colors
     rgch       = @font
     encoding   = @font_encoding
 
-    rgch = convert_to_ascii_if_ascii(rgch)
+    ruby_19 { rgch = convert_to_ascii_if_ascii(rgch) }
 
     # Handle utf8 strings
-    if rgch.encoding == Encoding::UTF_8
-      rgch = utf8_to_16be(rgch)
-      encoding = 1
+    ruby_18 do
+      if rgch =~ NonAscii
+        rgch = utf8_to_16be(rgch)
+        encoding = 1
+      end
+    end
+    ruby_19 do
+      if rgch.encoding == Encoding::UTF_8
+        rgch = utf8_to_16be(rgch)
+        encoding = 1
+      end
     end
 
     cch = rgch.bytesize

data/lib/writeexcel/formula.rb

@@ -18,7 +18,8 @@ module Writeexcel
 
 class Formula < ExcelFormulaParser       #:nodoc:
   require 'writeexcel/helper'
-  private :convert_to_ascii_if_ascii
+
+  NonAscii = /[^!"#\$%&'\(\)\*\+,\-\.\/\:\;<=>\?@0-9A-Za-z_\[\\\]\{\}^` ~\0\n]/
 
   attr_accessor :byte_order, :workbook, :ext_sheets, :ext_refs, :ext_ref_count
 
@@ -299,7 +300,7 @@ class Formula < ExcelFormulaParser       #:nodoc:
   # Convert a string to a ptg Str.
   #
   def convert_string(str)
-    str = convert_to_ascii_if_ascii(str)
+    ruby_19 { str = convert_to_ascii_if_ascii(str) }
 
     encoding = 0
 
@@ -312,10 +313,19 @@ class Formula < ExcelFormulaParser       #:nodoc:
              ruby_19 { str.length }
 
     # Handle utf8 strings
-    if str.encoding == Encoding::UTF_8
-      str = utf8_to_16le(str)
-      str.force_encoding('BINARY')
-      encoding = 1
+    ruby_18 do
+      if str =~ NonAscii
+        str = utf8_to_16le(str)
+        ruby_19 { str.force_encoding('BINARY') }
+        encoding = 1
+      end
+    end
+    ruby_19 do
+      if str.encoding == Encoding::UTF_8
+        str = utf8_to_16le(str)
+        ruby_19 { str.force_encoding('BINARY') }
+        encoding = 1
+      end
     end
 
     exit "String in formula has more than 255 chars\n" if length > 255
@@ -500,11 +510,18 @@ class Formula < ExcelFormulaParser       #:nodoc:
   # sheet names is updated by the add_worksheet() method of the Workbook class.
   #
   def get_sheet_index(sheet_name)
-    sheet_name = convert_to_ascii_if_ascii(sheet_name)
+    ruby_19 { sheet_name = convert_to_ascii_if_ascii(sheet_name) }
 
     # Handle utf8 sheetnames
-    if sheet_name.encoding == Encoding::UTF_8
-      sheet_name = sheet_name.encode('UTF-16BE')
+    ruby_18 do
+      if sheet_name =~ NonAscii
+        sheet_name = utf8_to_16be(sheet_name)
+      end
+    end
+    ruby_19 do
+      if sheet_name.encoding == Encoding::UTF_8
+        sheet_name = sheet_name.encode('UTF-16BE')
+      end
     end
 
     if @ext_sheets[sheet_name].nil?

data/lib/writeexcel/helper.rb

@@ -1,64 +1,68 @@
-# -*- coding: utf-8 -*-
-#
-# helper.rb
-#
-  # Convert to US_ASCII encoding if ascii characters only.
-  def convert_to_ascii_if_ascii(str)
-    return nil if str.nil?
-    ruby_18 do
-      enc = str.encoding
-      begin
-        str = str.encode('ASCII')
-      rescue
-        str.force_encoding(enc)
-      end
-    end ||
-    ruby_19 do
-      if !str.nil? && str.ascii_only?
-        str = [str].pack('a*')
-      end
-    end
-    str
-  end
-  private :convert_to_ascii_if_ascii
-
-
-  def utf8_to_16be(utf8)
-    utf16be = NKF.nkf('-w16B0 -m0 -W', utf8)
-    utf16be.force_encoding('UTF-16BE')
-  end
-  private :utf8_to_16be
-
-  def utf8_to_16le(utf8)
-    utf16le = NKF.nkf('-w16L0 -m0 -W', utf8)
-    utf16le.force_encoding('UTF-16LE')
-  end
-  private :utf8_to_16le
-
-  def ascii_to_16be(ascii)
-    ascii.unpack("C*").pack("n*")
-    ascii.force_encoding('UTF-16BE')
-  end
-  private :ascii_to_16be
-
-  def store_simple(record, length, *args)
-    header = [record, length].pack('vv')
-    data = args.collect { |arg| [arg].pack('v') }.join('')
-
-    append(header, data)
-  end
-  private :store_simple
-
-  # Convert base26 column string to a number.
-  # All your Base are belong to us.
-  def chars_to_col(chars)
-    expn = 0
-    col  = 0
-    while (!chars.empty?)
-      char = chars.pop   # LS char first
-      col  += (char.ord - "A".ord + 1) * (26 ** expn)
-      expn += 1
-    end
-    col
-  end
-  private :chars_to_col
+# -*- coding: utf-8 -*-
+#
+# helper.rb
+#
+  # Convert to US_ASCII encoding if ascii characters only.
+  def convert_to_ascii_if_ascii(str)
+    return nil if str.nil?
+    ruby_18 do
+      unless str =~ /[^!"#\$%&'\(\)\*\+,\-\.\/\:\;<=>\?@0-9A-Za-z_\[\\\]\{\}^` ~\0\n]/
+        str = String.new(str)
+      end
+    end ||
+    ruby_19 do
+      if str.ascii_only?
+        str = [str].pack('a*')
+      end
+    end
+    str
+  end
+  private :convert_to_ascii_if_ascii
+
+
+  def utf8_to_16be(utf8)
+    ruby_18 { NKF.nkf('-w16B0 -m0 -W', utf8) } ||
+    ruby_19 do
+      utf16be = NKF.nkf('-w16B0 -m0 -W', utf8)
+      utf16be.force_encoding('UTF-16BE')
+    end
+  end
+  private :utf8_to_16be
+
+  def utf8_to_16le(utf8)
+    ruby_18 { NKF.nkf('-w16L0 -m0 -W', utf8) } ||
+    ruby_19 do
+      utf16le = NKF.nkf('-w16L0 -m0 -W', utf8)
+      utf16le.force_encoding('UTF-16LE')
+    end
+  end
+  private :utf8_to_16le
+
+  def ascii_to_16be(ascii)
+    ascii.unpack("C*").pack("n*")
+    ruby_19 { ascii.force_encoding('UTF-16BE') }
+    ascii
+  end
+  private :ascii_to_16be
+
+  def store_simple(record, length, *args)
+    header = [record, length].pack('vv')
+    data = args.collect { |arg| [arg].pack('v') }.join('')
+
+    append(header, data)
+  end
+  private :store_simple
+
+  # Convert base26 column string to a number.
+  # All your Base are belong to us.
+  def chars_to_col(chars)
+    expn = 0
+    col  = 0
+    while (!chars.empty?)
+      char = chars.pop   # LS char first
+      col  += (char.ord - "A".ord + 1) * (26 ** expn)
+      expn += 1
+    end
+    col
+  end
+  private :chars_to_col