alex_codebreaker 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9906ea2d8ba009f676ae54c4e40fe92a6c32c2027e925c75b2cc578139d0c0d0
-  data.tar.gz: e1b386d362478ee47deb158c476ed73fe38c33a85f7a2991967552009e399782
+  metadata.gz: e2eafa2c0be75cf61d237253aabc6ef2aeebf618454212a6e334f28904206a99
+  data.tar.gz: de56ea76a924a1aa0e720a5a34ba74ecefc31a370910daa685afb1bf5c0af38a
 SHA512:
-  metadata.gz: b3bf4021bf22dbbfb4bde1d3e8a73898adc68eb7607c0c05511576e41661eb2032588a3a38cc5895f0be61ea19861c4487e294c97bf1f4fba101e243c11e1856
-  data.tar.gz: 61c34662972de0c1e127c3740a04e12b33f4ac2fba86c834661f85c55f8321fddcfda9ac97f749a88ef10d1645bbac0e0bca5491b0fa46226aa83ba868a77e4b
+  metadata.gz: 892cd158961a99924ea7f5ecf7a1d2f805b13babe3853b70d03bc8c8bb050ab0067d0134cc3353f22945212170c36ea981ee47efdcf1b8a1ebcf77982a3ab90b
+  data.tar.gz: b67d9f9d6b214692617a422ea03ab9561b86607accbf1944e34fd11ae2b4aa3df76b1bed0bf3cdfce136c3e34a86850f257ad9e508410058198bc31e8671e4b0

data/lib/alex_codebreaker.rb

@@ -7,6 +7,7 @@ require_relative 'alex_codebreaker/modules/difficulty_levels'
 require_relative 'alex_codebreaker/modules/validators'
 require_relative 'alex_codebreaker/modules/arguments_validation'
 require_relative 'alex_codebreaker/secret_code_generator'
+require_relative 'alex_codebreaker/comparison'
 require_relative 'alex_codebreaker/players_rating'
 require_relative 'alex_codebreaker/session'
 require_relative 'alex_codebreaker/game'

data/lib/alex_codebreaker/comparison.rb

@@ -0,0 +1,41 @@
+module AlexCodebreaker
+  class Comparison
+    def initialize(user_input, secret_code_for_comparison)
+      @user_input = user_input
+      @secret_code_for_comparison = secret_code_for_comparison
+      @matching = { place: 0, presence: 0 }
+    end
+
+    def response
+      place_matches
+      presence_matches
+      format_response
+    end
+
+    private
+
+    def place_matches
+      @user_input.each_with_index do |value, index|
+        next unless value == @secret_code_for_comparison[index]
+
+        @secret_code_for_comparison[index] = nil
+        @user_input[index] = nil
+        @matching[:place] += 1
+      end
+    end
+
+    def presence_matches
+      @user_input.compact.each do |value|
+        if @secret_code_for_comparison.include?(value)
+          @matching[:presence] += 1
+          @secret_code_for_comparison.delete_at(@secret_code_for_comparison.index(value))
+        end
+      end
+    end
+
+    def format_response
+      AlexCodebreaker::Modules::Settings::MATCHING[:place] * @matching[:place] +
+        AlexCodebreaker::Modules::Settings::MATCHING[:presence] * @matching[:presence]
+    end
+  end
+end

data/lib/alex_codebreaker/game.rb

@@ -2,7 +2,7 @@ module AlexCodebreaker
   class Game
     include AlexCodebreaker::Modules::ArgumentsValidation
 
-    attr_reader :secret_code, :session, :win_status
+    attr_reader :secret_code, :session
 
     def initialize
       @secret_code = AlexCodebreaker::SecretCodeGenerator.new.secret_code
@@ -13,60 +13,31 @@ module AlexCodebreaker
     def hint
       return unless @session.check_hints
 
-      hint_processing
+      process_hint
     end
 
     def guess(user_input)
       return unless guess_validation(user_input) && @session.check_attempts
 
-      comparator(user_input)
+      compare_codes(user_input)
     end
 
     private
 
-    def hint_processing
+    def process_hint
       return @secret_code_for_hint.first if @secret_code_for_hint.one?
 
       @secret_code_for_hint.delete(@secret_code_for_hint.sample)
     end
 
-    def comparator(user_input)
-      user_input = user_input.chars.map!(&:to_i)
-      secret_code_for_comparison = @secret_code.clone
-      user_input = matching_numbers_and_indexes(user_input, secret_code_for_comparison).compact
-      user_input = matching_only_numbers(user_input, secret_code_for_comparison).compact
-      matching_absent(user_input)
+    def compare_codes(user_input)
+      user_input = format_user_input(user_input)
+      comparison = Comparison.new(user_input, @secret_code.clone)
+      comparison.response
     end
 
-    def matching_numbers_and_indexes(user_input, secret_code_for_comparison)
-      user_input.map.with_index do |value, index|
-        if value == secret_code_for_comparison[index]
-          secret_code_for_comparison[index] = nil
-          AlexCodebreaker::Modules::Settings::MATCHING[:place]
-        else
-          value
-        end
-      end
-    end
-
-    def matching_only_numbers(user_input, secret_code_for_comparison)
-      user_input.map do |value|
-        if secret_code_for_comparison.include?(value)
-          secret_code_for_comparison.delete_at(secret_code_for_comparison.index(value))
-          AlexCodebreaker::Modules::Settings::MATCHING[:presence]
-        elsif value == AlexCodebreaker::Modules::Settings::MATCHING[:place]
-          value
-        end
-      end
-    end
-
-    def matching_absent(user_input)
-      AlexCodebreaker::Modules::Settings::MATCHING[:place] *
-        user_input.count(AlexCodebreaker::Modules::Settings::MATCHING[:place]) +
-        AlexCodebreaker::Modules::Settings::MATCHING[:presence] *
-        user_input.count(AlexCodebreaker::Modules::Settings::MATCHING[:presence]) +
-        AlexCodebreaker::Modules::Settings::MATCHING[:absent] *
-        (AlexCodebreaker::Modules::Settings::CODE_LENGTH - user_input.length)
+    def format_user_input(user_input)
+      user_input.chars.map(&:to_i)
     end
   end
 end

data/lib/alex_codebreaker/modules/difficulty_levels.rb

@@ -3,23 +3,23 @@ module AlexCodebreaker
     module DifficultyLevels
       DIFFICULTY_LEVELS = {
         easy: {
-          name: 'Easy',
+          name: :easy,
           level: 0,
           attempts_total: 15,
           hints_total: 2
-        },
+        }.freeze,
         medium: {
-          name: 'Medium',
+          name: :medium,
           level: 1,
           attempts_total: 10,
           hints_total: 1
-        },
+        }.freeze,
         hell: {
-          name: 'Hell',
+          name: :hell,
           level: 2,
           attempts_total: 5,
           hints_total: 1
-        }
+        }.freeze
       }.freeze
     end
   end

data/lib/alex_codebreaker/modules/settings.rb

@@ -1,7 +1,7 @@
 module AlexCodebreaker
   module Modules
     module Settings
-      MATCHING = { place: '+', presence: '-', absent: ' ' }.freeze
+      MATCHING = { place: '+', presence: '-' }.freeze
       CODE_MIN_DIGIT = 1
       CODE_MAX_DIGIT = 6
       CODE_LENGTH = 4

data/lib/alex_codebreaker/players_rating.rb

@@ -4,25 +4,25 @@ module AlexCodebreaker
 
     def initialize
       @stats = []
-      stats_loader
+      load_and_sort_stats
     end
 
     private
 
-    def stats_loader
+    def load_and_sort_stats
       return unless File.exist?(AlexCodebreaker::Modules::Files::STATS_FILE)
 
       load_stats
-      sort_players_rating
+      sort_stats
     end
 
     def load_stats
       File.open(AlexCodebreaker::Modules::Files::STATS_FILE) do |file|
-        @stats = Array.new(Psych.load_stream(file))
+        @stats = Array.new(YAML.load_stream(file))
       end
     end
 
-    def sort_players_rating
+    def sort_stats
       @stats.sort_by! { |value| [-value.difficulty_level, value.attempts_used, value.hints_used] }
     end
   end

data/lib/alex_codebreaker/session.rb

@@ -18,9 +18,13 @@ module AlexCodebreaker
     end
 
     def add_difficulty(difficulty)
-      return unless AlexCodebreaker::Modules::DifficultyLevels::DIFFICULTY_LEVELS.include?(difficulty.downcase.to_sym)
+      difficulty_level = AlexCodebreaker::Modules::DifficultyLevels::DIFFICULTY_LEVELS[difficulty.downcase.to_sym]
+      return unless difficulty_level
 
-      difficulty(AlexCodebreaker::Modules::DifficultyLevels::DIFFICULTY_LEVELS[difficulty.downcase.to_sym])
+      @difficulty_name = difficulty_level[:name]
+      @difficulty_level = difficulty_level[:level]
+      @attempts_total = difficulty_level[:attempts_total]
+      @hints_total = difficulty_level[:hints_total]
     end
 
     def check_hints
@@ -34,14 +38,5 @@ module AlexCodebreaker
     def save_statistic
       File.open(AlexCodebreaker::Modules::Files::STATS_FILE, 'a') { |file| file.write(to_yaml) }
     end
-
-    private
-
-    def difficulty(difficulty)
-      @difficulty_name = difficulty[:name]
-      @difficulty_level = difficulty[:level]
-      @attempts_total = difficulty[:attempts_total]
-      @hints_total = difficulty[:hints_total]
-    end
   end
 end

data/lib/alex_codebreaker/version.rb

@@ -1,5 +1,5 @@
 module AlexCodebreaker
   module Version
-    VERSION = '0.1.7'.freeze
+    VERSION = '0.1.8'.freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: alex_codebreaker
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.8
 platform: ruby
 authors:
 - Oleksandr Loza
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-16 00:00:00.000000000 Z
+date: 2020-01-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -160,6 +160,7 @@ files:
 - LICENSE.txt
 - README.md
 - lib/alex_codebreaker.rb
+- lib/alex_codebreaker/comparison.rb
 - lib/alex_codebreaker/game.rb
 - lib/alex_codebreaker/modules/arguments_validation.rb
 - lib/alex_codebreaker/modules/difficulty_levels.rb