codebreaker-engine 0.1.1 → 0.1.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 42d8821c88fc2ab4820059be7101549058025a06e516cad51f8dc61dabb88583
-  data.tar.gz: 1d102b65878e90e07761d0dc01b3d0c60df98da9dcdec64c66cdf3a3c60c5697
+  metadata.gz: 4b040303bf8244420902874e719167aa986c3e86bb37d44b87346ffaa8abac82
+  data.tar.gz: 05f1923f53734b752d87ffe5bd5a4e3e8f974414509b5dea408240cc18a72256
 SHA512:
-  metadata.gz: ec5698e8791cb7cea7c66b49cd6c6a7bb9205f449a7fc5a93d5a6a4312a6da3e407fd1aec1400c98d9441644d68aa7025022d30117af700269fb9c47b2215546
-  data.tar.gz: 9178226c403b2a6464ec096b04f68b1a1b360dbf992bb472a7df501d24d0c71283698e4c6b09ea1e6111499b83bdd3f5678ccf64911aff1f7744efbe6df02929
+  metadata.gz: d6e85e51d12d4764a239d6ca582a4c0ad9d58af94016f28628c68a03ce7aff89537b67b6339b6c62d95b484c4e058898a3a3accc197ceb6388108c1b8e25492b
+  data.tar.gz: baa576556c759e4db793a3f21f2cc017a349cd5267a32fe60404bd8610b3a8aef1e72c00e245313b5cfc9f2d652a3de1d31f8c91263e13407b278a0fe0e52138

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    codebreaker-engine (0.1.0)
+    codebreaker-engine (0.1.1)
 
 GEM
   remote: https://rubygems.org/

data/lib/codebreaker/code_formatter.rb

@@ -1,4 +1,5 @@
 class CodeFormatter
+  attr_reader :result
   def self.call(*args)
     new(*args).call
   end
@@ -6,32 +7,46 @@ class CodeFormatter
   def initialize(maker_code = [], user_code = [])
     @maker_code = maker_code
     @user_code = user_code
+    @result = []
   end
 
   def call
-    format(@maker_code, @user_code)
+    format_plus.format_minus
+    @result
   end
 
-  def format(maker_code, user_code)
-    user_code.each_with_index.map do |char, index|
-      if maker_code[index] == user_code[index]
-        maker_code[index] = nil
-        '+'
-      else
-        char_index = maker_code.index(char)
-        if char_index && minus?(char_index, maker_code, user_code)
-          maker_code[char_index] = nil
-          '-'
-        end
-      end
-    end.compact.sort
+  def format_plus
+    @user_code.zip(@maker_code).each_with_index do |numbers, index|
+      next unless numbers.first == numbers.last
+
+      @result << '+'
+      clear_number(@maker_code, index)
+      clear_number(@user_code, index)
+    end
+    code_compact
+    self
+  end
+
+  def format_minus
+    @user_code.each do |number|
+      next unless @maker_code.include?(number)
+
+      @result << '-'
+      clear_number(@maker_code, @maker_code.index(number))
+      clear_number(@user_code, @user_code.index(number))
+    end
+    code_compact
+    self
   end
 
   private
 
-  def minus?(char_index, maker_code, user_code)
-    return unless maker_code[char_index]
+  def code_compact
+    @user_code.compact!
+    @maker_code.compact!
+  end
 
-    maker_code[char_index] != user_code[char_index]
+  def clear_number(array, index)
+    array[index] = nil
   end
 end

data/lib/codebreaker/version.rb

@@ -1,3 +1,3 @@
 module Codebreaker
-  VERSION = '0.1.1'.freeze
+  VERSION = '0.1.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: codebreaker-engine
 version: !ruby/object:Gem::Version
-  version: 0.1.1
+  version: 0.1.2
 platform: ruby
 authors:
 - Danil Danilin
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-24 00:00:00.000000000 Z
+date: 2019-12-03 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler