codebreaker_paratskiy 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec7ec95bb6e89a33ab0190224f5e0c70cda359e1d0816d1e210513197f554c50
-  data.tar.gz: 4c09db722c5c0d47ed4faccc8862c8712e6678fb00aa902757b97e89f826760a
+  metadata.gz: a740c06c1d949e1351797d3ef0c2a7b72be6c4247061481dfc010ddce1f000ef
+  data.tar.gz: 8464c7f040eb4aa02afeb75cd00b70084a5f4626d9e993701ee6d2898b6971b1
 SHA512:
-  metadata.gz: 175716fc24f2ad2209a35dc0ee6cd81917ebfa876c262483ab837e58c4d4332cdf8d3f155890a2c270bc927bfea410f8c1c7014d445b0c202493910827806fb2
-  data.tar.gz: 72640b59eac91753c925fe0226ae7f5b14a0d6c30d0240a724550c857fcf5a9da4160de24771840ce3263e0aac9364c7d71fde3488fc5b4913b8ae3a660b8186
+  metadata.gz: fb59f3acd35765e86d82b59cb40c1b7ee1d1703fd780d4b1ada45690a4dfcae9c49fd3688c6bf3b80cb1335ae9a3226b04df5ebb19e076ba6dd05f8cea763756
+  data.tar.gz: 6278c095c690e9277d89787c41189c16e539b8a1a3cdffc3208536339cb0756cac2ae8c4c82614eba555869c4d6d6dfa82c2f39bf4335545a8cd495afae1b490

data/lib/codebreaker_paratskiy.rb

@@ -1,8 +1,8 @@
 require_relative 'game'
+require_relative 'current_game'
 module CodebreakerParatskiy
-  def self.run_game(name = DEFAULT_NAME, difficulty = DIFFICULTIES[:default])
-    game = Game.new(name, difficulty)
-    game.run
-    game
+  def self.run_game(name, difficulty)
+    CurrentGame.new(Game.new(name, difficulty))
+    CurrentGame.game.run
   end
 end

data/lib/codebreaker_paratskiy/version.rb

@@ -1,3 +1,3 @@
 module CodebreakerParatskiy
-  VERSION = '0.2.2'.freeze
+  VERSION = '0.2.3'.freeze
 end

data/lib/config/constants.rb

@@ -3,8 +3,7 @@ DB = 'stats.yml'.freeze
 DIFFICULTIES = {
   easy: { attempts: 15, hints: 2 },
   medium: { attempts: 10, hints: 1 },
-  hell: { attempts: 5, hints: 1 },
-  default: { attempts: 0, hints: 0 }
+  hell: { attempts: 5, hints: 1 }
 }.freeze
 
 DEFAULT_NAME = 'default'.freeze

data/lib/console.rb

@@ -3,7 +3,7 @@ class Console
   include CodebreakerParatskiy
   include Validating
   include Output
-  attr_accessor :user_code, :game
+  attr_accessor :user_code
 
   def initialize
     @user_code = []
@@ -64,7 +64,7 @@ class Console
   end
 
   def registration
-    @game = CodebreakerParatskiy.run_game(_get_name, _get_difficulty_level)
+    CodebreakerParatskiy.run_game(_get_name, _get_difficulty_level)
   end
 
   def _get_name
@@ -80,7 +80,7 @@ class Console
   def _get_difficulty_level
     show_msg(:EnterDifficulty)
     answer = user_enter
-    return DIFFICULTIES[answer.to_sym] if DIFFICULTIES.include?(answer.to_sym)
+    return answer if DIFFICULTIES.include?(answer.to_sym)
 
     show_msg(:InvalidCommand)
     _get_difficulty_level
@@ -115,4 +115,8 @@ class Console
   def exit?(answer)
     answer == EXIT_COMMAND
   end
+
+  def game
+    CurrentGame.game
+  end
 end

data/lib/current_game.rb

@@ -0,0 +1,9 @@
+class CurrentGame
+  def initialize(game)
+    @@game = game
+  end
+
+  def self.game
+    @@game
+  end
+end

data/lib/dependencies.rb

@@ -8,6 +8,7 @@ require_relative 'i18n_config'
 require_relative 'error'
 require_relative 'services/matching_service'
 require_relative 'services/statistic_service'
+require_relative 'current_game'
 require_relative 'game'
 require_relative 'modules/validating'
 require_relative 'modules/output'

data/lib/game.rb

@@ -7,9 +7,9 @@ class Game
   def initialize(player_name, difficulty)
     @stats = Statistic.stats
     @player_name = player_name
-    @difficulty_name = DIFFICULTIES.key(difficulty).to_s
-    @attempts = difficulty[:attempts]
-    @hints = difficulty[:hints]
+    @difficulty_name = difficulty
+    @attempts = DIFFICULTIES[difficulty.to_sym][:attempts]
+    @hints = DIFFICULTIES[difficulty.to_sym][:hints]
     @db = DB
     @secret_code_for_hint = []
   end

data/lib/modules/output.rb

@@ -36,10 +36,10 @@ module Output
       row do
         column(player[:name])
         column(player[:difficulty])
-        column(player[:attempts_total])
-        column(player[:attempts_used])
-        column(player[:hints_total])
-        column(player[:hints_used])
+        column(player[:total_attempts])
+        column(player[:used_attempts])
+        column(player[:total_hints])
+        column(player[:used_hints])
       end
     end
   end

data/lib/services/statistic_service.rb

@@ -1,25 +1,53 @@
 require_relative '../utils/db_utils'
 require_relative '../config/constants'
 class Statistic
-  attr_reader :game
-
-  def self.generate_stats(game)
-    {
-      name: game.player_name,
-      difficulty: game.difficulty_name,
-      attempts_total: DIFFICULTIES[game.difficulty_name.to_sym][:attempts],
-      attempts_used: DIFFICULTIES[game.difficulty_name.to_sym][:attempts] - game.attempts,
-      hints_total: DIFFICULTIES[game.difficulty_name.to_sym][:hints],
-      hints_used: DIFFICULTIES[game.difficulty_name.to_sym][:hints] - game.hints,
-      date: Time.now
-    }
-  end
+  class << self
+    def generate_stats(game)
+      {
+        name: player_name,
+        difficulty: difficulty_name,
+        total_attempts: total_attempts,
+        used_attempts: used_attempts,
+        total_hints: total_hints,
+        used_hints: used_hints,
+        date: Time.now
+      }
+    end
 
-  def self.sort_stats
-    stats.sort_by { |player| [player[:attempts_total], player[:attempts_used], player[:hints_used]] }
-  end
+    def sort_stats
+      stats.sort_by { |player| [player[:total_attempts], player[:used_attempts], player[:used_hints]] }
+    end
+
+    def stats
+      DbUtils.get(DB) || []
+    end
+
+    def total_attempts
+      DIFFICULTIES[game.difficulty_name.to_sym][:attempts]
+    end
+
+    def used_attempts
+      DIFFICULTIES[game.difficulty_name.to_sym][:attempts] - game.attempts
+    end
+
+    def total_hints
+      DIFFICULTIES[game.difficulty_name.to_sym][:hints]
+    end
+
+    def used_hints
+      DIFFICULTIES[game.difficulty_name.to_sym][:hints] - game.hints
+    end
+
+    def difficulty_name
+      game.difficulty_name
+    end
+
+    def player_name
+      game.player_name
+    end
 
-  def self.stats
-    DbUtils.get(DB) || []
+    def game
+      CurrentGame.game
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker_paratskiy
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Bogdan Paratskiy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-09-23 00:00:00.000000000 Z
+date: 2019-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -215,6 +215,7 @@ files:
 - lib/codebreaker_paratskiy/version.rb
 - lib/config/constants.rb
 - lib/console.rb
+- lib/current_game.rb
 - lib/dependencies.rb
 - lib/error.rb
 - lib/game.rb