language_cards 0.1.3 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: f22e96585dc1b1e68ac22cdf4c2f3a4952e0c89b
-  data.tar.gz: ae89a8be6614e9707d4ac400bd1a87535718ae63
+SHA256:
+  metadata.gz: 18f1ce1cc9252361375183fcf05ff8f0c53af01f61c8c9b4a361e58265be245f
+  data.tar.gz: 6930a65377a3bb2dc4e0d29b897e99e1f85aa8301a352eaeb49771142cbfcc1f
 SHA512:
-  metadata.gz: 8ff61fd64bf7e765c593e642799d2a869a47f40cc620fb3b71d27af34f722cbdc548b4861f24cf7b74c5cb7942c2fe374c2600f0a20a62c6f8cf47b17e9019b4
-  data.tar.gz: 8170a20139eeb403cb5b99b361e0edffb0a64e39788e90100a5f30f55fa6e709c08ed33dde30626e444a63e3b35d6541105acc7138d6ee243b229540197b42ee
+  metadata.gz: f418b1fc7567256199684e241d93d76ade1987fdaec463e80ed8105a11bb58f4de9e5a408ddcaa59837c825bea73dc873e1f8bbedcb6fca298eb0c3daa7727a5
+  data.tar.gz: 2a6f47d07d483b3401840a840fbba080e21801bd596ad55fb653afa3947d93a4f69b04132ac0d5f04d71e3e7d7c64ac0d8e95ca520cf4a961b0978546739575c

data/.gitignore

