katsuyoujin 0.0.2 → 0.0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1d2d86774f80cd186b0600fac3406b429630482e
-  data.tar.gz: 234cfd1fa512c20603731af88c225a2836d2f735
+  metadata.gz: 11bf087d163f85a06dc34142b52f36804fccc8e9
+  data.tar.gz: 40170f7f9ea5504cff44aca563278f4647de0974
 SHA512:
-  metadata.gz: 04955ced89c6f018e526c54c5c3ab4eeaaf053406eb158960e30d98ce490a3b04cb32eb7fd7bd7ceeaecd19efef24d6e77b22324b8352dd109a4e677b7040137
-  data.tar.gz: 3f7b4ebd7506c3abde0330345663418fa003f68b8bca7e7f0699a86cc206d90084cb2efbf98b03091b961fb5918289dcd0fbaafe7cb8f2ab729281622842f4da
+  metadata.gz: 8e58cf72f25754d6f92d31d6229df04083ed886c065f1494208a1b23f923d7009de18932858aad94fe02808c71d0a005ae511148d2478926b7a97d0c478ad7d7
+  data.tar.gz: 603e24714debdb62458b3bf92577784a1f51343dfa444d15273691f145b0dd4ef8c6dc9c2bff0394db1efdba32ba2ebcc870888aa4913a35b268f790694c4da0

data/lib/katsuyoujin/analyzer.rb

@@ -45,16 +45,8 @@ module Katsuyoujin
       'くる' == base_form_hiragana
     end
 
-    def godan_iru_eru?
-      GODAN_IRU_ERU.include?(base_form_hiragana)
-    end
-
-    def godan_kuru_suru?
-      GODAN_KURU_SURU.include?(base_form)
-    end
-
     def irregular_godan?
-      godan_iru_eru? || godan_kuru_suru?
+      Katsuyoujin.ruleset('godan/irregular').include?(base_form_hiragana)
     end
 
     def ichidan?

data/lib/katsuyoujin/base.rb

@@ -18,15 +18,16 @@ module Katsuyoujin
     private
 
     def ichidan_base(base_letter, hiragana: true)
-      verb_root(hiragana) + ICHIDAN_BASE_TABLE[base_letter]
+      verb_root(hiragana) + Katsuyoujin.ruleset('ichidan/base')[base_letter]
     end
 
     def godan_base(base_letter, hiragana: true)
-      verb_root(hiragana) + GODAN_BASE_TABLE[base_letter][verb.ending]
+      verb_root(hiragana) + Katsuyoujin.ruleset('godan/base')[base_letter][verb.ending]
     end
 
     def irregular_base(base_letter, hiragana: true)
-      IRREGULAR_BASE_TABLE[base_letter][verb.hiragana_ending][hiragana ? 'hiragana' : 'kanji']
+      form = hiragana ? 'hiragana' : 'kanji'
+      Katsuyoujin.ruleset('irregular/base')[base_letter][verb.hiragana_ending][form]
     end
 
     def verb_root(hiragana = true)

data/lib/katsuyoujin/version.rb

@@ -1,3 +1,3 @@
 module Katsuyoujin
-  VERSION = '0.0.2'
+  VERSION = '0.0.2.1'
 end

data/lib/katsuyoujin.rb

@@ -6,37 +6,20 @@ require 'katsuyoujin/base'
 require 'katsuyoujin/analyzer'
 
 module Katsuyoujin
-  def self.root
-    File.dirname __dir__
-  end
-
-  def self.rules
-    File.join root, 'rules'
-  end
-
-  GODAN_IRU_ERU   = YAML.load_file(File.join(Katsuyoujin.rules, 'godan/iru_eru.yml')).freeze
-  GODAN_KURU_SURU = YAML.load_file(File.join(Katsuyoujin.rules, 'godan/kuru_suru.yml')).freeze
-
-  ICHIDAN_BASE_TABLE    = YAML.load_file File.join(Katsuyoujin.rules, 'ichidan/base.yml').freeze
-  GODAN_BASE_TABLE      = YAML.load_file File.join(Katsuyoujin.rules, 'godan/base.yml').freeze
-  IRREGULAR_BASE_TABLE  = YAML.load_file File.join(Katsuyoujin.rules, 'irregular/base.yml').freeze
-
-  CONJUGATIONS = {
-    'ichidan' => YAML.load_file(File.join(rules, 'ichidan/conjugations.yml')).freeze,
-    'godan' => YAML.load_file(File.join(rules, 'godan/conjugations.yml')).freeze,
-    'irregular' => YAML.load_file(File.join(rules, 'irregular/conjugations.yml')).freeze
-  }
-
   def self.conjugate(word, *args, category: nil, hiragana: true)
     verb = Verb.new word
 
     vcat = category || verb.category
     vcat = 'irregular' if ['kuru', 'suru'].include?(vcat)
 
-    rules = args.inject(CONJUGATIONS[vcat]) { |a, e| a[e] || {} }
+    rules = args.inject(ruleset("#{vcat}/conjugations")) { |a, e| a[e] || {} }
     return unless rules['base']
 
     base = Base.new(verb, rules['base']).conjugate category: category, hiragana: hiragana
     base + rules['attachment']
   end
+
+  def self.ruleset(rule)
+    YAML.load_file(File.join(File.dirname(__dir__), 'rules', "#{rule}.yml"))
+  end
 end

data/rules/godan/{iru_eru.yml → irregular.yml}

@@ -1,3 +1,11 @@
+- "刷る"
+- "摺る"
+- "擦る"
+- "摩る"
+- "磨る"
+- "擂る"
+- "掏る"
+- "繰る"
 - "あせる"
 - "あざける"
 - "だべる"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: katsuyoujin
 version: !ruby/object:Gem::Version
-  version: 0.0.2
+  version: 0.0.2.1
 platform: ruby
 authors:
 - LuckyThirteen
@@ -146,8 +146,7 @@ files:
 - lib/katsuyoujin/version.rb
 - rules/godan/base.yml
 - rules/godan/conjugations.yml
-- rules/godan/iru_eru.yml
-- rules/godan/kuru_suru.yml
+- rules/godan/irregular.yml
 - rules/ichidan/base.yml
 - rules/ichidan/conjugations.yml
 - rules/irregular/base.yml

data/rules/godan/kuru_suru.yml

@@ -1,8 +0,0 @@
-- "刷る"
-- "摺る"
-- "擦る"
-- "摩る"
-- "磨る"
-- "擂る"
-- "掏る"
-- "繰る"