new_super_codebreaker_2021 0.3.3 → 0.3.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fd386dbc10a479c2ef3009c011023e62302ddca4e3acff8673582ba96b73e508
-  data.tar.gz: 3a597039a82a4e78bc29b8bb41c01133a785bbf958bf208cb2be4707ae86d3d7
+  metadata.gz: 157dbae0333bd8d36649060482f89ea9f7327d475f948e8fef0aeac1eb0dd64d
+  data.tar.gz: d1819c81e8c1c84eafafeb1d0cce41bf8a714d1e3bfa36e7d2bdebe931b61f73
 SHA512:
-  metadata.gz: a8222847fefd1c56e9b0de5d945c0a18af5ee1f02fa33583b5c3ff1ccdaa17aa4314e38dc501a6a0d57425224cd9512c686b014056e08ec6e31f541ed424c2b6
-  data.tar.gz: 33b13a1bf320dc6b9c5a349365246ebb1a17c647c1ecca6887aa836588a5cd8d1a8a7e94f7b33f83e140703f803a080d644940178c9b2d8e36cd9a8126864618
+  metadata.gz: 94d7ff189e12b46cee85e11ffc6a2c3cde3346d922e4525d864be652d426851aec4580d9bb2dec84cb34dcb9fd2d3119a4c7f8e2f38f89494357c4ca2c894dab
+  data.tar.gz: b0e22fee9f1104399f138e6042d8321d98ff88805809f26750dd5b0b934e10a9e63ea6f46560d438710134ed7f0c707fd2e43b14d4d5656245ebce1eb391446a

data/lib/db_methods.rb

@@ -10,7 +10,7 @@ module DBMethods
   end
 
   def load_file(file)
-    YAML.load_file(file) || []
+    YAML.load_file(file)
   rescue Errno::ENOENT
     []
   end

data/lib/game.rb

@@ -0,0 +1,86 @@
+require "yaml"
+require_relative "validate"
+require_relative "show_content"
+require_relative "db_methods"
+require_relative "user"
+module NewSuperCodebreaker2021
+  class Game
+    include Validate
+    include ShowContent
+    include DBMethods
+
+    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_com(command)
+      START_COMMANDS.include?(command.to_sym) ? command.to_sym : false
+    end
+
+    def take_name(input_name)
+      if input_name == "exit"
+        :exit
+      else
+        validate_name(input_name)
+      end
+    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) }
+    end
+
+    def user_guess(code)
+      GUESS_COMMANDS.include?(code.to_s.to_sym) ? code.to_s.to_sym : validate_user_code(code)
+    end
+
+    def take_hint(user, code, used_hints)
+      if user.hints_total > user.hints_used
+        user.hints_used += 1
+        used_hints.each { |hint| code.delete(hint) }
+        code.sample
+      else
+        false
+      end
+    end
+
+    def after_game_commands(command)
+      AFTER_GAME_COMMANDS.include?(command.to_sym) ? command.to_sym : false
+    end
+
+    def attempt_to_start(command)
+      YES_NO_COMMANDS.include?(command.to_sym) ? command.to_sym : false
+    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)
+    end
+
+    private
+
+    def number_on_right_place(secret_code, user_code)
+      matches = []
+      u_char = []
+      user_code.each_index do |i|
+        if secret_code[i] == user_code[i]
+          matches.unshift("+")
+          u_char << user_code[i]
+        end
+      end
+      [matches, u_char]
+    end
+
+    def number_in_secret_code(secret_code, user_code, matches, u_char)
+      user_code.each do |element|
+        matches.push("-") if secret_code.include?(element) && !u_char.include?(element)
+      end
+      matches
+    end
+  end
+end

data/lib/new_super_codebreaker_2021/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NewSuperCodebreaker2021
-  VERSION = "0.3.3"
+  VERSION = "0.3.4"
 end

data/lib/new_super_codebreaker_2021.rb

@@ -1,112 +1,6 @@
-# frozen_string_literal: true
-
-require "yaml"
 require_relative "new_super_codebreaker_2021/version"
