codebreaker_paratskiy 0.1.3 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: bc88f1830d8e2791f5f3e8ea508fbb5f80799b1d988d078c1dcd00d29fd6a9d5
-  data.tar.gz: 80e9b346a177f00ba3db89d97cf28ad26e503db15b53f45d90581c13de806bd3
+  metadata.gz: 4c7f0de90040b9ec274970f552b12d959b39648b2c38d26fe21514a9b18000cb
+  data.tar.gz: 0e0070f5f7e6f6472076344851b1f649821a8beb8a875bd4e89ffa91cc16f24f
 SHA512:
-  metadata.gz: 48dec98c1fb5c73da45dfe8364504ce608495fafec2cc6e2bcabf2ab252cc934ca36878911fa269a7c5043144d1758777a3b1803f2f48b2edae13c0147632e4d
-  data.tar.gz: 4fd5da4b654e8e7953853a10631f67140436ad176483b9fc6f81fa06c59cc76813b46439cc813b4ee923012cc5be464770ed9eef69a9d9ec6835a0faa5428a93
+  metadata.gz: 5ea31579120ac5943764fac800d60416382f1edf30b23d91b8baf18bf0ed6f33db63faf34ed1bd3ea260c7cb3601f5ba20ddf6237cbaeed3da33cd1edaeb1dc6
+  data.tar.gz: 148bc5ff6fb9570d0e58925298479450df85d2c6e87160d5b2e56e22e4670ef7869cecaf1819461a54cd12d7fcc4bbc3caaa126730dd6487c4f5685469e6551e

data/lib/codebreaker_paratskiy/version.rb

@@ -1,3 +1,3 @@
 module CodebreakerParatskiy
-  VERSION = '0.1.3'.freeze
+  VERSION = '0.1.5'.freeze
 end

data/lib/codebreaker_paratskiy.rb

@@ -6,4 +6,3 @@ module CodebreakerParatskiy
     game
   end
 end
-# game = CodebreakerParatskiy.run_game('asdf', { attempts: 5, hints: 1})

data/lib/config/constants.rb

@@ -12,3 +12,11 @@ MAIN_MENU_COMMANDS = {
   'stats' => :show_stats,
   'exit' => :exit
 }.freeze
+
+WINNING_RESULT = '++++'.freeze
+
+START_COMMAND = 'start'.freeze
+
+CONFIRM_COMMAND = 'yes'.freeze
+
+EXIT_COMMAND = 'exit'.freeze

data/lib/console.rb

@@ -32,7 +32,7 @@ class Console
 
   def game_scenario
     loop do
-      return lost if @game.lost?
+      return lost if game.lost?
 
       show_msg(:AccompanyingMsg)
       process_answer_game(user_enter)
@@ -42,7 +42,7 @@ class Console
   def process_answer_game(answer)
     case answer
     when /^[1-6]{4}$/
-      return won if @game.won?(check_code(answer))
+      return won if game.won?(check_code(answer))
     when 'hint' then request_of_hint
     else show_msg(:InvalidCommand)
     end
@@ -50,15 +50,15 @@ class Console
 
   def process_answer_menu(answer)
     send(MAIN_MENU_COMMANDS[answer])
-    main_menu if answer != 'start'
+    main_menu if answer != START_COMMAND
   end
 
   def request_of_hint
-    @game.hints.zero? ? show_msg(:HintsEnded) : (puts @game.give_hint)
+    game.hints.zero? ? show_msg(:HintsEnded) : (puts game.use_hint)
   end
 
   def check_code(answer)
-    result = @game.result(answer)
+    result = game.result(answer)
     puts result
     result
   end
@@ -88,18 +88,18 @@ class Console
 
   def save_result?
     show_msg(:SaveResult)
-    user_enter == 'yes'
+    user_enter == CONFIRM_COMMAND
   end
 
   def won
     show_msg(:Won)
-    @game.save_result if save_result?
+    game.save_result if save_result?
     main_menu
   end
 
   def lost
     show_msg(:Loss)
-    puts @game.secret_code.join
+    puts game.secret_code.join
     main_menu
   end
 
@@ -113,6 +113,6 @@ class Console
   end
 
   def exit?(answer)
-    answer == 'exit'
+    answer == EXIT_COMMAND
   end
 end

data/lib/game.rb

