ansel_iconv 1.1.5 → 1.1.6

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## 1.1.6
+
+- Remove dependency on activesupport
+- Remove dependency on jeweler
+- Migrate test suite to Rspec2
+
 ## 1.1.4
 
 - New gemspec and Rakefile

data/Gemfile

@@ -0,0 +1,2 @@
+gemspec
+source :rubygems

data/Gemfile.lock

@@ -0,0 +1,24 @@
+PATH
+  remote: .
+  specs:
+    ansel_iconv (1.1.6)
+
+GEM
+  remote: http://rubygems.org/
+  specs:
+    diff-lcs (1.1.2)
+    rspec (2.3.0)
+      rspec-core (~> 2.3.0)
+      rspec-expectations (~> 2.3.0)
+      rspec-mocks (~> 2.3.0)
+    rspec-core (2.3.1)
+    rspec-expectations (2.3.0)
+      diff-lcs (~> 1.1.2)
+    rspec-mocks (2.3.0)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  ansel_iconv!
+  rspec (~> 2.3.0)

data/README.md

@@ -5,7 +5,7 @@ ANSEL::Iconv is a wrapper for Iconv that adds ANSEL character set conversion.
 Copyright (c) 2006-2010 Keith Morrison <mailto:keithm@infused.org>, <http://www.infused.org>
 
 - Project page: <http://github.com/infused/ansel_iconv>
-- API Documentation: <http://rdoc.info/projects/infused/dbf>
+- API Documentation: <http://rubydoc.info/github/infused/ansel_iconv/frames>
 - 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

data/Rakefile

@@ -1,45 +1,15 @@
-# encoding: utf-8
+# encoding: ascii-8bit
 
 require 'rubygems'
-require 'rubygems/specification'
-require 'rake/testtask'
 
-
-desc 'Default: run unit tests.'
-task :default => :test
-
-Rake::TestTask.new(:test) do |t|
-  t.pattern = 'test/**/*_test.rb'
-  t.verbose = true
-  t.libs << 'test'
-end
-
-def gemspec
-  @gemspec ||= begin
-    file = File.expand_path('../ansel_iconv.gemspec', __FILE__)
-    eval(File.read(file), binding, file)
-  end
+require 'rspec/core/rake_task'
+RSpec::Core::RakeTask.new :spec do |t|
+  t.rspec_opts = %w(-fs --color)
 end
 
