ansel_iconv 1.0.5 → 1.1.0

data/History.txt

@@ -1,4 +1,8 @@
-== 1.0.4
+== 1.1.0
+
+* Ruby 1.9 compatibility
+
+== 1.0.5
 
 * Requires activesupport 2.3.5 and works when 3.0 is installed
 

data/README.markdown

@@ -9,6 +9,10 @@ Copyright (c) 2006-2010 Keith Morrison <mailto:keithm@infused.org>, <http://www.
 * Report bugs: <http://github.com/infused/ansel_iconv/issues>
 * Questions? Email [keithm@infused.org](mailto:keithm@infused.org?subject=ANSEL::Iconv)
   with ANSEL::Iconv in the subject line
+  
+## Compatibility
+
+ANSEL::Iconv is compatible with Ruby 1.8.6, 1.8.7 and 1.9.1
 
 ## Installation
 

data/Rakefile

@@ -8,7 +8,7 @@ require 'jeweler'
 
 Jeweler::Tasks.new do |p|
   p.name = 'ansel_iconv'
-  p.description = 'Convert ANSEL encoded text to any other encoding'
+  p.description = 'Convert ANSEL encoded text to any other encoding available to Iconv'
   p.summary = 'Convert ANSEL encoded text'
   p.platform = Gem::Platform::RUBY
   p.authors = ['Keith Morrison']

data/VERSION.yml

@@ -1,4 +1,4 @@
 --- 
-:patch: 5
+:patch: 0
 :major: 1
-:minor: 0
+:minor: 1

data/ansel_iconv.gemspec

@@ -5,12 +5,12 @@
 
 Gem::Specification.new do |s|
   s.name = %q{ansel_iconv}
-  s.version = "1.0.5"
+  s.version = "1.1.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Keith Morrison"]
   s.date = %q{2010-04-07}
