rename Network.Xmpp.Monad to Network.Xmpp.Connection

pontarius-xmpp.cabal

@@ -61,7 +61,7 @@ Library
                  , Network.Xmpp.IM.Message
                  , Network.Xmpp.IM.Presence
                  , Network.Xmpp.Marshal
-                 , Network.Xmpp.Monad
+                 , Network.Xmpp.Connection
                  , Network.Xmpp.Message
                  , Network.Xmpp.Pickle
                  , Network.Xmpp.Presence

source/Network/Xmpp.hs

@@ -149,22 +149,22 @@ module Network.Xmpp
   , exampleParams
   ) where
 
-import           Data.XML.Types (Element)
+import Data.XML.Types (Element)
 
-import           Network.Xmpp.Bind
+import Network.Xmpp.Bind
-import           Network.Xmpp.Concurrent
+import Network.Xmpp.Concurrent
-import           Network.Xmpp.Concurrent.Channels
+import Network.Xmpp.Concurrent.Channels
-import           Network.Xmpp.Concurrent.Types
+import Network.Xmpp.Concurrent.Types
-import           Network.Xmpp.Marshal
+import Network.Xmpp.Connection
-import           Network.Xmpp.Message
+import Network.Xmpp.Marshal
-import           Network.Xmpp.Monad
+import Network.Xmpp.Message
-import           Network.Xmpp.Presence
+import Network.Xmpp.Presence
-import           Network.Xmpp.Sasl
+import Network.Xmpp.Sasl
-import           Network.Xmpp.Session
+import Network.Xmpp.Session
 -- import           Network.Xmpp.Session
-import           Network.Xmpp.Stream
+import Network.Xmpp.Stream
-import           Network.Xmpp.TLS
+import Network.Xmpp.TLS
-import           Network.Xmpp.Types
+import Network.Xmpp.Types
 
 
 -- -- Sends the session IQ set element and waits for an answer. Throws an error if

source/Network/Xmpp/Basic.hs

@@ -16,9 +16,9 @@ module Network.Xmpp.Basic
 
        where
 
-import Network.Xmpp.Monad
+import Network.Xmpp.Connection
 import Network.Xmpp.Sasl
+import Network.Xmpp.Session
 import Network.Xmpp.Stream
 import Network.Xmpp.TLS
 import Network.Xmpp.Types
-import Network.Xmpp.Session

source/Network/Xmpp/Bind.hs

@@ -11,9 +11,9 @@ import Data.Text as Text
 import Data.XML.Pickle
 import Data.XML.Types
 
-import Network.Xmpp.Types
+import Network.Xmpp.Connection
 import Network.Xmpp.Pickle
-import Network.Xmpp.Monad
+import Network.Xmpp.Types
 
 import Control.Monad.State(modify)
 

source/Network/Xmpp/Concurrent/Monad.hs

@@ -18,7 +18,7 @@ import qualified Data.Map as Map
 import           Data.Text(Text)
 
 import           Network.Xmpp.Concurrent.Types
-import           Network.Xmpp.Monad
+import           Network.Xmpp.Connection
 
 
 

source/Network/Xmpp/Concurrent/Threads.hs

@@ -4,21 +4,21 @@
 
 module Network.Xmpp.Concurrent.Threads where
 
-import Network.Xmpp.Types
+import           Network.Xmpp.Types
 
-import Control.Applicative((<$>))
+import           Control.Applicative((<$>))
-import Control.Concurrent
+import           Control.Concurrent
-import Control.Concurrent.STM
+import           Control.Concurrent.STM
 import qualified Control.Exception.Lifted as Ex
-import Control.Monad
+import           Control.Monad
-import Control.Monad.IO.Class
+import           Control.Monad.IO.Class
-import Control.Monad.State.Strict
+import           Control.Monad.State.Strict
 
 import qualified Data.ByteString as BS
-import Network.Xmpp.Monad
+import           Network.Xmpp.Concurrent.Types
-import Network.Xmpp.Concurrent.Types
+import           Network.Xmpp.Connection
 
-import GHC.IO (unsafeUnmask)
+import           GHC.IO (unsafeUnmask)
 
 -- Worker to read stanzas from the stream and concurrently distribute them to
 -- all listener threads.

source/Network/Xmpp/Connection.hs

@@ -2,7 +2,7 @@
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE OverloadedStrings #-}
 
-module Network.Xmpp.Monad where
+module Network.Xmpp.Connection where
 
 import           Control.Applicative((<$>))
 import           Control.Concurrent (forkIO, threadDelay)

source/Network/Xmpp/IM/Presence.hs

@@ -73,4 +73,4 @@ presenceOffline = presence {presenceType = Just Unavailable}
 -- | Set the current status message. This implicitly sets the client's status
 -- online.
 --presenceMessage :: Text -> Presence
---presenceMessage txt = status (Just txt) Nothing Nothing
+--presenceMessage txt = status (Just txt) Nothing Nothing

source/Network/Xmpp/Sasl.hs

@@ -29,15 +29,15 @@ import qualified Data.Text as Text
 import           Data.Text (Text)
 import qualified Data.Text.Encoding as Text
 
-import           Network.Xmpp.Monad
+import           Network.Xmpp.Connection
+import           Network.Xmpp.Pickle
 import           Network.Xmpp.Stream
 import           Network.Xmpp.Types
-import           Network.Xmpp.Pickle
 
 import qualified System.Random as Random
 
-import Network.Xmpp.Sasl.Types
+import           Network.Xmpp.Sasl.Types
-import Network.Xmpp.Sasl.Mechanisms
+import           Network.Xmpp.Sasl.Mechanisms
 
 -- | Uses the first supported mechanism to authenticate, if any. Updates the
 -- state with non-password credentials and restarts the stream upon

source/Network/Xmpp/Sasl/Common.hs

@@ -22,10 +22,10 @@ import           Data.Word (Word8)
 import           Data.XML.Pickle
 import           Data.XML.Types
 
-import           Network.Xmpp.Monad
+import           Network.Xmpp.Connection
 import           Network.Xmpp.Pickle
-import           Network.Xmpp.Sasl.Types
 import           Network.Xmpp.Sasl.StringPrep
+import           Network.Xmpp.Sasl.Types
 
 import qualified System.Random as Random
 

source/Network/Xmpp/Sasl/Mechanisms/DigestMd5.hs

@@ -31,7 +31,7 @@ import qualified Data.ByteString as BS
 
 import           Data.XML.Types
 
-import           Network.Xmpp.Monad
+import           Network.Xmpp.Connection
 import           Network.Xmpp.Pickle
 import           Network.Xmpp.Stream
 import           Network.Xmpp.Types

source/Network/Xmpp/Sasl/Mechanisms/Plain.hs

@@ -29,24 +29,24 @@ import qualified Data.Text as Text
 import           Data.Text (Text)
 import qualified Data.Text.Encoding as Text
 
-import Data.XML.Pickle
+import           Data.XML.Pickle
 
 import qualified Data.ByteString as BS
 
-import Data.XML.Types
+import           Data.XML.Types
 
-import           Network.Xmpp.Monad
+import           Network.Xmpp.Connection
+import           Network.Xmpp.Pickle
 import           Network.Xmpp.Stream
 import           Network.Xmpp.Types
-import           Network.Xmpp.Pickle
 
 import qualified System.Random as Random
 
-import Data.Maybe (fromMaybe)
+import           Data.Maybe (fromMaybe)
 import qualified Data.Text as Text
 
-import Network.Xmpp.Sasl.Common
+import           Network.Xmpp.Sasl.Common
-import Network.Xmpp.Sasl.Types
+import           Network.Xmpp.Sasl.Types
 
 -- TODO: stringprep
 xmppPlain :: Text.Text -- ^ Password
@@ -79,4 +79,4 @@ plain :: Text.Text -- ^ authentication ID (username)
       -> Maybe Text.Text -- ^ authorization ID
       -> Text.Text -- ^ password
       -> SaslHandler
-plain authcid authzid passwd = ("PLAIN", xmppPlain authcid authzid passwd)
+plain authcid authzid passwd = ("PLAIN", xmppPlain authcid authzid passwd)

source/Network/Xmpp/Session.hs

@@ -6,19 +6,19 @@ import           Control.Monad.Error
 import           Data.Text as Text
 import           Data.XML.Pickle
 import           Data.XML.Types(Element)
+import           Network
 import qualified Network.TLS as TLS
 import           Network.Xmpp.Bind
 import           Network.Xmpp.Concurrent.Types
+import           Network.Xmpp.Connection
 import           Network.Xmpp.Marshal
-import           Network.Xmpp.Monad
 import           Network.Xmpp.Pickle
 import           Network.Xmpp.Sasl
 import           Network.Xmpp.Sasl.Mechanisms
 import           Network.Xmpp.Sasl.Types
 import           Network.Xmpp.Stream
-import           Network.Xmpp.Types
-import           Network
 import           Network.Xmpp.TLS
+import           Network.Xmpp.Types
 
 -- | The quick and easy way to set up a connection to an XMPP server
 --

source/Network/Xmpp/Stream.hs

@@ -19,10 +19,10 @@ import           Data.Void (Void)
 import           Data.XML.Pickle
 import           Data.XML.Types
 
-import           Network.Xmpp.Monad
+import           Network.Xmpp.Connection
+import           Network.Xmpp.Errors
 import           Network.Xmpp.Pickle
 import           Network.Xmpp.Types
-import           Network.Xmpp.Errors
 
 import           Text.XML.Stream.Elements
 import           Text.XML.Stream.Parse as XP

source/Network/Xmpp/TLS.hs

@@ -17,7 +17,7 @@ import           Data.Conduit.TLS as TLS
 import           Data.Typeable
 import           Data.XML.Types
 
-import           Network.Xmpp.Monad
+import           Network.Xmpp.Connection
 import           Network.Xmpp.Pickle(ppElement)
 import           Network.Xmpp.Stream
 import           Network.Xmpp.Types

source/Network/Xmpp/Utilities.hs

@@ -51,4 +51,4 @@ idGenerator prefix = atomically $ do
 
 -- Constructs a "Version" based on the major and minor version numbers.
 versionFromNumbers :: Integer -> Integer -> Version
-versionFromNumbers major minor = Version major minor
+versionFromNumbers major minor = Version major minor

source/Network/Xmpp/Xep/InbandRegistration.hs

@@ -19,7 +19,7 @@ import qualified Data.Text as Text
 import           Data.XML.Pickle
 import qualified Data.XML.Types as XML
 
-import           Network.Xmpp.Monad
+import           Network.Xmpp.Connection
 import           Network.Xmpp.Pickle
 import           Network.Xmpp.Types
 import           Network.Xmpp.Xep.ServiceDiscovery
@@ -201,4 +201,4 @@ instance Read Field where
 
 
 -- Registered
--- Instructions
+-- Instructions

source/Network/Xmpp/Xep/ServiceDiscovery.hs

@@ -25,12 +25,12 @@ import           Data.XML.Pickle
 import           Data.XML.Types
 
 import           Network.Xmpp
-import           Network.Xmpp.Monad
-import           Network.Xmpp.Pickle
-import           Network.Xmpp.Types
 import           Network.Xmpp.Concurrent
-import           Network.Xmpp.Concurrent.Types
 import           Network.Xmpp.Concurrent.Channels
+import           Network.Xmpp.Concurrent.Types
+import           Network.Xmpp.Connection
+import           Network.Xmpp.Pickle
+import           Network.Xmpp.Types
 
 data DiscoError = DiscoNoQueryElement
                 | DiscoIQError IQError