@@ -2,7 +2,8 @@ require_relative 'services/matching_service'
 require_relative 'services/statistic_service'
 class Game
   attr_accessor :player_name, :secret_code, :user_code, :attempts, :hints, :difficulty_name
-  attr_reader :stats
+  attr_reader :stats, :secret_code_for_hint
+
   def initialize(player_name, difficulty)
     @stats = Statistic.stats
     @player_name = player_name
@@ -10,15 +11,17 @@ class Game
     @attempts = difficulty[:attempts]
     @hints = difficulty[:hints]
     @db = DB
+    @secret_code_for_hint = []
   end
 
-  def give_hint
+  def use_hint
     @hints -= 1
-    @secret_code.sample
+    secret_code_for_hint.sort_by { rand }.pop
   end
 
   def run
     @secret_code = generate_code
+    @secret_code_for_hint = @secret_code.clone
   end
 
   def generate_code
@@ -28,18 +31,18 @@ class Game
   def result(response)
     @user_code = response.each_char.map(&:to_i)
     @attempts -= 1
-    return '++++' if @secret_code == user_code
+    return WINNING_RESULT if @secret_code == user_code
 
-    Matching.create_response(self)
+    Matching.new(self).create_response
   end
 
   def save_result
     @stats.push(Statistic.generate_stats(self))
-    DbUtils.add(@db, @stats)
+    DbUtils.add(@db, stats)
   end
 
   def won?(result)
-    result == '++++'
+    result == WINNING_RESULT
   end
 
   def lost?

data/lib/services/matching_service.rb

@@ -1,41 +1,48 @@
-module Matching
-  def self.matches(game)
-    user_code_clone = game.user_code.clone
-    matches = game.secret_code.map do |number|
-      user_code_clone.find do |user_number|
-        user_code_clone.delete_at(user_code_clone.index(user_number)) if user_number == number
-      end
-    end
-    matches.compact! || matches
+class Matching
+  attr_reader :game
+
+  def initialize(game)
+    @game = game
   end
 
-  def self.create_response(game)
+  def create_response
     @pluses = ''
     @minuses = ''
-    @spaces = ''
-    check_the_code(game)
-    "#{@pluses}#{@minuses}#{@spaces}"
+    check_the_code
+    "#{@pluses}#{@minuses}"
   end
 
-  def self.check_the_code(game)
-    @secret_code_clone = game.secret_code.clone
-    (4 - matches(game).length).times { @spaces += ' ' }
-    matches(game).each do |match|
-      if same_position?(game, match)
-        @pluses += '+'
-      else
-        @minuses += '-'
+  def exact_matches
+    exact_matches = []
+    game.secret_code.each_index do |index|
+      if current_secret_number(index) == current_user_number(index)
+        exact_matches.push(current_secret_number(index))
+        remove_verified_number(current_user_number(index))
       end
-      remove_verified_number(match, game)
     end
+    exact_matches
+  end
+
+  def rest_matches
+    @secret_code_clone & game.user_code
   end
 
-  def self.same_position?(game, match)
-    [game.user_code[@secret_code_clone.index(match)], @secret_code_clone[game.user_code.index(match)]].include? match
+  def current_secret_number(index)
+    game.secret_code.at(index)
+  end
+
+  def current_user_number(index)
+    game.user_code.at(index)
+  end
+
+  def check_the_code
+    @secret_code_clone = game.secret_code.clone
+    exact_matches.length.times { @pluses += '+' }
+    rest_matches.compact.length.times { @minuses += '-' }
   end
 
-  def self.remove_verified_number(number, game)
-    game.user_code[game.user_code.index(number)] = 0
-    @secret_code_clone[@secret_code_clone.index(number)] = 0
+  def remove_verified_number(number)
+    game.user_code[game.user_code.index(number)] = nil
+    @secret_code_clone[@secret_code_clone.index(number)] = nil
   end
 end

data/lib/services/statistic_service.rb

@@ -1,6 +1,8 @@
 require_relative '../utils/db_utils'
 require_relative '../config/constants'
-module Statistic
+class Statistic
+  attr_reader :game
+
   def self.generate_stats(game)
     {
       name: game.player_name,

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker_paratskiy
 version: !ruby/object:Gem::Version
-  version: 0.1.3
+  version: 0.1.5
 platform: ruby
 authors:
 - Bogdan Paratskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-08-29 00:00:00.000000000 Z
+date: 2019-08-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler