Move ResponseType into Response module

Author: garyb

src/Network/HTTP/Affjax.purs

@@ -23,7 +23,6 @@ import Data.Nullable (Nullable(), toNullable)
 import DOM.XHR (XMLHttpRequest())
 import Network.HTTP.Affjax.Request
 import Network.HTTP.Affjax.Response
-import Network.HTTP.Affjax.ResponseType
 import Network.HTTP.Method (Method(..), methodToString)
 import Network.HTTP.RequestHeader (RequestHeader(), requestHeaderName, requestHeaderValue)
 import Network.HTTP.ResponseHeader (ResponseHeader(), responseHeader)

src/Network/HTTP/Affjax/Response.purs

@@ -1,5 +1,6 @@
 module Network.HTTP.Affjax.Response
-  ( ResponseContent()
+  ( ResponseType(), responseTypeToString
+  , ResponseContent()
   , Respondable, responseType, fromResponse
   ) where
 
@@ -9,10 +10,41 @@ import Data.Foreign (Foreign(), F(), readString, parseJSON, unsafeReadTagged)
 import DOM (Document())
 import DOM.File (Blob())
 import DOM.XHR (FormData())
-import Network.HTTP.Affjax.ResponseType
 import Type.Proxy (Proxy())
 import qualified Data.ArrayBuffer.Types as A
 
+-- | Valid response types for an AJAX request. This is used to determine the
+-- | `ResponseContent` type for a request.
+data ResponseType
+  = ArrayBufferResponse
+  | BlobResponse
+  | DocumentResponse
+  | JSONResponse
+  | StringResponse
+
+instance eqResponseType :: Eq ResponseType where
+  (==) ArrayBufferResponse ArrayBufferResponse = true
+  (==) BlobResponse        BlobResponse        = true
+  (==) DocumentResponse    DocumentResponse    = true
+  (==) JSONResponse        JSONResponse        = true
+  (==) StringResponse      StringResponse      = true
+  (==) _ _ = false
+  (/=) x y = not (x == y)
+
+instance showResponseType :: Show ResponseType where
+  show ArrayBufferResponse = "ArrayBufferResponse"
+  show BlobResponse = "BlobResponse"
+  show DocumentResponse = "DocumentResponse"
+  show JSONResponse = "JSONResponse"
+  show StringResponse = "StringResponse"
+
+responseTypeToString :: ResponseType -> String
+responseTypeToString ArrayBufferResponse = "arraybuffer"
+responseTypeToString BlobResponse = "blob"
+responseTypeToString DocumentResponse = "document"
+responseTypeToString JSONResponse = "json"
+responseTypeToString StringResponse = "text"
+
 -- | Type representing content types that be received from an XHR request
 -- | (Blob, Document, JSON, String).
 type ResponseContent = Foreign