new_super_codebreaker_2021 0.3.5 → 0.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1a82b958460bacd3f2058c0358f7d03934b817439cb09a35ce7afd9665cd579a
-  data.tar.gz: fa3eb2c2f1f60f4a3005c6aa3c91b9cfe01e189794ddc0372264234862855718
+  metadata.gz: 4fd40fec8111c449a529cb09ab6f8e530543d6ac1cdfc2ef23705ae42c8bfb4b
+  data.tar.gz: '084d4e637ece18072729939fe48befc743b34c1218d40f76e5e88508a88fd63e'
 SHA512:
-  metadata.gz: 313ff20be1e825b6665c27e2faccf4285a4b24fe7f69bb63b7fed3b703f3e36767c9d5e9d5bee94a318debb68fd7393b3c52107d28b5c5a9d0bae78027070ded
-  data.tar.gz: d2fdecb7035dec146a97fe2faa0d931a53d6154063f9733c9ba88cdcafc721e70aa6321569f1033b3149fe214dd14909e5a5ff34ca072834fdc8371c2504733d
+  metadata.gz: 7508f41c83260082bc6cb212ce85ded613637b48c8842040d4c363aa6a0ae7f535958781f8efc6938312e867eda165c71eb7773864c91a8989febf73dda3f9ef
+  data.tar.gz: 7d6ed122984525a2262bcc66aca2844723da9ecefb83976a09a9ac323e7cf062f6386fbfebc06cfd8971f0ca319d80a027ee18f5d9b1bf2c7fb5f0ecaed97ce8

data/lib/game.rb

@@ -9,14 +9,18 @@ module NewSuperCodebreaker2021
     include ShowContent
     include DBMethods
 
+    def initialize
+      @code = generate_code
+    end
+
+    GUESS_COMMANDS = %i[hint rules exit].freeze
     START_COMMANDS = %i[start rules stats exit].freeze
     DIFFICULTY_COMMANDS = %i[easy medium hell exit].freeze
-    GUESS_COMMANDS = %i[hint rules exit].freeze
     AFTER_GAME_COMMANDS = %i[start save exit].freeze
     YES_NO_COMMANDS = %i[yes no].freeze
 
     def chose_command(command)
-      START_COMMANDS.include?(command.to_sym) ? command.to_sym : false
+      check_input(command, START_COMMANDS)
     end
 
     def take_name(input_name)
@@ -28,11 +32,7 @@ module NewSuperCodebreaker2021
     end
 
     def chose_difficulty(difficulty)
-      DIFFICULTY_COMMANDS.include?(difficulty.to_sym) ? difficulty.to_sym : false
-    end
-
-    def generate_code
-      Array.new(4) { rand(1..6) }
+      check_input(difficulty, DIFFICULTY_COMMANDS)
     end
 
     def user_guess(code)
@@ -55,31 +55,25 @@ module NewSuperCodebreaker2021
     end
 
     def after_game_commands(command)
-      if command.to_i.zero? && AFTER_GAME_COMMANDS.include?(command.to_sym)
-        command.to_sym
-      else false
-      end
+      check_input(command, AFTER_GAME_COMMANDS)
     end
 
     def attempt_to_start(command)
-      if command.to_i.zero? && YES_NO_COMMANDS.include?(command.to_sym)
-        command.to_sym
-      else false
-      end
+      check_input(command, YES_NO_COMMANDS)
     end
 
-    def compare_codes(secret_code, user_code)
-      matches, u_char = number_on_right_place(secret_code, user_code)
-      number_in_secret_code(secret_code, user_code, matches, u_char)
+    def compare_codes(user_code)
+      matches, u_char = number_on_right_place(user_code)
+      number_in_secret_code(user_code, matches, u_char)
     end
 
     private
 
-    def number_on_right_place(secret_code, user_code)
+    def number_on_right_place(user_code)
       matches = []
       u_char = []
       user_code.each_index do |i|
-        if secret_code[i] == user_code[i]
+        if @code[i] == user_code[i]
           matches.unshift('+')
           u_char << user_code[i]
         end
@@ -87,11 +81,15 @@ module NewSuperCodebreaker2021
       [matches, u_char]
     end
 
-    def number_in_secret_code(secret_code, user_code, matches, u_char)
+    def number_in_secret_code(user_code, matches, u_char)
       user_code.each do |element|
-        matches.push('-') if secret_code.include?(element) && !u_char.include?(element)
+        matches.push('-') if @code.include?(element) && !u_char.include?(element)
       end
       matches
     end
+
+    def generate_code
+      Array.new(4) { rand(1..6) }
+    end
   end
 end

data/lib/new_super_codebreaker_2021/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NewSuperCodebreaker2021
-  VERSION = '0.3.5'
+  VERSION = '0.4.0'
 end

data/lib/validate.rb

@@ -16,6 +16,13 @@ module Validate
     end
   end
 
+  def check_input(input, command_list)
+    if input.to_i.zero? && command_list.include?(input.to_sym)
+      input.to_sym
+    else false
+    end
+  end
+
   private
 
   def valid_number?(arr_code)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: new_super_codebreaker_2021
 version: !ruby/object:Gem::Version
-  version: 0.3.5
+  version: 0.4.0
 platform: ruby
 authors:
 - Nazar Dakhno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-05 00:00:00.000000000 Z
+date: 2021-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fasterer