codebreaker_ap 0.1.0 → 0.1.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: deb22669c587e91d496671d56eef7eaa54a719125b85b929437aef5645ce9204
-  data.tar.gz: 0121d1d3dfc5e74ec0308522aa6184e467beac87e377a20a58d58f3ab50451dc
+  metadata.gz: 8ad9f28ef5499d36023b3252ec0edf5693a7a3f6dcc661d1c292a7fbf5355442
+  data.tar.gz: 7787374c62312877f4f4e22fd0a8255c2958800e2a90cc51b03ecdd163deac77
 SHA512:
-  metadata.gz: 8499e8a4cdc334447501406f10b18870f633cb0d45a6a89f805a2838e32e525ca514b42f5ca7cf7f0bdd6e90f9f4e591563ba6c75acb8de8abcbc1a0774b42e0
-  data.tar.gz: ed5f75a77537b91c6839a60af2e9a776513d5263126f88b0b21ea477b2d3ca9f8184cfa2c67a58fa1228ef913ea3755ea74afd49b45b71921b573646099fbdf8
+  metadata.gz: 37ef4c2ec01b2964979df2523546a456e9e82b42207cfa04d78714ae67674c33681bb01828bd58c0d442c8898600eaad14215e776e3d8395be6af16676b472c7
+  data.tar.gz: f75be4ac1d0b31d19fecc2c6768ebee081eea20724d07e106e9088e7a7526f23216fea4535fa8d75d6c3ea809e06360750a80f172455f7ea84282591b4bc1fc0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    codebreaker_ap (0.1.0)
+    codebreaker_ap (0.1.1)
 
 GEM
   remote: https://rubygems.org/

data/README.md

@@ -11,7 +11,7 @@ The codebreaker gets some number of chances to break the code (depends on chosen
 Include to Gemfile:
 
 ```ruby
-gem 'game_codebreaker_ap'
+gem 'codebreaker_ap'
 ```
 
 And then execute:
@@ -20,7 +20,7 @@ And then execute:
 
 Or install it yourself as:
 
-    $ gem install game_codebreaker_ap
+    $ gem install codebreaker_ap
 
 ## Usage
 

data/lib/codebreaker_ap.rb

@@ -4,9 +4,10 @@ I18n.available_locales = :en, :ru
 require 'yaml'
 require 'codebreaker_ap/modules/storage'
 require 'codebreaker_ap/modules/statistic'
+require 'codebreaker_ap/entities/message'
 require 'codebreaker_ap/modules/errors'
 require 'codebreaker_ap/modules/validation'
-require 'codebreaker_ap/entities/base_entity'
+require 'codebreaker_ap/entities/validator.rb'
 require 'codebreaker_ap/entities/player'
 require 'codebreaker_ap/entities/difficulty'
 require 'codebreaker_ap/game'

data/lib/codebreaker_ap/entities/difficulty.rb

@@ -1,5 +1,5 @@
 module CodebreakerAp
-  class Difficulty < BaseEntity
+  class Difficulty
     DIFFICULTY = {
       easy: {
         hints: 2,
@@ -9,7 +9,7 @@ module CodebreakerAp
         hints: 1,
         attempts: 10
       },
-      hell: {
+      difficult: {
         hints: 1,
         attempts: 5
       }
@@ -22,17 +22,19 @@ module CodebreakerAp
       @level = nil
       @hints = nil
       @attempts = nil
-      super()
     end
 
     def initialize_difficulty(level)
+      check = Validator.new
+      check.validate_difficulty(level, DIFFICULTY.keys)
+      return check.errors unless check.errors.empty?
+
       @level = level
-      valid?
-      setup_difficulty if validated
+      setup_difficulty
     end
 
     def hint(hints_code)
-      return I18n.t(:no_hint) if @hints.zero?
+      return Message.new.no_hint if @hints.zero?
 
       @hints -= 1
       hints_code.pop
@@ -45,11 +47,5 @@ module CodebreakerAp
       @hints = difficulty_options[:hints]
       @attempts = difficulty_options[:attempts]
     end
-
-    def validate
-      check_difficulty(@level.to_sym, DIFFICULTY.keys)
-    rescue WrongDifficultyError => e
-      @errors.push(e)
-    end
   end
 end

data/lib/codebreaker_ap/entities/message.rb

@@ -0,0 +1,23 @@
+module CodebreakerAp
+  class Message
+    def file_rules
+      I18n.t(:file_rules)
+    end
+
+    def wrong_length
+      I18n.t(:wrong_length)
+    end
+
+    def wrong_difficulty
+      I18n.t(:wrong_difficulty)
+    end
+
+    def wrong_chars
+      I18n.t(:wrong_chars)
+    end
+
+    def no_hint
+      I18n.t(:no_hint)
+    end
+  end
+end

data/lib/codebreaker_ap/entities/player.rb

@@ -1,5 +1,5 @@
 module CodebreakerAp
-  class Player < BaseEntity
+  class Player
     attr_reader :name
     attr_accessor :answer, :validated
 
@@ -9,44 +9,22 @@ module CodebreakerAp
     def initialize
       @name = nil
       @answer = nil
-      super()
     end
 
     def setup_name(player_name)
-      @name = player_name
-      valid_instance?
-    end
-
-    def setup_answer(answer)
-      @answer = answer
-      valid_instance?
-    end
-
-    private
+      check = Validator.new
+      check.validate_length(player_name, NAME_LENGTH)
+      return check.errors unless check.errors.empty?
 
-    def valid_instance?
-      valid?
-      return if validated
-
-      puts errors
-    end
-
-    def validate
-      @errors << validate_name if name
-      @errors << validate_answer if answer
-    rescue WrongLengthError => e
-      @errors.push(e)
-    rescue WrongNumbersError => e
-      @errors.push(e)
+      @name = player_name.capitalize
     end
 
-    def validate_name
-      check_length(@name, NAME_LENGTH)
-    end
+    def setup_answer(answer)
+      check = Validator.new
+      check.validate_player_answer(answer, ANSWER_LENGTH, ANSWER_CHARS_RANGE)
+      return check.errors unless check.errors.empty?
 
-    def validate_answer
-      check_length(@answer, ANSWER_LENGTH)
-      check_chars_range(@answer, ANSWER_CHARS_RANGE)
+      @answer = answer
     end
   end
 end

data/lib/codebreaker_ap/entities/validator.rb

@@ -0,0 +1,30 @@
+module CodebreakerAp
+  class Validator
+    include Validation
+
+    attr_reader :errors
+
+    def initialize
+      @errors = []
+    end
+
+    def validate_difficulty(level, difficulty_keys)
+      check_difficulty(level.to_sym, difficulty_keys)
+    rescue WrongDifficultyError => e
+      @errors.push(e)
+    end
+
+    def validate_length(name, name_length)
+      check_length(name, name_length)
+    rescue WrongLengthError => e
+      @errors.push(e)
+    end
+
+    def validate_player_answer(answer, answer_length, answer_chars_range)
+      validate_length(answer, answer_length)
+      check_chars_range(answer, answer_chars_range)
+    rescue WrongNumbersError => e
+      @errors.push(e)
+    end
+  end
+end

data/lib/codebreaker_ap/game.rb

@@ -37,10 +37,10 @@ module CodebreakerAp
     end
 
     def show_rules
-      rules = read_from_file("#{LOCALES_FOLDER}/#{I18n.t(:file_rules)}")
+      rules = read_from_file("#{LOCALES_FOLDER}/#{Message.new.file_rules}")
       return unless rules
 
-      puts rules
+      rules
     end
 
     private

data/lib/codebreaker_ap/modules/errors.rb

@@ -1,17 +1,17 @@
 module CodebreakerAp
   class WrongLengthError < StandardError
     def initialize
-      super(I18n.t(:wrong_length))
+      super(Message.new.wrong_length)
     end
   end
   class WrongDifficultyError < StandardError
     def initialize
-      super(I18n.t(:wrong_difficulty))
+      super(Message.new.wrong_difficulty)
     end
   end
   class WrongNumbersError < StandardError
     def initialize
-      super(I18n.t(:wrong_chars))
+      super(Message.new.wrong_chars)
     end
   end
 end

data/lib/codebreaker_ap/modules/statistic.rb

@@ -5,9 +5,15 @@ module CodebreakerAp
       save_to_file(create_statistic_data(player_name, difficulty), STATISTIC_FILE)
     end
 
+    def load_statistic
+      data = YAML.load_stream(File.open(STATISTIC_FILE, 'a+'))
+      return unless data
+
+      data.sort_by { |players| [-players[:difficulty].length, players[:used_attempts], players[:used_hints]] }
+    end
+
     def show_stats
-      statistic = load_statistic
-      statistic.each_with_index do |value, index|
+      load_statistic.each_with_index do |value, index|
         puts statistic(value, index + 1)
       end
     end
@@ -22,7 +28,8 @@ module CodebreakerAp
         total_attempts: difficulty_total[:attempts],
         total_hints: difficulty_total[:hints],
         used_attempts: difficulty_total[:attempts] - difficulty.attempts,
-        used_hints: difficulty_total[:hints] - difficulty.hints
+        used_hints: difficulty_total[:hints] - difficulty.hints,
+        date: Time.now.strftime('%d/%m/%Y %H:%M')
       }
     end
 
@@ -33,14 +40,8 @@ module CodebreakerAp
       "Total attempts: #{value[:total_attempts]}\n"\
       "Total hints: #{value[:total_hints]}\n"\
       "Used attempts: #{value[:used_attempts]}\n"\
-      "Used hints: #{value[:used_hints]}\n\n"
-    end
-
-    def load_statistic
-      data = YAML.load_stream(File.open(STATISTIC_FILE, 'a+'))
-      return unless data
-
-      data.sort_by { |players| [players[:difficulty], players[:used_attempts]] }
+      "Used hints: #{value[:used_hints]}\n"\
+      "Date: #{value[:date]}\n\n"
     end
   end
 end

data/lib/codebreaker_ap/version.rb

@@ -1,3 +1,3 @@
 module CodebreakerAp
-  VERSION = '0.1.0'.freeze
+  VERSION = '0.1.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker_ap
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.1.3
 platform: ruby
 authors:
 - andrewpetrenko1
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-22 00:00:00.000000000 Z
+date: 2020-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -131,9 +131,10 @@ files:
 - bin/setup
 - codebreaker_ap.gemspec
 - lib/codebreaker_ap.rb
-- lib/codebreaker_ap/entities/base_entity.rb
 - lib/codebreaker_ap/entities/difficulty.rb
+- lib/codebreaker_ap/entities/message.rb
 - lib/codebreaker_ap/entities/player.rb
+- lib/codebreaker_ap/entities/validator.rb
 - lib/codebreaker_ap/game.rb
 - lib/codebreaker_ap/modules/errors.rb
 - lib/codebreaker_ap/modules/statistic.rb

data/lib/codebreaker_ap/entities/base_entity.rb

@@ -1,23 +0,0 @@
-module CodebreakerAp
-  class BaseEntity
-    include Validation
-
-    attr_reader :errors, :validated
-
-    def initialize
-      @validated = false
-      @errors = []
-    end
-
-    def valid?
-      @errors.clear
-      validate
-      @errors.compact!
-      @validated = true if @errors.empty?
-    end
-
-    private
-
-    def validate; end
-  end
-end