cb-core 0.1.6 → 0.1.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaa6a62438cc6336ddc9329d0c56f9b070f52d66bdee469d0bd2ec5f16ed6a72
-  data.tar.gz: 3ef241b273c84403f66ff74521e3b6f234f7af9758f3ad96e40473f40815d561
+  metadata.gz: fe28b7f9cb8b365bef09a5e66f7e7e4e8bc3613e5fd040582a574374f9fb8e3b
+  data.tar.gz: 9c21dfafcfc866bba9447dd4dfafd40627874e4fd6ad798ffbce0c8c85661036
 SHA512:
-  metadata.gz: acaed6517f2d08384eac662e39ae0ca174822572ca9efe6d19861b71c42403b402f9674605ddde7a0fde82cc6516632867fabc0936966f4f39808624d7b44435
-  data.tar.gz: e4da06e1b72430b70a7b3a669da965a65795dc6a0f620030e7aeb5dfd819b8423a44b9ed52ab89a30431ef298db370e48ad277a0db1112a3c28c2357e78a2d55
+  metadata.gz: e8daed2a5f0e44e76836444198c77059277b4bb040f4cdbc1db51ad24e7353fe70376d8f63c4c1fbd4c74944e6fe460216770c419015417276ba39c8ae9d395b
+  data.tar.gz: e41b6b32135c06ff547ba9dd4f7eea8ccf19490ed2c1249e44760c608b9e77412ad9cae6f90b7c62e24cbcae8fc41b2444cfd41e98321b7b7f869919a20f6a0b

data/.fasterer.yml

@@ -19,4 +19,4 @@ speedups:
   setter_vs_attr_writer: true
 
 exclude_paths:
-  - 'vendor/**/*.rb'
+  - 'vendor/**/*.rb'

data/.gitignore

@@ -14,3 +14,5 @@
 *.gem
 
 .idea
+
+db

data/Gemfile.lock

@@ -1,18 +1,22 @@
 PATH
   remote: .
   specs:
-    cb-core (0.1.6)
+    cb-core (0.1.7)
+      i18n (~> 1.8.9)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.2)
     colorize (0.8.1)
+    concurrent-ruby (1.1.8)
     diff-lcs (1.4.4)
     docile (1.3.5)
     fasterer (0.8.3)
       colorize (~> 0.7)
       ruby_parser (>= 3.14.1)
+    i18n (1.8.10)
+      concurrent-ruby (~> 1.0)
     parallel (1.20.1)
     parser (3.0.0.0)
       ast (~> 2.4.1)

data/codebreaker.gemspec

@@ -1,15 +1,15 @@
 require_relative 'lib/codebreaker/version'
 
 Gem::Specification.new do |spec|
-  spec.name          = 'cb-core'
-  spec.version       = Codebreaker::VERSION
-  spec.authors       = ['Dmytro Yakupov']
-  spec.email         = ['yakupov.dmitrij@gmail.com']
+  spec.name = 'cb-core'
+  spec.version = Codebreaker::VERSION
+  spec.authors = ['Dmytro Yakupov']
+  spec.email = ['yakupov.dmitrij@gmail.com']
 
-  spec.summary       = 'Core'
-  spec.description   = 'Contains a core logic.'
-  spec.homepage      = 'https://github.com/YakupovDima/rubygarage-codebreaker-core'
-  spec.license       = 'MIT'
+  spec.summary = 'Core'
+  spec.description = 'Contains a core logic.'
+  spec.homepage = 'https://github.com/YakupovDima/rubygarage-codebreaker-core'
+  spec.license = 'MIT'
   spec.required_ruby_version = Gem::Requirement.new('>= 2.7.0')
 
   spec.metadata['homepage_uri'] = spec.homepage
@@ -20,10 +20,12 @@ Gem::Specification.new do |spec|
   spec.files = Dir.chdir(File.expand_path(__dir__)) do
     `git ls-files -z`.split("\x0").reject { |f| f.match(%r{\A(?:test|spec|features)/}) }
   end
-  spec.bindir        = 'exe'
-  spec.executables   = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
+  spec.bindir = 'exe'
+  spec.executables = spec.files.grep(%r{\Aexe/}) { |f| File.basename(f) }
   spec.require_paths = ['lib']
 
+  spec.add_dependency 'i18n', '~> 1.8.9'
+
   spec.add_development_dependency 'fasterer', '~> 0.8.3'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rspec_junit_formatter', '~> 0.4'

data/config/i18n.rb

@@ -0,0 +1,3 @@
+I18n.load_path << Dir["#{File.expand_path('config/locales')}/*.yml"]
+I18n.config.available_locales = :en
+I18n.default_locale = :en

data/config/locales/en.yml

@@ -0,0 +1,4 @@
+en:
+  errors:
+    invalid_difficulty: "unknown difficulty type %{type}"
+    validation_length: "invalid length '%{value}'. min=%{min}, max=%{max}"

