learn-japanese 0.6.0 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d63b5f7f7aafa4c249290ead834bad949693cb156bb25f537fba3c0665211ab
-  data.tar.gz: 758f37922314566ac2e95a944428bbd6180de32df90549fad521037548c72cdf
+  metadata.gz: b9551ba5848ab1baac33056aea1f97eaeba4057bf3de1c2cace4fe48b871e28d
+  data.tar.gz: 4101529e9a6874489cc7001d5eccf4b83691cabdd0db6c057ce32fc92373c805
 SHA512:
-  metadata.gz: 9cd09b6001f729cbf395e3bf10eadc7e3a8a69a80d3201c1ef41290d3df67b120071cff1435566f857cf2a5678a5df6a59fb53e1e14fb313582cb52f90d0b738
-  data.tar.gz: 6ad71c8b31c20cb5a7196968ef58bf6f32b3f7e719bf7ac3d33d0cb8e2e8f31126166ad80c16ddff7224c6b8fe4a183c2d99d7469b95ebaffb0f7466f9f6eb7d
+  metadata.gz: 71d59ed075201be14f7f46d69e0d1ffe98d45f46c36b96cc62f56619198c00b8c35b22a398e414b60d789cc4ed475ddf3099ade875050f185e08bb324a99b917
+  data.tar.gz: c81f8b3190ed01932c2f9483d87ebecdf9026df68c8b770631c735e89033ad6d2e89e3e30aa42b1144658beb30e1ef15ad071167592e2ad09c82e430131e80fa

data/.ruby-version

@@ -1 +1 @@
-2.7.5
+3.1.0

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 romanji
+    LearnJapanese.romanji
+  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/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/romanji-game.rb

@@ -0,0 +1,47 @@
+#!/usr/bin/env ruby
+
+require_relative '../debug'
+require_relative '../data/dictionary'
+
+class RomanjiGame
+
+  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_romanji(@words.first)
+    end
+  end
+
+  private
+
+  def guess_romanji(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 ' '*10+"#{spanish} (#{sounds})".white
+      return true
+    end
+    puts "Right answer is #{good}".light_red
+    puts ' '*10+"#{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.0'
+  VERSION  = '0.8.0'
   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/romanji-game'
 
 module LearnJapanese
 
@@ -30,4 +31,8 @@ module LearnJapanese
   def self.sound
     SoundGame.run
   end
+
+  def self.romanji
+    RomanjiGame.new.run
+  end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: learn-japanese
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.8.0
 platform: ruby
 authors:
 - David Vargas Ruiz
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-04-19 00:00:00.000000000 Z
+date: 2022-05-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -63,13 +63,14 @@ files:
 - 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/words.yaml
 - lib/learn-japanese/debug.rb
-- lib/learn-japanese/dictionary.rb
 - lib/learn-japanese/game/choose-answer-game.rb
+- lib/learn-japanese/game/romanji-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:
@@ -90,7 +91,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.6
+rubygems_version: 3.3.3
 signing_key:
 specification_version: 4
 summary: Learn Japanese (UNDER DEVELOPMENT)

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}",
-      si: "\u{3057}",
-      su: "\u{3059}",
-      se: "\u{305B}",
-      so: "\u{305D}"
-    }
-  end
-
-  def self.group4
-    { ta: "\u{305F}",
-      ti: "\u{3061}",
-      tu: "\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