learn-japanese 0.6.1 → 0.8.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9914d80e21c8c34c39ed26df234b08cd46b4c415cc1abf350cd765b7a356213a
-  data.tar.gz: 31e75a97b121964b1ef3828ea751c82f9897594cba31763f8a9a35b0b96674b1
+  metadata.gz: c5265cf2cdc7e5919c77300d3bc624ea0e98dcc64310ebe21b08c343319fee93
+  data.tar.gz: ced6eb30b6fba2e4d744bb5015b76619a03335a90bb3a5182bc072c5333b2ce9
 SHA512:
-  metadata.gz: 568c67a6f8eb933bad67fc61c47fc0822c6cab94005df74f99bb0ee9415be7556c48faa5060f3dfc970b57bf9cdcaf5ddc16fa439a9baccb697bf701a8bc8059
-  data.tar.gz: 6f9d1f6b74ad511b674454b9f0638b86cab521bbcb24936d69075205041ec30050fab11e291260eb44f2927be2d42020bdf2fd0e2fa0d1ab83356c917d6748a9
+  metadata.gz: 5d43d584404ae0defbb6afc81d6c5c296fff3bf9f7219af373145fc2a298c82ec33b0a9df7752bafab0067bd4272505e5f868961bf146a97fca8554278fd355d
+  data.tar.gz: b4bfd549d68de45944a27abc45e21d70f835b7881f85fa55b775a559047c1c3e48391ac89dab431e20539c38a88f6d800d5c15d84de254daa0b62805d760ac15

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
@@ -27,4 +27,10 @@ class CLI < Thor
   def sound
     LearnJapanese.sound
   end
+
+  map ['ro', '-ro', '--romanji' ] => 'romaji'
+  desc 'romaji', 'Write Romaji for Hiragana word'
+  def romaji
+    LearnJapanese.romaji
+  end
 end

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

@@ -0,0 +1,11 @@
+
+require 'yaml'
+
+module Dictionary
+
+  def self.words
+    filename = File.join(File.dirname(__FILE__),  'words.yaml')
+    words = YAML.load(File.read(filename))
+  end
+
+end

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

@@ -0,0 +1,115 @@
+require 'colorize'
+require_relative '../debug'
+
+# Silabario japonés
+class Hiragana
+
+  def self.group1
+    { a: "\u{3042}",
+      i: "\u{3044}",
+      u: "\u{3046}",
+      e: "\u{3048}",
+      o: "\u{304A}"
+    }
+  end
+
+  def self.group2
+    { ka: "\u{304B}",
+      ki: "\u{304D}",
+      ku: "\u{304F}",
+      ke: "\u{3051}",
+      ko: "\u{3053}"
+    }
+  end
+
+  def self.group3
+    { sa: "\u{3055}",
+      shi: "\u{3057}",
+      su: "\u{3059}",
+      se: "\u{305B}",
+      so: "\u{305D}"
+    }
+  end
+
+  def self.group4
+    { ta: "\u{305F}",
+      chi: "\u{3061}",
+      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
+
+  def self.groups(levels)
+    return self.all if levels == :all
+    hiragana = {}
+    hiragana.merge! Hiragana.group1 if levels.include? 1
+    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
+
+  def self.sounds_to_hiragana(sounds)
+    hiraganas = Hiragana.all
+    hiragana_array = sounds.map { hiraganas[_1.to_sym] || '*' }
+    hiragana = hiragana_array.join('')
+  end
+
+  def self.hiraganas_to_sound(hiraganas_input)
+    all_hiraganas = Hiragana.all
+
+    sounds_array = hiraganas_input.map do |hiragana_input|
+      sound = '*'
+      all_hiraganas.each_pair do |key, value|
+        sound = key if value == hiragana_input
+      end
+      sound
+    end
+
+    sounds_array.join('')
+  end
+
+  def self.show_help(level=1)
+    Debug.puts_line
+    puts "Hiragana help\n".upcase.cyan
+
+    Debug.puts_group Hiragana.group1
+    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/data/words.yaml

@@ -4,7 +4,7 @@
   spanish: amor
 - sounds: áka
   hiragana: あか
-  spanish: rojo)
+  spanish: rojo
 - sounds: áo
   hiragana: あお
   spanish: azul
@@ -44,3 +44,6 @@
 - sounds: áisatsu wo suru
   hiragana: あいさつをする
   spanish: saludar
+- sounds: ohayou
+  hiragana: おはよう
+  spanish: Buenos días (casual)

data/lib/learn-japanese/debug.rb

@@ -15,4 +15,9 @@ class Debug
   def self.puts_line
     STDOUT.puts ('=' * 20).white
   end
+
+  def self.break
+    require 'debug'
+    binding.break
+  end
 end

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require_relative '../debug'
-require_relative '../hiragana'
+require_relative '../data/hiragana'
 
 class ChooseAnswerGame
 
