Drop system-filepath

ChangeLog.md

@@ -1,3 +1,7 @@
+## 0.1.13.2
+
+* Drop system-filepath
+
 ## 0.1.13.1
 
 Fixes for GHC 7.10

markdown.cabal

@@ -1,5 +1,5 @@
 Name:                markdown
-Version:             0.1.13.1
+Version:             0.1.13.2
 Synopsis:            Convert Markdown to HTML, with XSS protection
 Description:         This library leverages existing high-performance libraries (attoparsec, blaze-html, text, and conduit), and should integrate well with existing codebases.
 Homepage:            https://github.com/snoyberg/markdown
@@ -46,12 +46,12 @@ test-suite test
                  , hspec            >= 1.3
                  , blaze-html
                  , text
-                 , system-fileio
-                 , system-filepath
                  , transformers
                  , conduit
                  , conduit-extra
                  , containers
+                 , filepath
+                 , directory
 
 source-repository head
   type:     git

test/main.hs

@@ -5,16 +5,17 @@ import Test.Hspec
 import Text.Markdown
 import Data.Text.Lazy (Text, unpack, snoc, fromStrict)
 import qualified Data.Text as T
+import qualified Data.Text.IO as TIO
 import qualified Data.Text.Lazy as TL
 import Text.Blaze.Html.Renderer.Text (renderHtml)
 import Control.Monad (forM_)
 import qualified Data.Set as Set
 import qualified Data.Map as Map
-import Data.List (isInfixOf)
+import Data.List (isInfixOf, isSuffixOf)
 import Data.Maybe (fromMaybe)
 
-import qualified Filesystem.Path.CurrentOS as F
-import qualified Filesystem as F
+import System.Directory (getDirectoryContents)
+import System.FilePath ((</>), replaceExtension)
 
 import Block
 import Inline
@@ -253,26 +254,30 @@ main = do
 
 getExamples :: IO [Spec]
 getExamples = do
-    files <- F.listDirectory "test/examples"
-    mapM go $ filter (flip F.hasExtension "md") files
+    files <- getDirectoryContents dir
+    mapM go $ filter (".md" `isSuffixOf`) files
   where
-    go fp = do
-        input <- F.readTextFile fp
-        output <- F.readTextFile $ F.replaceExtension fp "html"
+    dir = "test/examples"
+    go basename = do
+        let fp = dir </> basename
+        input <- TIO.readFile fp
+        output <- TIO.readFile $ replaceExtension fp "html"
         let (checker, stripper)
-                | "-spec" `isInfixOf` F.encodeString fp = (check', dropFinalLF)
+                | "-spec" `isInfixOf` fp = (check', dropFinalLF)
                 | otherwise = (check, T.strip)
 
-        return $ it (F.encodeString $ F.basename fp) $ checker (fromStrict $ stripper output) (fromStrict input)
+        return $ it basename $ checker (fromStrict $ stripper output) (fromStrict input)
 
     dropFinalLF t = fromMaybe t $ T.stripSuffix "\n" t
 
 getGruber :: IO [Spec]
 getGruber = do
-    files <- F.listDirectory "test/Tests"
-    mapM go $ filter (flip F.hasExtension "text") files
+    files <- getDirectoryContents dir
+    mapM go $ filter (".text" `isSuffixOf`) files
   where
-    go fp = do
-        input <- F.readTextFile fp
-        output <- F.readTextFile $ F.replaceExtension fp "html"
-        return $ it (F.encodeString $ F.basename fp) $ checkNoNL (fromStrict $ T.strip output) (fromStrict input)
+    dir = "test/Tests"
+    go basename = do
+        let fp = dir </> basename
+        input <- TIO.readFile fp
+        output <- TIO.readFile $ replaceExtension fp "html"
+        return $ it basename $ checkNoNL (fromStrict $ T.strip output) (fromStrict input)