[groonga-commit:2806] ranguba/ranguba [master] use Encoding constants instead of Encoding.find

[null+ranguba at clear-code.com]

Kenji Okimoto	2010-12-21 02:55:00 +0000 (Tue, 21 Dec 2010)

  New Revision: 62b6a041e6ed1d903d8ebd756cba84f1c796804e

  Log:
    use Encoding constants instead of Encoding.find

  Modified files:
    lib/ranguba/category_loader.rb
    lib/ranguba/encoding_loader.rb
    lib/ranguba/file_reader.rb
    lib/ranguba/template.rb
    lib/ranguba/type_loader.rb
    test/unit/ranguba/category_loader_test.rb
    test/unit/ranguba/encoding_loader_test.rb

  Modified: lib/ranguba/category_loader.rb (+1 -1)
===================================================================
--- lib/ranguba/category_loader.rb    2010-12-21 02:45:09 +0000 (ac8d1b9)
+++ lib/ranguba/category_loader.rb    2010-12-21 02:55:00 +0000 (cc2556a)
@@ -2,7 +2,7 @@ require 'csv'
 
 class Ranguba::CategoryLoader
 
-  def initialize(encoding=Encoding.find("utf-8"))
+  def initialize(encoding=Encoding::UTF_8)
     @base = Ranguba::Application.config.customize_base_path
     @path = @base + 'categories.csv'
     @encoding = encoding

  Modified: lib/ranguba/encoding_loader.rb (+1 -1)
===================================================================
--- lib/ranguba/encoding_loader.rb    2010-12-21 02:45:09 +0000 (7d2b8b1)
+++ lib/ranguba/encoding_loader.rb    2010-12-21 02:55:00 +0000 (b478ded)
@@ -8,7 +8,7 @@ class Ranguba::EncodingLoader
   end
 
   def load
-    encodings = Hash.new {|h, k| h[k] = Encoding.find("utf-8")}
+    encodings = Hash.new {|h, k| h[k] = Encoding::UTF_8}
     return encodings unless File.exist?(@path)
     CSV.foreach(@path, encoding: "utf-8", skip_blanks: true) do |row|
       filename, encoding = row

  Modified: lib/ranguba/file_reader.rb (+3 -3)
===================================================================
--- lib/ranguba/file_reader.rb    2010-12-21 02:45:09 +0000 (5056b8f)
+++ lib/ranguba/file_reader.rb    2010-12-21 02:55:00 +0000 (a16416a)
@@ -2,16 +2,16 @@ require 'csv'
 
 class Ranguba::FileReader
 
-  def self.read(path, external_encoding=Encoding.find('utf-8'))
+  def self.read(path, external_encoding=Encoding::UTF_8)
     return '' unless File.exist?(path)
-    if external_encoding == Encoding.find('utf-8')
+    if external_encoding == Encoding::UTF_8
       File.open(path, "r:utf-8") {|file| file.read}
     else
       File.open(path, "r:#{external_encoding}:utf-8") {|file| file.read}
     end
   end
 
-  def self.read_csv(path, external_encoding=Encoding.find('utf-8'))
+  def self.read_csv(path, external_encoding=Encoding::UTF_8)
     str = read(path, external_encoding)
     CSV.parse(str, skip_blanks: true) do |row|
       yield row

  Modified: lib/ranguba/template.rb (+3 -3)
===================================================================
--- lib/ranguba/template.rb    2010-12-21 02:45:09 +0000 (62a25d9)
+++ lib/ranguba/template.rb    2010-12-21 02:55:00 +0000 (d837851)
@@ -22,9 +22,9 @@ class Ranguba::Template
   private
   def default_encodings
     {
-      'title.txt'  => Encoding.find('utf-8'),
-      'header.txt' => Encoding.find('utf-8'),
-      'footer.txt' => Encoding.find('utf-8'),
+      'title.txt'  => Encoding::UTF_8,
+      'header.txt' => Encoding::UTF_8,
+      'footer.txt' => Encoding::UTF_8,
     }
   end
 end

  Modified: lib/ranguba/type_loader.rb (+1 -1)
===================================================================
--- lib/ranguba/type_loader.rb    2010-12-21 02:45:09 +0000 (7bf8c2d)
+++ lib/ranguba/type_loader.rb    2010-12-21 02:55:00 +0000 (d05e05b)
@@ -2,7 +2,7 @@ require 'csv'
 
 class Ranguba::TypeLoader
 
-  def initialize(encoding=Encoding.find("utf-8"))
+  def initialize(encoding=Encoding::UTF_8)
     @base = Ranguba::Application.config.customize_base_path
     @path = @base + 'types.csv'
     @encoding = encoding

  Modified: test/unit/ranguba/category_loader_test.rb (+1 -1)
===================================================================
--- test/unit/ranguba/category_loader_test.rb    2010-12-21 02:45:09 +0000 (8dbdfc2)
+++ test/unit/ranguba/category_loader_test.rb    2010-12-21 02:55:00 +0000 (24fae81)
@@ -30,7 +30,7 @@ class Ranguba::CategoryLoaderTest < ActiveSupport::TestCase
   end
 
   def test_load_with_sjis
-    @loader = Ranguba::CategoryLoader.new(Encoding.find('sjis'))
+    @loader = Ranguba::CategoryLoader.new(Encoding::Shift_JIS)
     path = Rails.root + 'tmp' + 'categories.csv'
     File.open(path, 'w+:sjis:utf-8') do |file|
       str=<<CSV

  Modified: test/unit/ranguba/encoding_loader_test.rb (+6 -6)
===================================================================
--- test/unit/ranguba/encoding_loader_test.rb    2010-12-21 02:45:09 +0000 (5595d88)
+++ test/unit/ranguba/encoding_loader_test.rb    2010-12-21 02:55:00 +0000 (71f9d19)
@@ -9,20 +9,20 @@ class Ranguba::EncodingLoaderTest < ActiveSupport::TestCase
   def test_load
     encodings = @loader.load
     expected = {
-      'categories.csv' => Encoding.find('UTF-8'),
-      'title.txt'      => Encoding.find('UTF-8'),
-      'header.txt'     => Encoding.find('EUC-JP'),
-      'footer.txt'     => Encoding.find('Shift_JIS'),
+      'categories.csv' => Encoding::UTF_8,
+      'title.txt'      => Encoding::UTF_8,
+      'header.txt'     => Encoding::EUC_JP,
+      'footer.txt'     => Encoding::Shift_JIS,
     }
     assert_equal(expected, encodings)
-    assert_equal(Encoding.find('UTF-8'), encodings['unknown.txt'])
+    assert_equal(Encoding::UTF_8, encodings['unknown.txt'])
   end
 
   def test_load_not_exist_path
     @loader.instance_variable_set(:@path, 'missing')
     encodings = @loader.load
     assert_true(encodings.empty?)
-    assert_equal(Encoding.find('utf-8'), encodings['categories.csv'])
+    assert_equal(Encoding::UTF_8, encodings['categories.csv'])
   end
 
 end