-begin
-  require 'rake/gempackagetask'
-rescue LoadError
-  task(:gem) { $stderr.puts '`gem install rake` to package gems' }
-else
-  Rake::GemPackageTask.new(gemspec) do |pkg|
-    pkg.gem_spec = gemspec
-  end
-  task :gem => :gemspec
-end
-
-desc "install the gem locally"
-task :install => :package do
-  sh %{gem install pkg/#{gemspec.name}-#{gemspec.version}}
-end
+task :default => :spec
 
-desc "validate the gemspec"
-task :gemspec do
-  gemspec.validate
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -I lib -r dbf.rb"
 end
-
-task :package => :gemspec

data/lib/ansel_iconv.rb

@@ -1,7 +1,5 @@
 # encoding: ascii-8bit
 
-gem 'activesupport', '>= 2.3.5', '<=2.3.8'
-require 'active_support'
 require 'iconv'
 require 'ansel_iconv/character_map'
 require 'ansel_iconv/iconv'

data/lib/ansel_iconv/character_map.rb

@@ -1,3 +1,5 @@
+# encoding: ascii-8bit
+
 module ANSEL
   module CharacterMap
     @@non_combining = {

data/lib/ansel_iconv/converter.rb

@@ -6,9 +6,10 @@ module ANSEL
     
     def initialize(to_charset = 'UTF-8')
       @to_charset = to_charset
-      @ansi_to_utf8 = {}
-      @ansi_to_utf8.merge!(@@non_combining)
-      @ansi_to_utf8.merge!(@@combining)
+    end
+    
+    def ansi_to_utf8
+      @ansi_to_utf8 ||= @@non_combining.merge(@@combining)
     end
 
     def iconv(string)
@@ -22,21 +23,21 @@ module ANSEL
           output << byte
         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'])
+          output << ::Iconv.conv(@to_charset, 'UTF-16', ansi_to_utf8[hex_key] || ansi_to_utf8['ERR'])
           scanner.get_byte # ignore the next byte
         elsif char >= 0xE0 && char <= 0xFB
           [2, 1, 0].each do |n| # try 3 bytes, then 2 bytes, then 1 byte
             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)  
-              output << ::Iconv.conv(@to_charset, 'UTF-16', @ansi_to_utf8[hex_key])
+            hex_key = bytes.join('+')
+            if ansi_to_utf8.has_key?(hex_key)  
+              output << ::Iconv.conv(@to_charset, 'UTF-16', ansi_to_utf8[hex_key])
               n.times {scanner.get_byte}
               break
             end
           end
         else
-          output << ::Iconv.conv(@to_charset, 'UTF-16', @ansi_to_utf8['ERR'])
+          output << ::Iconv.conv(@to_charset, 'UTF-16', ansi_to_utf8['ERR'])
           scanner.get_byte if scanner.get_byte.unpack('C')[0] >= 0xE0 # ignore the next byte
         end
       end

data/lib/ansel_iconv/iconv.rb

@@ -1,11 +1,13 @@
 # encoding: ascii-8bit
 
 module ANSEL
-  class Iconv
-    delegate :iconv, :to => :@converter
-    
+  class Iconv    
     def initialize(to, from = 'ANSEL')
       @converter = (from == 'ANSEL') ? Convert.new(to) : ::Iconv.new(to, from)
     end
+    
+    def iconv(*args)
+      @converter.iconv(*args)
+    end
   end
 end

data/lib/ansel_iconv/version.rb

@@ -1,3 +1,7 @@
+# encoding: ascii-8bit
+
 module ANSEL
-  VERSION = '1.1.5'
+  class Iconv
+    VERSION = '1.1.6'
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: ansel_iconv
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 1
-  - 5
-  version: 1.1.5
+  - 6
+  version: 1.1.6
 platform: ruby
 authors: 
 - Keith Morrison
@@ -15,32 +15,24 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-25 00:00:00 -07:00
+date: 2010-12-30 00:00:00 -08:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
-    - - ">="
+    - - ~>
       - !ruby/object:Gem::Version 
-        hash: 9
+        hash: 3
         segments: 
         - 2
         - 3
-        - 5
-        version: 2.3.5
-    - - <=
-      - !ruby/object:Gem::Version 
-        hash: 19
-        segments: 
-        - 2
-        - 3
-        - 8
-        version: 2.3.8
-  type: :runtime
+        - 0
+        version: 2.3.0
+  type: :development
   version_requirements: *id001
 description: Convert ANSEL encoded text to any other encoding available to Iconv
 email: keithm@infused.org
@@ -51,8 +43,11 @@ extensions: []
 extra_rdoc_files: 
 - README.md
 - CHANGELOG.md
+- MIT-LICENSE
 files: 
 - CHANGELOG.md
+- Gemfile
+- Gemfile.lock
 - MIT-LICENSE
 - Rakefile
 - README.md
@@ -61,8 +56,6 @@ files:
 - lib/ansel_iconv/iconv.rb
 - lib/ansel_iconv/version.rb
 - lib/ansel_iconv.rb
-- test/ansel_iconv_test.rb
-- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/infused/ansel_iconv
 licenses: []

data/test/ansel_iconv_test.rb

@@ -1,103 +0,0 @@
-# encoding: ascii-8bit
-
-require 'test_helper'
-
-class ANSEL::IconvTest < Test::Unit::TestCase
-  FIXTURE_PATH = File.dirname(__FILE__) + "/../../../fixtures/gedcom"
-  
-  def setup
-    @ansel = ANSEL::Iconv.new 'UTF-8'
-  end
-  
-  should "return ASCII values without conversion" do
-    assert_equal " ", @ansel.iconv("\x20")
-    assert_equal "x", @ansel.iconv("\x78")
-  end
-  
-  should "return the unicode replacement character for invalid characters" do
-    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
-    # ANSEL non-combining mappings
-    assert_equal "", @ansel.iconv("\x88\x00")
-    assert_equal "", @ansel.iconv("\x89\x00")
-    assert_equal "", @ansel.iconv("\x8D\x00")
-    assert_equal "", @ansel.iconv("\x8E\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 "Ả".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?".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
-    converter = ANSEL::Iconv.new 'UTF-16', 'ANSEL'
-    assert_equal "\376\377\000a\000b\000c", converter.iconv('abc')
-  end
-  
-  should "convert ASCII to UTF-16" do
-    converter = ANSEL::Iconv.new 'UTF-16', 'ASCII'
-    assert_equal "\376\377\000a\000b\000c", converter.iconv('abc')
-  end
-  
-  should "convert UTF-8 to UTF-16" do
-    converter = ANSEL::Iconv.new 'UTF-16', 'UTF-8'
-    assert_equal "\376\377\000a\000b\000c", converter.iconv('abc')
-  end
-  
-  should "convert UTF-16 to UTF-16" do
-    converter = ANSEL::Iconv.new 'UTF-16', 'UTF-16'
-    assert_equal "\376\377\000a\000b\000c", converter.iconv("\376\377\000a\000b\000c")
-  end
-end

data/test/test_helper.rb

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