feat: Ch14 complete

Author: OlaoluwaM

hffp.cabal

@@ -28,17 +28,17 @@ library
       Ch14.Addition
       Ch14.Morse
       Ch8.Playground
+      Ch11.Cipher
+      Ch9.Cipher
   other-modules:
       Ch10.Playground
-      Ch11.Cipher
       Ch11.HuttonsRazor
       Ch11.Phone
       Ch11.PhoneAlt
       Ch11.Playground
       Ch12.Playground
       Ch13.Person
       Ch13.Playground
-      Ch9.Cipher
       Ch9.Playground
       Ch9.StdFunc
       Lib
@@ -50,6 +50,7 @@ library
   default-extensions:
       ImportQualifiedPost
       LambdaCase
+      TypeApplications
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints
   build-depends:
       PyF
@@ -72,6 +73,7 @@ executable hffp
   default-extensions:
       ImportQualifiedPost
       LambdaCase
+      TypeApplications
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       base >=4.7 && <5
@@ -82,6 +84,7 @@ test-suite hffp-test
   type: exitcode-stdio-1.0
   main-is: Spec.hs
   other-modules:
+      Ch14.CipherSpec
       Ch14.ExerciseSpec
       Ch14.Identity
       Ch14.MorseSpec
@@ -95,6 +98,7 @@ test-suite hffp-test
   default-extensions:
       ImportQualifiedPost
       LambdaCase
+      TypeApplications
   ghc-options: -Wall -Wcompat -Widentities -Wincomplete-record-updates -Wincomplete-uni-patterns -Wmissing-home-modules -Wpartial-fields -Wredundant-constraints -threaded -rtsopts -with-rtsopts=-N
   build-depends:
       QuickCheck

package.yaml

@@ -25,6 +25,7 @@ dependencies:
 default-extensions:
   - ImportQualifiedPost
   - LambdaCase
+  - TypeApplications
 
 ghc-options:
   - -Wall
@@ -50,6 +51,8 @@ library:
     - Ch14.Addition
     - Ch14.Morse
     - Ch8.Playground
+    - Ch11.Cipher
+    - Ch9.Cipher
 
 executables:
   hffp:

src/Ch11/Cipher.hs

@@ -1,4 +1,4 @@
-module Ch11.Cipher (vigenereCipher, CaesarCipher.cipherMsg) where
+module Ch11.Cipher (vigenereCipher, CaesarCipher.cipherMsg, vigenereUncipher) where
 
 import Ch9.Cipher qualified as CaesarCipher
 
@@ -9,11 +9,11 @@ type Message = String
 type CipherText = String
 
 ceilingDivision :: Int -> Int -> Int
-ceilingDivision num1 num2 = ceiling . fromIntegral $ div num1 num2
+ceilingDivision num1 num2 = (ceiling @Double) . fromIntegral $ div num1 num2
 
 standardizeKeywordLength :: Keyword -> Message -> String
 standardizeKeywordLength keyword msg
-  | length keyword < length msg = let replicateCount = ceilingDivision (length msg) (length keyword) in concat $ replicate replicateCount keyword
+  | length keyword < length msg = let replicateCount = ceilingDivision (length msg) (length keyword) in concat $ replicate (replicateCount + 1) keyword
   | otherwise = keyword
 
 zipWithSpaces :: String -> String -> [(Char, Char)]

test/Ch14/CipherSpec.hs

@@ -0,0 +1,36 @@
+module Ch14.CipherSpec where
+
+import Ch11.Cipher
+import Ch9.Cipher
+
+import Test.Hspec
+import Test.Hspec.QuickCheck
+import Test.QuickCheck
+
+import Data.Char
+
+newtype AlphaChar = AlphaChar {unAlphaChar :: Char} deriving (Eq, Show)
+
+genAlphaChar :: Gen AlphaChar
+genAlphaChar = do
+  let upperCaseAlphaRange = (65, 90)
+  let lowerCaseAlphaRange = (97, 122)
+  charCode <- oneof [chooseInt upperCaseAlphaRange, chooseInt lowerCaseAlphaRange]
+
+  pure $ AlphaChar $ chr charCode
+
+instance Arbitrary AlphaChar where
+  arbitrary = genAlphaChar
+
+spec :: Spec
+spec = do
+  describe "Cipher Identity" $ do
+    prop "Vigenere Cipher" $ \(NonEmpty keyword') (NonEmpty msg') ->
+      let keyword = unAlphaChar <$> (keyword' :: [AlphaChar])
+          msg = unAlphaChar <$> (msg' :: [AlphaChar])
+       in vigenereUncipher keyword (vigenereCipher keyword msg) == msg
+
+    prop "Caesar Cipher" $ \(Positive delta') (NonEmpty msg') ->
+      let delta = (delta' :: Int)
+          msg = unAlphaChar <$> (msg' :: [AlphaChar])
+       in unCipherMsg delta (cipherMsg delta msg) == msg