text 0.1.13 → 0.1.14

data/test/test_double_metaphone.rb

@@ -1,20 +1,13 @@
 require File.join(File.dirname(__FILE__), 'preamble')
 
-begin
-  require 'rubygems' rescue nil
-  require 'fastercsv'
-  METHOD = [ FasterCSV, :foreach, { :col_sep => ', ' } ]
-rescue LoadError
-  require 'csv'
-  METHOD = [ CSV, :open, 'r', ', ' ]
-end
+require 'csv'
 
 class DoubleMetaphoneTest < Test::Unit::TestCase
 
   def test_cases
-    METHOD.shift.send(METHOD.shift, File.rel('data', 'double_metaphone.csv'), *METHOD) do |row|
+    CSV.open(File.rel('data', 'double_metaphone.csv'), 'r').to_a.each do |row|
       primary, secondary = Text::Metaphone.double_metaphone(row[0])
-
+      
       assert_equal row[1], primary
       assert_equal row[2], secondary.nil?? primary : secondary
     end

data/test/test_figlet.rb

@@ -2,16 +2,17 @@ require File.join(File.dirname(__FILE__), 'preamble')
 
 class FigletTest < Test::Unit::TestCase
 
-  def test_hello_world
-    font = Text::Figlet::Font.new(File.rel('data', 'big.flf'))
-    figlet = Text::Figlet::Typesetter.new(font)
-    assert_equal File.read(File.rel('data', 'big.txt')), figlet['Hello World']
-  end
+  if !Text.is_19?
+    def test_hello_world
+      font = Text::Figlet::Font.new(File.rel('data', 'big.flf'))
+      figlet = Text::Figlet::Typesetter.new(font)
+      assert_equal File.read(File.rel('data', 'big.txt')), figlet['Hello World']
+    end
 
-  def test_no_smushing
-    font = Text::Figlet::Font.new(File.rel('data', 'chunky.flf'))
-    figlet = Text::Figlet::Typesetter.new(font, :smush => false)
-    assert_equal File.read(File.rel('data', 'chunky.txt')), figlet['Chunky Bacon']
+    def test_no_smushing
+      font = Text::Figlet::Font.new(File.rel('data', 'chunky.flf'))
+      figlet = Text::Figlet::Typesetter.new(font, :smush => false)
+      assert_equal File.read(File.rel('data', 'chunky.txt')), figlet['Chunky Bacon']
+    end
   end
-
 end

data/test/test_levenshtein.rb

@@ -41,16 +41,28 @@ class LevenshteinTest < Test::Unit::TestCase
 
   def assert_set(name)
     TEST_CASES[name].each do |s, t, x|
+      if defined?(Encoding) && Encoding.default_internal # Change the encoding if in 1.9
+        t.force_encoding(Encoding.default_internal)
+        s.force_encoding(Encoding.default_internal)
+      end
+
       assert_equal x, distance(s, t)
       assert_equal x, distance(t, s)
     end
   end
 
-  def with_kcode(k)
-    old_kcode = $KCODE
-    $KCODE = k
-    yield
-    $KCODE = old_kcode
+  def with_encoding(kcode, encoding)
+    if Text.is_19?
+      old_encoding = Encoding.default_internal 
+      Encoding.default_internal = encoding
+      yield
+      Encoding.default_internal = old_encoding
+    else # 1.8 backwards compat
+      old_kcode = $KCODE
+      $KCODE = kcode
+      yield
+      $KCODE = old_kcode
+    end
   end
 
   def test_easy_cases
@@ -66,13 +78,13 @@ class LevenshteinTest < Test::Unit::TestCase
   end
 
   def test_utf8_cases
-    with_kcode('U') do
+    with_encoding('U', 'UTF-8') do
       assert_set(:utf8)
     end
   end
 
   def test_iso_8859_1_cases
-    with_kcode('NONE') do
+    with_encoding('NONE', 'ISO-8859-1') do
       assert_set(:iso_8859_1)
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: text
 version: !ruby/object:Gem::Version 
-  version: 0.1.13
+  version: 0.1.14
 platform: ruby
 authors: 
 - Paul Battley
@@ -11,7 +11,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-11 00:00:00 +01:00
+date: 2010-02-02 00:00:00 +00:00
 default_executable: 
 dependencies: []