new_super_codebreaker_2021 0.4.2 → 0.4.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: dd7869a4d751d84d0a042d1cd3952bab0d885810a52108988056d7e060064fca
-  data.tar.gz: f352eda0a33895d65c847f80f4f393382a48eebfac47a218dfb713b9f763248b
+  metadata.gz: 81df7f5993ddc2b124bf20ac2632b1c6908a785076afacb407e2a3dcf14b7c11
+  data.tar.gz: a9246bff8d86887c221547198b93f8716297989de63ea77a5baa6e2a5c3ff87c
 SHA512:
-  metadata.gz: 6504ce6e5d9162e084b055deb28710aaf73b7433eb0f0e58ba543ac219e3e22c8154ad6e4604e14955c70cc7ab58c5988b27095cf7e8cdcbef2fe590eef39958
-  data.tar.gz: 96bd8fb3d4797bd36ac5ba4e735a7a8741a165fa046db94cc9ab9ac5231364eef1a2d857d35c31c317afe4fbcb027962ef99653559c02bb4232eb488ae21b7f9
+  metadata.gz: c8c12e16606143f316f87d56e5b92fe5a76ea1fffbe4f4e7c5ea5ca07dd16905dc8d0f35347bfc81c5ad3e4eddee3f435486e1ccfe77682ccd54ca47e9642f5e
+  data.tar.gz: eb64b063703142840276857ebf202e97ed4c2c1e31743c7636cc0f0f0759b69ec71626b0a00b77a8afd7e0ab166940c4a3680238d96f1501bbe838919fe0bafa

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    new_super_codebreaker_2021 (0.1.0)
+    new_super_codebreaker_2021 (0.4.5)
 
 GEM
   remote: https://rubygems.org/
@@ -13,6 +13,7 @@ GEM
     fasterer (0.9.0)
       colorize (~> 0.7)
       ruby_parser (>= 3.14.1)
+    ffaker (2.19.0)
     parallel (1.20.1)
     parser (3.0.2.0)
       ast (~> 2.4.1)
@@ -54,6 +55,8 @@ GEM
       simplecov_json_formatter (~> 0.1)
     simplecov-html (0.12.3)
     simplecov_json_formatter (0.1.3)
+    terminal-table (3.0.1)
+      unicode-display_width (>= 1.1.1, < 3)
     unicode-display_width (2.0.0)
 
 PLATFORMS
@@ -61,11 +64,13 @@ PLATFORMS
 
 DEPENDENCIES
   fasterer (~> 0.9.0)
+  ffaker (~> 2.19.0)
   new_super_codebreaker_2021!
   rake (~> 13.0)
   rspec (~> 3.10.0)
   rubocop (~> 1.7)
-  simplecov
+  simplecov (~> 0.21.2)
+  terminal-table (~> 3.0.1)
 
 BUNDLED WITH
    2.2.26

data/lib/loader.rb

@@ -0,0 +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/new_super_codebreaker_2021'
+require_relative 'new_super_codebreaker_2021/game'
+require_relative 'new_super_codebreaker_2021/version'

data/lib/new_super_codebreaker_2021/db_methods.rb

@@ -0,0 +1,17 @@
+module NewSuperCodebreaker2021
+  module DBMethods
+    def save(user, file)
+      rating = load_file(file)
+      rating.push(user)
+      File.open(file, 'w') do |filename|
+        YAML.dump(rating, filename)
+      end
+    end
+
+    def load_file(file)
+      YAML.load_file(file)
+    rescue Errno::ENOENT
+      []
+    end
+  end
+end

data/lib/{game.rb → new_super_codebreaker_2021/game.rb}

@@ -1,16 +1,16 @@
-require 'yaml'
-require_relative 'validate'
-require_relative 'show_content'
-require_relative 'db_methods'
-require_relative 'user'
+require_relative '../loader'
+
 module NewSuperCodebreaker2021
   class Game
-    include Validate
-    include ShowContent
     include DBMethods
+    include ShowContent
+    include Validate
+
+    attr_reader :code
 
     def initialize
       @code = generate_code
+      @code_copy = @code.dup
     end
 
     GUESS_COMMANDS = %i[hint rules exit].freeze
@@ -36,23 +36,18 @@ module NewSuperCodebreaker2021
     end
 
     def user_guess(code)
-      if code.to_i != 0
-        validate_user_code(code)
-      elsif GUESS_COMMANDS.include?(code.to_sym)
-        code.to_sym
-      else false
-      end
+      return validate_user_code(code) unless code.to_i.zero?
+
+      symbol_code = code.to_sym
+      GUESS_COMMANDS.include?(symbol_code) ? symbol_code : nil
     end
 
     def take_hint(user, used_hints)
