writeexcel 0.4.3 → 0.5.0

data/README.rdoc

@@ -4,6 +4,12 @@ Write to a cross-platform Excel binary file.
 
 == Recent Changes
 
+v0.5.0
+* use 1.9-compatible Encoding interface for Ruby 1.8 encodings class; support US-ASCII and ASCII-8BIT. by Jeremy Weathers
+  The original project by cxn03651 has its own odd encoding scheme that is not compatible with other
+  software (e.g. nokogiri) that expects strings encodings to be compatible with Ruby 1.9 Encodings.
+  The purpose of this fork is to make the encoding system for Ruby 1.8 compatible with the Ruby 1.9 encoding   system.
+
 v0.4.3
 * test passed under Ruby 1.9.2
 * Bug fix. Format#set_format_properties, Formula#convert_number found under Ruby 1.9.2

data/VERSION

@@ -1 +1 @@
-0.4.3
+0.5.0

data/lib/writeexcel/compatibility.rb

@@ -1,312 +1,326 @@
-# coding: utf-8
-#
-# Why would we ever use Ruby 1.8.7 when we can backport with something
-# as simple as this?
-#
-# copied from prawn.
-# modified by Hideo NAKAMURA
-#
-unless defined?(Encoding)
-  class Encoding # :nodoc:
-    class ConverterNotFoundError < StandardError; end
-    class UndefinedConversionError < StandardError; end
-
-    ASCII    = 0
-    BINARY   = 1
-    UTF_8    = 2
-    EUCJP    = 3
-    SJIS     = 4
-    UTF_16LE = 5
-    UTF_16BE = 6
-  end
-end
-
-class String #:nodoc:
-  def first_line
-    self.each_line { |line| return line }
-  end
-  unless "".respond_to?(:lines)
-    alias_method :lines, :to_a
-  end
-  unless "".respond_to?(:each_char)
-    def each_char #:nodoc:
-      # copied from jcode
-      if block_given?
-        scan(/./m) { |x| yield x }
-      else
-        scan(/./m)
-      end
-    end
-  end
-
-  unless "".respond_to?(:encode)
-    @encoding = Encoding::UTF_8
-
-    def encode(encoding) # :nodoc:
-      require 'nkf'
-      @encoding ||= Encoding::UTF_8
-      if @encoding == Encoding::UTF_8
-        # supported only $KCODE = 'u'. so @encoding.nil? means UTF_8.
-        case encoding
-        when /ASCII/i
-          if self.mbchar?('UTF8')
-            raise Encoding::UndefinedConversionError
-          else
-            str = String.new(self)
-            str.force_encoding(encoding)
-            str
-          end
-        when /BINARY/i
-          if self.mbchar?('UTF8')
-            raise Encoding::UndefinedConversionError
-          else
-            str = String.new(self)
-            str.force_encoding(encoding)
-            str
-          end
-        when /UTF_8/i
-          raise Encoding::ConverterNotFoundError
-        when /EUCJP/i, /SJIS/i
-          enc = encoding =~ /EUCJP/i ? 'e' : 's'
-          str = NKF.nkf("-#{enc} -m0 -W", self)
-          str.force_encoding(encoding)
-          str
-        when /UTF_16LE/i, /UTF_16BE/i
-          raise Encoding::ConverterNotFoundError
-        else
-          raise "Sorry, encoding #{encoding} is not supported by WriteExcel."
-        end
-      elsif @encoding == Encoding::ASCII
-        case encoding
-        when /ASCII/i, /BINARY/i, /EUCJP/i, /SJIS/i
-          str = String.new(self)
-          str.force_encoding(encoding)
-          str
-        when /UTF_8/i, /UTF_16LE/i, /UTF_16BE/i
-          raise Encoding::ConverterNotFoundError
-        else
-          raise "Sorry, encoding #{encoding} is not supported by WriteExcel."
-        end
-      elsif @encoding == Encoding::BINARY
-        case encoding
-        when /ASCII/i, /EUCJP/i, /SJIS/i
-          if self.ascii_only? || self.mbchar?('UTF8') || self.mbchar?('EUCJP') || self.mbchar?('SJIS')
-            raise Encoding::UndefinedConversionError
-          else
-            str = String.new(self)
-            str.force_encoding(encoding)
-            str
-          end
-        when /BINARY/i
-          self
-        when /UTF_8/i, /UTF_16LE/i, /UTF_16BE/i
-          raise Encoding::ConverterNotFoundError
-        else
-          raise "Sorry, encoding #{encoding} is not supported by WriteExcel."
-        end
-      elsif @encoding == Encoding::EUCJP || @encoding == Encoding::SJIS
-        type   = @encoding == Encoding::EUCJP ? 'EUCJP' : 'SJIS'
-        inenc  = @encoding == Encoding::EUCJP ? 'e' : 's'
-        case encoding
-        when /ASCII/i
-          if self.mbchar?(type)
-            raise Encoding::UndefinedConversionError
-          else
-            str = String.new(self)
-            str.force_encoding(encoding)
-            str
-          end
-        when /BINARY/i
-          if self.mbchar?(type)
-            raise Encoding::UndefinedConversionError
-          else
-            str = String.new(self)
-            str.force_encoding(encoding)
-            str
-          end
-        when /UTF_8/i
-          raise Encoding::ConverterNotFoundError
-        when /EUCJP/i, /SJIS/i
-          outenc = encoding =~ /EUCJP/i ? 'E' : 'S'
-          str = NKF.nkf("-#{inenc} -#{outenc}", self)
-          str.force_encoding(encoding)
-          str
-        when /UTF_16LE/i, /UTF_16BE/i
-          raise Encoding::ConverterNotFoundError
-        else
-          raise "Sorry, encoding #{encoding} is not supported by WriteExcel."
-        end
-      elsif @encoding == Encoding::UTF_16LE || @encoding == Encoding::UTF_16BE
-        enc = @encoding == Encoding::UTF_16LE ? 'L' : 'B'
-        utf8 = NKF.nkf("-w -m0 -W16#{enc}", self)
-        case encoding
-        when /ASCII/i
-          if utf8.mbchar?
-            raise Encoding::UndefinedConversionError
-          else
-            str = String.new(self)
-            str.force_encoding(encoding)
-            str
-          end
-        when /BINARY/i
-          if utf8.mbchar?
-            raise Encoding::UndefinedConversionError
-          else
-            str = String.new(self)
-            str.force_encoding(encoding)
-            str
-          end
-        when /UTF_8/i
-          raise Encoding::ConverterNotFoundError
-        when /EUCJP/i, /SJIS/i
-            str = String.new(self)
-            str.force_encoding(encoding)
-            str
-        when /UTF_16LE/i, /UTF_16BE/i
-          raise Encoding::ConverterNotFoundError
-        else
-          raise "Sorry, encoding #{encoding} is not supported by WriteExcel."
-        end
-      else
-      end
-    end
-
-    def self_with_encoding(encoding)
-      if encoding =~ /ASCII/i
-        @encoding = Encoding::ASCII
-      elsif encoding =~ /BINARY/i
-        @encoding = Encoding::BINARY
-      elsif encoding =~ /UTF_8/i
-        @encoding = Encoding::UTF_8
-      elsif encoding =~ /EUCJP/i
-        @encoding = Encoding::EUCJP
-      elsif encoding =~ /SJIS/i
-        @encoding = Encoding::SJIS
-      elsif encoding =~ /UTF_16LE/i
-        @encoding = Encoding::UTF_16LE
-      elsif encoding =~ /UTF_16BE/i
-        @encoding = Encoding::UTF_16BE
-      else
-        raise "Sorry, encoding #{encoding} is not supported by WriteExcel."
-      end
-      self
-    end
-    private :self_with_encoding
-  end
-
-  unless "".respond_to?(:encoding)
-    def encoding
-      @encoding ||= Encoding::UTF_8
-    end
-  end
-
-  unless "".respond_to?(:bytesize)
-    def bytesize # :nodoc:
-      self.length
-    end
-  end
-
-  unless "".respond_to?(:ord)
-    def ord
-      self[0]
-    end
-  end
-
-  unless "".respond_to?(:force_encoding)
-    def force_encoding(encoding)
-      if encoding.respond_to?(:to_str)
-        @encoding = case encoding
-          when /ASCII/i
-            Encoding::ASCII
-          when /BINARY/i
-            Encoding::BINARY
-          when /UTF[-_]8/i
-            Encoding::UTF_8
-          when /EUCJP/i
-            Encoding::EUCJP
-          when /SJIS/i
-            Encoding::SJIS
-          when /UTF[-_]16LE/i
-            Encoding::UTF_16LE
-          when /UTF[-_]16BE/i
-            Encoding::UTF_16BE
-        end
-      else
-        @encoding = case encoding
-          when Encoding::ASCII
-            Encoding::ASCII
-          when Encoding::BINARY
-            Encoding::BINARY
-          when Encoding::UTF_8
-            Encoding::UTF_8
-          when Encoding::EUCJP
-            Encoding::EUCJP
-          when Encoding::SJIS
-            Encoding::SJIS
-          when Encoding::UTF_16LE
-            Encoding::UTF_16LE
-          when Encoding::UTF_16BE
-            Encoding::UTF_16BE
-        end
-      end
-      self
-    end
-  end
-
-  unless "".respond_to?(:ascii_only?)
-    def ascii_only?
-      !!(self =~ /[^!"#\$%&'\(\)\*\+,\-\.\/\:\;<=>\?@0-9A-Za-z_\[\\\]\{\}^` ~\0\n]/)
-    end
-  end
-
-  if RUBY_VERSION < "1.9"
-    unless "".respond_to?(:mbchar?)
-      PATTERN_SJIS = '[\x81-\x9f\xe0-\xef][\x40-\x7e\x80-\xfc]' # :nodoc:
-      PATTERN_EUC = '[\xa1-\xfe][\xa1-\xfe]' # :nodoc:
-      PATTERN_UTF8 = '[\xc0-\xdf][\x80-\xbf]|[\xe0-\xef][\x80-\xbf][\x80-\xbf]' # :nodoc:
-
-      RE_SJIS = Regexp.new(PATTERN_SJIS, 0, 'n') # :nodoc:
-      RE_EUC = Regexp.new(PATTERN_EUC, 0, 'n') # :nodoc:
-      RE_UTF8 = Regexp.new(PATTERN_UTF8, 0, 'n') # :nodoc:
-
-      def mbchar?(type = nil)# :nodoc:     idea copied from jcode.rb
-        if (!type.nil? && type =~ /SJIS/i) || $KCODE == 'SJIS'
-          self =~ RE_SJIS
-        elsif (!type.nil? && type =~ /EUCJP/i) || $KCODE == 'EUC'
-          self =~ RE_EUC
-        elsif (!type.nil? && type =~ /UTF_8/i) || $KCODE == 'UTF8'
-          self =~ RE_UTF8
-        else
-          nil
-        end
-      end
-    end
-  end
-end
-
-unless File.respond_to?(:binread)
-  def File.binread(file) #:nodoc:
-    File.open(file,"rb") { |f| f.read }
-  end
-end
-
-if RUBY_VERSION < "1.9"
-
-  def ruby_18 #:nodoc:
-    yield
-  end
-
-  def ruby_19 #:nodoc:
-    false
-  end
-
-else
-
-  def ruby_18 #:nodoc:
-    false
-  end
-
-  def ruby_19 #:nodoc:
-    yield
-  end
-end
+# coding: utf-8
+#
+# Why would we ever use Ruby 1.8.7 when we can backport with something
+# as simple as this?
+#
+# copied from prawn.
+# modified by Hideo NAKAMURA
+#
+unless defined?(Encoding)
+  class Encoding # :nodoc:
+    class ConverterNotFoundError < StandardError; end
+    class UndefinedConversionError < StandardError; end
+
+    def self.const_missing (name)
+      @looked_for ||= {}
+      if !@looked_for.has_key?(name)
+        begin
+          @looked_for[name] = find(name)
+        rescue ArgumentError
+          @looked_for[name] = nil
+        end
+      end
+      @looked_for[name]
+    end
+
+    def self.find (name)
+      result   = try_name name
+      result ||= try_name name.gsub(/-/, '_') if name =~ /-/
+      raise ArgumentError, "unknown encoding name - #{name}" unless result
+      result
+    end
+    def self.try_name (name)
+      dname = name.to_s.downcase
+      sel = SupportedEncodings.select{ |se| dname == se.name.downcase }
+      return sel.first if 1 <= sel.size
+      sel = SupportedEncodings.select{ |se| se.name.downcase =~ Regexp.new(dname) }
+      return sel.first if 1 <= sel.size
+      nil
+    end
+
+    attr_accessor :name, :value
+    def initialize (name, value)
+      @name  = name
+      @value = value
+    end
+
+    def == (other)
+      if other.is_a? Encoding
+        other.value == @value
+      elsif other.is_a? Fixnum
+        other == @value
+      else
+        other == @name
+      end
+    end
+
+    SupportedEncodings = [
+      Encoding.new('ASCII', 0),
+      Encoding.new('US_ASCII', 0),
+      Encoding.new('BINARY', 1),
+      Encoding.new('ASCII_8BIT', 1),
+      Encoding.new('UTF_8', 2),
+      Encoding.new('EUCJP', 3),
+      Encoding.new('SJIS', 4),
+      Encoding.new('UTF_16LE', 5),
+      Encoding.new('UTF_16BE', 6)
+    ]
+    # ASCII    = 0
+    # BINARY   = 1
+    # UTF_8    = 2
+    # EUCJP    = 3
+    # SJIS     = 4
+    # UTF_16LE = 5
+    # UTF_16BE = 6
+  end
+end
+
+class String #:nodoc:
+  def first_line
+    self.each_line { |line| return line }
+  end
+  unless "".respond_to?(:lines)
+    alias_method :lines, :to_a
+  end
+  unless "".respond_to?(:each_char)
+    def each_char #:nodoc:
+      # copied from jcode
+      if block_given?
+        scan(/./m) { |x| yield x }
+      else
+        scan(/./m)
+      end
+    end
+  end
+
+  unless "".respond_to?(:encode)
+    @encoding = Encoding::UTF_8
+
+    def encode(encoding) # :nodoc:
+      require 'nkf'
+      @encoding ||= Encoding::UTF_8
+      if @encoding == Encoding::UTF_8
+        # supported only $KCODE = 'u'. so @encoding.nil? means UTF_8.
+        case encoding
+        when /ASCII$/i
+          if self.mbchar?('UTF8')
+            raise Encoding::UndefinedConversionError
+          else
+            str = String.new(self)
+            str.force_encoding(encoding)
+            str
+          end
+        when /(BINARY|ASCII[-_]8BIT)/i
+          if self.mbchar?('UTF8')
+            raise Encoding::UndefinedConversionError
+          else
+            str = String.new(self)
+            str.force_encoding(encoding)
+            str
+          end
+        when /UTF_8/i
+          raise Encoding::ConverterNotFoundError
+        when /EUCJP/i, /SJIS/i
+          enc = encoding =~ /EUCJP/i ? 'e' : 's'
+          str = NKF.nkf("-#{enc} -m0 -W", self)
+          str.force_encoding(encoding)
+          str
+        when /UTF_16LE/i, /UTF_16BE/i
+          raise Encoding::ConverterNotFoundError
+        else
+          raise "Sorry, encoding #{encoding} is not supported by WriteExcel."
+        end
+      elsif @encoding == Encoding::ASCII
+        case encoding
+        when /ASCII/i, /BINARY/i, /EUCJP/i, /SJIS/i
+          str = String.new(self)
+          str.force_encoding(encoding)
+          str
+        when /UTF_8/i, /UTF_16LE/i, /UTF_16BE/i
+          raise Encoding::ConverterNotFoundError
+        else
+          raise "Sorry, encoding #{encoding} is not supported by WriteExcel."
+        end
+      elsif @encoding == Encoding::BINARY
+        case encoding
+        when /ASCII$/i, /EUCJP/i, /SJIS/i
+          if self.ascii_only? || self.mbchar?('UTF8') || self.mbchar?('EUCJP') || self.mbchar?('SJIS')
+            raise Encoding::UndefinedConversionError
+          else
+            str = String.new(self)
+            str.force_encoding(encoding)
+            str
+          end
+        when /(BINARY|ASCII[-_]8BIT)/i
+          self
+        when /UTF_8/i, /UTF_16LE/i, /UTF_16BE/i
+          raise Encoding::ConverterNotFoundError
+        else
+          raise "Sorry, encoding #{encoding} is not supported by WriteExcel."
+        end
+      elsif @encoding == Encoding::EUCJP || @encoding == Encoding::SJIS
+        type   = @encoding == Encoding::EUCJP ? 'EUCJP' : 'SJIS'
+        inenc  = @encoding == Encoding::EUCJP ? 'e' : 's'
+        case encoding
+        when /ASCII$/i
+          if self.mbchar?(type)
+            raise Encoding::UndefinedConversionError
+          else
+            str = String.new(self)
+            str.force_encoding(encoding)
+            str
+          end
+        when /(BINARY|ASCII[-_]8BIT)/i
+          if self.mbchar?(type)
+            raise Encoding::UndefinedConversionError
+          else
+            str = String.new(self)
+            str.force_encoding(encoding)
+            str
+          end
+        when /UTF_8/i
+          raise Encoding::ConverterNotFoundError
+        when /EUCJP/i, /SJIS/i
+          outenc = encoding =~ /EUCJP/i ? 'E' : 'S'
+          str = NKF.nkf("-#{inenc} -#{outenc}", self)
+          str.force_encoding(encoding)
+          str
+        when /UTF_16LE/i, /UTF_16BE/i
+          raise Encoding::ConverterNotFoundError
+        else
+          raise "Sorry, encoding #{encoding} is not supported by WriteExcel."
+        end
+      elsif @encoding == Encoding::UTF_16LE || @encoding == Encoding::UTF_16BE
+        enc = @encoding == Encoding::UTF_16LE ? 'L' : 'B'
+        utf8 = NKF.nkf("-w -m0 -W16#{enc}", self)
+        case encoding
+        when /ASCII$/i
+          if utf8.mbchar?
+            raise Encoding::UndefinedConversionError
+          else
+            str = String.new(self)
+            str.force_encoding(encoding)
+            str
+          end
+        when /(BINARY|ASCII[-_]8BIT)/i
+          if utf8.mbchar?
+            raise Encoding::UndefinedConversionError
+          else
+            str = String.new(self)
+            str.force_encoding(encoding)
+            str
+          end
+        when /UTF_8/i
+          raise Encoding::ConverterNotFoundError
+        when /EUCJP/i, /SJIS/i
+            str = String.new(self)
+            str.force_encoding(encoding)
+            str
+        when /UTF_16LE/i, /UTF_16BE/i
+          raise Encoding::ConverterNotFoundError
+        else
+          raise "Sorry, encoding #{encoding} is not supported by WriteExcel."
+        end
+      else
+      end
+    end
+
+    def self_with_encoding(encoding)
+      found = Encoding.find(encoding)
+      if found
+        @encoding = found
+      else
+        raise "Sorry, encoding #{encoding} is not supported by WriteExcel."
+      end
+      self
+    end
+    private :self_with_encoding
+  end
+
+  unless "".respond_to?(:encoding)
+    def encoding
+      @encoding ||= Encoding::UTF_8
+    end
+  end
+
+  unless "".respond_to?(:bytesize)
+    def bytesize # :nodoc:
+      self.length
+    end
+  end
+
+  unless "".respond_to?(:ord)
+    def ord
+      self[0]
+    end
+  end
+
+  unless "".respond_to?(:force_encoding)
+    def force_encoding(encoding)
+      if encoding.respond_to?(:to_str)
+        found = Encoding.find(encoding)
+        @encoding = found if found
+      else
+        @encoding = encoding if encoding.is_a?(Encoding)
+      end
+      self
+    end
+  end
+
+  unless "".respond_to?(:ascii_only?)
+    def ascii_only?
+      !!(self =~ /[^!"#\$%&'\(\)\*\+,\-\.\/\:\;<=>\?@0-9A-Za-z_\[\\\]\{\}^` ~\0\n]/)
+    end
+  end
+
+  if RUBY_VERSION < "1.9"
+    unless "".respond_to?(:mbchar?)
+      PATTERN_SJIS = '[\x81-\x9f\xe0-\xef][\x40-\x7e\x80-\xfc]' # :nodoc:
+      PATTERN_EUC = '[\xa1-\xfe][\xa1-\xfe]' # :nodoc:
+      PATTERN_UTF8 = '[\xc0-\xdf][\x80-\xbf]|[\xe0-\xef][\x80-\xbf][\x80-\xbf]' # :nodoc:
+
+      RE_SJIS = Regexp.new(PATTERN_SJIS, 0, 'n') # :nodoc:
+      RE_EUC = Regexp.new(PATTERN_EUC, 0, 'n') # :nodoc:
+      RE_UTF8 = Regexp.new(PATTERN_UTF8, 0, 'n') # :nodoc:
+
+      def mbchar?(type = nil)# :nodoc:     idea copied from jcode.rb
+        if (!type.nil? && type =~ /SJIS/i) || $KCODE == 'SJIS'
+          self =~ RE_SJIS
+        elsif (!type.nil? && type =~ /EUCJP/i) || $KCODE == 'EUC'
+          self =~ RE_EUC
+        elsif (!type.nil? && type =~ /UTF_8/i) || $KCODE == 'UTF8'
+          self =~ RE_UTF8
+        else
+          nil
+        end
+      end
+    end
+  end
+end
+
+unless File.respond_to?(:binread)
+  def File.binread(file) #:nodoc:
+    File.open(file,"rb") { |f| f.read }
+  end
+end
+
+if RUBY_VERSION < "1.9"
+
+  def ruby_18 #:nodoc:
+    yield
+  end
+
+  def ruby_19 #:nodoc:
+    false
+  end
+
+else
+
+  def ruby_18 #:nodoc:
+    false
+  end
+
+  def ruby_19 #:nodoc:
+    yield
+  end
+end

data/test/test_new_encoding.rb

@@ -0,0 +1,205 @@
+# -*- coding: utf-8 -*-
+require 'helper'
+require 'nkf'
+
+class TC_new_encoding < Test::Unit::TestCase
+  def setup
+    ruby_18 do
+      @kcode = $KCODE
+      $KCODE = 'u'
+    end
+  end
+
+  def teardown
+    ruby_18 { $KCODE = @kcode }
+  end
+
+  def test_finder
+    if RUBY_VERSION < '1.9'
+      %w{ UTF_8 UTF-8 utf-8 utf }.each do |name|
+        e = Encoding.find(name)
+        assert_equal 'UTF_8', e.name
+        assert_equal 2, e.value
+      end
+    end
+  end
+
+  def test_comparison
+    if RUBY_VERSION < '1.9'
+      assert_equal Encoding.find('US-ASCII'), Encoding.find('ASCII')
+      assert_equal Encoding.find('ASCII-8BIT'), Encoding.find('BINARY')
+      assert_not_equal Encoding.find('ASCII'), Encoding.find('UTF-8')
+    end
+  end
+  
+  
+  # TEST WITH ALTERNATE Encoding NAMES
+  def test_ascii_str_ascii_to_ascii
+    str = ascii_str_enc_us_ascii
+    assert_equal(Encoding::ASCII, str.encode('ASCII').encoding)
+  end
+  def test_ascii_str_ascii_to_us_ascii
+    str = ascii_str_enc_us_ascii
+    assert_equal(Encoding::US_ASCII, str.encode('US-ASCII').encoding)
+  end
+
+  def test_ascii_str_ascii_to_binary
+    str = ascii_str_enc_us_ascii
+    assert_equal(Encoding::BINARY, str.encode('BINARY').encoding)
+  end
+  def test_ascii_str_ascii_to_ascii_8bit
+    str = ascii_str_enc_us_ascii
+    assert_equal(Encoding::ASCII_8BIT, str.encode('ASCII-8BIT').encoding)
+  end
+
+  def test_ascii_str_utf8_to_ascii
+    str = ascii_str_enc_utf8
+    assert_equal(Encoding::ASCII, str.encode('US-ASCII').encoding)
+  end
+
+  def test_non_ascii_str_utf8_to_ascii
+    str = non_ascii_str_enc_utf8
+    assert_raise(Encoding::UndefinedConversionError) { str.encode('US-ASCII') }
+  end
+
+  def test_ascii_str_utf8_to_binary
+    str = ascii_str_enc_utf8
+    assert_equal(Encoding::BINARY, str.encode('ASCII-8BIT').encoding)
+  end
+
+  def test_non_ascii_str_utf8_to_binary
+    str = non_ascii_str_enc_utf8
+    assert_raise(Encoding::UndefinedConversionError) { str.encode('ASCII-8BIT') }
+  end
+  
+  
+  
+  def ascii_str_enc_ascii
+    str = ["abc"].pack('a*').encode('ASCII')
+    str.encode('ASCII') if RUBY_VERSION < "1.9"
+    str
+  end
+
+  def test_ascii_str_enc_ascii_is_ascii_encoding
+    assert_equal(Encoding::ASCII, ascii_str_enc_ascii.encoding)
+  end
+
+  def ascii_str_enc_us_ascii
+    str = ["abc"].pack('a*').encode('US-ASCII')
+    str.encode('US-ASCII') if RUBY_VERSION < "1.9"
+    str
+  end
+
+  def test_ascii_str_enc_ascii_is_ascii_encoding
+    assert_equal(Encoding::ASCII, ascii_str_enc_us_ascii.encoding)
+  end
+
+  def ascii_str_enc_binary
+    str = ["abc"].pack('a*').encode('BINARY')
+    str.encode('BINARY') if RUBY_VERSION < "1.9"
+    str
+  end
+
+  def test_ascii_str_enc_binary_is_binary_encoding
+    assert_equal(Encoding::BINARY, ascii_str_enc_binary.encoding)
+  end
+
+  def non_ascii_str_enc_binary
+    str = [0x80].pack('v*')
+    str.force_encoding('BINARY')
+    str
+  end
+
+  def test_non_ascii_str_enc_binary
+    assert_equal(Encoding::BINARY, non_ascii_str_enc_binary.encoding)
+  end
+
+  def ascii_str_enc_utf8
+    "abc"
+  end
+
+  def test_ascii_str_enc_utf8_is_utf8_encoding
+    assert_equal(Encoding::UTF_8, ascii_str_enc_utf8.encoding)
+  end
+
+  def non_ascii_str_enc_utf8
+    'あいう'
+  end
+
+  def test_non_ascii_str_enc_utf8
+    assert_equal(Encoding::UTF_8, non_ascii_str_enc_utf8.encoding)
+  end
+
+  def ascii_str_enc_eucjp
+    str = "abc".encode('EUCJP')
+    str
+  end
+
+  def test_ascii_str_enc_eucjp_is_eucjp_encoding
+    assert_equal(Encoding::EUCJP, ascii_str_enc_eucjp.encoding)
+  end
+
+  def non_ascii_str_enc_eucjp
+    str = 'あいう'.encode('EUCJP')
+    str
+  end
+
+  def test_non_ascii_str_enc_eucjp
+    assert_equal(Encoding::EUCJP, non_ascii_str_enc_eucjp.encoding)
+  end
+
+  def ascii_str_enc_sjis
+    str = "abc".encode('SJIS')
+    str
+  end
+
+  def test_ascii_str_enc_sjis_is_sjis_encoding
+    assert_equal(Encoding::SJIS, ascii_str_enc_sjis.encoding)
+  end
+
+  def non_ascii_str_enc_sjis
+    str = 'あいう'.encode('SJIS')
+    str
+  end
+
+  def test_non_ascii_str_enc_sjis
+    assert_equal(Encoding::SJIS, non_ascii_str_enc_sjis.encoding)
+  end
+
+  def ascii_str_enc_utf16le
+    str = NKF.nkf('-w16L0 -m0 -W', "abc")
+    str.force_encoding('UTF_16LE') if RUBY_VERSION < "1.9"
+    str
+  end
+
+  def test_ascii_str_enc_utf16le_is_utf16le_encoding
+    assert_equal(Encoding::UTF_16LE, ascii_str_enc_utf16le.encoding)
+  end
+
+  def non_ascii_str_enc_utf16le
+    str = NKF.nkf('-w16L0 -m0 -W', 'あいう')
+    str.force_encoding('UTF_16LE') if RUBY_VERSION < "1.9"
+    str
+  end
+
+  def test_non_ascii_str_enc_utf16le
+    assert_equal(Encoding::UTF_16LE, non_ascii_str_enc_utf16le.encoding)
+  end
+
+  def ascii_str_enc_utf16be
+    str = NKF.nkf('-w16B0 -m0 -W', "abc")
+    str.force_encoding('UTF_16BE') if RUBY_VERSION < "1.9"
+    str
+  end
+
+  def test_ascii_str_enc_utf16be_is_utf16be_encoding
+    assert_equal(Encoding::UTF_16BE, ascii_str_enc_utf16be.encoding)
+  end
+
+  def non_ascii_str_enc_utf16be
+    str = NKF.nkf('-w16B0 -m0 -W', 'あいう')
+    str.force_encoding('UTF_16BE') if RUBY_VERSION < "1.9"
+    str
+  end
+  
+end

data/writeexcel.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{writeexcel}
-  s.version = "0.4.3"
+  s.version = "0.5.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Hideo NAKAMURA"]
-  s.date = %q{2010-10-13}
+  s.date = %q{2010-10-14}
   s.description = %q{Multiple worksheets can be added to a workbook and formatting can be applied to cells. Text, numbers, formulas, hyperlinks and images can be written to the cells.}
   s.email = %q{cxn03651@msj.biglobe.ne.jp}
   s.extra_rdoc_files = [
@@ -219,6 +219,7 @@ Gem::Specification.new do |s|
      "test/test_example_match.rb",
      "test/test_format.rb",
      "test/test_formula.rb",
+     "test/test_new_encoding.rb",
      "test/test_ole.rb",
      "test/test_storage_lite.rb",
      "test/test_workbook.rb",
@@ -271,6 +272,7 @@ Gem::Specification.new do |s|
      "test/test_example_match.rb",
      "test/test_format.rb",
      "test/test_formula.rb",
+     "test/test_new_encoding.rb",
      "test/test_ole.rb",
      "test/test_storage_lite.rb",
      "test/test_workbook.rb",

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 0
-  - 4
-  - 3
-  version: 0.4.3
+  - 5
+  - 0
+  version: 0.5.0
 platform: ruby
 authors: 
 - Hideo NAKAMURA
@@ -14,7 +14,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-10-13 00:00:00 +09:00
+date: 2010-10-14 00:00:00 +09:00
 default_executable: 
 dependencies: []
 
@@ -230,6 +230,7 @@ files:
 - test/test_example_match.rb
 - test/test_format.rb
 - test/test_formula.rb
+- test/test_new_encoding.rb
 - test/test_ole.rb
 - test/test_storage_lite.rb
 - test/test_workbook.rb
@@ -306,6 +307,7 @@ test_files:
 - test/test_example_match.rb
 - test/test_format.rb
 - test/test_formula.rb
+- test/test_new_encoding.rb
 - test/test_ole.rb
 - test/test_storage_lite.rb
 - test/test_workbook.rb