http-types 0.6.10 → 0.6.11

raw patch · 3 files changed

+62/−17 lines, 3 filesdep ~hspecPVP ok

version bump matches the API change (PVP)

Dependency ranges changed: hspec

API changes (from Hackage documentation)

Files

• Network/HTTP/Types.hs +50/−14
• http-types.cabal +2/−2
• runtests.hs +10/−1

@@ -106,10 +106,12 @@ , gatewayTimeout504 , status505 , httpVersionNotSupported505--- * Headers+  -- * Headers+  -- ** Types , Header , RequestHeaders , ResponseHeaders+  -- ** Common headers , headerAccept , headerAuthorization , headerCacheControl@@ -118,6 +120,13 @@ , headerContentType , headerContentMD5 , headerDate+  -- ** Byte ranges+, ByteRange(..)+, renderByteRangeBuilder+, renderByteRange+, ByteRanges+, renderByteRangesBuilder+, renderByteRanges   -- * Query string , QueryItem , Query@@ -191,21 +200,22 @@ ) where -import           Control.Arrow            (second, (|||), (***))+import           Control.Arrow                  (second, (|||), (***)) import           Data.Array-import           Data.Bits                (shiftL, (.|.))+import           Data.Bits                      (shiftL, (.|.)) import           Data.Char import           Data.Maybe-import           Data.Monoid              (mempty, mappend, mconcat)-import           Data.Text                (Text)-import           Data.Text.Encoding       (encodeUtf8, decodeUtf8With)-import           Data.Text.Encoding.Error (lenientDecode)-import           Data.Word                (Word8)-import           Data.List                (intersperse)-import qualified Blaze.ByteString.Builder as Blaze-import qualified Data.ByteString          as B-import qualified Data.ByteString.Char8    as B8-import qualified Data.CaseInsensitive     as CI+import           Data.Monoid                    (mempty, mappend, mconcat)+import           Data.Text                      (Text)+import           Data.Text.Encoding             (encodeUtf8, decodeUtf8With)+import           Data.Text.Encoding.Error       (lenientDecode)+import           Data.Word                      (Word8)+import           Data.List                      (intersperse)+import qualified Blaze.ByteString.Builder       as Blaze+import qualified Blaze.ByteString.Builder.Char8 as Blaze+import qualified Data.ByteString                as B+import qualified Data.ByteString.Char8          as B8+import qualified Data.CaseInsensitive           as CI  type Ascii = B.ByteString @@ -852,11 +862,37 @@ headerContentMD5    = (,) "Content-MD5" headerDate          = (,) "Date" +-- | RFC 2616 Byte range (individual). +-- +-- Negative indices are not allowed!+data ByteRange +  = ByteRangeFrom !Integer+  | ByteRangeFromTo !Integer !Integer+  | ByteRangeSuffix !Integer++renderByteRangeBuilder :: ByteRange -> Blaze.Builder+renderByteRangeBuilder (ByteRangeFrom from) = Blaze.fromShow from `mappend` Blaze.fromChar '-'+renderByteRangeBuilder (ByteRangeFromTo from to) = Blaze.fromShow from `mappend` Blaze.fromChar '-' `mappend` Blaze.fromShow to+renderByteRangeBuilder (ByteRangeSuffix suffix) = Blaze.fromChar '-' `mappend` Blaze.fromShow suffix++renderByteRange :: ByteRange -> Ascii+renderByteRange = Blaze.toByteString . renderByteRangeBuilder++-- | RFC 2616 Byte ranges (set).+type ByteRanges = [ByteRange]++renderByteRangesBuilder :: ByteRanges -> Blaze.Builder+renderByteRangesBuilder xs = Blaze.copyByteString "bytes=" `mappend` +                             mconcat (intersperse (Blaze.fromChar ',') (map renderByteRangeBuilder xs))++renderByteRanges :: ByteRanges -> Ascii+renderByteRanges = Blaze.toByteString . renderByteRangesBuilder+ -- | Query item type QueryItem = (B.ByteString, Maybe B.ByteString)  -- | Query.---+--  -- General form: a=b&c=d, but if the value is Nothing, it becomes -- a&c=d. type Query = [QueryItem]

@@ -7,7 +7,7 @@ -- The package version. See the Haskell package versioning policy -- (http://www.haskell.org/haskellwiki/Package_versioning_policy) for -- standards guiding when and how versions should be incremented.-Version:             0.6.10+Version:             0.6.11  -- A short (one-line) description of the package. Synopsis:            Generic HTTP types for Haskell (for both client and server code).@@ -70,4 +70,4 @@ Test-suite runtests     main-is:           runtests.hs     type:              exitcode-stdio-1.0-    build-depends:     text, bytestring, base, blaze-builder, array, case-insensitive, QuickCheck, HUnit, hspec+    build-depends:     text, bytestring, base, blaze-builder, array, case-insensitive, QuickCheck, HUnit, hspec >= 1.0

@@ -16,7 +16,7 @@ import qualified Data.Text                as T  --main :: IO ()-main = hspec $ descriptions+main = hspecX     [ describe "encode/decode path"         [ it "is identity to encode and then decode"             $ property propEncodeDecodePath@@ -32,6 +32,15 @@     , describe "encode/decode path segments"         [ it "is identity to encode and then decode"             $ property propEncodeDecodePathSegments+        ]+    , describe "encode ByteRanges"+        [ it "first 500 bytes" $ renderByteRanges [ByteRangeFromTo 0 499] @?= "bytes=0-499"+        , it "second 500 bytes" $ renderByteRanges [ByteRangeFromTo 500 999] @?= "bytes=500-999"+        , it "final 500 bytes" $ renderByteRanges [ByteRangeSuffix 500] @?= "bytes=-500"+        , it "final 500 bytes (of 1000, absolute)" $ renderByteRanges [ByteRangeFrom 9500] @?= "bytes=9500-"+        , it "first and last bytes only" $ renderByteRanges [ByteRangeFromTo 0 0, ByteRangeSuffix 1] @?= "bytes=0-0,-1"+        , it "non-canonical second 500 bytes (1)" $ renderByteRanges [ByteRangeFromTo 500 600, ByteRangeFromTo 601 999] @?= "bytes=500-600,601-999"+        , it "non-canonical second 500 bytes (2)" $ renderByteRanges [ByteRangeFromTo 500 700, ByteRangeFromTo 601 999] @?= "bytes=500-700,601-999"                   ]     ]