master..8ebe432 · typeable/http-api-data

git.iko.soy/typeable/http-api-data

on 8ebe432 help sign in

4 files changed+65−62

since splitsnapshots

unifiedsplit

.github/workflows/haskell-ci.yml+30−41 CHANGELOG.md−7 http-api-data.cabal+25−11 src/Web/Internal/HttpApiData.hs+10−3

.github/workflows/haskell-ci.yml+30−41

@@ -8,9 +8,9 @@

88#

99# For more information, see https://github.com/haskell-CI/haskell-ci

1010#

11−# version: 0.15.20220609

11+# version: 0.13.20211111

1212#

13−# REGENDATA ("0.15.20220609",["github","cabal.project"])

13+# REGENDATA ("0.13.20211111",["github","cabal.project"])

1414#

1515name: Haskell-CI

1616on:

@@ -23,7 +23,7 @@ on:

2323jobs:

2424 linux:

2525 name: Haskell-CI - Linux - ${{ matrix.compiler }}

26− runs-on: ubuntu-20.04

26+ runs-on: ubuntu-18.04

2727 timeout-minutes:

2828 60

2929 container:

@@ -32,20 +32,15 @@ jobs:

3232 strategy:

3333 matrix:

3434 include:

35− - compiler: ghc-9.4.0.20220523

35+ - compiler: ghc-9.2.1

3636 compilerKind: ghc

37− compilerVersion: 9.4.0.20220523

38− setup-method: ghcup

39− allow-failure: true

40− - compiler: ghc-9.2.3

41− compilerKind: ghc

42− compilerVersion: 9.2.3

37+ compilerVersion: 9.2.1

4338 setup-method: ghcup

4439 allow-failure: false

45− - compiler: ghc-9.0.2

40+ - compiler: ghc-9.0.1

4641 compilerKind: ghc

47− compilerVersion: 9.0.2

48− setup-method: ghcup

42+ compilerVersion: 9.0.1

43+ setup-method: hvr-ppa

4944 allow-failure: false

5045 - compiler: ghc-8.10.7

5146 compilerKind: ghc

@@ -77,6 +72,16 @@ jobs:

7772 compilerVersion: 8.0.2

7873 setup-method: hvr-ppa

7974 allow-failure: false

75+ - compiler: ghc-7.10.3

76+ compilerKind: ghc

77+ compilerVersion: 7.10.3

78+ setup-method: hvr-ppa

79+ allow-failure: false

80+ - compiler: ghc-7.8.4

81+ compilerKind: ghc

82+ compilerVersion: 7.8.4

83+ setup-method: hvr-ppa

84+ allow-failure: false

8085 fail-fast: false

8186 steps:

8287 - name: apt

@@ -85,19 +90,18 @@ jobs:

8590 apt-get install -y --no-install-recommends gnupg ca-certificates dirmngr curl git software-properties-common libtinfo5

8691 if [ "${{ matrix.setup-method }}" = ghcup ]; then

8792 mkdir -p "$HOME/.ghcup/bin"

88− curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"

93+ curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"

8994 chmod a+x "$HOME/.ghcup/bin/ghcup"

90− if $HEADHACKAGE; then "$HOME/.ghcup/bin/ghcup" config add-release-channel https://raw.githubusercontent.com/haskell/ghcup-metadata/master/ghcup-prereleases-0.0.7.yaml; fi

91− "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER" || (cat "$HOME"/.ghcup/logs/*.* && false)

92− "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

95+ "$HOME/.ghcup/bin/ghcup" install ghc "$HCVER"

96+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0

9397 else

9498 apt-add-repository -y 'ppa:hvr/ghc'

9599 apt-get update

96100 apt-get install -y "$HCNAME"

97101 mkdir -p "$HOME/.ghcup/bin"

98− curl -sL https://downloads.haskell.org/ghcup/0.1.17.8/x86_64-linux-ghcup-0.1.17.8 > "$HOME/.ghcup/bin/ghcup"

102+ curl -sL https://downloads.haskell.org/ghcup/0.1.17.3/x86_64-linux-ghcup-0.1.17.3 > "$HOME/.ghcup/bin/ghcup"

99103 chmod a+x "$HOME/.ghcup/bin/ghcup"

100− "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0 || (cat "$HOME"/.ghcup/logs/*.* && false)

104+ "$HOME/.ghcup/bin/ghcup" install cabal 3.6.2.0

101105 fi

102106 env:

103107 HCKIND: ${{ matrix.compilerKind }}

@@ -128,7 +132,7 @@ jobs:

128132 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

129133 echo "ARG_TESTS=--enable-tests" >> "$GITHUB_ENV"

130134 echo "ARG_BENCH=--enable-benchmarks" >> "$GITHUB_ENV"

131− if [ $((HCNUMVER >= 90400)) -ne 0 ] ; then echo "HEADHACKAGE=true" >> "$GITHUB_ENV" ; else echo "HEADHACKAGE=false" >> "$GITHUB_ENV" ; fi

135+ echo "HEADHACKAGE=false" >> "$GITHUB_ENV"

132136 echo "ARG_COMPILER=--$HCKIND --with-compiler=$HC" >> "$GITHUB_ENV"

133137 echo "GHCJSARITH=0" >> "$GITHUB_ENV"

134138 env:

@@ -157,18 +161,6 @@ jobs:

157161 repository hackage.haskell.org

158162 url: http://hackage.haskell.org/

159163 EOF

160− if $HEADHACKAGE; then

161− cat >> $CABAL_CONFIG <<EOF

162− repository head.hackage.ghc.haskell.org

163− url: https://ghc.gitlab.haskell.org/head.hackage/

164− secure: True

165− root-keys: 7541f32a4ccca4f97aea3b22f5e593ba2c0267546016b992dfadcd2fe944e55d

166− 26021a13b401500c8eb2761ca95c61f2d625bfef951b939a8124ed12ecf07329

167− f76d08be13e9a61a377a85e2fb63f4c5435d40f8feb3e12eb05905edb8cdea89

168− key-threshold: 3

169− active-repositories: hackage.haskell.org, head.hackage.ghc.haskell.org:override

170− EOF

171− fi

172164 cat >> $CABAL_CONFIG <<EOF

173165 program-default-options

174166 ghc-options: $GHCJOBS +RTS -M3G -RTS

@@ -185,7 +177,7 @@ jobs:

185177 - name: cache (tools)

186178 uses: actions/cache@v2

187179 with:

188− key: ${{ runner.os }}-${{ matrix.compiler }}-tools-445c2459

180+ key: ${{ runner.os }}-${{ matrix.compiler }}-tools-13a8fe6d

189181 path: ~/.haskell-ci-tools

190182 - name: install cabal-plan

191183 run: |

@@ -198,8 +190,8 @@ jobs:

198190 cabal-plan --version

199191 - name: install doctest

200192 run: |

201− if [ $((HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.20' ; fi

202− if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi

193+ if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then $CABAL --store-dir=$HOME/.haskell-ci-tools/store v2-install $ARG_COMPILER --ignore-project -j2 doctest --constraint='doctest ^>=0.17' ; fi

194+ if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then doctest --version ; fi

203195 - name: checkout

204196 uses: actions/checkout@v2

205197 with:

@@ -229,9 +221,6 @@ jobs:

229221 if [ $((HCNUMVER >= 80200)) -ne 0 ] ; then echo " ghc-options: -Werror=missing-methods" >> cabal.project ; fi

230222 cat >> cabal.project <<EOF

231223 EOF

232− if $HEADHACKAGE; then

233− echo "allow-newer: $($HCPKG list --simple-output | sed -E 's/([a-zA-Z-]+)-[0-9.]+/*:\1,/g')" >> cabal.project

234− fi

235224 $HCPKG list --simple-output --names-only | perl -ne 'for (split /\s+/) { print "constraints: $_ installed\n" unless /^(http-api-data)$/; }' >> cabal.project.local

236225 cat cabal.project

237226 cat cabal.project.local

@@ -261,15 +250,15 @@ jobs:

261250 - name: doctest

262251 run: |

263252 perl -i -e 'while (<ARGV>) { print unless /package-id\s+(base-compat)-\d+(\.\d+)*/; }' .ghc.environment.*

264− if [ $((HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_http_api_data} || false ; fi

265− if [ $((HCNUMVER < 90000)) -ne 0 ] ; then doctest -XHaskell2010 src/ ; fi

253+ if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then cd ${PKGDIR_http_api_data} || false ; fi

254+ if [ $((HCNUMVER >= 80000 && HCNUMVER < 90000)) -ne 0 ] ; then doctest src/ ; fi

266255 - name: cabal check

267256 run: |

268257 cd ${PKGDIR_http_api_data} || false

269258 ${CABAL} -vnormal check

270259 - name: haddock

271260 run: |

272− $CABAL v2-haddock --haddock-all $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all

261+ $CABAL v2-haddock $ARG_COMPILER --with-haddock $HADDOCK $ARG_TESTS $ARG_BENCH all

273262 - name: unconstrained build

274263 run: |

275264 rm -f cabal.project.local

CHANGELOG.md−7

@@ -1,10 +1,3 @@

1−0.5

2−---

3−

4−* Use `attoparsec-iso8601-1.1.0.0`.

5− `Day` and `UTCTime` parsers require at least 4 digits now, which is a breaking change.

6−* Drop GHC-7.8 and GHC-7.10 support.

7−

810.4.3

92-----

103

http-api-data.cabal+25−11

@@ -1,6 +1,7 @@

11cabal-version: >= 1.10

22name: http-api-data

3−version: 0.5

3+version: 0.4.3

4+x-revision: 6

56synopsis: Converting to/from HTTP API data like URL pieces, headers and query parameters.

67category: Web

@@ -24,15 +25,16 @@ extra-source-files:

2425 README.md

2526

2627tested-with:

28+ GHC==7.8.4,

29+ GHC==7.10.3,

2730 GHC==8.0.2,

2831 GHC==8.2.2,

2932 GHC==8.4.4,

3033 GHC==8.6.5,

3134 GHC==8.8.4,

3235 GHC==8.10.7,

33− GHC==9.0.2,

34− GHC==9.2.3,

35− GHC==9.4.1

36+ GHC==9.0.1,

37+ GHC==9.2.1

3638

3739flag use-text-show

3840 description: Use text-show library for efficient ToHttpApiData implementations.

@@ -44,16 +46,20 @@ library

4446 include-dirs: include/

4547

4648 -- GHC bundled

47− build-depends: base >= 4.9 && < 4.17

48− , bytestring >= 0.10.8.1 && < 0.12

49− , containers >= 0.5.7.1 && < 0.7

49+ build-depends: base >= 4.7 && < 4.17

50+ , bytestring >= 0.10.4.0 && < 0.12

51+ , containers >= 0.5.5.1 && < 0.7

5052 , text >= 1.2.3.0 && < 1.3 || >=2.0 && <2.1

51− , transformers >= 0.5.2.0 && < 0.7

53+ , transformers >= 0.3 && < 0.7

54+

55+ -- so Semigroup Builder exists

56+ if impl(ghc >= 8.0)

57+ build-depends: bytestring >= 0.10.8.1

5258

5359 -- other-dependencies

5460 build-depends:

5561 attoparsec >= 0.13.2.2 && < 0.15

56− , attoparsec-iso8601 >= 1.1.0.0 && < 1.2

62+ , attoparsec-iso8601 >= 1.0.2.0 && < 1.1

5763 , base-compat >= 0.10.5 && < 0.13

5864 , cookie >= 0.4.3 && < 0.5

5965 , hashable >= 1.2.7.0 && < 1.5

@@ -63,6 +69,14 @@ library

6369 , unordered-containers >= 0.2.10.0 && < 0.3

6470 , uuid-types >= 1.0.3 && < 1.1

6571

72+ if !impl(ghc >= 7.10)

73+ build-depends:

74+ nats >= 1.1.2 && < 1.2,

75+ void >= 0.7.3 && < 0.8

76+

77+ if !impl(ghc >= 8.0)

78+ build-depends: semigroups >= 0.18.5 && < 0.21

79+

6680 if flag(use-text-show)

6781 cpp-options: -DUSE_TEXT_SHOW

6882 build-depends: text-show >= 3.8.2 && <3.10

@@ -85,7 +99,7 @@ test-suite spec

8599 hs-source-dirs: test

86100 ghc-options: -Wall

87101 default-language: Haskell2010

88− build-tool-depends: hspec-discover:hspec-discover >= 2.7.1 && <2.11

102+ build-tool-depends: hspec-discover:hspec-discover >= 2.7.1 && <2.10

89103 -- inherited depndencies

90104 build-depends:

91105 base

@@ -102,7 +116,7 @@ test-suite spec

102116 build-depends: nats

103117

104118 build-depends: HUnit >= 1.6.0.0 && <1.7

105− , hspec >= 2.7.1 && <2.11

119+ , hspec >= 2.7.1 && <2.10

106120 , QuickCheck >= 2.13.1 && <2.15

107121 , quickcheck-instances >= 0.3.25.2 && <0.4

108122

src/Web/Internal/HttpApiData.hs+10−3

@@ -32,7 +32,6 @@ import Data.Data (Data)

3232import qualified Data.Fixed as F

3333import Data.Functor.Identity (Identity(Identity))

3434import Data.Int (Int16, Int32, Int64, Int8)

35−import Data.Kind (Type)

3635import qualified Data.Map as Map

3736import Data.Monoid (All (..), Any (..), Dual (..),

3837 First (..), Last (..),

@@ -72,6 +71,12 @@ import Text.Read (readMaybe)

7271import Web.Cookie (SetCookie, parseSetCookie,

7372 renderSetCookie)

7473

74+#if MIN_VERSION_base(4,9,0)

75+import Data.Kind (Type)

76+#else

77+#define Type *

78+#endif

79+

7580#if USE_TEXT_SHOW

7681import TextShow (TextShow, showt)

7782#endif

@@ -96,7 +101,7 @@ class ToHttpApiData a where

96101 -- The default definition uses 'H.encodePathSegmentsRelative',

97102 -- but this may be overriden with a more efficient version.

98103 toEncodedUrlPiece :: a -> BS.Builder

99− toEncodedUrlPiece = H.urlEncodeBuilder True . encodeUtf8 . toUrlPiece

104+ toEncodedUrlPiece = H.encodePathSegmentsRelative . (:[]) . toUrlPiece

100105

101106 -- | Convert to HTTP header value.

102107 toHeader :: a -> ByteString

@@ -514,7 +519,7 @@ instance ToHttpApiData DayOfWeek where

514519

515520 toEncodedUrlPiece = unsafeToEncodedUrlPiece

516521

517−-- |

522+-- |

518523-- >>> toUrlPiece Q4

519524-- "q4"

520525instance ToHttpApiData QuarterOfYear where

@@ -865,3 +870,5 @@ runAtto :: Atto.Parser a -> Text -> Either Text a

865870runAtto p t = case Atto.parseOnly (p <* Atto.endOfInput) t of

866871 Left err -> Left (T.pack err)

867872 Right x -> Right x

873+

874+