-      code_copy = @code.dup
-      if user.hints_total > user.hints_used
-        user.hints_used += 1
-        used_hints.each { |hint| code_copy.delete(hint) }
-        code_copy.sample
-      else
-        false
-      end
+      return unless user.hints_total > user.hints_used
+
+      user.hints_used += 1
+      used_hints.each { |hint| @code_copy.delete(hint) }
+      @code_copy.sample
     end
 
     def after_game_commands(command)
@@ -64,27 +59,34 @@ module NewSuperCodebreaker2021
     end
 
     def compare_codes(user_code)
-      matches, u_char = number_on_right_place(user_code)
-      number_in_secret_code(user_code, matches, u_char)
+      matches, user_code, code_copy = number_on_right_place(user_code)
+      number_in_secret_code(user_code, matches, code_copy)
     end
 
     private
 
     def number_on_right_place(user_code)
+      code_copy = @code.dup
       matches = []
-      u_char = []
       user_code.each_index do |i|
-        if @code[i] == user_code[i]
-          matches.unshift('+')
-          u_char << user_code[i]
-        end
+        next unless @code[i] == user_code[i]
+
+        matches.unshift('+')
+        user_code[i] = nil
+        code_copy[i] = false
       end
-      [matches, u_char]
+      [matches, user_code, code_copy]
     end
 
-    def number_in_secret_code(user_code, matches, u_char)
+    def number_in_secret_code(user_code, matches, code_copy)
+      amount_numbers_in_secret_code = Hash.new(0)
+      amount_numbers_in_user_code = Hash.new(0)
+      code_copy.each { |number| amount_numbers_in_secret_code[number] += 1 }
       user_code.each do |element|
