codebreaker_diz 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b25b6d901bf9bd538342fb86c878b4cb1e66a2b33f50902a39989677c89b036b
-  data.tar.gz: b2b97cdbaeb85c13b95190770aa476da1443f158ebd5786d7b44e9cb3fa626c1
+  metadata.gz: f77ae0a549a358d95d77adafed1a8d50dec95cbf04470ccd576bc663206370af
+  data.tar.gz: f81fe8cbcb8bfbf977153f75813326ab1fb6d6423c474587a9c3a6417dc9ee83
 SHA512:
-  metadata.gz: bb0673a0234e0daa3bb044139e7dd25c0a210dc21e57ceedce78f70b72d9263a874a730531360030a0bc013c9e17e806ec2bff3dff8c9789d8f04d4ef6079cef
-  data.tar.gz: 9d78f67fc142ed43e3feef1d9f7e246207f59a985635e8e3c2360770b361e7e1aa9c37ea3d4b87d76e312ac0285074638e3777525dc0283dcd2020a9ad35b485
+  metadata.gz: e4cc4384c80451f3aced0873d8ecab89f442b98515acb53364178080848a895ee6333c9d99d9c5afd0ac38bb8e6ca444009c5aaae003e9629d36c6f1b47c9ce8
+  data.tar.gz: ca9baf924279712fb58be861a6892d67949ef60bf6e7c1eee4cc1abf7385619e8879e58b0d923673a316946cf12cdecafb89e7dd37045f15eedcb5e0a675d25d

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    codebreaker_diz (0.2.6)
+    codebreaker_diz (0.2.7)
 
 GEM
   remote: https://rubygems.org/
@@ -16,20 +16,17 @@ GEM
       ffi (~> 1.0, >= 1.0.11)
     coderay (1.1.2)
     colorize (0.8.1)
-    concurrent-ruby (1.1.5)
     diff-lcs (1.3)
     docile (1.3.1)
     fasterer (0.5.1)
       colorize (~> 0.7)
       ruby_parser (>= 3.13.0)
     ffi (1.11.1)
-    i18n (1.6.0)
-      concurrent-ruby (~> 1.0)
     iniparse (1.4.4)
     jaro_winkler (1.5.2)
     json (2.2.0)
     method_source (0.9.2)
-    overcommit (0.48.0)
+    overcommit (0.48.1)
       childprocess (~> 0.6, >= 0.6.3)
       iniparse (~> 1.4)
     parallel (1.17.0)
@@ -84,7 +81,6 @@ DEPENDENCIES
   bundler (~> 2.0)
   codebreaker_diz!
   fasterer (~> 0.5.1)
-  i18n (~> 1.6)
   overcommit (~> 0.48.0)
   pry (~> 0.12.2)
   rake (~> 10.0)

data/lib/codebreaker_diz.rb

@@ -2,5 +2,5 @@
 
 require_relative 'codebreaker_diz/game'
 require_relative 'codebreaker_diz/matcher'
-require_relative 'codebreaker_diz/errors'
+require_relative 'codebreaker_diz/errors/autoload'
 require_relative 'codebreaker_diz/version'

data/lib/codebreaker_diz/errors/autoload.rb

@@ -0,0 +1,5 @@
+# frozen_string_literal: true
+
+require_relative 'difficulty_error'
+require_relative 'guess_format_error'
+require_relative 'no_hints_left_error'

data/lib/codebreaker_diz/errors/difficulty_error.rb

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

data/lib/codebreaker_diz/errors/guess_format_error.rb

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

data/lib/codebreaker_diz/errors/no_hints_left_error.rb

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

data/lib/codebreaker_diz/matcher.rb

@@ -25,15 +25,21 @@ module CodebreakerDiz
     end
 
     def calculate_matches
-      @secret_code.zip(@user_code).each do |secret_code_number, user_code_number|
+      @secret_code.zip(@user_code).map 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
-        else @number_matches += 1
-        end
+        next add_match(user_code_number, exact: true) if secret_code_number == user_code_number
 
-        @secret_code.delete_at(@secret_code.index(user_code_number))
+        add_match(user_code_number)
       end
     end
+
+    def add_match(matched_code_number, exact: false)
+      @exact_matches  += 1 if exact
+
+      @number_matches += 1 unless exact
+
+      @secret_code.delete_at(@secret_code.index(matched_code_number))
+    end
   end
 end

data/lib/codebreaker_diz/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker_diz
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - bl0rch1d
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-06-05 00:00:00.000000000 Z
+date: 2019-06-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -191,7 +191,10 @@ files:
 - codebreaker_diz.gemspec
 - lib/codebreaker_diz.rb
 - lib/codebreaker_diz/config.rb
-- lib/codebreaker_diz/errors.rb
+- lib/codebreaker_diz/errors/autoload.rb
+- lib/codebreaker_diz/errors/difficulty_error.rb
+- lib/codebreaker_diz/errors/guess_format_error.rb
+- lib/codebreaker_diz/errors/no_hints_left_error.rb
 - lib/codebreaker_diz/game.rb
 - lib/codebreaker_diz/matcher.rb
 - lib/codebreaker_diz/version.rb

data/lib/codebreaker_diz/errors.rb

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