new_super_codebreaker_2021 0.4.9 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4a45867c0685da262332ee817796e564c8944d6af38aa4c258b824ea42f88f24
-  data.tar.gz: '0815f455e9c28adbce6b1040c08208430ada9ac5647dac40ada7588f90a46502'
+  metadata.gz: eefe6fdf6726a78b7b59a4bab743e3d4fc78c2305553993ab94bd35cf87b6def
+  data.tar.gz: 4a935daec1b031b0d34c9296b7c275a7871788154fdd1be5bb875f56925e0142
 SHA512:
-  metadata.gz: 38351e45906fa5a0f99aae6f5e45b4a9b0f481fdb9913605447b5abea9b993beca5a72618342c29087800354254c06215d455c8f1aee0bb492dd987699d91952
-  data.tar.gz: 4dc02b5a06f89940c19ad6beeee2e2088ce484843616a176fa3915bcf6db11c7571e3dc61037d4535fc2a21fadab85920ca8905a4f184ca6c5ea55d1dc23cd8e
+  metadata.gz: 4fdff73737550e1859efa5c0e28dc33bdd4e710538ede1c9e1745612d1770a3197c823370e3c2911770abcb53add586db25d6dd74d42c2c6e03b5889ace019f0
+  data.tar.gz: e42f57e0cf33aaaf0e779d72ac57a5770372959fab44c8fa02e7e9a6ffb130cfb053bb80a4da04e6e723912624e87aced1751bf7ea61b099d5f12e173ba12625

data/lib/new_super_codebreaker_2021/game.rb

@@ -4,12 +4,7 @@ module NewSuperCodebreaker2021
     include ShowContent
     include Validate
 
-    attr_reader :code
-
-    def initialize
-      @code = generate_code
-      @code_copy = @code.dup
-    end
+    attr_accessor :code
 
     GUESS_COMMANDS = %i[hint rules exit].freeze
     START_COMMANDS = %i[start rules stats exit].freeze
@@ -17,6 +12,11 @@ module NewSuperCodebreaker2021
     AFTER_GAME_COMMANDS = %i[start save exit].freeze
     YES_NO_COMMANDS = %i[yes no].freeze
 
+    def initialize
+      @code = generate_code
+      @code_copy = @code.dup
+    end
+
     def chose_command(command)
       check_input(command, START_COMMANDS)
     end
@@ -81,14 +81,23 @@ module NewSuperCodebreaker2021
       amount_numbers_in_user_code = Hash.new(0)
       code_copy.each { |number| amount_numbers_in_secret_code[number] += 1 }
       user_code.each do |element|
-        if code_copy.include?(element) && amount_numbers_in_user_code[element] < amount_numbers_in_secret_code[element]
-          matches.push('-')
-          amount_numbers_in_user_code[element] += 1
-        end
+        next unless include_element?(code_copy, element) &&
+                    less_amount_of_element?(amount_numbers_in_user_code, amount_numbers_in_secret_code, element)
+
+        matches.push('-')
+        amount_numbers_in_user_code[element] += 1
       end
       matches
     end
 
+    def include_element?(given_array, element)
+      given_array.include? element
+    end
+
+    def less_amount_of_element?(first_hash, second_hash, element)
+      first_hash[element] < second_hash[element]
+    end
+
     def generate_code
       Array.new(4) { rand(1..6) }
     end

data/lib/new_super_codebreaker_2021/version.rb

@@ -1,3 +1,3 @@
 module NewSuperCodebreaker2021
-  VERSION = '0.4.9'.freeze
+  VERSION = '0.5.0'.freeze
 end

data/lib/new_super_codebreaker_2021.rb

@@ -1,7 +1,8 @@
 require 'yaml'
+
 require_relative 'new_super_codebreaker_2021/user'
 require_relative 'new_super_codebreaker_2021/show_content'
 require_relative 'new_super_codebreaker_2021/db_methods'
 require_relative 'new_super_codebreaker_2021/validate'
 require_relative 'new_super_codebreaker_2021/game'
-require_relative 'new_super_codebreaker_2021/version'
+require_relative 'new_super_codebreaker_2021/version'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: new_super_codebreaker_2021
 version: !ruby/object:Gem::Version
-  version: 0.4.9
+  version: 0.5.0
 platform: ruby
 authors:
 - Nazar Dakhno
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2021-09-14 00:00:00.000000000 Z
+date: 2021-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fasterer
@@ -94,20 +94,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.21.2
-- !ruby/object:Gem::Dependency
-  name: terminal-table
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.1
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: 3.0.1
 description: Game where you need to guess the secret code
 email:
 - dakhnonazar@gmail.com