data/lib/codebreaker.rb

@@ -1,25 +1,24 @@
 require 'fileutils'
 require 'yaml'
+require 'i18n'
 
+require_relative '../config/i18n'
+
+require_relative 'codebreaker/difficulty'
 require_relative 'codebreaker/difficulty_factory'
 require_relative 'codebreaker/difficulty_type'
-require_relative 'codebreaker/difficulties/base'
-require_relative 'codebreaker/difficulties/easy'
-require_relative 'codebreaker/difficulties/medium'
-require_relative 'codebreaker/difficulties/hell'
 require_relative 'codebreaker/errors/game_over_error'
 require_relative 'codebreaker/errors/game_save_error'
 require_relative 'codebreaker/errors/invalid_difficulty_error'
 require_relative 'codebreaker/errors/no_hints_error'
 require_relative 'codebreaker/errors/validation_length_error'
-require_relative 'codebreaker/file_storage'
+require_relative 'codebreaker/create_stat_service'
 require_relative 'codebreaker/game'
-require_relative 'codebreaker/hint'
-require_relative 'codebreaker/mixins/validatable'
+require_relative 'codebreaker/mixins/validator'
 require_relative 'codebreaker/player'
 require_relative 'codebreaker/secret_code_generator'
 require_relative 'codebreaker/secret_code_matcher'
-require_relative 'codebreaker/stats'
+require_relative 'codebreaker/stats_storage'
 require_relative 'codebreaker/version'
 
 module Codebreaker

data/lib/codebreaker/create_stat_service.rb

@@ -0,0 +1,24 @@
+module Codebreaker
+  class CreateStatService
+    def initialize(game)
+      @game = game
+    end
+
+    def call
+      StatsStorage.new.add(stat_data)
+    end
+
+    private
+
+    def stat_data
+      {
+        name: @game.player.name,
+        difficulty: @game.difficulty.type,
+        attempts_total: @game.difficulty.attempts,
+        attempts_used: @game.difficulty.attempts - @game.attempts_left,
+        hints_total: @game.difficulty.hints,
+        hints_used: @game.difficulty.hints - @game.hints_left
+      }
+    end
+  end
+end

data/lib/codebreaker/difficulty.rb

@@ -0,0 +1,11 @@
+module Codebreaker
+  class Difficulty
+    attr_reader :type, :attempts, :hints
+
+    def initialize(type, attempts, hints)
+      @type = type
+      @attempts = attempts
+      @hints = hints
+    end
+  end
+end

data/lib/codebreaker/difficulty_factory.rb

@@ -3,13 +3,13 @@ module Codebreaker
     def self.build(type)
       case type
       when DifficultyType::EASY
-        Difficulties::Easy.new
+        Difficulty.new(DifficultyType::EASY, 15, 2)
       when DifficultyType::MEDIUM
-        Difficulties::Medium.new
+        Difficulty.new(DifficultyType::MEDIUM, 10, 1)
       when DifficultyType::HELL
-        Difficulties::Hell.new
+        Difficulty.new(DifficultyType::HELL, 5, 1)
       else
-        raise Errors::InvalidDifficultyError, "unknown difficulty type #{type}"
+        raise Errors::InvalidDifficultyError, I18n.t('errors.invalid_difficulty', type: type)
       end
     end
   end

data/lib/codebreaker/game.rb

@@ -1,26 +1,34 @@
 module Codebreaker
   class Game
-    attr_reader :secret_code, :player, :difficulty
+    attr_reader :player
 
     def initialize(player, difficulty_type)
       @player = player
-      @secret_code = SecretCodeGenerator.new.call
-      @difficulty = DifficultyFactory.build(difficulty_type)
-      @hint = Hint.new(@difficulty, @secret_code)
+      @difficulty_type = difficulty_type
       @attempts_used = 0
       @is_win = false
     end
 
+    def secret_code
+      @secret_code ||= SecretCodeGenerator.new.call
+    end
+
+    def difficulty
+      @difficulty ||= DifficultyFactory.build(@difficulty_type)
+    end
+
     def take_hint
       ensure_game_is_not_over
-      @hint.take
+      raise Errors::NoHintsError if hints.empty?
+
+      hints.pop
     end
 
     def guess_secret_code(guess)
       ensure_game_is_not_over
       @attempts_used += 1
-      matching = SecretCodeMatcher.new(@secret_code, guess).call
-      check_win(matching)
+      matching = SecretCodeMatcher.new(secret_code, guess).call
+      check_win(guess)
       matching
     end
 
@@ -37,29 +45,35 @@ module Codebreaker
     end
 
     def hints_left
-      @hint.count
+      hints.count
     end
 
     def attempts_left
-      @difficulty.attempts - @attempts_used
+      difficulty.attempts - @attempts_used
     end
 
     def save_result
-      Stats.new.save_game(self)
+      raise Errors::GameSaveError unless win?
+
+      CreateStatService.new(self).call
     end
 
     private
 
+    def hints
+      @hints ||= secret_code.sample(difficulty.hints)
+    end
+
     def no_attempts?
-      @difficulty.attempts == @attempts_used
+      difficulty.attempts == @attempts_used
     end
 
     def ensure_game_is_not_over
       raise Errors::GameOverError if over?
     end
 
-    def check_win(combination)
-      @is_win = true if SecretCodeMatcher.win_combination?(combination)
+    def check_win(guess)
+      @is_win = true if guess == secret_code
     end
   end
 end

data/lib/codebreaker/mixins/validator.rb

@@ -0,0 +1,12 @@
+module Codebreaker
+  module Mixins
+    module Validator
+      def validate_length(value, min, max)
+        return if value.instance_of?(String) && value.size.between?(min, max)
+
+        raise Codebreaker::Errors::ValidationLengthError,
+              I18n.t('errors.validation_length', value: value, min: min, max: max)
+      end
+    end
+  end
+end

data/lib/codebreaker/player.rb

@@ -1,21 +1,20 @@
 module Codebreaker
   class Player
-    include Mixins::Validatable
+    include Mixins::Validator
 
-    NAME_MIN_SIZE = 3
-    NAME_MAX_SIZE = 20
+    NAME_SIZE = {
+      min: 3,
+      max: 20
+    }.freeze
 
     attr_reader :name
 
     def initialize(name)
       @name = name
-      validate
     end
 
-    private
-
     def validate
-      validate_length(@name, NAME_MIN_SIZE, NAME_MAX_SIZE)
+      validate_length(@name, NAME_SIZE[:min], NAME_SIZE[:max])
     end
   end
 end

data/lib/codebreaker/secret_code_matcher.rb

@@ -2,11 +2,6 @@ module Codebreaker
   class SecretCodeMatcher
     EXACT_MATCH_SYMBOL = '+'.freeze
     DIGIT_MATCH_SYMBOL = '-'.freeze
-    WIN_COMBINATION = '++++'.freeze
-
-    def self.win_combination?(combination)
-      combination == WIN_COMBINATION
-    end
 
     def initialize(secret_code, guess_code)
       @secret_code = secret_code.dup
@@ -20,20 +15,17 @@ module Codebreaker
     private
 
     def exact_match
-      result = ''
-      @guess_code.each_with_index do |digit, index|
+      @guess_code.each_with_object('').with_index do |(digit, result), index|
         next unless digit == @secret_code[index]
 
         result << EXACT_MATCH_SYMBOL
         @guess_code[index] = nil
         @secret_code[index] = nil
       end
-      result
     end
 
     def digit_match
-      result = ''
-      @guess_code.compact.each do |digit|
+      @guess_code.compact.each_with_object('') do |digit, result|
         found_index = @secret_code.index(digit)
 
         next unless found_index
@@ -41,7 +33,6 @@ module Codebreaker
         result << DIGIT_MATCH_SYMBOL
         @secret_code[found_index] = nil
       end
-      result
     end
   end
 end

data/lib/codebreaker/stats_storage.rb

@@ -0,0 +1,22 @@
+module Codebreaker
+  class StatsStorage
+    PATH = './db/data.yml'.freeze
+
+    def load
+      File.file?(PATH) ? YAML.load_file(PATH) : []
+    end
+
+    def add(stat)
+      stats = load
+      stats << stat
+      save(stats)
+    end
+
+    private
+
+    def save(stats)
+      Pathname(PATH).dirname.mkpath
+      File.write(PATH, stats.to_yaml)
+    end
+  end
+end

data/lib/codebreaker/version.rb

@@ -1,3 +1,3 @@
 module Codebreaker
-  VERSION = '0.1.6'.freeze
+  VERSION = '0.1.7'.freeze
 end

metadata

@@ -1,15 +1,29 @@
 --- !ruby/object:Gem::Specification
 name: cb-core
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.7
 platform: ruby
 authors:
 - Dmytro Yakupov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-03-29 00:00:00.000000000 Z
+date: 2021-04-23 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: i18n
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.9
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 1.8.9
 - !ruby/object:Gem::Dependency
   name: fasterer
   requirement: !ruby/object:Gem::Requirement
@@ -129,11 +143,11 @@ files:
 - bin/console
 - bin/setup
 - codebreaker.gemspec
+- config/i18n.rb
+- config/locales/en.yml
 - lib/codebreaker.rb