-  s.description = %q{Convert ANSEL encoded text to any other encoding}
+  s.description = %q{Convert ANSEL encoded text to any other encoding available to Iconv}
   s.email = %q{keithm@infused.org}
   s.extra_rdoc_files = [
     "README.markdown"

data/lib/ansel_iconv.rb

@@ -1,3 +1,5 @@
+# encoding: ascii-8bit
+
 gem 'activesupport', '=2.3.5'
 require 'active_support'
 require 'iconv'
@@ -588,15 +590,15 @@ module ANSEL
       until scanner.eos? do
         byte = scanner.get_byte
       
-        if byte[0] <= 0x7F
+        if byte.unpack('C')[0] <= 0x7F
           output << byte
-        elsif byte[0] >= 0x88 && byte[0] <= 0xC8
-          hex_key = byte[0].to_s(16).upcase
+        elsif byte.unpack('C')[0] >= 0x88 && byte.unpack('C')[0] <= 0xC8
+          hex_key = byte.unpack('C')[0].to_s(16).upcase
           output << ::Iconv.conv(@to_charset, 'UTF-16', @ansi_to_utf8.has_key?(hex_key) ? @ansi_to_utf8[hex_key] : @ansi_to_utf8['ERR'])
           scanner.get_byte # ignore the next byte
-        elsif byte[0] >= 0xE0 && byte[0] <= 0xFB
+        elsif byte.unpack('C')[0] >= 0xE0 && byte.unpack('C')[0] <= 0xFB
           [2, 1, 0].each do |n| # try 3 bytes, then 2 bytes, then 1 byte
-            bytes = [byte[0].to_s(16).upcase]
+            bytes = [byte.unpack('C')[0].to_s(16).upcase]
             scanner.peek(n).each_byte {|b| bytes << b.to_s(16).upcase}
             hex_key = bytes.join("+")
             if @ansi_to_utf8.has_key?(hex_key)  
@@ -607,7 +609,7 @@ module ANSEL
           end
         else
           output << ::Iconv.conv(@to_charset, 'UTF-16', @ansi_to_utf8['ERR'])
-          scanner.get_byte if scanner.get_byte[0] >= 0xE0 # ignore the next byte
+          scanner.get_byte if scanner.get_byte.unpack('C')[0] >= 0xE0 # ignore the next byte
         end
       end
     

data/test/ansel_iconv_test.rb

@@ -1,3 +1,5 @@
+# encoding: ascii-8bit
+
 require 'test_helper'
 
 class ANSEL::IconvTest < Test::Unit::TestCase
@@ -13,8 +15,8 @@ class ANSEL::IconvTest < Test::Unit::TestCase
   end
   
   should "return the unicode replacement character for invalid characters" do
-    assert_equal "\xEF\xBF\xBD", @ansel.iconv("\xBE\x00")
-    assert_equal "\xEF\xBF\xBD", @ansel.iconv("\xD1\x00")
+    assert_equal "�".force_encoding('utf-8'), @ansel.iconv("\xBE\x00")
+    assert_equal "�".force_encoding('utf-8'), @ansel.iconv("\xD1\x00")
   end
   
   should "return UTF-8 characters for valid ANSEL characters" do
@@ -23,60 +25,60 @@ class ANSEL::IconvTest < Test::Unit::TestCase
     assert_equal "", @ansel.iconv("\x89\x00")
     assert_equal "", @ansel.iconv("\x8D\x00")
     assert_equal "", @ansel.iconv("\x8E\x00")
-    assert_equal "Ł", @ansel.iconv("\xA1\x00")
-    assert_equal "Ø", @ansel.iconv("\xA2\x00")
-    assert_equal "Đ", @ansel.iconv("\xA3\x00")
-    assert_equal "Þ", @ansel.iconv("\xA4\x00")
-    assert_equal "Æ", @ansel.iconv("\xA5\x00")
-    assert_equal "Œ", @ansel.iconv("\xA6\x00")
-    assert_equal "ʹ", @ansel.iconv("\xA7\x00")
-    assert_equal "·", @ansel.iconv("\xA8\x00")
-    assert_equal "♭", @ansel.iconv("\xA9\x00")
-    assert_equal "®", @ansel.iconv("\xAA\x00")
-    assert_equal "±", @ansel.iconv("\xAB\x00")
-    assert_equal "±", @ansel.iconv("\xAB\x00")
-    assert_equal "Ơ", @ansel.iconv("\xAC\x00")
-    assert_equal "Ư", @ansel.iconv("\xAD\x00")
-    assert_equal "ʼ", @ansel.iconv("\xAE\x00")
-    assert_equal "ʻ", @ansel.iconv("\xB0\x00")
-    assert_equal "ł", @ansel.iconv("\xB1\x00")
-    assert_equal "ø", @ansel.iconv("\xB2\x00")
-    assert_equal "đ", @ansel.iconv("\xB3\x00")
-    assert_equal "þ", @ansel.iconv("\xB4\x00")
-    assert_equal "æ", @ansel.iconv("\xB5\x00")
-    assert_equal "œ", @ansel.iconv("\xB6\x00")
-    assert_equal "ʺ", @ansel.iconv("\xB7\x00")
-    assert_equal "ı", @ansel.iconv("\xB8\x00")
-    assert_equal "£", @ansel.iconv("\xB9\x00")
-    assert_equal "ð", @ansel.iconv("\xBA\x00")
-    assert_equal "ơ", @ansel.iconv("\xBC\x00")
-    assert_equal "ư", @ansel.iconv("\xBD\x00")
-    assert_equal "°", @ansel.iconv("\xC0\x00")
-    assert_equal "ℓ", @ansel.iconv("\xC1\x00")
-    assert_equal "℗", @ansel.iconv("\xC2\x00")
-    assert_equal "©", @ansel.iconv("\xC3\x00")
-    assert_equal "♯", @ansel.iconv("\xC4\x00")
-    assert_equal "¿", @ansel.iconv("\xC5\x00")
-    assert_equal "¡", @ansel.iconv("\xC6\x00")
-    assert_equal "ß", @ansel.iconv("\xC7\x00")
-    assert_equal "€", @ansel.iconv("\xC8\x00")
+    assert_equal "Ł".force_encoding('utf-8'), @ansel.iconv("\xA1\x00")
+    assert_equal "Ø".force_encoding('utf-8'), @ansel.iconv("\xA2\x00")
+    assert_equal "Đ".force_encoding('utf-8'), @ansel.iconv("\xA3\x00")
+    assert_equal "Þ".force_encoding('utf-8'), @ansel.iconv("\xA4\x00")
+    assert_equal "Æ".force_encoding('utf-8'), @ansel.iconv("\xA5\x00")
+    assert_equal "Œ".force_encoding('utf-8'), @ansel.iconv("\xA6\x00")
+    assert_equal "ʹ".force_encoding('utf-8'), @ansel.iconv("\xA7\x00")
+    assert_equal "·".force_encoding('utf-8'), @ansel.iconv("\xA8\x00")
+    assert_equal "♭".force_encoding('utf-8'), @ansel.iconv("\xA9\x00")
+    assert_equal "®".force_encoding('utf-8'), @ansel.iconv("\xAA\x00")
+    assert_equal "±".force_encoding('utf-8'), @ansel.iconv("\xAB\x00")
+    assert_equal "±".force_encoding('utf-8'), @ansel.iconv("\xAB\x00")
+    assert_equal "Ơ".force_encoding('utf-8'), @ansel.iconv("\xAC\x00")
+    assert_equal "Ư".force_encoding('utf-8'), @ansel.iconv("\xAD\x00")
+    assert_equal "ʼ".force_encoding('utf-8'), @ansel.iconv("\xAE\x00")
+    assert_equal "ʻ".force_encoding('utf-8'), @ansel.iconv("\xB0\x00")
+    assert_equal "ł".force_encoding('utf-8'), @ansel.iconv("\xB1\x00")
+    assert_equal "ø".force_encoding('utf-8'), @ansel.iconv("\xB2\x00")
+    assert_equal "đ".force_encoding('utf-8'), @ansel.iconv("\xB3\x00")
+    assert_equal "þ".force_encoding('utf-8'), @ansel.iconv("\xB4\x00")
+    assert_equal "æ".force_encoding('utf-8'), @ansel.iconv("\xB5\x00")
+    assert_equal "œ".force_encoding('utf-8'), @ansel.iconv("\xB6\x00")
+    assert_equal "ʺ".force_encoding('utf-8'), @ansel.iconv("\xB7\x00")
+    assert_equal "ı".force_encoding('utf-8'), @ansel.iconv("\xB8\x00")
+    assert_equal "£".force_encoding('utf-8'), @ansel.iconv("\xB9\x00")
+    assert_equal "ð".force_encoding('utf-8'), @ansel.iconv("\xBA\x00")
+    assert_equal "ơ".force_encoding('utf-8'), @ansel.iconv("\xBC\x00")
+    assert_equal "ư".force_encoding('utf-8'), @ansel.iconv("\xBD\x00")
+    assert_equal "°".force_encoding('utf-8'), @ansel.iconv("\xC0\x00")
+    assert_equal "ℓ".force_encoding('utf-8'), @ansel.iconv("\xC1\x00")
+    assert_equal "℗".force_encoding('utf-8'), @ansel.iconv("\xC2\x00")
+    assert_equal "©".force_encoding('utf-8'), @ansel.iconv("\xC3\x00")
+    assert_equal "♯".force_encoding('utf-8'), @ansel.iconv("\xC4\x00")
+    assert_equal "¿".force_encoding('utf-8'), @ansel.iconv("\xC5\x00")
+    assert_equal "¡".force_encoding('utf-8'), @ansel.iconv("\xC6\x00")
+    assert_equal "ß".force_encoding('utf-8'), @ansel.iconv("\xC7\x00")
+    assert_equal "€".force_encoding('utf-8'), @ansel.iconv("\xC8\x00")
     
     # ANSEL combining characters
-    assert_equal "Ả", @ansel.iconv("\xE0\x41")
-    assert_equal "Ḻ", @ansel.iconv("\xF6\x4C")
-    assert_equal "̲", @ansel.iconv("\xF6")
-    assert_equal "̮", @ansel.iconv("\xF9")
-    assert_equal "Ḫ", @ansel.iconv("\xF9\x48")
-    assert_equal "Ậ", @ansel.iconv("\xF2\xE3\x41")
-    assert_equal "ỵ", @ansel.iconv("\xF2\x79")
-    assert_equal "̣", @ansel.iconv("\xF2")
+    assert_equal "Ả".force_encoding('utf-8'), @ansel.iconv("\xE0\x41")
+    assert_equal "Ḻ".force_encoding('utf-8'), @ansel.iconv("\xF6\x4C")
+    assert_equal "̲".force_encoding('utf-8'), @ansel.iconv("\xF6")
+    assert_equal "̮".force_encoding('utf-8'), @ansel.iconv("\xF9")
+    assert_equal "Ḫ".force_encoding('utf-8'), @ansel.iconv("\xF9\x48")
+    assert_equal "Ậ".force_encoding('utf-8'), @ansel.iconv("\xF2\xE3\x41")
+    assert_equal "ỵ".force_encoding('utf-8'), @ansel.iconv("\xF2\x79")
+    assert_equal "̣".force_encoding('utf-8'), @ansel.iconv("\xF2")
   end
   
   should "convert full text correctly" do
     assert_equal "What is the question?", @ansel.iconv("What is the question?")
-    assert_equal "¿What is the question?", @ansel.iconv("\xC5\x00What is the question?")
-    assert_equal "© 1994", @ansel.iconv("\xC3\x00 1994")
-    assert_equal "£4.59", @ansel.iconv("\xB9\x004.59")
+    assert_equal "¿What is the question?".force_encoding('utf-8'), @ansel.iconv("\xC5\x00What is the question?")
+    assert_equal "© 1994".force_encoding('utf-8'), @ansel.iconv("\xC3\x00 1994")
+    assert_equal "£4.59".force_encoding('utf-8'), @ansel.iconv("\xB9\x004.59")
   end
   
   should "convert ANSEL to UTF-16" do

data/test/test_helper.rb

@@ -1,5 +1,15 @@
+# encoding: ascii-8bit
+
 $:.unshift(File.dirname(__FILE__) + "/../lib/")
 require 'rubygems'
 require 'test/unit'
 require 'shoulda'
-require 'ansel_iconv'
+require 'ansel_iconv'
+
+if RUBY_VERSION < '1.9'
+  class String
+    def force_encoding(e)
+      self
+    end
+  end
+end

metadata

@@ -4,9 +4,9 @@ version: !ruby/object:Gem::Version
   prerelease: false
   segments: 
   - 1
+  - 1
   - 0
-  - 5
-  version: 1.0.5
+  version: 1.1.0
 platform: ruby
 authors: 
 - Keith Morrison
@@ -31,7 +31,7 @@ dependencies:
         version: 2.3.5
   type: :runtime
   version_requirements: *id001
-description: Convert ANSEL encoded text to any other encoding
+description: Convert ANSEL encoded text to any other encoding available to Iconv
 email: keithm@infused.org
 executables: []