language_cards 0.0.1 → 0.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6f7f8621d542935a3fd0ef4a0f3443adb400b770
-  data.tar.gz: c3e5c5271866b9b2ccc29715db06459847a27a86
+  metadata.gz: b9b17dee4ee233e521d211a5f25fb3ab666f619c
+  data.tar.gz: 43f4d40ecf065c78d19fe149812204175d672eae
 SHA512:
-  metadata.gz: efa78c38cbf83cccef29b98897b2b2434f2c777d09b7b95850c2cc78bd663b85bbec2b3c7d27926c50b560014ad206bb3e4c1d4394d2ea3c30e50596ec296f68
-  data.tar.gz: 263f886122db25b28b0919d01d0bdb5fc451a584219788a46015a21c10bad4c09131c405dd623d6d16c5eea523d4db8cdf359295ee071879db7cf4814ef38211
+  metadata.gz: 26053e6f86a8e79fe943227b3fde5f2dd5310cf18c9490621282b7ed7aa1e628c53e1783f84680f1801c427fc752a73a1173bbe32ec94a46a4b3d23039d77236
+  data.tar.gz: 70b7c8c51b4cbbfb492ab0b912fce3962e58186db7879aebe785a649559016734ca808485fd6d430650fa8461a9d97a1f07518e34ca99d3b63123a46f55d882a

data/README.md

@@ -41,6 +41,7 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 ## Contributing
 
 Bug reports and pull requests are welcome on GitHub at https://github.com/danielpclark/language_cards.
+Translations of the game itself are kept in the `locales` folder.  Flash cards are stored in YAML format in the`cards` folder.
 
 
 ## License

data/lib/language_cards/comparator.rb

@@ -6,7 +6,13 @@ module LanguageCards
       ##
       # @title should be a hash like {"Romaji"=>"Katakana"}
       # @mapping should be an array like [:k, :v]
-      @mapped_as, @mapping = mapping[mapping_key].reduce
+      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
 

data/lib/language_cards/mapping.rb

@@ -37,6 +37,10 @@ module LanguageCards
       self[key].values.flatten
     end
 
+    def has_key? key
+      @mappings.has_key? key
+    end
+
     def keys
       @mappings.keys
     end

data/lib/language_cards/version.rb

@@ -1,3 +1,3 @@
 module LanguageCards
-  VERSION = "0.0.1"
+  VERSION = "0.0.2"
 end

data/lib/language_cards.rb

@@ -31,7 +31,7 @@ module LanguageCards
 
   SUBMENUWIDTH = 60
 
-  ::I18n.load_path = Dir[File.join 'locales', '*.yml']
+  ::I18n.load_path = Dir[File.join(File.expand_path(File.join('..','..'), __FILE__), 'locales', '*.yml')]
 
   def self.start
     LanguageCards.new.start

data/locales/en.yml

@@ -20,6 +20,7 @@ en:
         * and one with one language name as the key and the other as a value
       Fix your language mapping.
     EmptyCollection: Invalid option on empty card collection! 
+    MappingNotFound: The key for the mapping you've provided isn't in the collection!
   LanguageName:
     Japanese: Japanese
     Romaji: Romaji

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: language_cards
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors:
 - Daniel P. Clark