-require_relative "validate"
-require_relative "show_content"
-require_relative "db_methods"
-require_relative "user"
+require "game"
 
 module NewSuperCodebreaker2021
   class Error < StandardError; end
-
-  class Game
-    include Validate
-    include ShowContent
-    include DBMethods
-    def chose_com(command)
-      case command
-      when "start" then :start
-      when "rules" then :rules
-      when "stats" then :stats
-      when "exit" then :exit
-      else false
-      end
-    end
-
-    def take_name(input_name)
-      if input_name == "exit"
-        :exit
-      else
-        validate_name(input_name)
-      end
-    end
-
-    def chose_difficulty(difficulty)
-      case difficulty
-      when "easy" then :easy
-      when "medium" then :medium
-      when "hell" then :hell
-      when "exit" then :exit
-      else
-        false
-      end
-    end
-
-    def generate_code
-      Array.new(4) { rand(1..6) }
-    end
-
-    def user_guess(code)
-      case code
-      when "exit" then :exit
-      when "hint" then :hint
-      when "rules" then :rules
-      else validate_user_code(code)
-      end
-    end
-
-    def take_hint(user, code, used_hints)
-      if user.hints_total > user.hints_used
-        user.hints_used += 1
-        used_hints.each { |hint| code.delete(hint) }
-        code.sample
-      else
-        false
-      end
-    end
-
-    def after_game_commands(command)
-      case command
-      when "start" then :start
-      when "save" then :save
-      when "exit" then :exit
-      else false
-      end
-    end
-
-    def attempt_to_start(command)
-      case command
-      when "yes" then :yes
-      when "no" then :no
-      else false
-      end
-    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)
-    end
-
-    private
-
-    def number_on_right_place(secret_code, user_code)
-      matches = []
-      u_char = []
-      user_code.each_index do |i|
-        if secret_code[i] == user_code[i]
-          matches.unshift("+")
-          u_char << user_code[i]
-        end
-      end
-      [matches, u_char]
-    end
-
-    def number_in_secret_code(secret_code, user_code, matches, u_char)
-      user_code.each do |element|
-        matches.push("-") if secret_code.include?(element) && !u_char.include?(element)
-      end
-      matches
-    end
-  end
 end

data/lib/show_content.rb

@@ -1,20 +1,8 @@
 module ShowContent
-  def show_rules(rules)
-    rules
-  end
-
   def show_stats(file)
     data = YAML.load_file(file) || []
     data.sort_by(&:hints_used).sort_by(&:attempts_used).sort_by { |game| -game.difficulty }
   rescue Errno::ENOENT
     []
   end
-
-  def show_goodbye(goodbye)
-    goodbye
-  end
-
-  def show_error(error)
-    error
-  end
 end

data/lib/validate.rb

@@ -9,7 +9,7 @@ module Validate
 
   def validate_user_code(us_code)
     arr_code = check_splitting(us_code)
-    if arr_code && check_length?(arr_code) && check_numbers?(arr_code)
+    if valid_number?(arr_code)
       arr_code
     else
       false
@@ -18,6 +18,10 @@ module Validate
 
   private
 
+  def valid_number?(arr_code)
+    arr_code && check_length?(arr_code) && check_numbers?(arr_code)
+  end
+
   def check_splitting(code)
     code.chars.map!(&:to_i) if integer?(code)
   end
@@ -32,7 +36,7 @@ module Validate
 
   def check_numbers?(code)
     code.each do |number|
-      return false if number < 1 || number > 6
+      return if number < 1 || number > 6
     end
     true
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: new_super_codebreaker_2021
 version: !ruby/object:Gem::Version
-  version: 0.3.3
+  version: 0.3.4
 platform: ruby
 authors:
 - Nazar Dakhno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-23 00:00:00.000000000 Z
+date: 2021-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fasterer
@@ -96,6 +96,7 @@ files:
 - bin/console
 - bin/setup
 - lib/db_methods.rb
+- lib/game.rb
 - lib/new_super_codebreaker_2021.rb
 - lib/new_super_codebreaker_2021/version.rb
 - lib/show_content.rb