-- lib/codebreaker/difficulties/base.rb
-- lib/codebreaker/difficulties/easy.rb
-- lib/codebreaker/difficulties/hell.rb
-- lib/codebreaker/difficulties/medium.rb
+- lib/codebreaker/create_stat_service.rb
+- lib/codebreaker/difficulty.rb
 - lib/codebreaker/difficulty_factory.rb
 - lib/codebreaker/difficulty_type.rb
 - lib/codebreaker/errors/game_over_error.rb
@@ -141,14 +155,12 @@ files:
 - lib/codebreaker/errors/invalid_difficulty_error.rb
 - lib/codebreaker/errors/no_hints_error.rb
 - lib/codebreaker/errors/validation_length_error.rb
-- lib/codebreaker/file_storage.rb
 - lib/codebreaker/game.rb
-- lib/codebreaker/hint.rb
-- lib/codebreaker/mixins/validatable.rb
+- lib/codebreaker/mixins/validator.rb
 - lib/codebreaker/player.rb
 - lib/codebreaker/secret_code_generator.rb
 - lib/codebreaker/secret_code_matcher.rb
-- lib/codebreaker/stats.rb
+- lib/codebreaker/stats_storage.rb
 - lib/codebreaker/version.rb
 homepage: https://github.com/YakupovDima/rubygarage-codebreaker-core
 licenses:

data/lib/codebreaker/difficulties/base.rb

@@ -1,17 +0,0 @@
-module Codebreaker
-  module Difficulties
-    class Base
-      def type
-        raise NotImplementedError
-      end
-
-      def attempts
-        raise NotImplementedError
-      end
-
-      def hints
-        raise NotImplementedError
-      end
-    end
-  end
-end

data/lib/codebreaker/difficulties/easy.rb

@@ -1,17 +0,0 @@
-module Codebreaker
-  module Difficulties
-    class Easy < Base
-      def type
-        DifficultyType::EASY
-      end
-
-      def attempts
-        15
-      end
-
-      def hints
-        2
-      end
-    end
-  end
-end

data/lib/codebreaker/difficulties/hell.rb

@@ -1,17 +0,0 @@
-module Codebreaker
-  module Difficulties
-    class Hell < Base
-      def type
-        DifficultyType::HELL
-      end
-
-      def attempts
-        5
-      end
-
-      def hints
-        1
-      end
-    end
-  end
-end

data/lib/codebreaker/difficulties/medium.rb

@@ -1,17 +0,0 @@
-module Codebreaker
-  module Difficulties
-    class Medium < Base
-      def type
-        DifficultyType::MEDIUM
-      end
-
-      def attempts
-        10
-      end
-
-      def hints
-        1
-      end
-    end
-  end
-end

data/lib/codebreaker/file_storage.rb

@@ -1,16 +0,0 @@
-module Codebreaker
-  class FileStorage
-    def initialize(path)
-      @path = path
-    end
-
-    def load
-      File.file?(@path) ? YAML.load_file(@path) : nil
-    end
-
-    def save(data)
-      Pathname(@path).dirname.mkpath
-      File.write(@path, data.to_yaml)
-    end
-  end
-end

data/lib/codebreaker/hint.rb

@@ -1,18 +0,0 @@
-module Codebreaker
-  class Hint
-    def initialize(difficulty, secret_code)
-      @difficulty = difficulty
-      @hints = secret_code.sample(difficulty.hints)
-    end
-
-    def take
-      raise Errors::NoHintsError if @hints.empty?
-
-      @hints.pop
-    end
-
-    def count
-      @hints.count
-    end
-  end
-end

data/lib/codebreaker/mixins/validatable.rb

@@ -1,15 +0,0 @@
-module Codebreaker
-  module Mixins
-    module Validatable
-      def validate
-        raise NotImplementedError
-      end
-
-      def validate_length(value, min, max)
-        return if value.instance_of?(String) && value.size >= min && value.size <= max
-
-        raise Codebreaker::Errors::ValidationLengthError, "invalid length '#{value}'. min=#{min}, max=#{max}"
-      end
-    end
-  end
-end

data/lib/codebreaker/stats.rb

@@ -1,37 +0,0 @@
-module Codebreaker
-  class Stats
-    PATH = './db/data.yml'.freeze
-
-    def initialize
-      @storage = FileStorage.new(PATH)
-    end
-
-    def load
-      @storage.load || []
-    end
-
-    def save_game(game)
-      validate_game_is_win(game)
-      data = load
-      data << game_data(game)
-      @storage.save(data)
-    end
-
-    private
-
-    def game_data(game)
-      {
-        name: game.player.name,
-        difficulty: game.difficulty.type,
-        attempts_total: game.difficulty.attempts,
-        attempts_used: game.difficulty.attempts - game.attempts_left,
-        hints_total: game.difficulty.hints,
-        hints_used: game.difficulty.hints - game.hints_left
-      }
-    end
-
-    def validate_game_is_win(game)
-      raise Errors::GameSaveError unless game.win?
-    end
-  end
-end