add unRaw and remove id from StaticFiles.hs

servant-server/src/Servant/Utils/StaticFiles.hs

@@ -43,9 +43,7 @@ serveDirectoryWith settings = Raw (staticApp settings)
 
 serveDirectory :: FilePath -> ServerT (Raw Application m) n
 serveDirectory = serveDirectoryWith . defaultFileServerSettings .
-#if MIN_VERSION_wai_app_static(3,1,0)
-  id .
-#else
+#if !MIN_VERSION_wai_app_static(3,1,0)
   decodeString .
 #endif
   addTrailingPathSeparator

servant/src/Servant/API/Raw.hs

@@ -12,5 +12,7 @@ import           Data.Typeable (Typeable)
 -- In addition to just letting you plug in your existing WAI 'Application's,
 -- this can also be used with 'Servant.Utils.StaticFiles.serveDirectory' to serve
 -- static files stored in a particular directory on your filesystem
-newtype Raw a (m :: * -> *) = Raw a
-    deriving Typeable
+newtype Raw a (m :: * -> *) = Raw {
+    unRaw :: a
+    }
+    deriving (Eq, Show, Typeable)

servant/test/Servant/API/RawSpec.hs

@@ -0,0 +1,15 @@
+{-# LANGUAGE DataKinds #-}
+{-# LANGUAGE OverloadedStrings #-}
+module Servant.API.RawSpec where
+
+import Test.Hspec
+
+import Servant.API.Raw
+
+spec :: Spec
+spec = describe "Servant.API.Raw" $ do
+  describe "unRaw" $ do
+    it "unRaw returns proper value" $ do
+      let p = Raw "testing" :: Raw String IO
+      p `shouldBe` (Raw "testing")
+      (unRaw p) `shouldBe` "testing"