Codebreaker_RG2016 0.2.1 → 0.2.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 9faf642e4eb9433ed0fb046bd304de14d57d32ac
-  data.tar.gz: 879e3e7124e4314f14b8d8f8950f02a0831c0fc1
+  metadata.gz: d4cc5c494e8032671ab676c9b6cbff6ae219b7f3
+  data.tar.gz: 7266840d9a2d22eeeaebdd9b91b15524a2278090
 SHA512:
-  metadata.gz: dbb29c54d09eb31826b6af3d82ac79ef929d4037777cc356e028d19b0295663323c17f5d56edc0d8323f48f559468738deb86671e4e6e0f4405031e10b6468a8
-  data.tar.gz: b623071b23e4f59a1ce061996b2fd441dbbc1214aee5b14f59eddaebae40c6e892220bb82716428c6325b87c29e206b9dc60cdf3597c3372d0c825775533c571
+  metadata.gz: 1237929ebf73842447d21c06f0ab4faa8378bfd142ba19476e4eaaed015cbe2f4bb9285703191966cca7dfe2a7ff9ac81be693e6b47e9ee422568661b8d27f33
+  data.tar.gz: eb53f2327bdb90c865978ddec2eabae28d0bfab1c197f700ee9466be87b55e60cc570184364c0fc6cd8f3e021e419a02e8afc5be7cd6ea8fada02a533c764e88

data/lib/codebreaker/modules/marker.rb

@@ -8,22 +8,33 @@ module Codebreaker
         @game_start = false
         "Game over! Secret code is #{@secret_code}."
       else
-        @attempts -= 1
-        '+' * pluses + '-' * (minuses - pluses)
+        marking
       end
     end
 
+    def marking
+      @player_code = convert_to_a(@player_code)
+      @attempts -= 1
+      '+' * pluses + '-' * (minuses - pluses)
+    end
+
     def pluses
-      @player_code.to_s.chars.to_a.map.with_index { |num, index| '+' if num == @secret_code[index] }.compact.size
+      @player_code.zip(@secret_code.chars).map {|array| '+' if array[0] == array[1]}.count('+')
     end
 
     def minuses
-      secret_code = @secret_code.chars.to_a
-      @player_code.to_s.chars.to_a.map { |num| secret_code[secret_code.find_index(num)] = '-' if secret_code.include?(num) }.count('-')
+      secret = convert_to_a(@secret_code)
+      @player_code.map { |num| secret[secret.find_index(num)] = '-' if secret.include?(num) }.count('-')
     end
 
     def win?
       @secret_code == @player_code
     end
+
+    private
+
+    def convert_to_a(code)
+      code.chars.to_a
+    end
   end
 end

data/lib/codebreaker/version.rb

@@ -1,3 +1,3 @@
 module Codebreaker
-  VERSION = '0.2.1'.freeze
+  VERSION = '0.2.2'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: Codebreaker_RG2016
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors:
 - Ajiexwel4
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-12-17 00:00:00.000000000 Z
+date: 2016-12-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler