cb-core 0.1.8 → 0.1.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10d77f2204399e688b8fdc7682608c67a20635e2081089bb19ccb67e937ab8e5
-  data.tar.gz: 8b1beda09989c6570219bd385d4f280772c62990471367b3d561a36357cae59d
+  metadata.gz: 177b156f01c5212b23c6bef720dc6962a5103bd09dd79f9df40b84dd3312c57c
+  data.tar.gz: eb3c47dd6140adb217d3e64d4bf0c69446a555dd63944db0c0d09f04d29743c2
 SHA512:
-  metadata.gz: cc43320fc01a5bd588122b13ef482017b8a067efeccd37d53fa1e530477cea056e99e00b349ecfdfa9a0ba12b22b11ad4b99f0e957fbf0f05b204fb7974506b3
-  data.tar.gz: 62b52ad66559cfbb93e49d3269ef87e20db0673cf3aff4885d88ab81aac26829ccb3876d1728b43b668f1326f3253050ba202da2cefbc0979bc359de01531aae
+  metadata.gz: 9bd350d5b79d20591e5bd3911a9c4f13817f1639af878ec8d2d520a7eb3116c9e8d74800389c2669c5874c9bc55c587c764e6bece85d53385111ba96954f71ca
+  data.tar.gz: 1a0db0f64f89eb34ce758b84080c3b588663500e3199b2644232948bb07270a972a5c6946503769bfcc8f22ea8befb51d3f9f9af0c638128546797fd3dc6009d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    cb-core (0.1.8)
+    cb-core (0.1.9)
       i18n (~> 1.8.9)
 
 GEM

data/config/locales/en.yml

@@ -1,4 +1,7 @@
 en:
   errors:
-    invalid_difficulty: "unknown difficulty type %{type}"
-    validation_length: "invalid length '%{value}'. min=%{min}, max=%{max}"
+    validation_length_common: Invalid string length
+    validation_length_detailed: "Invalid length '%{value}'. min=%{min}, max=%{max}"
+    game_over: No attempts available or a player won the game
+    game_save: Only won game could be saved
+    no_hints: No hints available

data/lib/codebreaker.rb

@@ -4,12 +4,8 @@ require 'i18n'
 
 require_relative '../config/i18n'
 
-require_relative 'codebreaker/difficulty'
-require_relative 'codebreaker/difficulty_factory'
-require_relative 'codebreaker/difficulty_type'
 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/create_stat_service'

data/lib/codebreaker/create_stat_service.rb

@@ -13,11 +13,11 @@ module Codebreaker
     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
+        difficulty: @game.difficulty_type,
+        attempts_total: @game.attempts_total,
+        attempts_used: @game.attempts_total - @game.attempts_left,
+        hints_total: @game.hints_total,
+        hints_used: @game.hints_total - @game.hints_left
       }
     end
   end

data/lib/codebreaker/errors/game_over_error.rb

@@ -1,7 +1,7 @@
 module Codebreaker
   module Errors
     class GameOverError < StandardError
-      def initialize(msg = 'No attempts available or a player won the game')
+      def initialize(msg = I18n.t('errors.game_over'))
         super
       end
     end

data/lib/codebreaker/errors/game_save_error.rb

@@ -1,7 +1,7 @@
 module Codebreaker
   module Errors
     class GameSaveError < StandardError
-      def initialize(msg = 'Only won game could be saved')
+      def initialize(msg = I18n.t('errors.game_save'))
         super
       end
     end

data/lib/codebreaker/errors/no_hints_error.rb

@@ -1,7 +1,7 @@
 module Codebreaker
   module Errors
     class NoHintsError < StandardError
-      def initialize(msg = 'No hints available')
+      def initialize(msg = I18n.t('errors.no_hints'))
         super
       end
     end

data/lib/codebreaker/errors/validation_length_error.rb

@@ -1,7 +1,7 @@
 module Codebreaker
   module Errors
     class ValidationLengthError < StandardError
-      def initialize(msg = 'Invalid string length')
+      def initialize(msg = I18n.t('errors.validation_length_common'))
         super
       end
     end

data/lib/codebreaker/game.rb

@@ -1,11 +1,17 @@
 module Codebreaker
   class Game
-    attr_reader :player, :attempts_left
+    attr_reader :player, :difficulty_type, :attempts_left
+
+    DIFFICULTIES = {
+      easy: { attempts: 15, hints: 2, hardness: 1 },
+      medium: { attempts: 10, hints: 1, hardness: 2 },
+      hell: { attempts: 5, hints: 1, hardness: 3 }
+    }.freeze
 
     def initialize(player, difficulty_type)
       @player = player
       @difficulty_type = difficulty_type
-      @attempts_left = difficulty.attempts
+      @attempts_left = difficulty[:attempts]
       @is_win = false
     end
 
@@ -13,10 +19,6 @@ module Codebreaker
       @secret_code ||= SecretCodeGenerator.new.call
     end
 
-    def difficulty
-      @difficulty ||= DifficultyFactory.build(@difficulty_type)
-    end
-
     def take_hint
       ensure_game_is_not_over
       raise Errors::NoHintsError if hints.empty?
@@ -33,7 +35,7 @@ module Codebreaker
     end
 
     def lose?
-      no_attempts? && !win?
+      attempts_left.zero? && !win?
     end
 
     def win?
@@ -44,6 +46,14 @@ module Codebreaker
       win? || lose?
     end
 
+    def attempts_total
+      difficulty[:attempts]
+    end
+
+    def hints_total
+      difficulty[:hints]
+    end
+
     def hints_left
       hints.count
     end
@@ -56,12 +66,12 @@ module Codebreaker
 
     private
 
-    def hints
-      @hints ||= secret_code.sample(difficulty.hints)
+    def difficulty
+      DIFFICULTIES[@difficulty_type]
     end
 
-    def no_attempts?
-      attempts_left.zero?
+    def hints
+      @hints ||= secret_code.sample(difficulty[:hints])
     end
 
     def ensure_game_is_not_over

data/lib/codebreaker/mixins/validator.rb

@@ -5,7 +5,7 @@ module Codebreaker
         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)
+              I18n.t('errors.validation_length_detailed', value: value, min: min, max: max)
       end
     end
   end

data/lib/codebreaker/version.rb

@@ -1,3 +1,3 @@
 module Codebreaker
-  VERSION = '0.1.8'.freeze
+  VERSION = '0.1.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: cb-core
 version: !ruby/object:Gem::Version
-  version: 0.1.8
+  version: 0.1.9
 platform: ruby
 authors:
 - Dmytro Yakupov
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-23 00:00:00.000000000 Z
+date: 2021-05-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: i18n
@@ -147,12 +147,8 @@ files:
 - config/locales/en.yml
 - lib/codebreaker.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
 - lib/codebreaker/errors/game_save_error.rb
-- lib/codebreaker/errors/invalid_difficulty_error.rb
 - lib/codebreaker/errors/no_hints_error.rb
 - lib/codebreaker/errors/validation_length_error.rb
 - lib/codebreaker/game.rb

data/lib/codebreaker/difficulty.rb

@@ -1,11 +0,0 @@
-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

@@ -1,16 +0,0 @@
-module Codebreaker
-  class DifficultyFactory
-    def self.build(type)
-      case type
-      when DifficultyType::EASY
-        Difficulty.new(DifficultyType::EASY, 15, 2)
-      when DifficultyType::MEDIUM
-        Difficulty.new(DifficultyType::MEDIUM, 10, 1)
-      when DifficultyType::HELL
-        Difficulty.new(DifficultyType::HELL, 5, 1)
-      else
-        raise Errors::InvalidDifficultyError, I18n.t('errors.invalid_difficulty', type: type)
-      end
-    end
-  end
-end

data/lib/codebreaker/difficulty_type.rb

@@ -1,7 +0,0 @@
-module Codebreaker
-  module DifficultyType
-    EASY = :easy
-    MEDIUM = :medium
-    HELL = :hell
-  end
-end

data/lib/codebreaker/errors/invalid_difficulty_error.rb

@@ -1,9 +0,0 @@
-module Codebreaker
-  module Errors
-    class InvalidDifficultyError < StandardError
-      def initialize(msg = 'Invalid difficulty type')
-        super
-      end
-    end
-  end
-end