codebreaker_kirill 1.1.0 → 1.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ea8d9499d3f3afaf3a663f2f5d2d393843be5bb29eef1cd4cc769fdbd08e5d4c
-  data.tar.gz: b465bcb3d9eefe5fc004a2c98cbc174979985b1d363d0150f445ce5a1343065c
+  metadata.gz: 13184f386f8e6c28fce445b1bd7849afe194a85129b8ade51d8a72c58da0faae
+  data.tar.gz: a5c9fdd868c7f244304685f542fbc38cd9a238efb42e842b84043934762b3b32
 SHA512:
-  metadata.gz: c440ac19bd13a5678d0cdfa24e94b04d278cf770fae412e64d77e718004f17f6031b114cca8764439435015386b0a6a0337cd331c1abf0810ca64e03a1ed601b
-  data.tar.gz: '05239e74c1dacb9277e2e3a2ceb879938624e482c52757148f74346b59a9dab9f638d10aa3221a7a6e44ae8a6d3b236f5da7fd832a56bbc9292bfe2290a24087'
+  metadata.gz: 38cc6d0005882e01699e6997749d451f82f99c37c06f41bfb5f4a48a7159a38605b60d8c7e7fe9617147148e1ce544e9cfd74ad24643267a602fbd99920e1657
+  data.tar.gz: '09e7d0b555b122db1e004623082a695d1b62ff519b136eba6e35ac52073317bf788e8c30c76569b399eea4d24814ac00492f88c6a9389e33934f64c2fe65b029'

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    codebreaker_kirill (0.3.2)
+    codebreaker_kirill (1.1.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/codebreaker_kirill/autoload.rb

@@ -1,9 +1,10 @@
 # frozen_string_literal: true
 
 require 'yaml'
-require_relative 'validations'
-require_relative 'guess_handler'
 require_relative 'settings'
 require_relative 'code_generator'
-require_relative 'stats'
+require_relative 'validations'
+require_relative 'guess_handler'
 require_relative 'user'
+require_relative 'game'
+require_relative 'stats'

data/lib/codebreaker_kirill/game.rb

@@ -1,8 +1,6 @@
 # frozen_string_literal: true
 
 require_relative 'autoload'
-require_relative 'code_generator'
-require_relative 'user'
 
 class Game
   include CodeGenerator
@@ -15,25 +13,23 @@ class Game
   end
 
   def give_a_hint
-    return nil if @user.hints[:used] >= @user.hints[:all]
+    return nil if @user.hints_used >= @user.level[:hints]
 
-    @user.hints[:used] += 1
-    @secret_code.shuffle[@user.hints[:used]]
+    @user.hints_used += 1
+    @secret_code.shuffle[@user.hints_used]
   end
 
-  def respond_to_guess(input, code)
-    @user.attempts[:used] += 1
-    status = status(input, code)
-    resolved_code = GuessHandler.new(input, code).call
-    { status: status, response: resolved_code }
-  end
+  def respond_to_guess(input)
+    @user.attempts_used += 1
+    status = status(input, @secret_code)
+    resolved_code = GuessHandler.new(input, @secret_code).call
+    return { status: status, secret_code: @secret_code } if status == 'loss'
 
-  def attempts_handler
-    @user.attempts[:used] += 1
+    { status: status, response: resolved_code, secret_code: code }
   end
 
   def status(input, code)
-    return 'loss' if @user.attempts[:used] >= @user.attempts[:all]
+    return 'loss' if @user.attempts_used >= @user.level[:attempts]
     return 'win' if input.each_char.map(&:to_i) == code
 
     'in_game'

data/lib/codebreaker_kirill/guess_handler.rb

@@ -3,47 +3,36 @@
 require_relative 'autoload'
 
 class GuessHandler
+  include Settings
+
   def initialize(input, code)
-    validation(input)
+    Validations.validate_guess(input)
     @input = input.each_char.map(&:to_i)
     @code = code.clone
     @result = []
   end
 
   def call
-    add_pluses(@input, @code)
-    add_minuses(@input, @code)
+    check_same_indexes
+    check_different_indexes
     @result
   end
 
-  def add_pluses(input, code)
-    input.each_with_index do |element, index|
-      next unless element == code[index]
+  def check_same_indexes
+    @input.each_index do |index|
+      next unless @input[index] == @code[index]
 
-      @result << Settings::POSITIVE
-      input[input.find_index(element)] = ''
-      code[index] = ''
+      @result << Settings::POSITIVE_RESPONSE
+      @input[index], @code[index] = nil
     end
-    input.delete('')
-    code.delete('')
   end
 
-  def add_minuses(input, code)
-    input.each_with_index do |element, _index|
-      next unless code.include?(element)
+  def check_different_indexes
+    @input.each_with_index do |value, _index|
+      next unless !value.nil? && @code.include?(value)
 
-      @result << Settings::NEGATIVE
-      input[input.find_index(element)] = ''
-      code[code.find_index(element)] = ''
+      @result << Settings::NEGATIVE_RESPONSE
+      @input[@input.find_index(value)], @code[@code.find_index(value)] = nil
     end
   end
-
-  private
-
-  def validation(input)
-    Validations.validate_guess(input)
-  rescue StandardError => e
-    puts e.message
-    nil
-  end
 end

data/lib/codebreaker_kirill/settings.rb

@@ -1,6 +1,8 @@
 # frozen_string_literal: true
 
-class Settings
+require_relative 'autoload'
+
+module Settings
   DIFFICULTY = {
     'easy' => { attempts: 15, hints: 2 },
     'medium' => { attempts: 10, hints: 1 },
@@ -8,6 +10,9 @@ class Settings
   }.freeze
   CODE_LENGTH = 4
   RANDOM_RANGE = (1..6).freeze
-  POSITIVE = '+'
-  NEGATIVE = '-'
+  POSITIVE_RESPONSE = '+'
+  NEGATIVE_RESPONSE = '-'
+  NAME_MIN_LENGTH = 3
+  NAME_MAX_LENGTH = 20
+  GUESS_LENGTH = 4
 end

data/lib/codebreaker_kirill/stats.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
-require 'yaml'
-require_relative 'user'
+require_relative 'autoload'
 
 class Stats
   def self.save_game(user)
@@ -13,20 +12,6 @@ class Stats
 
   def self.show_stats
     @data = File.exist?('stats.yml') ? YAML.load_file('stats.yml') : []
-    @data.sort_by! { |user| [user.attempts[:all], user.attempts[:used], user.hints[:used]] }
-    @data.each_with_index do |user, index|
-      stats_format(user, index)
-    end
-  end
-
-  def self.stats_format(user, index)
-    index += 1
-    puts "Rating: #{index}", "Name: #{user.name}",
-         "Difficulty: #{user.difficulty}",
-         "Available Attempts: #{user.attempts[:all]}",
-         "Used Attempts: #{user.attempts[:used]}",
-         "Available Hints: #{user.hints[:all]}",
-         "Used Hints: #{user.hints[:used]}",
-         '-----------------------'
+    @data.sort_by! { |user| [user.level[:attempts], user.attempts_used, user.hints_used] }
   end
 end

data/lib/codebreaker_kirill/user.rb

@@ -1,18 +1,20 @@
 # frozen_string_literal: true
 
 require_relative 'autoload'
-require_relative 'settings'
 
 class User
-  attr_reader :name, :difficulty, :attempts, :hints
+  include Settings
+
+  attr_accessor :attempts_used, :hints_used
+  attr_reader :difficulty, :name, :level
 
   def initialize(name, difficulty)
     validation(name, difficulty)
     @difficulty = difficulty
     @name = name
     @level = Settings::DIFFICULTY[@difficulty]
-    @attempts = { all: @level[:attempts], used: 0 }
-    @hints = { all: @level[:hints], used: 0 }
+    @attempts_used = 0
+    @hints_used = 0
   end
 
   def validation(name, difficulty)

data/lib/codebreaker_kirill/validations.rb

@@ -1,23 +1,27 @@
 # frozen_string_literal: true
 
+require_relative 'autoload'
+
 class Validations
+  include Settings
+
   def self.validate_name(name)
     raise "Name shouldn't be empty" if name.empty?
     raise 'Name should be string' if name.class != String
-    raise 'Name should be at least 3 characters long' if name.length < 3
-    raise "Name shouldn't be more than 20 characters long" if name.length > 20
+    raise 'Name should be at least 3 characters long' if name.length < Settings::NAME_MIN_LENGTH
+    raise "Name shouldn't be more than 20 characters long" if name.length > Settings::NAME_MAX_LENGTH
   end
 
   def self.validate_guess(guess)
     raise "Guess shouldn't be empty" if guess.empty?
-    raise 'Guess should be at least 3 characters long' if guess.length < 4
-    raise 'Guess shouldn\'t be more than 4 characters long' if guess.length > 4
+    raise "Guess should be 4 characters. Got #{guess}" if guess.length < Settings::GUESS_LENGTH
+    raise 'Guess shouldn\'t be more than 4 characters long' if guess.length > Settings::GUESS_LENGTH
   end
 
   def self.validate_difficulty(difficulty)
     raise "Input shouldn't be empty" if difficulty.empty?
     return if Settings::DIFFICULTY.keys.include?(difficulty)
 
-    raise 'You should enter one of the following options: easy, medium, hell'
+    raise "You should enter one of the following options: #{Settings::DIFFICULTY.keys.join(', ')}"
   end
 end

data/lib/codebreaker_kirill/version.rb

@@ -3,5 +3,5 @@
 require_relative 'game'
 
 module CodebreakerKirill
-  VERSION = '1.1.0'
+  VERSION = '1.2.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker_kirill
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.3
 platform: ruby
 authors:
 - Kirill Dudchenko
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-08-24 00:00:00.000000000 Z
+date: 2022-08-26 00:00:00.000000000 Z
 dependencies: []
 description:
 email: