alex_codebreaker 0.1.4 → 0.1.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f18cfa67f231f11172b1ba9a7d7a7b0cb1422388f19035108d2aa89f82c01efa
-  data.tar.gz: 37623313c45504b3946bef46091f0075fb22041f693ea95990d058081225a455
+  metadata.gz: 26769c84cb57b5f1cd0c183b113399ed6ed2d552bcefc28d1ecf2af8dbb4de6a
+  data.tar.gz: be13615fb5241f768943b66d5e78f8ae8fb0a2211e26aad4916ee0d22281dabc
 SHA512:
-  metadata.gz: 5839469508281a0062cd4c716627a0c735056e3fd288d9ddb7a28be4947fc630346a903da1315b90a43764b5d1b52ec4fa8d123121ffcc6ac8fd7fc808706ce8
-  data.tar.gz: b14f877f74a5e2a2f9598c04a2a7d487082a5480570b6a5012ef9d366600ea010495005127554f5adb6109804f34c9eef4d98be1475a6481f8d26a3ea32f1f5b
+  metadata.gz: 89f4e1efaa071d08e2e7ad1f12f2dc8bcdefea304b3efd68d2268b6398104e16e51579c800c0a6254a233c623b09742180624246943f17060f3d6b58e21128d0
+  data.tar.gz: b291bb4605a14c54bc45a99b23dd3b63ac64e26c9e378d6a331f81df09d923ed1d6c89059d15bc26b3ea3e859f7ecaf923e43161cb1fcf913e98394cf87bf3c6

data/lib/alex_codebreaker.rb

@@ -1,17 +1,10 @@
 require_relative 'config/gem.rb'
 require_relative 'alex_codebreaker/version'
 require_relative 'alex_codebreaker/modules/files'
-require_relative 'alex_codebreaker/modules/game_messages'
+require_relative 'alex_codebreaker/modules/settings'
 require_relative 'alex_codebreaker/modules/difficulty_levels'
 require_relative 'alex_codebreaker/modules/validators/validators'
 require_relative 'alex_codebreaker/modules/validators/arguments_validation'
-require_relative 'alex_codebreaker/exceptions/file_does_not_exist'
-require_relative 'alex_codebreaker/exceptions/invalid_digit'
-require_relative 'alex_codebreaker/exceptions/invalid_length'
-require_relative 'alex_codebreaker/exceptions/no_attempts_left'
-require_relative 'alex_codebreaker/exceptions/no_hints_left'
-require_relative 'alex_codebreaker/exceptions/wrong_class'
-require_relative 'alex_codebreaker/exceptions/wrong_difficulty'
 require_relative 'alex_codebreaker/game'
 require_relative 'alex_codebreaker/players_rating'
 require_relative 'alex_codebreaker/session'

data/lib/alex_codebreaker/game.rb

@@ -4,13 +4,13 @@ class Game
   attr_reader :session
 
   def start
-    @secret_code = Array.new(4) { rand(1..6) }
+    @secret_code = Array.new(Settings::CODE_LENGTH) { rand(Settings::CODE_MIN_DIGIT..Settings::CODE_MAX_DIGIT) }
     @session = Session.new
     @win_status = false
   end
 
   def add_player_name(given_name)
-    @session.player_name = name_validation(given_name)
+    name_validation(given_name) ? @session.player_name = given_name : false
   end
 
   def choose_difficulty(chosen_difficulty)
@@ -18,7 +18,7 @@ class Game
   end
 
   def hint
-    raise NoHintsLeft if @session.hints_used >= @session.hints_total
+    return false if @session.hints_used >= @session.hints_total
 
     @session.hints_used += 1
     @secret_code_for_hint ||= @secret_code.clone.uniq
@@ -26,12 +26,13 @@ class Game
   end
 
   def guess(user_input)
-    guess_validation(user_input)
-    raise NoAttemptsLeft if @session.attempts_used >= @session.attempts_total
+    return false unless guess_validation(user_input)
+
+    return I18n.t(:no_attempts_left_message) if @session.attempts_used >= @session.attempts_total
 
     @session.attempts_used += 1
-    @win_status = true if comparator(user_input.to_s) == GameMessages::WIN_CONDITION
-    comparator(user_input.to_s)
+    @win_status = true if user_input.to_i == @secret_code.join.to_i
+    comparator(user_input)
   end
 
   def save_game
@@ -48,17 +49,19 @@ class Game
     user_input = user_input.chars.map!(&:to_i)
     @secret_code_for_comparison = @secret_code.clone
     user_input = matching_numbers_and_indexes(user_input)
+
     user_input = matching_only_numbers(user_input).sort
-    user_input.rotate(user_input.count(' ')).join
+
+    user_input.rotate(user_input.count(Settings::MATCHING[:absent])).join
   end
 
   def matching_numbers_and_indexes(user_input)
     user_input.map.with_index do |value, index|
       if value == @secret_code_for_comparison[index]
         @secret_code_for_comparison[index] = nil
-        GameMessages::MATCHING[:number_and_index]
+        Settings::MATCHING[:place]
       elsif !@secret_code_for_comparison.include?(value)
-        GameMessages::MATCHING[:no_matching]
+        Settings::MATCHING[:absent]
       else
         value
       end
@@ -68,12 +71,12 @@ class Game
   def matching_only_numbers(user_input)
     user_input.map do |value|
       if @secret_code_for_comparison.include?(value)
-        @secret_code_for_comparison.delete(value)
-        GameMessages::MATCHING[:only_number]
-      elsif [GameMessages::MATCHING[:number_and_index], GameMessages::MATCHING[:no_matching]].include?(value)
+        @secret_code_for_comparison.delete_at(@secret_code_for_comparison.index(value))
+        Settings::MATCHING[:presence]
+      elsif [Settings::MATCHING[:place], Settings::MATCHING[:absent]].include?(value)
         value
       else
-        GameMessages::MATCHING[:no_matching]
+        Settings::MATCHING[:absent]
       end
     end
   end

data/lib/alex_codebreaker/modules/difficulty_levels.rb

@@ -1,7 +1,7 @@
 module DifficultyLevels
   DIFFICULTY_LEVELS = {
     Easy: {
-      name: :easy,
+      name: :Easy,
       level: 0,
       attempts_total: 15,
       hints_total: 2

data/lib/alex_codebreaker/modules/settings.rb

@@ -0,0 +1,8 @@
+module Settings
+  MATCHING = { place: '+', presence: '-', absent: ' ' }.freeze
+  CODE_MIN_DIGIT = 1
+  CODE_MAX_DIGIT = 6
+  CODE_LENGTH = 4
+  MIN_PLAYER_NAME_LENGTH = 3
+  MAX_PLAYER_NAME_LENGTH = 20
+end

data/lib/alex_codebreaker/modules/validators/arguments_validation.rb

@@ -2,15 +2,12 @@ module ArgumentsValidation
   include Validators
 
   def name_validation(name)
-    argument_instance_check(name, String)
-    argument_length_check(name, max: 20, min: 3)
-    name
+    argument_min_length_check(name, Settings::MIN_PLAYER_NAME_LENGTH) && \
+      argument_max_length_check(name, Settings::MAX_PLAYER_NAME_LENGTH)
   end
 
   def guess_validation(guess)
-    argument_instance_check(guess, Integer)
-    argument_fixed_length_check(guess, 4)
-    digits_check(guess)
-    guess
+    argument_fixed_length_check(guess, Settings::CODE_LENGTH) && \
+      digits_check(guess, min_digit: Settings::CODE_MIN_DIGIT, max_digit: Settings::CODE_MAX_DIGIT)
   end
 end

data/lib/alex_codebreaker/modules/validators/validators.rb

@@ -1,19 +1,17 @@
 module Validators
-  def argument_instance_check(arg, checking_class)
-    raise WrongClass, (I18n.t(:value_instance_of) + checking_class.to_s) unless arg.instance_of?(checking_class)
+  def argument_fixed_length_check(arg, fixed_length)
+    arg.to_s.length == fixed_length
   end
 
-  def argument_fixed_length_check(arg, fix_length)
-    message = I18n.t(:invalid_argument_length) + fix_length.to_s + I18n.t(:given) + arg.to_s.length.to_s
-    raise InvalidLength, message unless arg.to_s.length == fix_length
+  def argument_max_length_check(arg, max)
+    arg.length <= max
   end
 
-  def argument_length_check(arg, max: nil, min: nil)
-    raise InvalidLength, (I18n.t(:argument_length_long) + max.to_s) if max && arg.length > max
-    raise InvalidLength, (I18n.t(:argument_length_short) + min.to_s) if min && arg.length < min
+  def argument_min_length_check(arg, min)
+    arg.length >= min
   end
 
-  def digits_check(arg)
-    raise InvalidDigit unless arg.to_s.split('').map { |value| value unless value.to_i.between?(1, 6) }.compact.empty?
+  def digits_check(arg, min_digit: 1, max_digit: 6)
+    arg.to_s.split('').map { |value| value unless value.to_i.between?(min_digit, max_digit) }.compact.empty?
   end
 end

data/lib/alex_codebreaker/players_rating.rb

@@ -8,7 +8,7 @@ class PlayersRating
   private
 
   def stats_loader
-    raise FileDoesNotExist unless File.exist?(Files::STATS_FILE)
+    return @stats = false unless File.exist?(Files::STATS_FILE)
 
     load_stats
     sort_players_rating

data/lib/alex_codebreaker/session.rb

@@ -1,18 +1,21 @@
 class Session
+  INITIAL_ATTEMPTS_USED = 0
+  INITIAL_HINTS_USED = 0
+
   attr_reader :difficulty_name, :difficulty_level, :attempts_total, :hints_total
 
   attr_accessor :player_name, :attempts_used, :hints_used
 
   def initialize
-    @attempts_used = 0
-    @hints_used = 0
+    @attempts_used = INITIAL_ATTEMPTS_USED
+    @hints_used = INITIAL_HINTS_USED
   end
 
   def difficulty_manager(difficulty)
     if DifficultyLevels::DIFFICULTY_LEVELS.include?(difficulty)
       add_difficulty(DifficultyLevels::DIFFICULTY_LEVELS[difficulty])
     end
-    raise WrongDifficulty unless DifficultyLevels::DIFFICULTY_LEVELS.include?(difficulty)
+    return false unless DifficultyLevels::DIFFICULTY_LEVELS.include?(difficulty)
   end
 
   def save_session_statistic

data/lib/alex_codebreaker/version.rb

@@ -1,3 +1,3 @@
 module AlexCodebreaker
-  VERSION = '0.1.4'.freeze
+  VERSION = '0.1.5'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alex_codebreaker
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.1.5
 platform: ruby
 authors:
 - Oleksandr Loza
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-04 00:00:00.000000000 Z
+date: 2019-12-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -160,17 +160,10 @@ files:
 - LICENSE.txt
 - README.md
 - lib/alex_codebreaker.rb
-- lib/alex_codebreaker/exceptions/file_does_not_exist.rb
-- lib/alex_codebreaker/exceptions/invalid_digit.rb
-- lib/alex_codebreaker/exceptions/invalid_length.rb
-- lib/alex_codebreaker/exceptions/no_attempts_left.rb
-- lib/alex_codebreaker/exceptions/no_hints_left.rb
-- lib/alex_codebreaker/exceptions/wrong_class.rb
-- lib/alex_codebreaker/exceptions/wrong_difficulty.rb
 - lib/alex_codebreaker/game.rb
 - lib/alex_codebreaker/modules/difficulty_levels.rb
 - lib/alex_codebreaker/modules/files.rb
-- lib/alex_codebreaker/modules/game_messages.rb
+- lib/alex_codebreaker/modules/settings.rb
 - lib/alex_codebreaker/modules/validators/arguments_validation.rb
 - lib/alex_codebreaker/modules/validators/validators.rb
 - lib/alex_codebreaker/players_rating.rb

data/lib/alex_codebreaker/exceptions/file_does_not_exist.rb

@@ -1,5 +0,0 @@
-class FileDoesNotExist < StandardError
-  def initialize(msg = I18n.t(:file_does_not_exist_message))
-    super(msg)
-  end
-end

data/lib/alex_codebreaker/exceptions/invalid_digit.rb

@@ -1,5 +0,0 @@
-class InvalidDigit < StandardError
-  def initialize(msg = I18n.t(:invalid_digit_message))
-    super(msg)
-  end
-end

data/lib/alex_codebreaker/exceptions/invalid_length.rb

@@ -1,5 +0,0 @@
-class InvalidLength < StandardError
-  def initialize(msg = I18n.t(:invalid_length_message))
-    super(msg)
-  end
-end

data/lib/alex_codebreaker/exceptions/no_attempts_left.rb

@@ -1,5 +0,0 @@
-class NoAttemptsLeft < StandardError
-  def initialize(msg = I18n.t(:no_attempts_left_message))
-    super(msg)
-  end
-end

data/lib/alex_codebreaker/exceptions/no_hints_left.rb

@@ -1,5 +0,0 @@
-class NoHintsLeft < StandardError
-  def initialize(msg = I18n.t(:no_hints_left_message))
-    super(msg)
-  end
-end

data/lib/alex_codebreaker/exceptions/wrong_class.rb

@@ -1,5 +0,0 @@
-class WrongClass < StandardError
-  def initialize(msg = I18n.t(:wrong_class_message))
-    super(msg)
-  end
-end

data/lib/alex_codebreaker/exceptions/wrong_difficulty.rb

@@ -1,5 +0,0 @@
-class WrongDifficulty < StandardError
-  def initialize(msg = I18n.t(:wrong_difficulty_message))
-    super(msg)
-  end
-end

data/lib/alex_codebreaker/modules/game_messages.rb

@@ -1,4 +0,0 @@
-module GameMessages
-  WIN_CONDITION = '++++'.freeze
-  MATCHING = { number_and_index: '+', only_number: '-', no_matching: ' ' }.freeze
-end