gimchi 0.1.5 → 0.1.6

data/config/default.yml

@@ -107,7 +107,8 @@ number:
         tenfolds: [열, 스물, 서른, 마흔, 쉰, 예순, 일흔, 여든, 아흔, 백]
         digits: ["", 한, 두, 세, 네, 다섯, 여섯, 일곱, 여덟, 아홉]
         post substitution:
-            물살: 무살
+            ? !ruby/regexp /스물$/
+            : 스무
 
 romanization:
     chosung:

data/lib/gimchi/korean.rb

@@ -72,8 +72,8 @@ class Korean
 	def read_number str
 		nconfig = config['number']
 		
-		str.to_s.gsub(/([+-]\s*)?[0-9,]*,*[0-9]+(\.[0-9]+(e[+-][0-9]+)?)?(\s*.)?/) { 
-			read_number_sub($&, $4)
+		str.to_s.gsub(/(([+-]\s*)?[0-9,]*,*[0-9]+(\.[0-9]+(e[+-][0-9]+)?)?)(\s*.)?/) { 
+			read_number_sub($1, $5)
 		}
 	end
 
@@ -168,17 +168,17 @@ class Korean
 	end
 
 private
-	def read_number_sub num, next_char = nil
+	def read_number_sub num, next_char
 		nconfig = config['number']
 
 		num = num.gsub(',', '')
-		num = num.sub(/#{next_char}$/, '') if next_char
+		next_char = next_char.to_s
 		is_float = num.match(/[\.e]/) != nil
 
 		# Alternative notation for integers with proper suffix
 		alt = false
 		if is_float == false && 
-				nconfig['alt notation']['when suffix'].keys.include?(next_char.to_s.strip)
+				nconfig['alt notation']['when suffix'].keys.include?(next_char.strip)
 			max = nconfig['alt notation']['when suffix'][next_char.strip]['max']
 
 			if max.nil? || num.to_i <= max
@@ -265,14 +265,9 @@ private
 					v %= 10
 					str += digits[v] if v > 0
 
-					if alt
-						suffix = next_char.strip
-						str = str + suffix
-						alt_post_subs.each do | k, v |
-							str.gsub!(k, v)
-						end
-						str.sub!(/#{suffix}$/, '')
-					end
+					alt_post_subs.each do | k, v |
+						str.gsub!(k, v)
+					end if alt
 					tokens << str.sub(/ $/, '') + nconfig['units'][unit_idx]
 				end
 			end
@@ -280,7 +275,7 @@ private
 		end
 
 		tokens += sign unless sign.empty?
-		ret = tokens.reverse.join(' ') + below + next_char.to_s
+		ret = tokens.reverse.join(' ') + below + next_char
 		nconfig['post substitution'].each do | k, v |
 			ret.gsub!(k, v)
 		end

data/test/test_gimchi.rb

@@ -91,7 +91,11 @@ class TestGimchi < Test::Unit::TestCase
 		assert_equal "플러스 십점영", ko.read_number("+ 10.0")
 
 		# 나이, 시간, 개수, 명 ( -살, -시, -개, -명 )
+		assert_equal "나는 이십", ko.read_number("나는 20")
 		assert_equal "나는 스무살", ko.read_number("나는 20살")
+		assert_equal "나는 스물네살", ko.read_number("나는 24살")
+		assert_equal "스무개", ko.read_number("20개")
+		assert_equal "스무 명", ko.read_number("20 명")
 		assert_equal "이십 칠점일살", ko.read_number("27.1살")
 		assert_equal "너는 열세 살", ko.read_number("너는 13 살")
 		assert_equal "백 서른두명", ko.read_number("132명")

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: gimchi
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  version: 0.1.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-04-12 00:00:00.000000000Z
+date: 2011-04-13 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152493140 !ruby/object:Gem::Requirement
+  requirement: &2152254860 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -21,10 +21,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152493140
+  version_requirements: *2152254860
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152491800 !ruby/object:Gem::Requirement
+  requirement: &2152253040 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -32,10 +32,10 @@ dependencies:
         version: 1.5.2
   type: :development
   prerelease: false
-  version_requirements: *2152491800
+  version_requirements: *2152253040
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152490620 !ruby/object:Gem::Requirement
+  requirement: &2152251640 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152490620
+  version_requirements: *2152251640
 - !ruby/object:Gem::Dependency
   name: ansi
-  requirement: &2152489680 !ruby/object:Gem::Requirement
+  requirement: &2152249420 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +54,7 @@ dependencies:
         version: 1.2.2
   type: :development
   prerelease: false
-  version_requirements: *2152489680
+  version_requirements: *2152249420
 description: Gimchi knows how to pronounce Korean strings and how to write them in
   roman alphabet.
 email: junegunn.c@gmail.com
@@ -93,7 +93,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -4096346844211308775
+      hash: 170191827344354628
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: