irc-core 2.1.1.0 → 2.1.1.1

raw patch · 4 files changed

+43/−20 lines, 4 filesPVP ok

version bump matches the API change (PVP)

API changes (from Hackage documentation)

Files

• ChangeLog.md +5/−0
• irc-core.cabal +1/−1
• src/Irc/RawIrcMsg.hs +19/−18
• test/Main.hs +18/−1

@@ -1,5 +1,10 @@ # Revision history for irc-core +## 2.1.1.1  -- 2016-08-28++* Added parsing tests+* Slightly more tolerant of whitespace+ ## 2.1.1.0  -- 2016-08-13  * Add `Eq` instances to `UserInfo` and `RawIrcMsg`

@@ -1,5 +1,5 @@ name:                irc-core-version:             2.1.1.0+version:             2.1.1.1 synopsis:            IRC core library for glirc description:         IRC core library for glirc                      .

@@ -66,10 +66,10 @@ -- -- @:prefix COMMAND param0 param1 param2 .. paramN@ data RawIrcMsg = RawIrcMsg-  { _msgTags       :: [TagEntry] -- ^ IRCv3.2 message tags+  { _msgTags       :: [TagEntry]     -- ^ IRCv3.2 message tags   , _msgPrefix     :: Maybe UserInfo -- ^ Optional sender of message-  , _msgCommand    :: !Text -- ^ command-  , _msgParams     :: [Text] -- ^ command parameters+  , _msgCommand    :: !Text          -- ^ command+  , _msgParams     :: [Text]         -- ^ command parameters   }   deriving (Eq, Read, Show) @@ -169,16 +169,14 @@        return (x:xs)  tagsParser :: Parser [TagEntry]-tagsParser = tagParser `sepBy1` char ';' <* char ' '+tagsParser = tagParser `sepBy1` char ';' <* spaces  tagParser :: Parser TagEntry tagParser =-  do key <- P.takeWhile (notInClass " =;")-     hasValue <- optionalChar '='-     val <- if hasValue-              then unescapeTagVal <$> P.takeWhile (notInClass " ;")-              else return ""-     return $! TagEntry key val+  do key <- P.takeWhile (notInClass "=; ")+     _   <- optional (char '=')+     val <- P.takeWhile (notInClass "; ")+     return $! TagEntry key (unescapeTagVal val)   unescapeTagVal :: Text -> Text@@ -212,9 +210,11 @@ simpleTokenParser :: Parser Text simpleTokenParser =   do xs <- P.takeWhile1 (/= ' ')-     P.skipWhile (== ' ')+     spaces      return $! Text.copy xs +spaces :: Parser ()+spaces = P.skipWhile (== ' ')  -- | Serialize a structured IRC protocol message back into its wire -- format. This command adds the required trailing newline.@@ -244,9 +244,10 @@  renderTag :: TagEntry -> Builder renderTag (TagEntry key val)-   = Text.encodeUtf8Builder key-  <> Builder.char8 '='-  <> Text.encodeUtf8Builder (escapeTagVal val)+  | Text.null val = Text.encodeUtf8Builder key+  | otherwise     = Text.encodeUtf8Builder key+                 <> Builder.char8 '='+                 <> Text.encodeUtf8Builder (escapeTagVal val)  renderPrefix :: UserInfo -> Builder renderPrefix u@@ -278,9 +279,9 @@ optionalChar c = True <$ char c <|> pure False  --- | Try to decode a message as UTF-8. If that fails interpret it as Windows CP1252--- This helps deal with clients like XChat that get clever and otherwise misconfigured--- clients.+-- | Try to decode a message as UTF-8. If that fails interpret it as Windows+-- CP1252 This helps deal with clients like XChat that get clever and otherwise+-- misconfigured clients. asUtf8 :: ByteString -> Text asUtf8 x = case Text.decodeUtf8' x of              Right txt -> txt@@ -290,7 +291,7 @@ decodeCP1252 :: ByteString -> Text decodeCP1252 bs = Text.pack [ cp1252 Vector.! fromIntegral x | x <- B.unpack bs ] --- This character encoding is a superset of ISO 8859-1 in terms of printable+-- | This character encoding is a superset of ISO 8859-1 in terms of printable -- characters, but differs from the IANA's ISO-8859-1 by using displayable -- characters rather than control characters in the 80 to 9F (hex) range. cp1252 :: Vector Char

@@ -97,6 +97,16 @@             { _msgTags = [TagEntry "this\\s" "value"] })       (parseRawIrcMsg "@this\\s=value CMD") +  , assertEqual "optional key"+      (Just (rawIrcMsg "CMD" [])+            { _msgTags = [TagEntry "this" ""] })+      (parseRawIrcMsg "@this CMD")++  , assertEqual "optional keys"+      (Just (rawIrcMsg "CMD" [])+            { _msgTags = [TagEntry "this" "", TagEntry "that" ""] })+      (parseRawIrcMsg "@this;that CMD")+   ]  userInfos :: Test@@ -155,6 +165,13 @@   , assertEqual "two tags"       "@time=value;this=\\n\\rand\\\\\\s\\:that CMD\r\n"       (renderRawIrcMsg (rawIrcMsg "CMD" [])-            { _msgTags = [TagEntry "time" "value", TagEntry "this" "\n\rand\\ ;that"] })+            { _msgTags = [TagEntry "time" "value",+                          TagEntry "this" "\n\rand\\ ;that"] })++  , assertEqual "empty tags"+      "@time;magic CMD\r\n"+      (renderRawIrcMsg (rawIrcMsg "CMD" [])+            { _msgTags = [TagEntry "time" "",+                          TagEntry "magic" ""] })    ]