ep-codebreaker 0.3.1 → 0.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9d8b421d3c5caf1b37d80b9d168a7ebc32820b58
-  data.tar.gz: 26c7ee1e48c44513879769ebce8984bc6b9d5e7f
+  metadata.gz: 1bfaaf8084c62deada86235e21b8d00083cffb19
+  data.tar.gz: 074d6e1faa9313dda342f0955185208eea75139f
 SHA512:
-  metadata.gz: f7e0278325eabc82ccfa08f38035df512801f64ef8270521b3ade44ad4a1bf3fe869bdec67adba03c481be69b2e5a8713491419181dfea4d67edd063acf1ec6c
-  data.tar.gz: a84d3cf7b3136cec8df57365cc71ef2262b1d43a60ec6496b62a9edce86c947a7b985c22b4a443975dc64325e41f79aa85c9e891be510c3cbaa050a8bf51b663
+  metadata.gz: c0972fdbfa7fc7b1df76b16f595080f1f88c5ed200c4839469af0cd01193b8723538e6949ba342cf1142999f43d075a38f28b3c24c328f75027bf03c4a3a28d7
+  data.tar.gz: 5a674713394eda837d6ef357282499cc913608276f307cf1d166bdbb61e4b4783a4114a379bc2daf827a0af08902ae046ddb9bb61872bb629c37c54bf5fdcb2a

data/lib/ep-codebreaker/game.rb

@@ -7,55 +7,43 @@ module Codebreaker
   class Game
     include GameWriter
 
-    MIN = 1
-    MAX = 6
+    MIN    = 1
+    MAX    = 6
     LENGTH = 4
 
-    REGEXP = Regexp.new("^[#{MIN}-#{MAX}]{#{LENGTH}}$")
-
     TRIES = 10
     HINTS = 3
 
-    private_constant :MIN, :MAX, :LENGTH, :REGEXP, :TRIES, :HINTS
+    private_constant :MIN, :MAX, :LENGTH, :TRIES, :HINTS
     attr_reader :tries_left, :hints_left
 
     def start
-      @code = Array.new(LENGTH) { rand(MIN..MAX) }.join
+      @code             = Array.new(LENGTH) { rand(MIN..MAX) }.join
+      @result           = ''
+      @tries_left       = TRIES
+      @hints_left       = HINTS
       @indexes_for_hint = (0...LENGTH).to_a
-
-      @tries_left = TRIES
-      @hints_left = HINTS
-
-      @finished = false
-      @won = false
     end
 
     def check_guess(input)
       verify input
-
       @tries_left -= 1
-
-      result = check_input(@code.chars, input.chars)
-      define_stage result
-      result
+      @result = check_input(@code.chars, input.chars)
     end
 
     def hint
       return false if @hints_left.zero?
-
       @tries_left -= 1
       @hints_left -= 1
-      define_stage
-
       generate_hint
     end
 
     def finished?
-      @finished
+      @tries_left.zero? || won?
     end
 
     def won?
-      @won
+      @result == ('+' * LENGTH)
     end
 
     def answer
@@ -108,18 +96,10 @@ module Codebreaker
       hint
     end
 
-    def define_stage(result = '')
-      if result == ('+' * LENGTH)
-        @finished = true
-        @won = true
-      elsif @tries_left.zero?
-        @finished = true
-      end
-    end
-
     def verify(input)
+      regexp = Regexp.new("^[#{MIN}-#{MAX}]{#{LENGTH}}$")
       msg = "Guesses must consist of #{LENGTH} digits from #{MIN} to #{MAX}"
-      raise(ArgumentError, msg) if !input.is_a?(String) || !input.match?(REGEXP)
+      raise(ArgumentError, msg) if !input.is_a?(String) || !input.match?(regexp)
     end
   end
 end

data/lib/ep-codebreaker/version.rb

@@ -1,3 +1,3 @@
 module Codebreaker
-  VERSION = '0.3.1'.freeze
+  VERSION = '0.3.2'.freeze
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: ep-codebreaker
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.3.2
 platform: ruby
 authors:
 - Eugene Poberezhny