learn-japanese 0.7.0 → 0.8.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 164745bdc76d66bff134ec0e06fb5fceef44fb480f9c266c32beb6342dfe252b
-  data.tar.gz: 9bea86b40b59102cad35e1749fc379e6c14b2384b9f6f6f4b0abcd29409c446b
+  metadata.gz: 56a53ac9e7d74b5ac133f329c8b49829bea61f343014cb3fb4715728286bfe9d
+  data.tar.gz: 16449663b042b8b857548db94dbab7d4d3034d88a7b9b00e191e5e28cd136601
 SHA512:
-  metadata.gz: a0b5cf252d1a7eefb8b3953a7285bb7a6ec99b1059c284f7f934ca7813307ba37f9297423a77498277750b1a6da17745bb1c200f7067607a45884c70edb9bb17
-  data.tar.gz: 37b4068955aa70702a166265a2e9482e9141da5404251f0888a1f2bce44337b9970f70edafd0adc5cf81d20574d2431533e795a9e158ca737d5f440645b7dec8
+  metadata.gz: ad4108e66120821a75139feb827162cbf3300f828c6cb8b1019dd2b7ecc952cf156e0e840ac7c840fc72c3244efdc4fc5f54c31a7fad39cfe0fbcaf93b71a4b9
+  data.tar.gz: 16b2ca13e45f9764f7bd78dc4f04382d9feba4fa0d8ec37de3e93097056013aa05ed065403ab3670898f2e8beefe25da2d25bd36b82b9f2de28229399ecbd25b

data/lib/learn-japanese/cli.rb

@@ -11,15 +11,19 @@ class CLI < Thor
   end
 
   map ['ca', '-ca', '--choose-answer', 'choose-answer'] => 'choose_answer'
-  desc 'choose-answer [LEVEL]', 'LEVEL = 1-4'
-  def choose_answer(level)
-    LearnJapanese.choose_answer(level.to_i)
+  option :level
+  desc 'choose-answer [--level=NUMBER]', 'Values 1-6'
+  def choose_answer()
+    level = options[:level].to_i
+    LearnJapanese.choose_answer(level)
   end
 
   map ['sa', '-sa', '--short-answer', 'short-answer'] => 'short_answer'
-  desc 'short-answer [LEVEL]', 'LEVEL = 1-4'
-  def short_answer(level)
-    LearnJapanese.short_answer(level.to_i)
+  option :level
+  desc 'short-answer [--level=NUMBER]', 'Values 1-6'
+  def short_answer()
+    level = options[:level].to_i
+    LearnJapanese.short_answer(level)
   end
 
   map ['so', '-so', '--sound', 'sound'] => 'sound'
@@ -30,7 +34,7 @@ class CLI < Thor
 
   map ['ro', '-ro', '--romanji' ] => 'romaji'
   desc 'romaji', 'Write Romaji for Hiragana word'
-  def romanji
-    LearnJapanese.romanji
+  def romaji
+    LearnJapanese.romaji
   end
 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/data/hiragana.yaml

@@ -0,0 +1,36 @@
+group1:
+  a: "\u{3042}"
+  i: "\u{3044}"
+  u: "\u{3046}"
+  e: "\u{3048}"
+  o: "\u{304A}"
+group2:
+  ka: "\u{304B}"
+  ki: "\u{304D}"
+  ku: "\u{304F}"
+  ke: "\u{3051}"
+  ko: "\u{3053}"
+group3:
+  sa: "\u{3055}"
+  shi: "\u{3057}"
+  su: "\u{3059}"
+  se: "\u{305B}"
+  so: "\u{305D}"
+group4:
+  ta: "\u{305F}"
+  chi: "\u{3061}"
+  tsu: "\u{3064}" # つ
+  te: "\u{3066}"
+  to: "\u{3068}"
+group5:
+  na: "\u{306A}"
+  ni: "\u{306B}"
+  nu: "\u{306C}"
+  ne: "\u{306D}"
+  no: "\u{306E}"
+group6:
+  ha: "\u{306F}"
+  hi: "\u{3072}"
+  hu: "\u{3075}"
+  he: "\u{3078}"
+  ho: "\u{307B}"

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/{romanji-game.rb → romaji-game.rb}

@@ -3,7 +3,7 @@
 require_relative '../debug'
 require_relative '../data/dictionary'
 
-class RomanjiGame
+class RomajiGame
 
   def initialize(level=1, max=10)
     @level = level
@@ -17,13 +17,13 @@ class RomanjiGame
     Debug.puts_line
     while @score < @max_score
       @words.shuffle!
-      guess_romanji(@words.first)
+      guess_romaji(@words.first)
     end
   end
 
   private
 
-  def guess_romanji(data)
+  def guess_romaji(data)
     hiragana = data['hiragana']
     spanish = data['spanish']
     sounds = data['sounds']
@@ -36,11 +36,11 @@ class RomanjiGame
     good = Hiragana.hiraganas_to_sound(hiragana.split(''))
     if resp == good
       @score += 1
-      puts ' '*10+"#{spanish} (#{sounds})".white
+      puts ' ' * 9 + "#{spanish} (#{sounds})".white
       return true
     end
     puts "Right answer is #{good}".light_red
-    puts ' '*10+"#{spanish} (#{sounds})".red
+    puts ' ' * 9 + "#{spanish} (#{sounds})".red
     false
   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.2'
   NAME     = 'learn-japanese'
   HOMEPAGE = 'https://github.com/dvarrui/learn-japanese'
 end

data/lib/learn-japanese.rb

@@ -3,7 +3,7 @@ require_relative 'learn-japanese/version'
 require_relative 'learn-japanese/game/choose-answer-game'
 require_relative 'learn-japanese/game/short-answer-game'
 require_relative 'learn-japanese/game/sound-game'
-require_relative 'learn-japanese/game/romanji-game'
+require_relative 'learn-japanese/game/romaji-game'
 
 module LearnJapanese
 
@@ -32,7 +32,7 @@ module LearnJapanese
     SoundGame.run
   end
 
-  def self.romanji
-    RomanjiGame.new.run
+  def self.romaji
+    RomajiGame.new.run
   end
 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.2
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-28 00:00:00.000000000 Z
+date: 2022-05-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -41,10 +41,7 @@ dependencies:
 description:
 email: dvarrui@protonmail.com
 executables:
-- choose-answer-game
 - learn-japanese
-- short-answer-game
-- sounds-to-hiragana
 extensions: []
 extra_rdoc_files: []
 files:
@@ -54,10 +51,7 @@ files:
 - LICENSE
 - README.md
 - Rakefile
-- bin/choose-answer-game
 - bin/learn-japanese
-- bin/short-answer-game
-- bin/sounds-to-hiragana
 - examples/01-emoji.rb
 - examples/02-emoji.rb
 - learn-japanese.gemspec
@@ -65,10 +59,11 @@ files:
 - lib/learn-japanese/cli.rb
 - lib/learn-japanese/data/dictionary.rb
 - lib/learn-japanese/data/hiragana.rb
+- lib/learn-japanese/data/hiragana.yaml
 - lib/learn-japanese/data/words.yaml
 - lib/learn-japanese/debug.rb
 - lib/learn-japanese/game/choose-answer-game.rb
-- lib/learn-japanese/game/romanji-game.rb
+- lib/learn-japanese/game/romaji-game.rb
 - lib/learn-japanese/game/short-answer-game.rb
 - lib/learn-japanese/game/sound-game.rb
 - lib/learn-japanese/version.rb

data/bin/choose-answer-game

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'learn-japanese/game/choose-answer-game'
-
-def get_level
-  level = ARGV.first.to_i
-
-  if level.zero?
-    name = File.basename(__FILE__)
-    puts "Usage: #{name} [LEVEL]  # LEVEL is [1,2,3,4]"
-    exit 0
-  end
-  level
-end
-
-level = get_level
-ChooseAnswerGame.show_help(level)
-ChooseAnswerGame.new(level).run

data/bin/short-answer-game

@@ -1,19 +0,0 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'learn-japanese/game/short-answer-game'
-
-def get_level
-  level = ARGV.first.to_i
-
-  if level.zero?
-    name = File.basename(__FILE__)
-    puts "Usage: #{name} [LEVEL]  # LEVEL is [1,2,3,4]"
-    exit 0
-  end
-  level
-end
-
-level = get_level
-ShortAnswerGame.show_help(level)
-ShortAnswerGame.new(level).run

data/bin/sounds-to-hiragana

@@ -1,6 +0,0 @@
-#!/usr/bin/env ruby
-
-$LOAD_PATH.unshift File.expand_path('../../lib', __FILE__)
-require 'learn-japanese/game/sound-game'
-
-SoundGame.run