codebreaker_kub 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f04c487aaa2731e942ffff6cb60ef16d1104251d00bb9983a6e7d91c103b7169
-  data.tar.gz: 4b505fe8bfe8a2e60e0f3915db5f3e4afe8175f06812602d4f1d972c9dcb31f4
+  metadata.gz: 051607a50601d334aa48d9d28785323e8d5c221c0aef317be4b4a5ceee34386e
+  data.tar.gz: 6a7ef0f973f7f648ab9ec282631d77f18f62ab2b8d271fa1959e6a4d50286225
 SHA512:
-  metadata.gz: f4479ce9fa5fc088e8acdacc83756ea2842711fcc410f7885df6a70461906df3d9bbad0c0fe8f54df0ec98afe14d83f7574fbdd9d2b77c7ab7644da3f56481d9
-  data.tar.gz: 24ef175cf81346eb5a3eb83553ac0e31ea77cb95e09502c3428e4cba77413d1ec55eeb578502bcd1b423d3e02fc9cceac6f622f15ed7fdfc19c77ce7af205141
+  metadata.gz: a60a49f8ea3d902cc5455fba5e1acf75a1290d013bc4dda5ff4ca6cadabddd8795c8a8e25f697cfed92b1c10973e410b64070a5d48bc73e52afb252ec3c2da46
+  data.tar.gz: 50d31ee1829a607075be8ec34df7b77eea7aa5c783ea62b5f12bfdc119f4c9df5db751b2d195a2c19970375422442f4a797e6e8326b327a2325765fbba717f99

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    codebreaker_kub (0.1.9)
+    codebreaker_kub (0.2.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/codebreaker.rb

@@ -1,5 +1,6 @@
 # frozen_string_literal: true
 
+require_relative 'codebreaker/guess_checker'
 require_relative 'codebreaker/game'
 require_relative 'codebreaker/loader'
 require_relative 'codebreaker/output'

data/lib/codebreaker/game.rb

@@ -2,22 +2,21 @@
 
 module Codebreaker
   class Game
+    include Codebreaker::GuessChecker
+
+    attr_accessor :input_code, :code, :name, :difficulties, :difficulty, :hints_left, :attempts_left
+    attr_reader :minuse, :plus, :none, :hints_code
+
     CODE_LENGTH = 4
     CODE_RANGE = (1..6).freeze
-    attr_accessor :input_code, :code, :name, :difficulties, :difficulty, :hints_left, :attempts_left
-    attr_reader :minuse, :plus, :none
+
     def initialize
       @difficulties = Codebreaker::Loader.load('difficulties')
       @code = generate_code
+      @hints_code = @code.chars.shuffle
       symbols
     end
 
-    def symbols(minuse = '-', plus = '+', none = '')
-      @minuse = minuse
-      @plus = plus
-      @none = none
-    end
-
     def game_option(name, difficulty)
       @name = name
       @difficulty = difficulty
@@ -33,23 +32,22 @@ module Codebreaker
     end
 
     def hints_left?
-      @hints_left.positive?
+      hints_left.positive?
     end
 
     def input_operation(input_code)
-      @input_code = input_code
       return unless attempts_left?
 
       @attempts_left -= 1
-      check_input
+      check_input(@code, input_code)
     end
 
     def attempts_left?
-      @attempts_left.positive?
+      attempts_left.positive?
     end
 
     def win?
-      @input_code == @code
+      input_code == code
     end
 
     def save
@@ -58,25 +56,12 @@ module Codebreaker
 
     private
 
-    def check_input(code = @code.chars)
-      input = @input_code.chars
-      minuses = (code & input).map { |element| [code.count(element), input.count(element)].min }.sum
-      result = @minuse * minuses
-      input.each.with_index do |element, index|
-        result.sub!(@minuse, @plus) if element == code[index]
-      end
-      return result unless result.empty?
-
-      @none
-    end
-
     def generate_code
       Array.new(CODE_LENGTH) { rand(CODE_RANGE) }.join
     end
 
     def generate_hint
-      hint_code = @code.chars.shuffle
-      hint_code.pop
+      @hints_code.pop
     end
 
     def difficulty_option

data/lib/codebreaker/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Codebreaker
-  VERSION = '0.2.1'
+  VERSION = '0.2.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker_kub
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - katia kub
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2020-07-16 00:00:00.000000000 Z
+date: 2020-07-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fasterer