code_brkr_game_training 0.7.2 → 0.7.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b318c26b1c0fbbb3f410d204862100077cc1211f4a6fbd3f2c191e13e4418764
-  data.tar.gz: 882dab2737baf0cdcb0c8d182f09b8a6a59612ed7b1fc1208336265b6f1d3ef2
+  metadata.gz: e08993644da18256d3cd3720ec7ccc939ee82074a1effb12659116931c4d2a10
+  data.tar.gz: e10409ead753bdc0bd7f3cb6c89bdea87ca335c1b481abed9f912b36dd341370
 SHA512:
-  metadata.gz: 0b214b380fa55616ad912eb09f09c8cdb9c5796174af14dc17d837f78badf62720bb2b4e02bfb0455703be2f8e0f5f6f2795f186308036a1dc1073e4a5ed1eed
-  data.tar.gz: 5fa53619996367d8de6a0befbf8477421e86bfcaddf31119d156774580c78e8ad9aa02c44011ea30c1dfdc93803b88cd5ad6a03439184ac1f67429f6f53087f6
+  metadata.gz: 7ed4ebe5861682f5a3c77cc6e46de4e9d0b5dad2d6eca1390e223cc9208676d9821d19fbb65a2ccaf839c058e04622072b65b07696238ecf66418f804527e854
+  data.tar.gz: 9375923f2eca595e325eec041bd2852c15da1e7d79a9e4f9b9308110f9ca32332f57c18da3b409befb24c52151a6987287f4c9e9f91c33cc4de42de601735235

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    code_brkr_game_training (0.7.2)
+    code_brkr_game_training (0.7.5)
 
 GEM
   remote: https://rubygems.org/

data/lib/code_brkr_game_training/entities/code.rb

@@ -9,7 +9,7 @@ module CodeBrkrGameTraining
     GAME_NUMBERS = { from: 1, to: 6, count: 4 }.freeze
 
     def initialize
-      @secret_digit_arr = code_generator
+      @secret_digit_arr = generate_code
     end
 
     def to_s
@@ -18,23 +18,22 @@ module CodeBrkrGameTraining
 
     def code_check(user_digits_arr)
       check_array_code_format(user_digits_arr)
-      alg_result = code_check_algorithm(@secret_digit_arr.clone, user_digits_arr)
-      result = {
-        in_position: GAME_NUMBERS[:count] - alg_result[:miss_indexes].length,
-        out_of_position: alg_result[:out_of_positions].length
+
+      {
+        in_positions: check_in_positions(user_digits_arr),
+        out_of_positions: check_out_positions(user_digits_arr),
+        not_guessed: check_not_guessed(user_digits_arr)
       }
-      result[:not_guessed] = GAME_NUMBERS[:count] - result[:in_position] - result[:out_of_position]
-      result
     end
 
-    def random_secret_digit_according_indexes(exclude_indexes)
+    def random_digit(exclude_indexes)
       rand_index = @secret_digit_arr.each_index.reject { |index| exclude_indexes.include? index }.sample
       { index: rand_index, digit: @secret_digit_arr[rand_index] }
     end
 
     private
 
-    def code_generator
+    def generate_code
       Array.new(GAME_NUMBERS[:count]) { rand(GAME_NUMBERS[:from]..GAME_NUMBERS[:to]) }
     end
 
@@ -46,14 +45,25 @@ module CodeBrkrGameTraining
       code_arr.each { |digit| raise GameError, 'incorrect_code_format' unless digits_range_arr.member? digit }
     end
 
-    def code_check_algorithm(system_arr, user_arr)
-      miss_indexes_arr = user_arr.each_index.reject { |user_index| user_arr[user_index] == system_arr[user_index] }
-      system_arr.select!.with_index { |_, sys_index| miss_indexes_arr.include? sys_index }
-      out_of_positions = miss_indexes_arr.collect do |miss_index|
-        found = system_arr.find_index { |sys_num| user_arr[miss_index] == sys_num }
-        found.nil? ? nil : system_arr.delete_at(found)
-      end
-      { miss_indexes: miss_indexes_arr, out_of_positions: out_of_positions.compact }
+    def check_miss_indexes(user_arr)
+      GAME_NUMBERS[:count].times.reject { |user_index| user_arr[user_index] == @secret_digit_arr[user_index] }
+    end
+
+    def check_in_positions(user_arr)
+      GAME_NUMBERS[:count] - check_miss_indexes(user_arr).length
+    end
+
+    def check_out_positions(user_arr)
+      miss_indexes = check_miss_indexes(user_arr)
+      system_digits = @secret_digit_arr.select.with_index { |_, system_index| miss_indexes.include? system_index }
+      miss_indexes.collect do |miss_index|
+        found = system_digits.find_index { |system_num| user_arr[miss_index] == system_num }
+        found.nil? ? nil : system_digits.delete_at(found)
+      end.compact.length
+    end
+
+    def check_not_guessed(user_arr)
+      GAME_NUMBERS[:count] - check_in_positions(user_arr) - check_out_positions(user_arr)
     end
   end
 end

data/lib/code_brkr_game_training/entities/difficulty_controller.rb

@@ -21,11 +21,11 @@ module CodeBrkrGameTraining
         .collect { |difficulty| difficulty[:name] }
     end
 
-    def initialize(dfclt_val)
-      @value_name = dfclt_val
+    def initialize(difficulty_value)
+      @value_name = difficulty_value
       validate
 
-      @init_values = GAME_DIFFICULTIES[dfclt_val.to_sym]
+      @init_values = GAME_DIFFICULTIES[difficulty_value.to_sym]
       @actual_values = @init_values.clone
     end
 

data/lib/code_brkr_game_training/entities/game.rb

@@ -24,7 +24,7 @@ module CodeBrkrGameTraining
     def code_guessing_attempt(digits_arr)
       @difficulty.guessing_attempts_decrement!
       result = @code.code_check(digits_arr)
-      if result[:in_position] == Code::GAME_NUMBERS[:count]
+      if result[:in_positions] == Code::GAME_NUMBERS[:count]
         result = { win: true }
       elsif !@difficulty.guessing_attempts_available?
         result = { loss: true, сorrect_answer: @code.to_s }
@@ -34,7 +34,7 @@ module CodeBrkrGameTraining
 
     def game_hint
       @difficulty.hints_decrement!
-      hint = @code.random_secret_digit_according_indexes(@hints_indexes)
+      hint = @code.random_digit(@hints_indexes)
       @hints_indexes << hint[:index]
       hint[:digit]
     end

data/lib/code_brkr_game_training/version.rb

@@ -2,5 +2,5 @@
 
 # The main module is re-opened here for declaring gem version
 module CodeBrkrGameTraining
-  VERSION = '0.7.2'
+  VERSION = '0.7.5'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: code_brkr_game_training
 version: !ruby/object:Gem::Version
-  version: 0.7.2
+  version: 0.7.5
 platform: ruby
 authors:
 - Pavel
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-25 00:00:00.000000000 Z
+date: 2020-07-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fasterer