@@ -10,3 +10,4 @@
 **/*.swp
 mkmf.log
 *.gem
+.byebug_history

data/Gemfile

@@ -4,3 +4,7 @@ source 'https://rubygems.org'
 gemspec
 
 gem 'simplecov', :require => false, :group => :test
+
+group :development do
+  gem 'byebug'
+end

data/README.md

@@ -32,32 +32,21 @@ Or install it yourself as:
 ## Usage
 
 After installing the gem you can run the executable `language_cards`.  If you clone the repo then use
-`bin/language_cards`.
+`bundle exec bin/language_cards`.
 
 # Card Format
 
 The cards are stored in YAML format.  You can look in the `cards` directory for existing examples to follow.
-The first entry is a lnaguage name and it's okay if that already exists in another file.  The entries below that
+The first entry is a language name and it's okay if that already exists in another file.  The entries below that
 must be unique for that language (eg: you can't have two Hiragana sub entries on Japanese).  The next step in
-will have a mapping hash with exactly two entries.  The first mapping entry is how the language is being mapped
-from key to value (eg "Romaji" => "Hiragana").  The next mapping entry is the representation of how this is to be
-mapped; the how is for whether you want to do a translation mapping key to value, or keyboard practice mapping
-value to value.  This part of the mapping must be with the symbol entries of :k or :v.  Along with the mapping
-entry you may puts all the keys and values for your cards.  Just follow the below outline for a working example.
+will have a mapping hash on how the language is being mapped in the form of key to value (eg "Romaji" => "Hiragana").
+Just follow the below outline for a working example.
 
 ```yaml
 ---
 Japanese:
   Hiragana:
-    mapping:
-      - Romaji: Hiragana
-        index: 
-          - :k
-          - :v
-      - Hiragana: Hiragana
-        index: 
-          - :v
-          - :v
+    mapping: { Romaji: Hiragana }
     a: あ
     i: い
     u: う
@@ -65,14 +54,6 @@ Japanese:
     o: お
 ```
 
-In the example above we allow two mappings (game modes as-it-were).  The first mapping is a translation mapping
-for people to write romaji to solve the Hiragana character, and the second is to actually type the Hiragana
-character in.  As you can see the entries for the cards are bellow at the same level as mapping.
-
-The first entry Japanese can be in any other cards file.  The next level in where "Hiragana" is must be unique to
-the language Japanese and only in one file.  If you mess up the mapping the error messages will be very clear
-about it.  You may enter either one mapping, or two.
-
 ## Development
 
 *Tests required moving forward with this project unless it's translation files.*

data/cards/japanese-hiragana.yml

@@ -1,15 +1,7 @@
 --- # https://en.wikibooks.org/wiki/Japanese/Kana_chart
 Japanese:
   Hiragana:
-    mapping:
-      - Romaji: Hiragana
-        index:
-          - :k
-          - :v
-      - Hiragana: Hiragana
-        index:
-          - :v
-          - :v
+    mapping: { Romaji: Hiragana }
     a: あ # ✓
     i: い # ✓
     u: う # ✓
@@ -112,15 +104,7 @@ Japanese:
     ryu: りゅ # ✓
     ryo: りょ # ✓
   Hiragana Diacritics: # https://en.wikipedia.org/wiki/Hiragana
-    mapping:
-      - Romaji: Hiragana
-        index:
-          - :k
-          - :v
-      - Hiragana: Hiragana
-        index:
-          - :v
-          - :v
+    mapping: { Romaji: Hiragana }
     ga: が
     gi: ぎ
     gu: ぐ

data/cards/japanese-katakana.yml

@@ -1,15 +1,7 @@
 --- # https://en.wikibooks.org/wiki/Japanese/Kana_chart
 Japanese:
   Katakana:
-    mapping:
-      - Romaji: Katakana
-        index:
-          - :k
-          - :v
-      - Katakana: Katakana
-        index:
-          - :v
-          - :v
+    mapping: { Romaji: Katakana }
     a: ア # ✓
     i: イ # ✓
     u: ウ # ✓
@@ -111,15 +103,7 @@ Japanese:
     ryu: リュ # ✓
     ryo: リョ # ✓
   Katakana Diacritics: # https://en.wikipedia.org/wiki/Katakana
-    mapping:
-      - Romaji: Katakana
-        index:
-          - :k
-          - :v
-      - Katakana: Katakana
-        index:
-          - :v
-          - :v
+    mapping: { Romaji: Katakana }
     ga: ガ
     gi: ギ
     gu: グ
@@ -161,15 +145,7 @@ Japanese:
     pyu: ピュ
     pyo: ピョ
   Katakana Keyboard Mappings:
-    mapping:
-      - Romaji: Katakana
-        index:
-          - :k
-          - :v
-      - Katakana: Katakana
-        index:
-          - :v
-          - :v
+    mapping: { Romaji: Katakana }
     a: ア
     i: イ
     u: ウ

data/language_cards.gemspec

@@ -23,7 +23,8 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "highline", "~> 1.7"
   spec.add_dependency "i18n", "~> 0.7"
+  spec.add_dependency "elixirize", "~> 0.3"
   spec.add_development_dependency "bundler", "~> 1.13"
-  spec.add_development_dependency "rake", "~> 12.0"
+  spec.add_development_dependency "rake", "~> 12.3"
   spec.add_development_dependency "minitest", "~> 5.10"
 end

data/lib/language_cards.rb

@@ -3,6 +3,7 @@ require 'language_cards/language_cards'
 require 'yaml'
 require 'i18n'
 require 'highline'
+require 'elixirize'
 
 ##
 # TODO:

data/lib/language_cards/controllers/game.rb

@@ -6,16 +6,18 @@ module LanguageCards
         include Helpers::GameHelper
 
         def render(correct:, incorrect:, title:, timer:, last:)
-          _score = t('Game.ScoreMenu.Score') + ": %0.2d%" % calc_score(correct, incorrect)
+          _score = t('Game.ScoreMenu.Score') + ": %0.2d%%" % calc_score(correct, incorrect)
           _timer = [((t('Timer.Timer') + ": " + timer.ha) if timer.time?), nil, timer.h]
           _mexit = t 'Menu.Exit'
 
-          view = ERB.new(IO.read(File.expand_path('../view/game.erb', __dir__)))
+          view = File.expand_path('../view/game.erb', __dir__).
+            ᐅ( IO.method :read ).
+            ᐅ ERB.method :new
           view.result(binding)
         end
 
-        def process(card_collection, mode)
-          ic = struct_data.new(card_collection, mode.peek)
+        def process(cards, mode)
+          ic = struct_data.new(cards, mode)
           ic.get_input
           {
             correct: ic.valid?,
@@ -30,19 +32,26 @@ module LanguageCards
             end
 
             def get_input
-              @input ||= CLI.ask("#{I18n.t('Game.TypeThis')} #{collection.mapped_as}: #{display}")
+              @input ||= CLI.ask("#{I18n.t('Game.TypeThis')}: #{display}")
             end
 
-            def comp_bitz
-              @comp_bitz ||= collection.rand
+            def card
+              @card ||= collection.sample
             end
 
             def display
-              comp_bitz.display
+              "#{card}"
             end
 
             def expected
-              comp_bitz.expected
+              case mode
+              when :translate
+                card.translation
+              when :typing_practice
+                 "#{card}" 
+              else
+                raise "Invalid mode in Game Controller!"
+              end
             end
 
             def correct_msg
@@ -56,7 +65,7 @@ module LanguageCards
             end
 
             def valid?
-              collection.correct?(input, comp_bitz)
+              !!(expected == input)
             end
           end
         end

data/lib/language_cards/controllers/main_menu.rb

@@ -7,14 +7,17 @@ module LanguageCards
         def render(courses:, mode:)
           _title = t 'Menu.Title'
           _select = t 'Menu.Choose'
-          _mode = case mode.peek
+          _mode = t('Menu.GameMode') + case mode.peek
                   when :translate then t 'Menu.ModeTranslate'
-                  when :typing then t 'Menu.ModeTyping'
+                  when :typing_practice then t 'Menu.ModeTyping'
                   end
+          _toggle = "m: " + t('Menu.ToggleGameMode')
           _courses = courses.each.with_index.map {|item,index| "#{index + 1}: #{item}" }
           _mexit = t 'Menu.Exit'
 
-          view = ERB.new(IO.read(File.expand_path('../view/main_menu.erb', __dir__)))
+          view = File.expand_path('../view/main_menu.erb', __dir__).
+            ᐅ( IO.method :read ).
+            ᐅ ERB.method :new
           view.result(binding)
         end
       end

data/lib/language_cards/grapheme_builder.rb

@@ -0,0 +1,12 @@
+require 'language_cards/models/grapheme'
+
+module LanguageCards
+  module GraphemeBuilder
+    # Hash {translation => grapheme}
+    def self.call(translation_graphemes = {})
+      translation_graphemes.each_with_object([]) do |(key, value), memo|
+        memo << Grapheme.new(value, key)
+      end
+    end
+  end
+end

data/lib/language_cards/helpers/view_helper.rb

@@ -19,6 +19,10 @@ module LanguageCards
       def clear
         printf ::LanguageCards::ESC::CLEAR
       end
+
+      def humanize string
+        "#{string}".split('_').map(&:capitalize).join(' ')
+      end
     end
   end
 end

data/lib/language_cards/language_cards.rb

@@ -1,4 +1,4 @@
-require_relative 'card_collection'
+require 'language_cards/menu_node'
 require_relative 'user_interface'
 
 module LanguageCards
@@ -6,30 +6,50 @@ module LanguageCards
     def initialize
       @CARDS = {}
 
-      Dir[File.join(File.expand_path(File.join('..','..','..'), __FILE__), 'cards', '*.yml')].+(
-        if ENV['HOME']
-          Dir[File.join(File.expand_path(ENV['HOME']), '.language_cards', 'cards', '*.yml')]
-        else
-          []
-        end
-      ).
-        each do |c|
-        next unless yaml_data = YAML.load(File.open(c).read)
-        for language in yaml_data.keys do
-          if @CARDS.has_key? language
-            @CARDS[language] = Hash(@CARDS[language]).merge(Hash(yaml_data[language]))
+      # TODO: Extract out YAML file loading behavior to methods via SRP.
+      File.join('..','..').
+        ᐅ(File.method(:expand_path), __dir__  ).
+        ᐅ(File.method(:join), 'cards', '*.yml').
+        ᐅ(Dir.method :[]                      ).
+        +(
+          if ENV['HOME']
+            File.expand_path(ENV['HOME']).
+              ᐅ(File.method(:join), '.language_cards', 'cards', '*.yml').
+              ᐅ Dir.method :[]
           else
-            @CARDS.merge!({language => yaml_data[language]})
+            []
+          end
+        ).
+          each do |c|
+          next unless yaml_data = c.ᐅ(File.method :open).ᐅ(~:read).ᐅ(YAML.method :load)
+          for language in yaml_data.keys do
+            # Merges sub-items for languages
+            if @CARDS.has_key? language
+              @CARDS[language] = \
+                yaml_data[language].
+                ᐅ(method :Hash).
+                ᐅ @CARDS[language].
+                  ᐅ(method :Hash).
+                  method(:merge)
+            else
+              # Merges top scope languages
+              { language => yaml_data[language] }.
+                ᐅ @CARDS.method :merge!
+            end
           end
+
         end
 
+      # Builder
+      @CARDS = @CARDS.each_with_object([]) do |(language, values), memo|
+        values.each do |category_with_card_set|
+          memo << MenuNode.new(language, category_with_card_set)
+        end
       end
-      # Recursive Builder
-      @CARDS = CardCollection.new @CARDS
     end
 
     def start
-      UserInterface.new(@CARDS).start
+      @CARDS.ᐅ(UserInterface.method :new).ᐅ ~:start
     end
   end
 end

data/lib/language_cards/menu_node.rb

@@ -0,0 +1,38 @@
+require 'language_cards/models/card_set'
+module LanguageCards
+  class MenuNode
+    def initialize name, child
+      @name = name
+
+      if child.is_a?(Hash) and child.has_key?("mapping")
+        @mapping = child.delete("mapping") # Extra unused data for the moment
+        @child = CardSet.new(child)
+      else
+        @child = MenuNode.new(*child)
+      end
+    end
+
+    def title(fmt = ' - ', rng = 0..-1)
+      label[rng].delete_if(&:empty?).join(fmt)
+    end
+
+    # @return <Mode<CardSet> < Game>
+    def mode(game_mode)
+      child.mode(game_mode)
+    end
+
+    # This is the preferred method for the view as this object shouldn't
+    # care about how it should be displayed in the view.
+    # @return Array<String>
+    def label
+      [@name].push(*child.label)
+    end
+
+    def to_s
+      label.delete_if(&:empty?).join(' - ')
+    end
+
+    private
+    attr_reader :name, :child
+  end
+end

data/lib/language_cards/models/card_set.rb

@@ -0,0 +1,38 @@
+require 'language_cards/models/grapheme'
+require 'language_cards/grapheme_builder'
+require 'language_cards/modes/typing_practice'
+require 'language_cards/modes/translate'
+
+module LanguageCards
+  class CardSet
+    attr_reader :graphemes
+    def initialize(grapheme_hash)
+      @graphemes = GraphemeBuilder.(grapheme_hash)
+    end
+
+    def sample
+      @graphemes.sample
+    end
+
+    def mode(mode)
+      case mode
+      when :translate
+        Modes::Translate.new(self)
+      when :typing_practice
+        Modes::TypingPractice.new(self) 
+      else
+        raise "Invalid Game Mode!"
+      end
+    end
+
+    # So as to not interfere with menu naming as this is not meant to
+    # be displayed as a string.
+    def to_s
+      ""
+    end
+
+    def label
+      []
+    end
+  end
+end

data/lib/language_cards/models/grapheme.rb

@@ -0,0 +1,18 @@
+
+module LanguageCards
+  class Grapheme
+    attr_reader :translation
+    def initialize grapheme, translation
+      @grapheme = grapheme
+      @translation = translation
+    end
+
+    def display
+      @grapheme
+    end
+
+    def to_s
+      @grapheme
+    end
+  end
+end

data/lib/language_cards/modes/game.rb

@@ -0,0 +1,29 @@
+
+module LanguageCards
+  module Modes
+    class Game
+      def initialize card_set
+        @card_set = card_set
+        @index = 0
+        @current = nil
+      end
+
+      def current
+        @current or raise "Current grapheme not yet set!"
+      end
+
+      # @return Grapheme Returns a random grapheme
+      def sample
+        @current = @card_set.sample
+      end
+
+      # Iterator for cycling through all translations sequentially.
+      # @return Grapheme Returns a random grapheme
+      def next
+        value = @card_set[@index % @card_set.length]
+        @index += 1
+        @current = value
+      end
+    end
+  end
+end

data/lib/language_cards/modes/translate.rb

@@ -0,0 +1,14 @@
+require 'language_cards/modes/game'
+module LanguageCards
+  module Modes
+    class Translate < Game
+      def match? input
+        current.translation == input
+      end
+
+      def mode
+        :translate
+      end
+    end
+  end
+end

data/lib/language_cards/modes/typing_practice.rb

@@ -0,0 +1,14 @@
+require 'language_cards/modes/game'
+module LanguageCards
+  module Modes
+    class TypingPractice < Game
+      def match? input
+        "#{current}" == input
+      end
+
+      def mode
+        :typing_practice
+      end
+    end
+  end
+end

data/lib/language_cards/user_interface.rb

@@ -1,8 +1,8 @@
-require_relative 'timer'
-require_relative 'helpers/view_helper'
-require_relative 'helpers/game_helper'
-require_relative 'controllers/main_menu'
-require_relative 'controllers/game'
+require 'language_cards/timer'
+require 'language_cards/helpers/view_helper'
+require 'language_cards/helpers/game_helper'
+require 'language_cards/controllers/main_menu'
+require 'language_cards/controllers/game'
 require 'erb'
 
 module LanguageCards
@@ -11,15 +11,16 @@ module LanguageCards
     include Controllers
     def initialize cards
       @cards = cards
-      @courses = cards.classes
-      @mode = [:translate, :typing].cycle
+      @courses = cards.flat_map {|i| i.label.join(' - ') }
+      @mode = [:translate, :typing_practice].cycle
     end
 
     def start
-      clear
-
-      CLI.say SPLASH_SCREEN
-      sleep 2
+      unless ENV['SKIP_SPLASH']
+        clear
+        CLI.say SPLASH_SCREEN
+        sleep 2
+      end
 
       begin
         loop do
@@ -34,19 +35,23 @@ module LanguageCards
 
           last = nil
           if (0..courses.length-1).include? value
-            collection = cards.select_collection(courses(value))
+
+            collection = cards[value] # MenuNode
+            title = "#{collection.title} (#{humanize mode.peek})"
+            collection = collection.mode(mode.peek) # Mode<CardSet> < Game
+
             timer = Timer.new
-            begin
+            begin # Game Loop
               loop do
                 clear
                 timer.mark
-                CLI.say Game.render correct: @correct,
-                                    incorrect: @incorrect,
-                                    title: collection.name,
+                CLI.say Game.render correct: correct,
+                                    incorrect: incorrect,
+                                    title: title,
                                     timer: timer,
                                     last: last
-                result = Game.process(collection, mode)
-                result[:correct] ? correct : incorrect
+                result = Game.process(collection, collection.mode)
+                result[:correct] ? correct! : incorrect!
                 last = result[:last]
               end
             rescue SystemExit, Interrupt
@@ -59,23 +64,14 @@ module LanguageCards
     end
 
     private
-    attr_reader :mode, :cards
-    def correct
+    attr_reader :mode, :cards, :correct, :incorrect, :courses
+    def correct!
       @correct = @correct.to_i + 1
     end
 
-    def incorrect
+    def incorrect!
       @incorrect = @incorrect.to_i + 1
     end
-
-    def courses(value = nil)
-      courses = @courses.select {|c| detect_course_mode(c) == mode.peek }
-      value ? courses[value] : courses
-    end
-
-    def detect_course_mode str
-      str.split(JOIN).last.split(" => ").inject(:==) ? :typing : :translate
-    end
   end
 end
 

data/lib/language_cards/version.rb

@@ -1,3 +1,3 @@
 module LanguageCards
-  VERSION = "0.1.3"
+  VERSION = "0.2.0"
 end

data/lib/language_cards/view/main_menu.erb

@@ -1,9 +1,9 @@
 <%= divider %>
 <%= draw(_title, nil, 'v' + VERSION) %>
 <%= divider %>
-<%= draw(_select, nil, I18n.t('Menu.GameMode') + _mode) %>
+<%= draw(_select, nil, _mode) %>
 <% _courses.each do |course| %>
   <%= course.chomp %><% end %>
 
-<%= draw(_mexit, nil, ("m: " + I18n.t('Menu.ToggleGameMode'))) %>
+<%= draw(_mexit, nil, _toggle) %>
 <%= divider %>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: language_cards
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.2.0
 platform: ruby
 authors:
 - Daniel P. Clark
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-02-27 00:00:00.000000000 Z
+date: 2018-04-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: highline
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '0.7'
+- !ruby/object:Gem::Dependency
+  name: elixirize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: '0.3'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -58,14 +72,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.3'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '12.0'
+        version: '12.3'
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -103,15 +117,18 @@ files:
 - cards/japanese-katakana.yml
 - language_cards.gemspec
 - lib/language_cards.rb
-- lib/language_cards/card_collection.rb
-- lib/language_cards/comp_bitz.rb
-- lib/language_cards/comparator.rb
 - lib/language_cards/controllers/game.rb
 - lib/language_cards/controllers/main_menu.rb
+- lib/language_cards/grapheme_builder.rb
 - lib/language_cards/helpers/game_helper.rb
 - lib/language_cards/helpers/view_helper.rb
 - lib/language_cards/language_cards.rb
-- lib/language_cards/mappings.rb
+- lib/language_cards/menu_node.rb
+- lib/language_cards/models/card_set.rb
+- lib/language_cards/models/grapheme.rb
+- lib/language_cards/modes/game.rb
+- lib/language_cards/modes/translate.rb
+- lib/language_cards/modes/typing_practice.rb
 - lib/language_cards/timer.rb
 - lib/language_cards/user_interface.rb
 - lib/language_cards/version.rb
@@ -139,7 +156,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.10
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Flashcard game for language learning.

data/lib/language_cards/card_collection.rb

@@ -1,97 +0,0 @@
-require_relative 'comparator'
-require_relative 'mappings'
-
-module LanguageCards
-  class CardCollection
-    attr_reader :name
-    ##
-    # RULE: Always compare by value regardless of key value ordering in mapping.
-    #    (This allows for duplicate spellings of the same character translation)
-    def initialize hsh, name=nil
-      @hsh = hsh
-      @name = name ? I18n.t("LanguageName.#{name}") : nil
-      send :_build
-      @mappings = @hsh["mapping"]
-      if @mappings
-        @cards = @hsh.select {|k,v| !v.is_a? Mappings}
-      end
-    end
-
-    ##
-    # Recursively build class course names
-    def classes s=nil
-      s = @name.nil? ? nil : [s, @name].compact.join(JOIN)
-      @hsh.select do |k,v|
-        [CardCollection, Mappings].include? v.class
-      end.flat_map do |k,v|
-        v.send :classes, s
-      end
-    end
-
-    def [](value)
-      raise EmptyCollection unless collection?
-      @cards[value]
-    end
-
-    def rand
-      raise EmptyCollection unless collection?
-      v = @cards.keys.sample
-      @comparator.given(v, @cards[v])
-    end
-
-    def correct? input, comp_bitz
-      raise EmptyCollection unless collection?
-      @comparator.match? input, comp_bitz
-    end
-
-    def mapped_as
-      raise EmptyCollection unless collection?
-      @comparator.mapped_as
-    end
-
-    def children
-      @hsh.select {|k,v| v.is_a? CardCollection}.values.map do |cc|
-        {cc.name => cc}
-      end.inject(:merge)
-    end
-
-    def select_collection string
-      first, tail = string.split(JOIN, 2)
-      if collection?
-        @comparator = @mappings.select_mapping(first)
-        return self
-      else
-        children[first].select_collection tail
-      end
-    end
-
-    def collection?
-      !!(@cards ||= nil)
-    end
-
-    def cards
-      @cards || raise(I18n.t 'Errors.UpperCollection')
-    end
-
-    private
-    ##
-    # Replace respective raw ruby object with our objects
-    def _build
-      if @hsh.has_key? "mapping"
-        @hsh["mapping"] = Mappings.new(@hsh["mapping"], self) 
-      else
-        @hsh.tap do |h|
-          h.select {|k,v| v.is_a? Hash }.each do |k,v|
-            h[k] = self.class.new(v, k) 
-          end
-        end
-      end
-    end
-
-    class EmptyCollection < StandardError
-      def initialize
-        super(I18n.t 'Errors.EmptyCollection')
-      end
-    end
-  end
-end

data/lib/language_cards/comp_bitz.rb

@@ -1,12 +0,0 @@
-module LanguageCards
-  class CompBitz
-    attr_reader :display, :collection, :value, :mapping, :expected
-    def initialize options
-      @display = options.fetch(:display)
-      @collection = options.fetch(:collection)
-      @expected = options.fetch(:expected)
-      @value = options.fetch(:value)
-      @mapping = options.fetch(:mapping)
-    end
-  end
-end

data/lib/language_cards/comparator.rb

@@ -1,67 +0,0 @@
-require_relative 'comp_bitz'
-
-module LanguageCards
-  class Comparator
-    def initialize mapping_key, mapping, collection
-      ##
-      # @title should be a hash like {"Romaji"=>"Katakana"}
-      # @mapping should be an array like [:k, :v]
-      raise I18n.t('Error.MappingNotFound') unless mapping.has_key? mapping_key
-      begin
-        @mapped_as, @mapping = mapping[mapping_key].reduce 
-      rescue LocalJumpError
-        raise I18n.t('Errors.InvalidMapping')
-      end
-
-      @collection = collection
-    end
-
-    def mapped_as
-      case @mapping.first
-      when :k
-        @mapped_as.keys.first
-      else
-        @mapped_as.values.first
-      end
-    end
-
-    def given key, value
-      CompBitz.new(
-        display: choose_display(key, value),
-        collection: @collection,
-        expected: choose_expected(key, value),
-        value: value,
-        mapping: @mapping.first
-      )
-    end
-
-    def match? input, comp_bitz
-      case comp_bitz.mapping 
-      when :k
-        comp_bitz.value == comp_bitz.collection[input]
-      when :v
-        comp_bitz.value == input
-      end
-    end
-
-    private
-    def choose_display key, value
-      case @mapping.last
-      when :k
-        key
-      when :v
-        value
-      end
-    end
-
-    def choose_expected key, value
-      case @mapping.first
-      when :k
-        key
-      when :v
-        value
-      end
-    end
-  end
-end
-

data/lib/language_cards/mappings.rb

@@ -1,51 +0,0 @@
-module LanguageCards
-  class Mappings
-    def initialize mapping, collection=nil
-      @collection = collection
-      @mappings = {}
-      mapping.each do |h|
-        index = h.delete("index")
-        begin
-          a,b = h.reduce
-        rescue LocalJumpError
-          raise InvalidMapping
-        end
-        a = I18n.t "LanguageName.#{a}"
-        b = I18n.t "LanguageName.#{b}"
-
-        @mappings["#{a} => #{b}"] = {
-          h => index
-        }
-      end
-    end
-
-    def select_mapping string
-      Comparator.new string, self, @collection
-    end
-
-    def classes s=nil
-      keys.map do |names|
-        [s, names].compact.join(JOIN)
-      end
-    end
-
-    def [] key
-      @mappings[key]
-    end
-
-    def has_key? key
-      @mappings.has_key? key
-    end
-
-    def keys
-      @mappings.keys
-    end
-
-    class InvalidMapping < StandardError
-      def initialize
-        super(I18n.t 'Errors.InvalidMapping')
-      end
-    end
-
-  end
-end