Add key validation for Caesar and Gamma ciphers.

src/cipher_analytical_machine/cli/cli.clj

@@ -1,5 +1,7 @@
 (ns cipher-analytical-machine.cli.cli
   (:require
+   [cipher-analytical-machine.parsers.parsers :as ps]
+   [cipher-analytical-machine.parsers.gamma :as gamma-ps]
    [cipher-analytical-machine.cli.file :as file]
    [cipher-analytical-machine.symbols.factories :as sf]
    [cipher-analytical-machine.cli.options :as options]
@@ -77,6 +79,15 @@
            (or (contains? options :encrypt)
                (contains? options :decrypt)))
       (cond
+        (and (= (:cipher options) "Caesar")
+             (false? (ps/int-string? (:key options))))
+        {:exit-message (error-msg ["Please, use the key format: [+-](integer)!!! Example: 10, +9, -7."])}
+
+        (and (= (:cipher options) "Gamma")
+             (false? (gamma-ps/key? (:key options))))
+        {:exit-message (error-msg ["Please, use the key format: [+-](integer),[+-](integer),[+-](integer) !!! Example: 10,+9,-7."])}
+
+
         (contains? options :encrypt)
         {:options options :arguments arguments :action-type :encrypt}
 

src/cipher_analytical_machine/cli/options.clj

@@ -22,7 +22,7 @@
     (option-values-as-list option values)))
 
 (def cipher-options
-  #{"Caesar" "Simple substitution and Caesar"})
+  #{"Caesar" "Simple substitution and Caesar" "Gamma"})
 
 (def default-cipher "Caesar")
 

src/cipher_analytical_machine/parsers/gamma.clj

@@ -0,0 +1,9 @@
+(ns cipher-analytical-machine.parsers.gamma
+  (:gen-class))
+
+(defn key?
+  "Return true if the string is an key of three integers."
+  [str]
+  (if (re-matches #"[+-]?\b\d+\b,[+-]?\b\d+\b,[+-]?\b\d+\b" str)
+    true false))
+

src/cipher_analytical_machine/parsers/parsers.clj

@@ -2,12 +2,18 @@
   (:require [cheshire.core :as cc])
   (:gen-class))
 
-(defn unsigned-int?
+(defn unsigned-int-string?
   "Return true if the string is an unsigned integer."
   [str]
   (if (re-matches #"\d+" str)
     true false))
 
+(defn int-string?
+  "Return true if the string is an signed integer."
+  [str]
+  (if (re-matches #"[+-]?\b\d+\b" str)
+    true false))
+
 (defn parse-unsigned-int
   "Return an integer if the argument is an integer."
   [str-or-int]
@@ -15,7 +21,7 @@
     (int? str-or-int)
     str-or-int
 
-    (unsigned-int? str-or-int)
+    (unsigned-int-string? str-or-int)
     (Integer/parseInt str-or-int)
 
     :else

src/cipher_analytical_machine/parsers/simple_substitution.clj

@@ -15,14 +15,14 @@
 (defn decode-key
   "Returns the first character if the string is a char. Return the number if the string is a number."
   [str]
-  (if (ps/unsigned-int? str)
+  (if (ps/unsigned-int-string? str)
     (Integer/parseInt str)
     (first str)))
 
 (defn decode-pair
   "Decode a numbers as a string and a char as a string"
   [acc [key value]]
-  (if (ps/unsigned-int? key)
+  (if (ps/unsigned-int-string? key)
     (assoc acc (decode-key key) (decode-key value))
     (assoc acc (decode-key key) value)))
 
@@ -38,7 +38,7 @@
 (defn generate-table-or-decode-json
   "It generate the table and return map with the key and the table if the argument is a key. Else it decode the json."
   [key-or-json symbols]
-  (if (ps/unsigned-int? key-or-json)
+  (if (ps/unsigned-int-string? key-or-json)
     (-> {"key" key-or-json}
         (assoc "table" (ss/generate-substitution-table symbols)))
     (decode-key-and-substitution-table-from-json key-or-json)))

test/cipher_analytical_machine/parsers/gamma_test.clj

@@ -0,0 +1,20 @@
+(ns cipher-analytical-machine.parsers.gamma-test
+  (:require
+   [clojure.test :refer :all]
+   [cipher-analytical-machine.parsers.gamma :refer :all]))
+
+(deftest key?-test
+  (testing "The function return true only if the key in the format '%d,%d,%d'."
+    (are [str expected]
+        (= expected
+           (key? str))
+      "9"         false
+      "9,10"      false
+      "10,9,8"    true
+      "-10,9,-8"  true
+      "-10,-9,-8" true
+      "asd 10 "   false
+      " 10 "      false
+      "-10"       false
+      "abc"       false)))
+

test/cipher_analytical_machine/parsers/parsers_test.clj

@@ -3,16 +3,31 @@
    [clojure.test :refer :all]
    [cipher-analytical-machine.parsers.parsers :refer :all]))
 
-(deftest unsigned-int?-test
+(deftest unsigned-int-string?-test
   (testing "The function return true only for an unsingned integer as a string."
     (are [str expected]
         (= expected
-           (unsigned-int? str))
+           (unsigned-int-string? str))
+      "9" true
       "9" true
       "10" true
+      "asd 10 " false
+      " 10 " false
       "-10" false
       "abc" false)))
 
+(deftest int-string?-test
+  (testing "The function return true only for an singned integer as a string."
+    (are [str expected]
+        (= expected
+           (int-string? str))
+      "9" true
+      "10" true
+      "-10" true
+      "asd -10 " false
+      " -10 " false
+      "abc" false)))
+
 (deftest parse-unsigned-int-test
   (testing "The function parse the integer if the string is an integer."
     (are [str-or-int expected]