codebreaker-ga 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2ae8843aa507b5332c188c9a0e9caf2fe8889d4500db837e0384fd8cb3c787f0
-  data.tar.gz: 35563bc719b3982e6421377b24da6b763c55aebd1453d5dc532b8238854d0026
+  metadata.gz: e647e6d8cb566c0a1f3c8898876d13ac451f7271429ae361fb9750162eeb0e3b
+  data.tar.gz: ee54eee43f35693f60ec86ee5cbbb31ef735a6a662c1cde88a7698832f09f5fc
 SHA512:
-  metadata.gz: b9c9302560fd26e0dd001d40264a863c01d22baa5790b73f67c4e7ddd3a809e37b17698cf80c8bfc45e784ba3b18a142348bbb1cec34e46aae2c58c4e49374b9
-  data.tar.gz: e73a4da19d8a35e5ad0ee7d8630240a12350d2b9fe4b2844f889716e8db635799c7410eeb1af1a604583bc4d4441f4cceb84417744faa3d6719334a584d08610
+  metadata.gz: c50dc7181c2161a182ee4edb114d36d54795c4de8f81dae72aa948ea580e63cec486516c94357a126572270dd938d6a5861cf4bfc89216bd382d77e44cf83d43
+  data.tar.gz: 904ba288e4f486c88398a7a3297b3d3ba6df35b188367280b19d8d81a6bcd6f6d85776117bd1a781e8e677a2a5402b009ba5719862d4e24ee2e560a8a21e1c8a

data/Gemfile.lock

@@ -1,12 +1,13 @@
 PATH
   remote: .
   specs:
-    codebreaker-ga (0.2.5)
+    codebreaker-ga (0.2.6)
 
 GEM
   remote: https://rubygems.org/
   specs:
     ast (2.4.0)
+    coderay (1.1.2)
     colorize (0.8.1)
     diff-lcs (1.3)
     docile (1.3.2)
@@ -15,9 +16,13 @@ GEM
       ruby_parser (>= 3.14.1)
     jaro_winkler (1.5.4)
     json (2.3.0)
+    method_source (0.9.2)
     parallel (1.19.1)
     parser (2.6.5.0)
       ast (~> 2.4.0)
+    pry (0.12.2)
+      coderay (~> 1.1.0)
+      method_source (~> 0.9.0)
     rainbow (3.0.0)
     rake (12.3.3)
     rspec (3.9.0)
@@ -33,7 +38,7 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.9.0)
     rspec-support (3.9.0)
-    rubocop (0.77.0)
+    rubocop (0.78.0)
       jaro_winkler (~> 1.5.1)
       parallel (~> 1.10)
       parser (>= 2.6)
@@ -60,6 +65,7 @@ DEPENDENCIES
   bundler (~> 2.0)
   codebreaker-ga!
   fasterer (~> 0.8.0)
+  pry (~> 0.12.2)
   rake (~> 12.3.1)
   rspec (~> 3.0)
   rubocop-rspec

data/codebreaker.gemspec

@@ -21,7 +21,7 @@ Gem::Specification.new do |spec|
 
   spec.add_development_dependency 'bundler', '~> 2.0'
   spec.add_development_dependency 'fasterer', '~> 0.8.0'
-  # spec.add_development_dependency 'pry', '~> 0.12.2'
+  spec.add_development_dependency 'pry', '~> 0.12.2'
   spec.add_development_dependency 'rake', '~> 12.3.1'
   spec.add_development_dependency 'rspec', '~> 3.0'
   spec.add_development_dependency 'rubocop-rspec'

data/lib/codebreaker.rb

@@ -1,7 +1,9 @@
 module Codebreaker
+  require 'pry'
   require 'codebreaker/version'
   require 'codebreaker/yaml_file.rb'
   require 'codebreaker/validator.rb'
+  require 'codebreaker/compare_codes.rb'
   require 'codebreaker/base_class.rb'
   require 'codebreaker/difficulty.rb'
   require 'codebreaker/init_difficulties.rb'

data/lib/codebreaker/compare_codes.rb

@@ -0,0 +1,46 @@
+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)
+      @match_code_positions = get_code_positions(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
+
+    def get_cross_value(value)
+      guess_position(value) + guess_value(value)
+    end
+
+    def guess_position(value)
+      crossing_positions = @match_code_positions[value] & @secret_code_positions[value]
+      crossing_positions.empty? ? [] : Array.new(crossing_positions.size, true)
+    end
+
+    def guess_value(value)
+      crossing_positions = @match_code_positions[value] & @secret_code_positions[value]
+
+      match_code_positions = crossing_code_position(value, @match_code_positions, crossing_positions)
+      secret_code_positions = crossing_code_position(value, @secret_code_positions, crossing_positions)
+
+      size_no_cross_code = [secret_code_positions[value].size, match_code_positions[value].size].min
+      crossing_positions.empty? && size_no_cross_code.zero? ? [] : Array.new(size_no_cross_code, false)
+    end
+
+    def crossing_code_position(value, code_array, crossing_positions)
+      code_positions = code_array.dup
+      code_positions[value] -= crossing_positions
+      code_positions
+    end
+
+    def get_code_positions(code_array)
+      return if code_array.nil? || code_array.empty?
+
+      code_array.each_with_object(Hash.new([])).with_index { |(value, code), index| code[value] += [index] }
+    end
+  end
+end

data/lib/codebreaker/game.rb

@@ -1,46 +1,45 @@
 module Codebreaker
-  class CodebreakerGem < BaseClass
+  class Game < BaseClass
     include InitDifficulties
 
     CODE_LENGTH = 4
     CODE_NUMBERS = ('1'..'6').freeze
 
-    attr_reader :statistic, :difficulty, :game_stage, :difficulty_change, :errors
+    attr_reader :statistic, :difficulties, :difficulty, :errors #:game_stage
     attr_accessor :user, :hint_code
 
     def initialize
       @errors = {}
       @statistic = Statistic.new
-      @difficulty = init_difficulties
+      @difficulties = init_difficulties
     end
 
-    def user_code_valid_length?(user_code)
-      return true if validate_length?(user_code, CODE_LENGTH..CODE_LENGTH)
+    def match_code_valid_length?(match_code)
+      return true if validate_length?(match_code, CODE_LENGTH..CODE_LENGTH)
 
-      false || @errors[:user_code] = 'error_user_code_length'
+      (@errors[:match_code] = 'error_match_code_length') && false
     end
 
-    def validate_user_code_number_range?(user_code)
-      return true if validate_number_range?(user_code, CODE_NUMBERS)
+    def validate_match_code_number_range?(match_code)
+      return true if validate_number_range?(match_code, CODE_NUMBERS)
 
-      false || @errors[:user_code] = 'error_user_code_number'
+      (@errors[:match_code] = 'error_match_code_number') && false
     end
 
-    def difficulty_change=(difficulty)
-      @difficulty_change = @difficulty.detect { |value| value.name == difficulty }
+    def difficulty=(difficulty)
+      @difficulty = @difficulties.detect { |value| value.name == difficulty }
     end
 
     def game_start
       generate_secret_code
-      generate_hints unless @difficulty_change.nil?
-      @game_stage = GameStage.new(user_code_length: CODE_LENGTH, attempts: @difficulty_change.attempts)
+      generate_hints
+      @game_stage = GameStage.new(match_code_length: CODE_LENGTH, attempts: @difficulty.attempts)
     end
 
-    def game_step(user_code)
-      return unless user_code_valid?(user_code)
+    def game_step(match_codes)
+      return unless match_code_valid?(match_codes)
 
-      @user_code_positions = get_code_positions(user_code)
-      @game_stage.step(compare_codes(user_code))
+      @game_stage.step(@compare_codes.compare(match_codes))
       @game_stage.compare_result
     end
 
@@ -57,78 +56,40 @@ module Codebreaker
     end
 
     def statistic_save
-      @statistic.statistic_add_item(name: user.username, difficulty: difficulty_change, game_stage: game_stage)
+      @statistic.statistic_add_item(name: user.username, difficulty: @difficulty, game_stage: @game_stage)
       @statistic.statistic_save
     end
 
     private
 
-    def user_code_valid?(user_code)
-      return unless user_code_valid_length?(user_code)
-      return unless validate_user_code_number_range?(user_code)
+    def match_code_valid?(match_code)
+      return unless match_code_valid_length?(match_code)
+      return unless validate_match_code_number_range?(match_code)
 
       true
     end
 
     def difficulty_valid?
-      return true unless @difficulty_change.nil? || @difficulty_change.empty?
+      return true unless @difficulty.nil? || @difficulty.empty?
 
       @errors[:difficulty] = 'difficulty_change_error'
       false
     end
 
-    def compare_codes(user_code)
-      crossing_values = @secret_code & user_code
-      crossing_values.each_with_object([]) { |value, cross_result| cross_result << get_cross_value(value) }
-                     .flatten.sort_by { |item| item ? 0 : 1 }
-    end
-
     def generate_number
       Array.new(CODE_LENGTH) { CODE_NUMBERS.to_a.sample }
     end
 
-    def generate_secret_code
-      @secret_code = generate_number
-      @secret_code_positions = get_code_positions(@secret_code)
-      generate_hints
-    end
-
     def generate_hints
-      @hint_code = @secret_code.nil? ? [] : @secret_code.sample(@difficulty_change.hints)
+      @hint_code = @secret_code.nil? ? [] : @secret_code.sample(@difficulty.hints)
     end
 
-    def get_cross_value(value)
-      guess_position(value) + guess_value(value)
-    end
-
-    def guess_position(value)
-      crossing_positions = @user_code_positions[value] & @secret_code_positions[value]
-      crossing_positions.empty? ? [] : Array.new(crossing_positions.size, true)
-    end
-
-    def guess_value(value)
-      crossing_positions = @user_code_positions[value] & @secret_code_positions[value]
-
-      user_code_positions = crossing_code_position(value, @user_code_positions, crossing_positions)
-      secret_code_positions = crossing_code_position(value, @secret_code_positions, crossing_positions)
-
-      size_no_cross_code = [secret_code_positions[value].size, user_code_positions[value].size].min
-      crossing_positions.empty? && size_no_cross_code.zero? ? [] : Array.new(size_no_cross_code, false)
-    end
-
-    def crossing_code_position(value, code_array, crossing_positions)
-      code_positions = code_array.dup
-      code_positions[value] -= crossing_positions
-      code_positions
-    end
-
-    def get_code_positions(code_array)
-      return if code_array.nil? || code_array.empty?
-
-      code_array.each_with_object(Hash.new([])).with_index { |(value, code), index| code[value] += [index] }
+    def generate_secret_code
+      @secret_code = generate_number
+      @compare_codes = CompareCodes.new(@secret_code)
     end
 
-    def validate?
+    def validate
       @errors = {}
       difficulty_valid?
     end

data/lib/codebreaker/game_stage.rb

@@ -3,19 +3,19 @@ module Codebreaker
     attr_reader :step_number, :endgame, :attempts, :compare_result, :win
     attr_accessor :hint_used
 
-    def initialize(user_code_length:, attempts:)
+    def initialize(match_code_length:, attempts:)
       @step_number = 1
       @endgame = false
       @attempts = attempts
       @compare_result = []
-      @user_code_length = user_code_length
+      @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 == @user_code_length && @compare_result.all?
+      @win = @compare_result.length == @match_code_length && @compare_result.all?
       @endgame = true if @step_number > @attempts || @win
     end
   end

data/lib/codebreaker/init_difficulties.rb

@@ -1,10 +1,11 @@
 module Codebreaker
   module InitDifficulties
     def init_difficulties
-      difficulty = []
-      difficulty << Difficulty.new(name: 'Easy', attempts: 15, hints: 2, level: 0)
-      difficulty << Difficulty.new(name: 'Medium', attempts: 10, hints: 1, level: 1)
-      difficulty << Difficulty.new(name: 'Hell', attempts: 5, hints: 1, level: 2)
+      [
+        Difficulty.new(name: 'Easy', attempts: 15, hints: 2, level: 0),
+        Difficulty.new(name: 'Medium', attempts: 10, hints: 1, level: 1),
+        Difficulty.new(name: 'Hell', attempts: 5, hints: 1, level: 2)
+      ]
     end
   end
 end

data/lib/codebreaker/user.rb

@@ -6,13 +6,13 @@ module Codebreaker
 
     def initialize(username_new)
       @username = username_new
-      @errors = []
+      @errors = {}
     end
 
     private
 
     def validate
-      @errors << 'error_name_length' unless validate_length?(@username, USERNAME_LENGTH_RANGE)
+      @errors[:user] = 'error_name_length' unless validate_length?(@username, USERNAME_LENGTH_RANGE)
     end
   end
 end

data/lib/codebreaker/version.rb

@@ -1,3 +1,3 @@
 module Codebreaker
-  VERSION = '0.2.5'.freeze
+  VERSION = '0.2.6'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker-ga
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - GorohovAlex
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-12-21 00:00:00.000000000 Z
+date: 2019-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -38,6 +38,20 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.8.0
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.2
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 0.12.2
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -115,6 +129,7 @@ files:
 - codebreaker.gemspec
 - lib/codebreaker.rb
 - lib/codebreaker/base_class.rb
+- lib/codebreaker/compare_codes.rb
 - lib/codebreaker/difficulty.rb
 - lib/codebreaker/game.rb
 - lib/codebreaker/game_stage.rb