roka 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 497e882b9a0a284194ebb131fbb50a00c5ed3fd3
-  data.tar.gz: a46eef1091e38182f23dff720fe4333b3d095125
+  metadata.gz: f288807db01ef8354ddb642a8202e1709243751e
+  data.tar.gz: e019147f12f3a784f10012bdfa5bad85d635aa0a
 SHA512:
-  metadata.gz: 2acdaf6c30fc419b0ba6f4faceab0a13c5183bda348727e860062e1627e891b9653ccc21b0dcad1c35024b655c058e313ba1263d8e5693ea164fb7b53ec6b57d
-  data.tar.gz: 1ba7ca636288931eaeeeabdfac330fd2ceec9868be28a24ba6d38811c095e19f760eff3940c76de0f357b0462bcb034d33adcbdeee4f6c16f1160c2d09175bb6
+  metadata.gz: 38bcbf0086694e5d59619e98a940147eec56e53d01d398a27a6da8336fa20cdd006a690d49bf849585fce4459ee5f71852e493c2816895f11b55fb172d96c3a6
+  data.tar.gz: d795cba70b0b04a0a64a256c4d60660bbac4cabcc803c8c7d4a20aea066ad97984a3f5db7799d75b7835738a5d14e8023f376a43185a7d349f352a9e4e48a478

data/README.md

@@ -30,7 +30,7 @@ require 'roka'
   'kondo',
   'kyari-pamyupamyu',
   'hohno',
-  'hyogakyo',
+  'hyougaki',
 ].each do |romaji|
   puts romaji
   p Roka.convert(romaji)
@@ -38,32 +38,54 @@ end
 # oyasai
 # ["オヤサイ"]
 # ono
-# ["オノ", "オノオ", "オノウ"]
+# ["オンオ", "オノ", "オオンオ", "オオノ", "オウンオ", "オウノ"]
 # ohno
-# ["オノ", "オオノ", "オノオ", "オノウ", "オオノオ", "オオノウ"]
+# ["オンオ", "オノ", "オオンオ", "オオノ"]
 # omi
-# ["オミ", "オオミ", "オウミ"]
+# ["オミ"]
 # otto
-# ["オット", "オオット", "オウット", "オットオ", "オットウ", "オオットオ", "オオットウ", "オウットオ", "オウットウ"]
+# ["オット"]
 # kohama
 # ["コハマ"]
 # kondo
-# ["コンド", "コンドオ", "コンドウ"]
+# ["コンド", "コンドウ"]
 # kyari-pamyupamyu
 # ["キャリーパミュパミュ"]
 # hohno
-# ["ホノ", "ホオノ", "ホノオ", "ホノウ", "ホオノオ", "ホオノウ"]
-# hyogaki
-# ["ヒョガキ", "ヒョオガキ", "ヒョウガキ"]
+# ["ホンオ", "ホノ", "ホオンオ", "ホオノ"]
+# hyougaki
+# ["ヒョウガキ"]
   ```
 
 ### CLI
 
 ```sh
-$ roka rokadesu
-ロカデス
-ロオカデス
-ロウカデス
+$ roka koniro kono konno konyakku konnyaku ann koh kondo
+--- koniro
+コンイロ
+コニロ
+--- kono
+コンオ
+コノ
+コオンオ
+コオノ
+コウンオ
+コウノ
+--- konno
+コンノ
+コンノウ
+--- konyakku
+コニャック
+--- konnyaku
+コンニャク
+--- ann
+アン
+--- koh
+コ
+コウ
+--- kondo
+コンド
+コンドウ
 ```
 
 

data/exe/roka

@@ -6,5 +6,8 @@ $LOAD_PATH << "#{root}/lib" if File.exist?("#{root}/Gemfile")
 
 require 'roka'
 
-text = ARGV[0]
-puts Roka.convert(text) if text
+ARGV.each do |text|
+  next unless text
+  puts '--- %s' % [text]
+  puts Roka.convert(text)
+end

data/lib/roka/converter.rb

@@ -36,18 +36,19 @@ class Roka::Converter
   }
 
   PATTERN_CHANGES = {
-    /n([^aeiou])/                   => 'nn\1',
-    /([^aeiou])\1/                  => 'xtu\1',
     /([kg])w([aeiou])/              => '\1ux\2',
     /([td])w([aeiou])/              => '\1ox\2',
     /([sc])h([aeiou])/              => '\1ixy\2',
     /([kgszjtcdnhbpmrl])y([aeiou])/ => '\1ixy\2',
     /([td])h([aeiou])/              => '\1exy\2',
+    /n([^aeioun])/                  => 'n\1',
+    /([^aeioun])\1/                 => 'xtu\1',
+    /nn\b/                          => 'n',
+    /^(n[^aeiou]o)([^h]|\b)/        => '\1h\2',
   }
 
   EXCEPTIONS = {
     '-'    => 'ー',
-    'nn'   => 'ン',
     'xka'  => 'ヵ',
     'xke'  => 'ヶ',
     'xtu'  => 'ッ',
@@ -60,7 +61,7 @@ class Roka::Converter
   attr_reader :determined
 
   def initialize(str)
-    @buffer  = regulate(str)
+    @buffer     = regulate(str)
     @determined = []
   end
 
@@ -74,7 +75,7 @@ class Roka::Converter
       || parse_pattern \
       || parse_prefix \
       || parse_vowel \
-      || consume(1)
+      || parse_last
   end
 
   def parse_exception
@@ -109,8 +110,12 @@ class Roka::Converter
         vowel = @buffer[l]
 
         if (i = VOWELS_INDEX.index(vowel))
-          consume(l + 1, changes[i])
-          expand_long_sound(vowel)
+          if 'n' == @buffer[0] && 'x' != @buffer[l + 1] && 'ン' != @determined[@determined.size - 1]
+            consume(l + 1, ['ン' + VOWELS_KANA[i], changes[i]])
+          else
+            consume(l + 1, changes[i])
+          end
+          expand_long_sound(prefix, vowel)
           return true
         end
       end
@@ -123,13 +128,21 @@ class Roka::Converter
     vowel = @buffer[0]
     if (i = VOWELS_INDEX.index(vowel))
       consume(1, VOWELS_KANA[i])
-      expand_long_sound(vowel)
+      expand_long_sound(nil, vowel)
       true
     else
       false
     end
   end
 
+  def parse_last
+    if 'n' == @buffer[0]
+      consume(1, 'ン')
+    else
+      consume(1)
+    end
+  end
+
   def consume(len, replacement = nil)
     replacement = @buffer[0...len] if replacement.nil?
     @determined << replacement if replacement
@@ -137,18 +150,23 @@ class Roka::Converter
     true
   end
 
-  def expand_long_sound(vowel)
-    return unless 'o' == vowel
-    peak = @buffer[0]
-
-    if 'h' == peak
-      u1 = self.class.new(@buffer).tap(&:parse).determined
-      if u1[0] == 'h'
-        consume(1, false)
-        @determined << ['オ']
+  def expand_long_sound(prefix, vowel)
+    c = @buffer[0]
+
+    case vowel
+    when 'o'
+      if 'h' == c && !@buffer[1]
+        consume(1, ['', 'ウ'])
+      elsif 'h' == c
+        d, _ = peak
+        if d[0] == 'h'
+          consume(1, ['', 'オ'])
+        end
+      elsif !(VOWELS_INDEX + %w[y]).include?(c) && ('n' == c && 'o' == @buffer[1])
+        @determined << ['', 'オ', 'ウ']
       end
-    elsif !(VOWELS_INDEX + %w[n y]).include?(peak)
-      @determined << ['オ', 'ウ']
+    when 'u'
+      @determined << ['', 'ウ'] if 'y' == prefix
     end
   end
 
@@ -161,7 +179,7 @@ class Roka::Converter
 
     @determined.each do |det|
       if det.is_a?(Array)
-        tree += tree.product(det).map(&:join)
+        tree = tree.product(det).map(&:join)
       else
         tree.each { |t| t << det }
       end
@@ -174,4 +192,16 @@ class Roka::Converter
     NKF.nkf('-m0 -Z1 -w', str.to_s.downcase).gsub(/[^a-z-]+/, ' ')
   end
 
+  def peak(_buffer = nil)
+    determined  = @determined
+    buffer      = @buffer
+    @determined = []
+    @buffer = _buffer unless _buffer.nil?
+    parse while @determined.empty? || !eos?
+    [@determined, @buffer].tap do
+      @determined = determined
+      @buffer     = buffer
+    end
+  end
+
 end

data/lib/roka/version.rb

@@ -1,3 +1,3 @@
 module Roka
-  VERSION = "0.1.0"
+  VERSION = '0.1.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: roka
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yuki Iwanaga