@@ -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/romaji-game.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+
+require_relative '../debug'
+require_relative '../data/dictionary'
+
+class RomajiGame
+
+  def initialize(level=1, max=10)
+    @level = level
+    @score = 1
+    @max_score = max
+
+    @words = Dictionary.words
+  end
+
+  def run
+    Debug.puts_line
+    while @score < @max_score
+      @words.shuffle!
+      guess_romaji(@words.first)
+    end
+  end
+
+  private
+
+  def guess_romaji(data)
+    hiragana = data['hiragana']
+    spanish = data['spanish']
+    sounds = data['sounds']
+    progress = "[ #{@score}/#{@max_score} ]"
+
+    print  "#{progress.white} Write Romanji for #{hiragana.light_yellow}: "
+    resp = STDIN.gets.chomp
+    exit if resp.empty?
+
+    good = Hiragana.hiraganas_to_sound(hiragana.split(''))
+    if resp == good
+      @score += 1
+      puts ' ' * 9 + "#{spanish} (#{sounds})".white
+      return true
+    end
+    puts "Right answer is #{good}".light_red
+    puts ' ' * 9 + "#{spanish} (#{sounds})".red
+    false
+  end
+
+end

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

@@ -1,7 +1,7 @@
 #!/usr/bin/env ruby
 
 require_relative '../debug'
-require_relative '../hiragana'
+require_relative '../data/hiragana'
 
 class ShortAnswerGame
 
@@ -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/game/sound-game.rb

@@ -1,19 +1,16 @@
 
-require_relative '../hiragana'
-require_relative '../dictionary'
-require_relative '../debug'
 require 'colorize'
+require_relative '../debug'
+require_relative '../data/dictionary'
+require_relative '../data/hiragana'
 
 module SoundGame
 
   def self.to_hiragana(sounds)
-    hiraganas = Hiragana.all
+    hiragana = Hiragana.sounds_to_hiragana(sounds)
 
-    hiragana_array = sounds.map { hiraganas[_1.to_sym] || '*' }
-    hiragana = hiragana_array.join('')
-
-    none = {'hiragana': hiragana, 'spanish': '?', 'sounds': '?'}
-    words = Dictionary.new.words
+    none = {'hiragana' => hiragana, 'spanish' => '?', 'sounds' => '?'}
+    words = Dictionary.words
     word = (words.select {_1["hiragana"] == hiragana})[0] || none
 
     word
@@ -25,10 +22,11 @@ module SoundGame
     puts "Example: a i => あい （amor - ái）".blue
     Debug.puts_line
 
-    sounds = "init"
-    until sounds.empty?
+    loop do
       print "\nWrite sounds ? ".light_yellow
       sounds = STDIN.gets.chomp.split
+      return if sounds.empty?
+
       word = self.to_hiragana(sounds)
       print "Hiragana    => ".white
       puts word["hiragana"]

data/lib/learn-japanese/version.rb

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

data/lib/learn-japanese.rb

@@ -3,6 +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/romaji-game'
 
 module LearnJapanese
 
@@ -30,4 +31,8 @@ module LearnJapanese
   def self.sound
     SoundGame.run
   end
+
+  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.6.1
+  version: 0.8.1
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-19 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,22 +51,21 @@ 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
 - lib/learn-japanese.rb
 - 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/dictionary.rb
 - lib/learn-japanese/game/choose-answer-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/hiragana.rb
 - lib/learn-japanese/version.rb
 homepage: https://github.com/dvarrui/learn-japanese
 licenses:

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

data/lib/learn-japanese/dictionary.rb

@@ -1,12 +0,0 @@
-
-require 'yaml'
-
-class Dictionary
-  attr_reader :words
-
-  def initialize()
-    filename = File.join(File.dirname(__FILE__), 'data', 'words.yaml')
-    @words = YAML.load(File.read(filename))
-  end
-
-end

data/lib/learn-japanese/hiragana.rb

@@ -1,60 +0,0 @@
-require 'colorize'
-require_relative 'debug'
-
-# Silabario japonés
-class Hiragana
-
-  def self.group1
-    { a: "\u{3042}",
-      i: "\u{3044}",
-      u: "\u{3046}",
-      e: "\u{3048}",
-      o: "\u{304A}"
-    }
-  end
-
-  def self.group2
-    { ka: "\u{304B}",
-      ki: "\u{304D}",
-      ku: "\u{304F}",
-      ke: "\u{3051}",
-      ko: "\u{3053}"
-    }
-  end
-
-  def self.group3
-    { sa: "\u{3055}",
-      shi: "\u{3057}",
-      su: "\u{3059}",
-      se: "\u{305B}",
-      so: "\u{305D}"
-    }
-  end
-
-  def self.group4
-    { ta: "\u{305F}",
-      chi: "\u{3061}",
-      tsu: "\u{3064}",
-      te: "\u{3066}",
-      to: "\u{3068}"
-    }
-  end
-
-  def self.all
-    output = self.group1
-    output.merge!(self.group2)
-    output.merge!(self.group3)
-    output.merge!(self.group4)
-    output
-  end
-
-  def self.show_help(level=1)
-    Debug.puts_line
-    puts "Hiragana help\n".upcase.cyan
-
-    Debug.puts_group Hiragana.group1
-    Debug.puts_group Hiragana.group2 if level > 1
-    Debug.puts_group Hiragana.group3 if level > 2
-    Debug.puts_group Hiragana.group4 if level > 3
-  end
-end