ansel_iconv 1.1.0 → 1.1.2

data/History.txt

@@ -1,3 +1,7 @@
+== 1.1.2
+
+* Speed up conversion
+
 == 1.1.0
 
 * Ruby 1.9 compatibility

data/README.markdown

@@ -12,7 +12,7 @@ Copyright (c) 2006-2010 Keith Morrison <mailto:keithm@infused.org>, <http://www.
   
 ## Compatibility
 
-ANSEL::Iconv is compatible with Ruby 1.8.6, 1.8.7 and 1.9.1
+ANSEL::Iconv is compatible with Ruby 1.8.6, 1.8.7, and 1.9.2
 
 ## Installation
 
@@ -21,14 +21,21 @@ ANSEL::Iconv is compatible with Ruby 1.8.6, 1.8.7 and 1.9.1
 ## Basic Usage
 
 Conversion from ANSEL to any other encoding is fully supported, but you cannot 
-currently convert to ANSEL from another encoding. Two-way encoding will be added
-in a future release.
+convert to ANSEL from another encoding. Two-way encoding may be added
+in the future.
     
     require 'ansel_iconv'
     
-    # Convert ANSEL to UTF-8
-    @ansel = ANSEL::Iconv.new 'UTF-8'
-    @ansel.iconv("\xB9\x004.59") # => "£4.59" 
+    # convert ANSEL to UTF-8
+    converter = ANSEL::Iconv.new 'UTF-8'
+    converter.iconv("\xB9\x004.59") # => "£4.59"
+    
+You can use ANSEL::Iconv as a replacement for the built-in Iconv, because
+non-ANSEL conversions are simply passed through to Iconv.
+
+    # convert UTF-8 to UTF-16
+    converter = ANSEL::Iconv.new 'UTF-16', 'UTF-8'
+    converter.iconv("£4.59") # => "\376\377\000\243\0004\000.\0005\0009"
   
 ## About the ANSEL character set
 

data/VERSION.yml

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

data/ansel_iconv.gemspec

@@ -1,15 +1,15 @@
 # Generated by jeweler
-# DO NOT EDIT THIS FILE
-# Instead, edit Jeweler::Tasks in Rakefile, and run `rake gemspec`
+# DO NOT EDIT THIS FILE DIRECTLY
+# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
   s.name = %q{ansel_iconv}
-  s.version = "1.1.0"
+  s.version = "1.1.2"
 
   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.date = %q{2010-05-28}
   s.description = %q{Convert ANSEL encoded text to any other encoding available to Iconv}
   s.email = %q{keithm@infused.org}
   s.extra_rdoc_files = [
@@ -28,7 +28,7 @@ Gem::Specification.new do |s|
   s.homepage = %q{http://github.com/infused/ansel_iconv}
   s.rdoc_options = ["--charset=UTF-8"]
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.6}
+  s.rubygems_version = %q{1.3.7}
   s.summary = %q{Convert ANSEL encoded text}
   s.test_files = [
     "test/ansel_iconv_test.rb",
@@ -39,7 +39,7 @@ Gem::Specification.new do |s|
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
-    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+    if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_runtime_dependency(%q<activesupport>, ["= 2.3.5"])
     else
       s.add_dependency(%q<activesupport>, ["= 2.3.5"])
@@ -48,3 +48,4 @@ Gem::Specification.new do |s|
     s.add_dependency(%q<activesupport>, ["= 2.3.5"])
   end
 end
+

data/lib/ansel_iconv.rb

@@ -589,16 +589,17 @@ module ANSEL
       scanner = StringScanner.new(string)
       until scanner.eos? do
         byte = scanner.get_byte
+        char = byte.unpack('C')[0]
       
-        if byte.unpack('C')[0] <= 0x7F
+        if char <= 0x7F
           output << byte
-        elsif byte.unpack('C')[0] >= 0x88 && byte.unpack('C')[0] <= 0xC8
-          hex_key = byte.unpack('C')[0].to_s(16).upcase
+        elsif char >= 0x88 && char <= 0xC8
+          hex_key = char.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.unpack('C')[0] >= 0xE0 && byte.unpack('C')[0] <= 0xFB
+        elsif char >= 0xE0 && char <= 0xFB
           [2, 1, 0].each do |n| # try 3 bytes, then 2 bytes, then 1 byte
-            bytes = [byte.unpack('C')[0].to_s(16).upcase]
+            bytes = [char.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)  
@@ -615,20 +616,6 @@ module ANSEL
     
       @to_charset == 'UTF-8' ? output : ::Iconv.conv(@to_charset, 'UTF-8', output)
     end
-  
-    def convert_char(char)
-      return char if char.size <= 1 && char[0] <= 0x7f
-      
-      if char[0] > 0x7f && char[0] < 0xE0
-        hex_key = char[0].to_s(16).upcase
-      elsif char[0] >= 0xE0
-        bytes = []
-        char.each_byte {|byte| bytes << byte.to_s(16).upcase}
-        hex_key = bytes.join('+')
-      end
-      return ::Iconv.conv(@to_charset, 'UTF-16', @ansi_to_utf8.has_key?(hex_key) ? @ansi_to_utf8[hex_key] : @ansi_to_utf8['ERR'])
-    end
-  
+    
   end
-  
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ansel_iconv
 version: !ruby/object:Gem::Version 
+  hash: 23
   prerelease: false
   segments: 
   - 1
   - 1
-  - 0
-  version: 1.1.0
+  - 2
+  version: 1.1.2
 platform: ruby
 authors: 
 - Keith Morrison
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-04-07 00:00:00 -07:00
+date: 2010-05-28 00:00:00 -07:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: activesupport
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - "="
       - !ruby/object:Gem::Version 
+        hash: 9
         segments: 
         - 2
         - 3
@@ -58,23 +61,27 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.3.7
 signing_key: 
 specification_version: 3
 summary: Convert ANSEL encoded text