learn-japanese 0.7.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 164745bdc76d66bff134ec0e06fb5fceef44fb480f9c266c32beb6342dfe252b
-  data.tar.gz: 9bea86b40b59102cad35e1749fc379e6c14b2384b9f6f6f4b0abcd29409c446b
+  metadata.gz: b9551ba5848ab1baac33056aea1f97eaeba4057bf3de1c2cace4fe48b871e28d
+  data.tar.gz: 4101529e9a6874489cc7001d5eccf4b83691cabdd0db6c057ce32fc92373c805
 SHA512:
-  metadata.gz: a0b5cf252d1a7eefb8b3953a7285bb7a6ec99b1059c284f7f934ca7813307ba37f9297423a77498277750b1a6da17745bb1c200f7067607a45884c70edb9bb17
-  data.tar.gz: 37b4068955aa70702a166265a2e9482e9141da5404251f0888a1f2bce44337b9970f70edafd0adc5cf81d20574d2431533e795a9e158ca737d5f440645b7dec8
+  metadata.gz: 71d59ed075201be14f7f46d69e0d1ffe98d45f46c36b96cc62f56619198c00b8c35b22a398e414b60d789cc4ed475ddf3099ade875050f185e08bb324a99b917
+  data.tar.gz: c81f8b3190ed01932c2f9483d87ebecdf9026df68c8b770631c735e89033ad6d2e89e3e30aa42b1144658beb30e1ef15ad071167592e2ad09c82e430131e80fa

data/lib/learn-japanese/cli.rb

@@ -11,13 +11,13 @@ class CLI < Thor
   end
 
   map ['ca', '-ca', '--choose-answer', 'choose-answer'] => 'choose_answer'
-  desc 'choose-answer [LEVEL]', 'LEVEL = 1-4'
+  desc 'choose-answer [LEVEL]', 'LEVEL = 1-6'
   def choose_answer(level)
     LearnJapanese.choose_answer(level.to_i)
   end
 
   map ['sa', '-sa', '--short-answer', 'short-answer'] => 'short_answer'
-  desc 'short-answer [LEVEL]', 'LEVEL = 1-4'
+  desc 'short-answer [LEVEL]', 'LEVEL = 1-6'
   def short_answer(level)
     LearnJapanese.short_answer(level.to_i)
   end

data/lib/learn-japanese/data/hiragana.rb

@@ -34,17 +34,37 @@ class Hiragana
   def self.group4
     { ta: "\u{305F}",
       chi: "\u{3061}",
-      tsu: "\u{3064}",
+      tsu: "\u{3064}", # つ
       te: "\u{3066}",
       to: "\u{3068}"
     }
   end
 
+  def self.group5
+    { na: "\u{306A}",
+      ni: "\u{306B}",
+      nu: "\u{306C}",
+      ne: "\u{306D}",
+      no: "\u{306E}"
+    }
+  end
+
+  def self.group6
+    { ha: "\u{306F}",
+      hi: "\u{3072}",
+      hu: "\u{3075}",
+      he: "\u{3078}",
+      ho: "\u{307B}"
+    }
+  end
+
   def self.all
     output = self.group1
     output.merge!(self.group2)
     output.merge!(self.group3)
     output.merge!(self.group4)
+    output.merge!(self.group5)
+    output.merge!(self.group6)
     output
   end
 
@@ -55,6 +75,8 @@ class Hiragana
     hiragana.merge! Hiragana.group2 if levels.include? 2
     hiragana.merge! Hiragana.group3 if levels.include? 3
     hiragana.merge! Hiragana.group4 if levels.include? 4
+    hiragana.merge! Hiragana.group4 if levels.include? 5
+    hiragana.merge! Hiragana.group4 if levels.include? 6
     hiragana
   end
 
@@ -86,5 +108,8 @@ class Hiragana
     Debug.puts_group Hiragana.group2 if level > 1
     Debug.puts_group Hiragana.group3 if level > 2
     Debug.puts_group Hiragana.group4 if level > 3
+    Debug.puts_group Hiragana.group5 if level > 4
+    Debug.puts_group Hiragana.group6 if level > 5
+    Debug.puts_group Hiragana.group7 if level > 6
   end
 end

data/lib/learn-japanese/game/choose-answer-game.rb

@@ -10,10 +10,15 @@ class ChooseAnswerGame
     @score = 1
     @max_score = max
 
-    @silabario = Hiragana.group1
-    @silabario.merge! Hiragana.group2 if @level > 1
-    @silabario.merge! Hiragana.group3 if @level > 2
-    @silabario.merge! Hiragana.group4 if @level > 3
+    #@silabario = Hiragana.group1
+    #@silabario.merge! Hiragana.group2 if @level > 1
+    #@silabario.merge! Hiragana.group3 if @level > 2
+    #@silabario.merge! Hiragana.group4 if @level > 3
+    #@silabario.merge! Hiragana.group4 if @level > 4
+    #@silabario.merge! Hiragana.group5 if @level > 5
+    #@silabario.merge! Hiragana.group6 if @level > 6
+    levels = (1..@level).to_a
+    @silabario = Hiragana.groups(levels)
 
     @keys = @silabario.keys
   end

data/lib/learn-japanese/game/short-answer-game.rb

@@ -14,6 +14,8 @@ class ShortAnswerGame
     @silabario.merge! Hiragana.group2 if @level > 1
     @silabario.merge! Hiragana.group3 if @level > 2
     @silabario.merge! Hiragana.group4 if @level > 3
+    @silabario.merge! Hiragana.group5 if @level > 4
+    @silabario.merge! Hiragana.group6 if @level > 5
 
     @keys = @silabario.keys
   end

data/lib/learn-japanese/version.rb

@@ -1,6 +1,6 @@
 
 module LearnJapanese
-  VERSION  = '0.7.0'
+  VERSION  = '0.8.0'
   NAME     = 'learn-japanese'
   HOMEPAGE = 'https://github.com/dvarrui/learn-japanese'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-japanese
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.8.0
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-28 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize