codebreaker_diz 0.2.5 → 0.2.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f372885f870268ef00dbe3df3a3260bf06a2709c82befea7992b60614324f0e3
-  data.tar.gz: 7268f9caace93e8f76f5dd9da81d15242a5946a73807199d4237eec14492a7a9
+  metadata.gz: b25b6d901bf9bd538342fb86c878b4cb1e66a2b33f50902a39989677c89b036b
+  data.tar.gz: b2b97cdbaeb85c13b95190770aa476da1443f158ebd5786d7b44e9cb3fa626c1
 SHA512:
-  metadata.gz: 9a352e055e7048a0486d1fa8d9094a253b740e0e9e86ffb60fbe2ae06ad2c8537dabe1a2c4b520b2eae91339bc3d2b1f102c63d0f3a8ee4d9531dbed48aa1cc1
-  data.tar.gz: 3e538de718cf88cb1d5cf96c55adf0b52b9c911ac7386ee9fd427853809e988bafc1f8b43d599d85ce39275fad41a3f55b976c6e64218bf3eb487b415e98b159
+  metadata.gz: bb0673a0234e0daa3bb044139e7dd25c0a210dc21e57ceedce78f70b72d9263a874a730531360030a0bc013c9e17e806ec2bff3dff8c9789d8f04d4ef6079cef
+  data.tar.gz: 9d78f67fc142ed43e3feef1d9f7e246207f59a985635e8e3c2360770b361e7e1aa9c37ea3d4b87d76e312ac0285074638e3777525dc0283dcd2020a9ad35b485

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    codebreaker_diz (0.2.4)
+    codebreaker_diz (0.2.6)
 
 GEM
   remote: https://rubygems.org/

data/codebreaker_diz.gemspec

@@ -35,5 +35,4 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency 'simplecov', '~> 0.16.1'
   spec.add_development_dependency 'pry', '~> 0.12.2'
   spec.add_development_dependency 'bundle-audit', '~> 0.1.0'
-  spec.add_development_dependency 'i18n', '~> 1.6'
 end

data/lib/codebreaker_diz/errors.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+module CodebreakerDiz
+  DifficultyError   = Class.new(StandardError)
+
+  GuessFormatError  = Class.new(StandardError)
+
+  NoHintsError      = Class.new(StandardError)
+end

data/lib/codebreaker_diz/game.rb

@@ -4,7 +4,7 @@ require_relative 'config'
 
 module CodebreakerDiz
   class Game
-    attr_reader :tries_count, :hints_count
+    attr_reader :tries_count, :hints_count, :errors
 
     def initialize(difficulty: :kid)
       validate_difficulty(difficulty)
@@ -18,25 +18,25 @@ module CodebreakerDiz
       @tries_count  = DIFFICULTIES[@difficulty][:tries]
       @hints_count  = DIFFICULTIES[@difficulty][:hints]
 
-      @matches      = ''
-    end
+      @errors       = []
 
-    def validate_difficulty(difficulty)
-      raise ArgumentError, I18n.t(:INVALID_DIFFICULTY) unless DIFFICULTIES.include? difficulty.to_sym
+      @matches      = ''
     end
 
     def check_guess(input)
       input = to_array(input)
 
-      return I18n.t(:WRONG_FORMAT) unless valid? input
+      return add_error(GuessFormatError) unless valid? input
 
       @tries_count -= 1
 
-      @matches = Matcher.new(@secret, input).matches
+      resolver = CodeResolver.new(@secret, input)
+
+      @matches = resolver.matches
     end
 
     def generate_hint
-      return I18n.t(:NO_HINTS_LEFT) if @hints_count.zero?
+      return add_error(NoHintsError) if @hints_count.zero?
 
       index = @hint_indexes.sample
 
@@ -70,6 +70,14 @@ module CodebreakerDiz
 
     private
 
+    def add_error(err)
+      (@errors << err) && nil
+    end
+
+    def validate_difficulty(difficulty)
+      raise DifficultyError unless DIFFICULTIES.include? difficulty.to_sym
+    end
+
     def to_array(input)
       input.to_i.digits.reverse
     end

data/lib/codebreaker_diz/matcher.rb

@@ -3,29 +3,33 @@
 require_relative 'config'
 
 module CodebreakerDiz
-  class Matcher
+  class CodeResolver
+    attr_reader :matches
+
     def initialize(secret_code, user_code)
-      @secret_code = secret_code.clone
-      @user_code = user_code
+      @secret_code    = secret_code.clone
+      @user_code      = user_code
 
-      @exact_matches = 0
+      @exact_matches  = 0
       @number_matches = 0
+
+      @matches        = obtain_matches
     end
 
-    def matches
-      calculate_matches
+    private
+
+    def obtain_matches
+      calculate_matches unless @secret_code.empty?
 
       EXACT_MATCH_SIGN * @exact_matches << NUMBER_MATCH_SIGN * @number_matches
     end
 
-    private
-
     def calculate_matches
       @secret_code.zip(@user_code).each do |secret_code_number, user_code_number|
         next unless @secret_code.include? user_code_number
 
-        if secret_code_number == user_code_number     then @exact_matches   += 1
-        elsif @secret_code.include? user_code_number  then @number_matches  += 1
+        if secret_code_number == user_code_number then @exact_matches += 1
+        else @number_matches += 1
         end
 
         @secret_code.delete_at(@secret_code.index(user_code_number))

data/lib/codebreaker_diz/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CodebreakerDiz
-  VERSION = '0.2.5'
+  VERSION = '0.2.6'
 end

data/lib/codebreaker_diz.rb

@@ -1,11 +1,6 @@
 # frozen_string_literal: true
 
-require 'i18n'
-
 require_relative 'codebreaker_diz/game'
 require_relative 'codebreaker_diz/matcher'
+require_relative 'codebreaker_diz/errors'
 require_relative 'codebreaker_diz/version'
-
-I18n.config.load_path << Dir[File.expand_path('config/locales') + '/*.yml']
-I18n.config.available_locales = :en
-I18n.default_locale = :en

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker_diz
 version: !ruby/object:Gem::Version
-  version: 0.2.5
+  version: 0.2.6
 platform: ruby
 authors:
 - bl0rch1d
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-04 00:00:00.000000000 Z
+date: 2019-06-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -164,20 +164,6 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 0.1.0
-- !ruby/object:Gem::Dependency
-  name: i18n
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
-  type: :development
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.6'
 description: Game for true Hackers
 email:
 - temaflash96@gmail.com
@@ -203,9 +189,9 @@ files:
 - bin/console
 - bin/setup
 - codebreaker_diz.gemspec
-- config/locales/en.yml
 - lib/codebreaker_diz.rb
 - lib/codebreaker_diz/config.rb
+- lib/codebreaker_diz/errors.rb
 - lib/codebreaker_diz/game.rb
 - lib/codebreaker_diz/matcher.rb
 - lib/codebreaker_diz/version.rb

data/config/locales/en.yml

@@ -1,5 +0,0 @@
-en:
-  NO_TRIES_LEFT: 'no tries left'
-  WRONG_FORMAT: 'wrong format'
-  NO_HINTS_LEFT: 'no hints left'
-  INVALID_DIFFICULTY: 'invalid difficulty'