codebreaker-Bulatkin 0.1.0 → 0.1.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 650cb47ef623f29bf16ac29db47c79152674e0ad0927cc985c441af3213f526e
-  data.tar.gz: 24ec2b0c64f5fa568cc6eabeaf318e290d08403258b782159fe8992eb90e824f
+  metadata.gz: a3c4436b52cd092b50d56261fd4e89105673c713b8d852afbb5516c3375d1759
+  data.tar.gz: 19113c0674f6871613e15958771f5146b7defc44c2595c4a54c1efcab0f7a4cc
 SHA512:
-  metadata.gz: 1c87325aac46da9c0815e4b0d24aba5245f4f5ffc834df069218c4f134f79e047bf2165c70b41563477b4d6cd89823f81deb02d95d8e368069f235843a54b374
-  data.tar.gz: 0b825164cf97721a3c34767ccc06c9ab39084c28ba980588d9596b5051cbe6a592c29fbffa197ee02d2f45531c291039c4dcd9e11719692175ffaf4121a3f0da
+  metadata.gz: f59057c66e41b47a073ce0ab4faa1f24db127c8e36800b38742b839212aaa4c460d59e02d80248cdc7c79be3622e0364da6c943196ea1869b4997b538ae22204
+  data.tar.gz: 459e0db583ac0711c40fa15383b6cafb4d9f8972dc2a2aacb89f302212f3769f119c66a7e731d2e4dadcdc7006df163f483308c0795a4e10cec25dfacbb45739

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    codebreaker-Bulatkin (0.1.0)
+    codebreaker-Bulatkin (0.1.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/codebreaker/console.rb

@@ -19,8 +19,7 @@ module Codebreaker
         case user_input
         when I18n.t(:start) then start_game_preparations
         when I18n.t(:rule) then output(:rules)
-        when I18n.t(:stats) then statistic(sort_player(load))
-        when I18n.t(:exit) then exit
+        when I18n.t(:stats) then statistic(sort_player)
         else output(:wrong_command)
         end
       end
@@ -49,7 +48,7 @@ module Codebreaker
         round_menu
         @guess = user_input
         hint_menu if guess == I18n.t(:hint)
-        mark if game.validate_guess(guess)
+        mark if game.guess_valid?(guess)
         won if game.won?(guess)
       end
       lost
@@ -89,7 +88,7 @@ module Codebreaker
 
     def save_result
       output(:save)
-      Storage.save(game.to_yaml(player.name)) if user_input == 'yes'
+      game.save(game.to_yaml(player.name)) if user_input == 'yes'
     end
 
     def play_again

data/lib/codebreaker/game.rb

@@ -54,12 +54,8 @@ module Codebreaker
       @attempts -= 1
     end
 
-    def validate_guess(guess)
-      guess_valid?(guess)
-    end
-
     def guess(guess)
-      @result = '+' * exact_match_count(guess) + '-' * number_match_count(guess)
+      '+' * exact_match_count(guess) + '-' * number_match_count(guess)
     end
 
     private

data/lib/codebreaker/player.rb

@@ -15,9 +15,9 @@ module Codebreaker
 
     def validate
       @errors = []
-      errors << 'Name cannot be blank' if name.empty?
-      errors << 'Should be between 3-20 chars' unless size_correct?(name)
-      errors << 'Should consists of letters' unless class_valid?(name, String)
+
+      errors << I18n.t('errors.blank') if name.empty?
+      errors << I18n.t('errors.size') unless size_correct?(name)
     end
   end
 end

data/lib/codebreaker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Codebreaker
-  VERSION = '0.1.0'
+  VERSION = '0.1.1'
 end

data/lib/locales/en.yml

@@ -28,7 +28,9 @@ en:
   hints_left: 'You have %{hints} hints more'
   no_hints_left: 'No hints left'
   game_end: "Want to play one more game?\n"
-  errors: "Following errors have occured: \n"
+  errors:
+    blank: 'Name cannot be blank'
+    size: 'Should be between 3-20 chars'
   wrong_command: "You have passed unexpected command. Please choose one from listed commands\n"
   output_name: 'Write your name, please:'
   output_difficulty: "\nChoose desired mode:\n-- [hell]\n-- [medium]\n-- [easy]\n"

data/lib/modules/storage.rb

@@ -1,24 +1,37 @@
 # frozen_string_literal: true
 
 module Codebreaker
-  PATH = './db'
-  FILE_NAME = 'data.yml'
   module Storage
-    class << self
-      def save(results)
-        FileUtils.mkdir_p(PATH) unless Dir.exist?(PATH)
-        data = load << results
-        File.open(File.join(Dir.pwd, PATH, FILE_NAME), 'a+') { |file| file.write(data.to_yaml) }
-      end
-
-      def load
-        YAML.safe_load(File.join(Dir.pwd, PATH, FILE_NAME))
-        []
-      end
-
-      def sort_player
-        load_database.sort_by { |game| [game[:difficulty], game[:attempts_used], game[:hints_used]] }
-      end
+    PATH = 'db'
+    FILE_NAME = 'data.yml'
+
+    def save(results)
+      FileUtils.mkdir_p(PATH) unless Dir.exist?(PATH)
+      data = load_database << results
+      write_data(data)
+    end
+
+    def load_database
+      YAML.safe_load(File.read(file_path))
+    end
+
+    def sort_player
+      create_storage unless File.exist?(file_path)
+      load_database.sort_by { |game| [game[:difficulty], game[:attempts_used], game[:hints_used]] }
+    end
+
+    private
+
+    def file_path
+      File.join(Dir.pwd, PATH, FILE_NAME)
+    end
+
+    def create_storage
+      write_data([])
+    end
+
+    def write_data(data)
+      File.open(file_path, 'w') { |file| file.write(data.to_yaml) }
     end
   end
 end

data/lib/modules/validation.rb

@@ -6,10 +6,6 @@ module Codebreaker
       value.length.between?(3, 20)
     end
 
-    def class_valid?(value, klass)
-      value.is_a?(klass)
-    end
-
     def guess_valid?(value)
       /^[1-6]{4}$/.match?(value)
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker-Bulatkin
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.1
 platform: ruby
 authors:
 - Yevhenii Bulatkin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-04 00:00:00.000000000 Z
+date: 2019-11-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler