codebreaker2018 0.2.8.3 → 0.3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8fa4cc3d0ef752950287c8c950a12234d20f9740675004ec05ffe1582b6dbccb
-  data.tar.gz: 00cba10a77519a2d72e14a74f5d134d23a0dc93605b308ed21c4e09410b03962
+  metadata.gz: 799d4f49abd9be97d1c508b3b1ec3f3f3e603b274148e4c2474c476a43e63ea2
+  data.tar.gz: 5cf0cf34b755af1a5aa8dd71a19bc04a7b7a90e45f7c983c73eda0a5b0c2b8d8
 SHA512:
-  metadata.gz: 1752b231b2cd1887b61b3af73711f2ebc223ea8a23d674e44f70b7a7ff6d9679a943e1f01ee3112b4a4bfb4bea4fa05abc77c8d801b2bacfebfc585b2f4d4c42
-  data.tar.gz: df6249ffabb476eaa0b6ddf1528762436ae8e8b10aefc1abdae6b03c1040d621cb4f8e10935cb4ebe571d0e5e15feeac1f177e28d8e6beaf0fc71064494d7528
+  metadata.gz: 1645d38d18512010ee19adf04217ee0b3b9725636a3e565ee5da0e3c47864007209ec7bda17bc3d6de5e4a00534fb41851b348fc357c294709de70b9fc9ae1e1
+  data.tar.gz: 994f43db763377fadebf036ed4fab608064f9c11df670a9251e4debcde193380e97f0d6c168f293472ddc16f26b782e8eba591c8e98aafd419bad07efe35d6bc

data/lib/codebreaker/console.rb

@@ -1,10 +1,10 @@
 require 'colorize'
 require 'erb'
-require 'yaml'
 
 module Codebreaker
   class Console
     include Message
+    include Storage
 
     DEMO = Game.new('Demo User', 5, 2, :middle, :en)
     HINT = '-h'.freeze
@@ -44,10 +44,6 @@ module Codebreaker
       @scores = load_game_data
     end
 
-    def load_game_data
-      YAML.load(File.open(storage_path, 'r')) rescue []
-    end
-
     def submit_answer
       process(user_interaction)
     end
@@ -143,17 +139,6 @@ module Codebreaker
       end
     end
 
-    def prepare_storage_dir
-      storage_dir = File.dirname(storage_path)
-      Dir.mkdir(storage_dir) unless File.exists?(storage_dir)
-    end
-
-    def save_to_yml
-      File.open(storage_path, 'w') do |file|
-        file.write(YAML.dump(scores))
-      end
-    end
-
     def new_game
       print message['alerts']['new_game']
       if input_selector
@@ -179,7 +164,7 @@ module Codebreaker
 
     def erase_game_data
       begin
-        File.delete(storage_path)
+        erase_data_file
         scores.clear
         puts message['info']['successfully_erased'].green
       rescue

data/lib/codebreaker/localization.rb

@@ -4,8 +4,9 @@ module Codebreaker
   class Localization
     attr_accessor :lang
 
-    def initialize(app_type, lang = :en)
+    def initialize(app_type, external_path = false, lang = :en)
       @lang = lang
+      apply_external_path(external_path)
       select_application(app_type)
       candidates_to_load
       merge_localizations
@@ -18,7 +19,15 @@ module Codebreaker
 
     private
 
+    def apply_external_path(external_path)
+      if Dir.glob("#{external_path}/*/*.yml").empty? && external_path
+        raise ArgumentError, 'Invalid external path.'
+      end
+      @external_path = external_path ? external_path : false
+    end
+
     def localizations_dir
+      return @external_path if @external_path
       File.expand_path('./locale/.', File.dirname(__FILE__))
     end
 
@@ -41,7 +50,7 @@ module Codebreaker
 
     def merge_localizations
       localizations
-      loaded_ymls = @ymls_paths.map { |file| YAML.load(File.open(file, 'r')) }
+      loaded_ymls = candidates_to_load.map { |file| YAML.load(File.open(file, 'r')) }
       loaded_ymls.each { |loaded_yml| @localizations.update(loaded_yml) }
     end
   end

data/lib/codebreaker/message.rb

@@ -1,5 +1,6 @@
 module Codebreaker
   module Message
+    private
     def message
       @locale.localization
     end

data/lib/codebreaker/storage.rb

@@ -0,0 +1,26 @@
+require 'yaml'
+
+module Codebreaker
+  module Storage
+    private
+    def load_game_data
+      YAML.load(File.open(storage_path, 'r')) rescue []
+    end
+
+    def prepare_storage_dir
+      storage_dir = File.dirname(storage_path)
+      Dir.mkdir(storage_dir) unless File.exists?(storage_dir)
+    end
+
+    def save_to_yml
+      scores_to_save = scores | load_game_data
+      File.open(storage_path, 'w') do |file|
+        file.write(YAML.dump(scores_to_save))
+      end
+    end
+
+    def erase_data_file
+      File.delete(storage_path)
+    end
+  end
+end

data/lib/codebreaker/version.rb

@@ -1,3 +1,3 @@
 module Codebreaker
-  VERSION = '0.2.8.3'
+  VERSION = '0.3.0.2'
 end

data/lib/codebreaker.rb

@@ -1,6 +1,7 @@
 require_relative 'codebreaker/version'
 require_relative 'codebreaker/localization'
 require_relative 'codebreaker/message'
+require_relative 'codebreaker/storage'
 require_relative 'codebreaker/game'
 require_relative 'codebreaker/score'
 require_relative 'codebreaker/console'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker2018
 version: !ruby/object:Gem::Version
-  version: 0.2.8.3
+  version: 0.3.0.2
 platform: ruby
 authors:
 - Vladislav Trotsenko
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-06-12 00:00:00.000000000 Z
+date: 2018-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -95,6 +95,7 @@ files:
 - lib/codebreaker/localization.rb
 - lib/codebreaker/message.rb
 - lib/codebreaker/score.rb
+- lib/codebreaker/storage.rb
 - lib/codebreaker/version.rb
 homepage: https://github.com/bestwebua/homework-04-codebreaker
 licenses: