codebreaker-ga 0.2.8 → 0.2.9

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 571cb5edc34dfe9123091e8786675ed4460e02624ae59ab3b538abb7216d0303
-  data.tar.gz: 251dfb9530f68727c53b64cdbc96444982f28c432e73997992b2b7e7be02e335
+  metadata.gz: be1e59f2f709152c69c3a63b15e3ba7418b2305f3c0de91f5f290cb330f1a696
+  data.tar.gz: 95342c1fac36f34f760109028bb85c13c9cf2ea3e8b8872f3de158aa1634a73a
 SHA512:
-  metadata.gz: 02355ed87e5436a22d63e7dc7388762e726dd5dc045571c9c22dcc5ffbbd5ce16c038719a7ca27a2eaabe5f68c5803cf98f6365f2b9a829af894af248b86bc43
-  data.tar.gz: 81328f8cd2df76f85c3880c542b57ec38762e7d133f0e881926ddbaf32c3df7d9013105b53df78bc77260c99b738885ed202e3489304b723a2787b1d22c13fba
+  metadata.gz: c2367c6e2ffc4fc051a03a4e5707f697b0bd447d2d91028729241de2e20f8f5c6dc041d5e25ad5c5e924bca676e16cb219b3f50a238e80ff57234074bad0e935
+  data.tar.gz: 493ff78fd80619b4f34726f4ed785f867875ba4319f407f92dbe15bb8a7cd886f891512140060e4a39200db169f031b7ce21a8c2800bc42302aefeae6d234aff

data/.gitignore

@@ -8,3 +8,4 @@
 /tmp/
 spec/examples.txt
 spec/examples.txt
+spec/examples.txt

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    codebreaker-ga (0.2.8)
+    codebreaker-ga (0.2.9)
 
 GEM
   remote: https://rubygems.org/

data/lib/codebreaker/compare_codes.rb

@@ -1,13 +1,9 @@
 module Codebreaker
-  class CompareCodes
-    def initialize(secret_code)
-      @secret_code = secret_code
-      @secret_code_positions = get_code_positions(@secret_code)
-    end
-
-    def compare(match_code)
+  module CompareCodes
+    def compare(secret_code, match_code)
+      @secret_code_positions = get_code_positions(secret_code)
       @match_code_positions = get_code_positions(match_code)
-      crossing_values = @secret_code & match_code
+      crossing_values = secret_code & match_code
       crossing_values.each_with_object([]) { |value, cross_result| cross_result << get_cross_value(value) }
                      .flatten.sort_by { |item| item ? 0 : 1 }
     end

data/lib/codebreaker/game.rb

@@ -1,6 +1,7 @@
 module Codebreaker
   class Game < BaseClass
     include InitDifficulties
+    include CompareCodes
 
     CODE_LENGTH = 4
     CODE_NUMBERS = ('1'..'6').freeze
@@ -18,35 +19,43 @@ module Codebreaker
     def match_code_valid_length?(match_code)
       return true if validate_length?(match_code, CODE_LENGTH..CODE_LENGTH)
 
-      (@errors[:match_code] = 'error_match_code_length') && false
+      @errors[:match_code] = 'error_match_code_length'
+      false
     end
 
     def validate_match_code_number_range?(match_code)
       return true if validate_number_range?(match_code, CODE_NUMBERS)
 
-      (@errors[:match_code] = 'error_match_code_number') && false
+      @errors[:match_code] = 'error_match_code_number'
+      false
     end
 
     def difficulty=(difficulty)
       @difficulty = @difficulties.detect { |value| value.name == difficulty }
+      difficulty_valid?
     end
 
     def game_start
       generate_secret_code
       generate_hints
-      @game_stage = GameStage.new(match_code_length: CODE_LENGTH, attempts: @difficulty.attempts)
+      @game_stage = GameStage.new(attempts: @difficulty.attempts)
     end
 
     def game_step(match_codes)
       return unless match_code_valid?(match_codes)
+      return unless @game_stage.valide_allow_step?
 
-      @game_stage.step(@compare_codes.compare(match_codes))
+      @game_stage.step(compare(@secret_code, match_codes))
       @game_stage.compare_result
     end
 
     def registration(username)
       @user = User.new(username)
-      { status: @user.valid?, value: @user.errors.empty? ? @user.username : @user.errors[:user] }
+      if @user.valid?
+        { status: true, value: @user.username }
+      else
+        { status: false, value: @user.errors[:user] }
+      end
     end
 
     def hint_show
@@ -70,13 +79,6 @@ module Codebreaker
       true
     end
 
-    def difficulty_valid?
-      return true unless @difficulty.nil?
-
-      @errors[:difficulty] = 'difficulty_change_error'
-      false
-    end
-
     def generate_number
       Array.new(CODE_LENGTH) { CODE_NUMBERS.to_a.sample }
     end
@@ -87,11 +89,14 @@ module Codebreaker
 
     def generate_secret_code
       @secret_code = generate_number
-      @compare_codes = CompareCodes.new(@secret_code)
     end
 
-    def validate
-      difficulty_valid?
+    def difficulty_valid?
+      return true unless @difficulty.nil?
+
+      @errors = {}
+      @errors[:difficulty] = 'difficulty_change_error'
+      false
     end
   end
 end

data/lib/codebreaker/game_stage.rb

@@ -3,20 +3,23 @@ module Codebreaker
     attr_reader :step_number, :endgame, :attempts, :compare_result, :win
     attr_accessor :hint_used
 
-    def initialize(match_code_length:, attempts:)
+    def initialize(attempts:)
       @step_number = 1
       @endgame = false
       @attempts = attempts
       @compare_result = []
-      @match_code_length = match_code_length
       @hint_used = 0
     end
 
     def step(compare_result)
       @compare_result = compare_result
       @step_number += 1
-      @win = @compare_result.length == @match_code_length && @compare_result.all?
-      @endgame = true if @step_number > @attempts || @win
+      @win = @compare_result.length == Game::CODE_LENGTH && @compare_result.all?
+      @endgame = true if !valide_allow_step? || @win
+    end
+
+    def valide_allow_step?
+      @attempts >= @step_number
     end
   end
 end

data/lib/codebreaker/version.rb

@@ -1,3 +1,3 @@
 module Codebreaker
-  VERSION = '0.2.8'.freeze
+  VERSION = '0.2.9'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker-ga
 version: !ruby/object:Gem::Version
-  version: 0.2.8
+  version: 0.2.9
 platform: ruby
 authors:
 - GorohovAlex
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-24 00:00:00.000000000 Z
+date: 2019-12-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler