gimchi 0.2.0 → 0.2.1

data/gimchi.gemspec

@@ -4,7 +4,7 @@ $LOAD_PATH.unshift(lib) unless $LOAD_PATH.include?(lib)
 
 Gem::Specification.new do |gem|
   gem.name          = %q{gimchi}
-  gem.version       = "0.2.0"
+  gem.version       = "0.2.1"
   gem.authors       = ["Junegunn Choi"]
   gem.email         = ["junegunn.c@gmail.com"]
   gem.description   = %q{A Ruby gem for Korean characters}

data/lib/gimchi.rb

@@ -8,77 +8,11 @@ require 'gimchi/char'
 require 'gimchi/pronouncer'
 
 class Gimchi
-  class << self
-    def setup
-      @@default ||= Gimchi.new
-    end
-
-    def Char ch
-      @@default.kchar ch
-    end
-
-    [
-      :decompose,
-      :compose,
-      :korean_char?,
-      :complete_korean_char?,
-      :kchar,
-      :kchar?,
-      :chosung?,
-      :jungsung?,
-      :jongsung?,
-      :read_number,
-      :pronounce,
-      :romanize
-    ].each do |sym|
-      define_method(sym) do |*arg, &b|
-        @@default.send sym, *arg, &b
-      end
-    end
-  end
-
-  CONFIG_FILE_PATH = File.expand_path('../../config/default.yml', __FILE__)
-  attr_reader :config, :chosungs, :jungsungs, :jongsungs
-
-  # Initialize Gimchi::Korean.
-  def initialize
-    symbolize_keys = lambda do |val|
-      case val
-      when Hash
-        {}.tap do |h|
-          val.each do |k, v|
-            k = k.gsub(' ', '_').to_sym if k =~ /[a-z0-9 ]/
-            h[k] = symbolize_keys.call v
-          end
-        end
-      when Array
-        val.map { |v| symbolize_keys.call v }
-      else
-        val
-      end
-    end
-    @config = symbolize_keys.call YAML.load(File.read CONFIG_FILE_PATH)
+class << self
+  attr_reader :chosungs, :jungsungs, :jongsungs
 
-    [
-      @config[:romanization][:post_substitution],
-      @config[:number][:post_substitution],
-      @config[:number][:alt_notation][:post_substitution]
-    ].each do |r|
-      r.keys.each do |k|
-        r[Regexp.compile k.to_s] = r.delete k
-      end
-    end
-    @config.freeze
-
-    @pronouncer = Gimchi::Pronouncer.send :new, self
-
-    @chosungs  = config[:structure][:chosung]
-    @jungsungs = config[:structure][:jungsung]
-    @jongsungs = config[:structure][:jongsung]
-    @chosung_set  = Set[*@chosungs]
-    @jungsung_set = Set[*@jungsungs]
-    @jongsung_set = Set[*@jongsungs]
-    @all          = @chosung_set + @jungsung_set + @jongsung_set
+  def Char ch
+    kchar ch
   end
 
   # Decompose a Korean character into 3 components
@@ -144,11 +78,10 @@ class Gimchi
     ch.unpack('U').all? { | c | c >= 0xAC00 && c <= 0xD7A3 }
   end
 
-  # Returns a Gimchi::Char object for the given Korean character.
-  # @param [String] ch Korean character in String
-  # @return [Gimchi::Char] Gimchi::Char instance
+  # @deprecated
+  # @private
   def kchar ch
-    Gimchi::Char.new(self, ch)
+    Gimchi::Char.new(ch)
   end
 
   # Reads numeric expressions in Korean way.
@@ -206,7 +139,7 @@ class Gimchi
       :slur          => false
     }.merge options
 
-    rdata = config[:romanization]
+    rdata = @config[:romanization]
     post_subs = rdata[:post_substitution]
     rdata = [rdata[:chosung], rdata[:jungsung], rdata[:jongsung]]
 
@@ -252,12 +185,14 @@ class Gimchi
   end
 
 private
+  CONFIG_FILE_PATH = File.expand_path('../../config/default.yml', __FILE__)
+
   def str_length str
     str.length
   end
 
   def read_number_sub num, next_char
-    nconfig = config[:number]
+    nconfig = @config[:number]
 
     if num == '0'
       return nconfig[:digits].first
@@ -374,8 +309,54 @@ private
     end
     ret
   end
+
+  # @private
+  def setup
+    symbolize_keys = lambda do |val|
+      case val
+      when Hash
+        {}.tap do |h|
+          val.each do |k, v|
+            k = k.gsub(' ', '_').to_sym if k =~ /[a-z0-9 ]/
+            h[k] = symbolize_keys.call v
+          end
+        end
+      when Array
+        val.map { |v| symbolize_keys.call v }
+      else
+        val
+      end
+    end
+    @config = symbolize_keys.call YAML.load(File.read CONFIG_FILE_PATH)
+
+    [
+      @config[:romanization][:post_substitution],
+      @config[:number][:post_substitution],
+      @config[:number][:alt_notation][:post_substitution]
+    ].each do |r|
+      r.keys.each do |k|
+        r[Regexp.compile k.to_s] = r.delete k
+      end
+    end
+    @config.freeze
+
+    @pronouncer = Gimchi::Pronouncer.send :new, @config[:pronouncer], @config[:structure]
+
+    @chosungs  = @config[:structure][:chosung]
+    @jungsungs = @config[:structure][:jungsung]
+    @jongsungs = @config[:structure][:jongsung]
+    @chosung_set  = Set[*@chosungs]
+    @jungsung_set = Set[*@jungsungs]
+    @jongsung_set = Set[*@jongsungs]
+    @all          = @chosung_set + @jungsung_set + @jongsung_set
+  end
+end
+private
+  def initialize
+    raise NoMethodError, "Gimchi is a singleton class"
+  end
 end#Gimchi
 
 require 'gimchi/patch_1.8'
 
-Gimchi.setup
+Gimchi.send :setup

data/lib/gimchi/char.rb

@@ -13,13 +13,11 @@ class Gimchi
     # @return [String] Jongsung component of this character.
     attr_reader :jongsung
 
-    # @param [Gimchi] gimchi Gimchi instance
     # @param [String] kchar Korean character string
-    def initialize gimchi, kchar
-      raise ArgumentError.new('Not a korean character') unless gimchi.korean_char? kchar
+    def initialize kchar
+      raise ArgumentError.new('Not a korean character') unless Gimchi.korean_char? kchar
 
-      @gimchi = gimchi
-      if @gimchi.complete_korean_char? kchar
+      if Gimchi.complete_korean_char? kchar
         c = kchar.unpack('U').first
         n = c - 0xAC00
         # '가' ~ '깋' -> 'ㄱ'
@@ -28,14 +26,14 @@ class Gimchi
         n = n % (21 * 28)
         n2 = n / 28;
         n3 = n % 28;
-        self.chosung = @gimchi.chosungs[n1]
-        self.jungsung = @gimchi.jungsungs[n2]
-        self.jongsung = ([nil] + @gimchi.jongsungs)[n3]
-      elsif @gimchi.chosung? kchar
+        self.chosung = Gimchi.chosungs[n1]
+        self.jungsung = Gimchi.jungsungs[n2]
+        self.jongsung = ([nil] + Gimchi.jongsungs)[n3]
+      elsif Gimchi.chosung? kchar
         self.chosung = kchar
-      elsif @gimchi.jungsung? kchar
+      elsif Gimchi.jungsung? kchar
         self.jungsung = kchar
-      elsif @gimchi.jongsung? kchar
+      elsif Gimchi.jongsung? kchar
         self.jongsung = kchar
       end
     end
@@ -43,23 +41,23 @@ class Gimchi
     # Recombines components into a korean character.
     # @return [String] Combined korean character
     def to_s
-      @gimchi.compose chosung, jungsung, jongsung
+      Gimchi.compose chosung, jungsung, jongsung
     end
 
     # Sets the chosung component.
     # @param [String]
     def chosung= c
       raise ArgumentError.new('Invalid chosung component') if
-          c && @gimchi.chosung?(c) == false
-      @chosung = c && c.dup.extend(Component).tap { |e| e.kor = @gimchi }
+          c && Gimchi.chosung?(c) == false
+      @chosung = c && c.dup.extend(Component).tap { |e| e.kor = Gimchi }
     end
 
     # Sets the jungsung component
     # @param [String]
     def jungsung= c
       raise ArgumentError.new('Invalid jungsung component') if
-          c && @gimchi.jungsung?(c) == false
-      @jungsung = c && c.dup.extend(Component).tap { |e| e.kor = @gimchi }
+          c && Gimchi.jungsung?(c) == false
+      @jungsung = c && c.dup.extend(Component).tap { |e| e.kor = Gimchi }
     end
 
     # Sets the jongsung component
@@ -67,8 +65,8 @@ class Gimchi
     # @param [String]
     def jongsung= c
       raise ArgumentError.new('Invalid jongsung component') if
-          c && @gimchi.jongsung?(c) == false
-      @jongsung = c && c.dup.extend(Component).tap { |e| e.kor = @gimchi }
+          c && Gimchi.jongsung?(c) == false
+      @jongsung = c && c.dup.extend(Component).tap { |e| e.kor = Gimchi }
     end
 
     # Returns Array of three components.

data/lib/gimchi/patch_1.8.rb

@@ -2,9 +2,11 @@ if RUBY_VERSION =~ /^1\.8\./
   $KCODE = 'U'
 
   class Gimchi
-  private
+    class << self
+    private
     def str_length str
       str.scan(/./mu).length
     end
+    end
   end#Gimchi
 end

data/lib/gimchi/pronouncer.rb

@@ -7,9 +7,9 @@ class Gimchi
   # @private
   class Pronouncer
   private
-    def initialize gimchi
-      @gimchi = gimchi
-      @pconfig = gimchi.config[:pronouncer]
+    def initialize pconfig, structure
+      @pconfig = pconfig
+      @structure = structure
     end
 
     def pronounce! str, options = {}
@@ -17,7 +17,7 @@ class Gimchi
         "sequence_for_#{options[:each_char] ? '1' : '2'}".to_sym] - options[:except]
 
       # Dissecting
-      @chars = str.each_char.map { |c| @gimchi.kchar(c) rescue c }
+      @chars = str.each_char.map { |c| Gimchi.kchar(c) rescue c }
       @orig_chars = @chars.dup
 
       # Padding
@@ -86,12 +86,12 @@ class Gimchi
 
     # shortcut
     def fortis_map
-      @gimchi.config[:structure][:fortis_map]
+      @structure[:fortis_map]
     end
 
     # shortcut
     def double_consonant_map
-      @gimchi.config[:structure][:double_consonant_map]
+      @structure[:double_consonant_map]
     end
 
     # 제5항: ‘ㅑ ㅒ ㅕ ㅖ ㅘ ㅙ ㅛ ㅝ ㅞ ㅠ ㅢ’는 이중 모음으로 발음한다.
@@ -299,7 +299,7 @@ class Gimchi
 
       word = @kc.to_s + @next_kc.to_s
       if map.keys.include? word
-        new_char = @gimchi.kchar(map[word].scan(/./mu)[1])
+        new_char = Gimchi.kchar(map[word].scan(/./mu)[1])
         @next_kc.chosung = new_char.chosung
         @next_kc.jongsung = new_char.jongsung
 

data/test/test_gimchi.rb

@@ -226,4 +226,8 @@ class TestGimchi < Test::Unit::TestCase
 
     assert_equal 'ㅋ', Gimchi.compose(*ret)
   end
+
+  def test_singleton
+    assert_raise(NoMethodError) { Gimchi.new }
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gimchi
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-03-28 00:00:00.000000000 Z
+date: 2013-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: ansi