-        matches.push('-') if @code.include?(element) && !u_char.include?(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
       end
       matches
     end

data/lib/{new_super_codebreaker_2021.rb → new_super_codebreaker_2021/new_super_codebreaker_2021.rb}

@@ -1,6 +1,3 @@
-require_relative 'new_super_codebreaker_2021/version'
-require 'game'
-
 module NewSuperCodebreaker2021
   class Error < StandardError; end
 end

data/lib/new_super_codebreaker_2021/show_content.rb

@@ -0,0 +1,10 @@
+module NewSuperCodebreaker2021
+  module ShowContent
+    def show_stats(file)
+      data = YAML.load_file(file) || []
+      data.sort_by! { |game| [-game.difficulty, game.attempts_used, game.hints_used] }
+    rescue Errno::ENOENT
+      []
+    end
+  end
+end

data/lib/new_super_codebreaker_2021/user.rb

@@ -0,0 +1,28 @@
+module NewSuperCodebreaker2021
+  class User
+    attr_reader :name, :difficulty, :hints_total, :attempts_total
+    attr_accessor :hints_used, :attempts_used
+
+    DIFFICULTY = {
+      easy: { attempts: 15, hints: 2 },
+      medium: { attempts: 10, hints: 1 },
+      hell: { attempts: 5, hints: 1 }
+    }.freeze
+
+    def initialize(name, difficulty)
+      @name = name
+      @difficulty = difficulty
+      @hints_used = 0
+      @attempts_used = 0
+      set_total_fields
+    end
+
+    private
+
+    def set_total_fields
+      difficulty = DIFFICULTY.keys[@difficulty]
+      @hints_total = DIFFICULTY[difficulty][:hints]
+      @attempts_total = DIFFICULTY[difficulty][:attempts]
+    end
+  end
+end

data/lib/new_super_codebreaker_2021/validate.rb

@@ -0,0 +1,50 @@
+module NewSuperCodebreaker2021
+  module Validate
+    def validate_name(name)
+      name if valid_name?(name)
+    end
+
+    def validate_user_code(us_code)
+      arr_code = split_to_integer_array(us_code)
+      return unless valid_number?(arr_code)
+
+      arr_code
+    end
+
+    def check_input(input, command_list)
+      return unless valid_input?(input, command_list)
+
+      input.to_sym
+    end
+
+    private
+
+    def valid_input?(input, command_list)
+      input.to_i.zero? && command_list.include?(input.to_sym)
+    end
+
+    def valid_number?(arr_code)
+      arr_code && check_code_length?(arr_code) && check_numbers?(arr_code)
+    end
+
+    def split_to_integer_array(code)
+      code.chars.map!(&:to_i) if integer?(code)
+    end
+
+    def integer?(code)
+      code.to_i.to_s == code
+    end
+
+    def check_code_length?(code)
+      code.length == 4
+    end
+
+    def check_numbers?(code)
+      code.all? { |value| value.between?(1, 6) }
+    end
+
+    def valid_name?(name)
+      name.length >= 3 && name.length <= 20
+    end
+  end
+end

data/lib/new_super_codebreaker_2021/version.rb

@@ -1,5 +1,3 @@
-# frozen_string_literal: true
-
 module NewSuperCodebreaker2021
-  VERSION = '0.4.2'
+  VERSION = '0.4.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: new_super_codebreaker_2021
 version: !ruby/object:Gem::Version
-  version: 0.4.2
+  version: 0.4.6
 platform: ruby
 authors:
 - Nazar Dakhno
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-06 00:00:00.000000000 Z
+date: 2021-09-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fasterer
@@ -24,6 +24,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.9.0
+- !ruby/object:Gem::Dependency
+  name: ffaker
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.19.0
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 2.19.0
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -109,13 +123,14 @@ files:
 - Rakefile
 - bin/console
 - bin/setup
-- lib/db_methods.rb
-- lib/game.rb
-- lib/new_super_codebreaker_2021.rb
+- lib/loader.rb
+- lib/new_super_codebreaker_2021/db_methods.rb
+- lib/new_super_codebreaker_2021/game.rb
+- lib/new_super_codebreaker_2021/new_super_codebreaker_2021.rb
+- lib/new_super_codebreaker_2021/show_content.rb
+- lib/new_super_codebreaker_2021/user.rb
+- lib/new_super_codebreaker_2021/validate.rb
 - lib/new_super_codebreaker_2021/version.rb
-- lib/show_content.rb
-- lib/user.rb
-- lib/validate.rb
 homepage: https://rubygems.org/gems/new_super_codebreaker_2021
 licenses:
 - MIT

data/lib/db_methods.rb

@@ -1,15 +0,0 @@
-module DBMethods
-  def save(user, file)
-    rating = load_file(file)
-    rating.push(user)
-    File.open(file, 'w') do |filename|
-      YAML.dump(rating, filename)
-    end
-  end
-
-  def load_file(file)
-    YAML.load_file(file)
-  rescue Errno::ENOENT
-    []
-  end
-end

data/lib/show_content.rb

@@ -1,32 +0,0 @@
-require 'terminal-table'
-
-module ShowContent
-  DIFFICULTY = {
-    easy: { attempts: 15, hints: 2 },
-    medium: { attempts: 10, hints: 1 },
-    hell: { attempts: 5, hints: 1 }
-  }.freeze
-
-  def show_stats(file)
-    data = YAML.load_file(file) || []
-    data.sort_by(&:hints_used).sort_by(&:attempts_used).sort_by { |game| -game.difficulty }
-    create_table(data)
-  rescue Errno::ENOENT
-    []
-  end
-
-  private
-
-  def create_table(users)
-    table = Terminal::Table.new(headings: ['Rating', 'Name', 'Difficulty', 'Attempts Total',
-                                           'Attempts Used', 'Hints Total', 'Hints Used'])
-    rate = 1
-
-    users.each do |user|
-      table.add_row([rate, user.name, DIFFICULTY.keys[user.difficulty],
-                     user.attempts_total, user.attempts_used, user.hints_used, user.hints_total])
-      rate += 1
-    end
-    table
-  end
-end

data/lib/user.rb

@@ -1,32 +0,0 @@
-class User
-  attr_reader :name, :difficulty, :hints_total, :attempts_total
-  attr_accessor :hints_used, :attempts_used
-
-  def initialize(name, difficulty)
-    @name = name
-    @difficulty = difficulty
-    @hints_used = 0
-    @attempts_used = 0
-    check_difficulty(difficulty)
-  end
-
-  private
-
-  def check_difficulty(difficulty)
-    case difficulty
-    when 0
-      set_total_fields(2, 15)
-    when 1
-      set_total_fields(1, 10)
-    when 2
-      set_total_fields(1, 5)
-    else
-      false
-    end
-  end
-
-  def set_total_fields(hints_total, attempts_total)
-    @hints_total = hints_total
-    @attempts_total = attempts_total
-  end
-end

data/lib/validate.rb

@@ -1,50 +0,0 @@
-module Validate
-  def validate_name(name)
-    if name.length >= 3 && name.length <= 20
-      name
-    else
-      false
-    end
-  end
-
-  def validate_user_code(us_code)
-    arr_code = check_splitting(us_code)
-    if valid_number?(arr_code)
-      arr_code
-    else
-      false
-    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)
-    arr_code && check_length?(arr_code) && check_numbers?(arr_code)
-  end
-
-  def check_splitting(code)
-    code.chars.map!(&:to_i) if integer?(code)
-  end
-
-  def integer?(code)
-    code.to_i.to_s == code
-  end
-
-  def check_length?(code)
-    code.length == 4
-  end
-
-  def check_numbers?(code)
-    code.each do |number|
-      return if number < 1 || number > 6
-    end
-    true
-  end
-end