master..ef80ab3 · typeable/http-api-data

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

on ef80ab3 help sign in

4 files changed+71−101

since splitsnapshots

unifiedsplit

.github/workflows/haskell-ci.yml+34−77 CHANGELOG.md−7 http-api-data.cabal+27−14 src/Web/Internal/HttpApiData.hs+10−3

.github/workflows/haskell-ci.yml+34−77

@@ -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.20210827

1212#

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

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

1414#

1515name: Haskell-CI

1616on:

@@ -23,34 +23,22 @@ on:

2323jobs:

2424 linux:

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

26− runs-on: ubuntu-20.04

27− timeout-minutes:

28− 60

26+ runs-on: ubuntu-18.04

2927 container:

3028 image: buildpack-deps:bionic

3129 continue-on-error: ${{ matrix.allow-failure }}

3230 strategy:

3331 matrix:

3432 include:

35− - compiler: ghc-9.4.0.20220523

33+ - compiler: ghc-9.0.1

3634 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

43− setup-method: ghcup

44− allow-failure: false

45− - compiler: ghc-9.0.2

46− compilerKind: ghc

47− compilerVersion: 9.0.2

48− setup-method: ghcup

35+ compilerVersion: 9.0.1

36+ setup-method: hvr-ppa

4937 allow-failure: false

50− - compiler: ghc-8.10.7

38+ - compiler: ghc-8.10.4

5139 compilerKind: ghc

52− compilerVersion: 8.10.7

53− setup-method: ghcup

40+ compilerVersion: 8.10.4

41+ setup-method: hvr-ppa

5442 allow-failure: false

5543 - compiler: ghc-8.8.4

5644 compilerKind: ghc

@@ -77,28 +65,25 @@ jobs:

7765 compilerVersion: 8.0.2

7866 setup-method: hvr-ppa

7967 allow-failure: false

68+ - compiler: ghc-7.10.3

69+ compilerKind: ghc

70+ compilerVersion: 7.10.3

71+ setup-method: hvr-ppa

72+ allow-failure: false

73+ - compiler: ghc-7.8.4

74+ compilerKind: ghc

75+ compilerVersion: 7.8.4

76+ setup-method: hvr-ppa

77+ allow-failure: false

8078 fail-fast: false

8179 steps:

8280 - name: apt

8381 run: |

8482 apt-get update

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

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

87− 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"

89− 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)

93− else

94− apt-add-repository -y 'ppa:hvr/ghc'

95− apt-get update

96− apt-get install -y "$HCNAME"

97− 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"

99− chmod a+x "$HOME/.ghcup/bin/ghcup"

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

101− fi

84+ apt-add-repository -y 'ppa:hvr/ghc'

85+ apt-get update

86+ apt-get install -y "$HCNAME" cabal-install-3.4

10287 env:

10388 HCKIND: ${{ matrix.compilerKind }}

10489 HCNAME: ${{ matrix.compiler }}

@@ -110,25 +95,16 @@ jobs:

11095 echo "CABAL_DIR=$HOME/.cabal" >> "$GITHUB_ENV"

11196 echo "CABAL_CONFIG=$HOME/.cabal/config" >> "$GITHUB_ENV"

11297 HCDIR=/opt/$HCKIND/$HCVER

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

114− HC=$HOME/.ghcup/bin/$HCKIND-$HCVER

115− echo "HC=$HC" >> "$GITHUB_ENV"

116− echo "HCPKG=$HOME/.ghcup/bin/$HCKIND-pkg-$HCVER" >> "$GITHUB_ENV"

117− echo "HADDOCK=$HOME/.ghcup/bin/haddock-$HCVER" >> "$GITHUB_ENV"

118− echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"

119− else

120− HC=$HCDIR/bin/$HCKIND

121− echo "HC=$HC" >> "$GITHUB_ENV"

122− echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"

123− echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"

124− echo "CABAL=$HOME/.ghcup/bin/cabal-3.6.2.0 -vnormal+nowrap" >> "$GITHUB_ENV"

125− fi

126−

98+ HC=$HCDIR/bin/$HCKIND

99+ echo "HC=$HC" >> "$GITHUB_ENV"

100+ echo "HCPKG=$HCDIR/bin/$HCKIND-pkg" >> "$GITHUB_ENV"

101+ echo "HADDOCK=$HCDIR/bin/haddock" >> "$GITHUB_ENV"

102+ echo "CABAL=/opt/cabal/3.4/bin/cabal -vnormal+nowrap" >> "$GITHUB_ENV"

127103 HCNUMVER=$(${HC} --numeric-version|perl -ne '/^(\d+)\.(\d+)\.(\d+)(\.(\d+))?$/; print(10000 * $1 + 100 * $2 + ($3 == 0 ? $5 != 1 : $3))')

128104 echo "HCNUMVER=$HCNUMVER" >> "$GITHUB_ENV"

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

130106 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

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

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

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

134110 env:

@@ -157,22 +133,6 @@ jobs:

157133 repository hackage.haskell.org

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

159135 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

172− cat >> $CABAL_CONFIG <<EOF

173− program-default-options

174− ghc-options: $GHCJOBS +RTS -M3G -RTS

175− EOF

176136 cat $CABAL_CONFIG

177137 - name: versions

178138 run: |

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

185145 - name: cache (tools)

186146 uses: actions/cache@v2

187147 with:

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

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

189149 path: ~/.haskell-ci-tools

190150 - name: install cabal-plan

191151 run: |

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

198158 cabal-plan --version

199159 - name: install doctest

200160 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

161+ 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

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

203163 - name: checkout

204164 uses: actions/checkout@v2

205165 with:

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

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

230190 cat >> cabal.project <<EOF

231191 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

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

236193 cat cabal.project

237194 cat cabal.project.local

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

261218 - name: doctest

262219 run: |

263220 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

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

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

266223 - name: cabal check

267224 run: |

268225 cd ${PKGDIR_http_api_data} || false

269226 ${CABAL} -vnormal check

270227 - name: haddock

271228 run: |

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

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

273230 - name: unconstrained build

274231 run: |

275232 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+27−14

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

11cabal-version: >= 1.10

22name: http-api-data

3−version: 0.5

3+version: 0.4.3

4+x-revision: 3

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

67category: Web

@@ -24,15 +25,15 @@ 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,

32− GHC==8.10.7,

33− GHC==9.0.2,

34− GHC==9.2.3,

35− GHC==9.4.1

35+ GHC==8.10.4,

36+ GHC==9.0.1

3637

3738flag use-text-show

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

@@ -44,25 +45,37 @@ library

4445 include-dirs: include/

4546

4647 -- 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

50− , text >= 1.2.3.0 && < 1.3 || >=2.0 && <2.1

51− , transformers >= 0.5.2.0 && < 0.7

48+ build-depends: base >= 4.7 && < 4.16

49+ , bytestring >= 0.10.4.0 && < 0.12

50+ , containers >= 0.5.5.1 && < 0.7

51+ , text >= 1.2.3.0 && < 1.3

52+ , transformers >= 0.3 && < 0.7

53+

54+ -- so Semigroup Builder exists

55+ if impl(ghc >= 8.0)

56+ build-depends: bytestring >= 0.10.8.1

5257

5358 -- other-dependencies

5459 build-depends:

5560 attoparsec >= 0.13.2.2 && < 0.15

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

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

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

5863 , cookie >= 0.4.3 && < 0.5

59− , hashable >= 1.2.7.0 && < 1.5

64+ , hashable >= 1.2.7.0 && < 1.4

6065 , http-types >= 0.12.3 && < 0.13

6166 , tagged >= 0.8.5 && < 0.9

6267 , time-compat >= 1.9.5 && < 1.10

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

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

6570

71+ if !impl(ghc >= 7.10)

72+ build-depends:

73+ nats >= 1.1.2 && < 1.2,

74+ void >= 0.7.3 && < 0.8

75+

76+ if !impl(ghc >= 8.0)

77+ build-depends: semigroups >= 0.18.5 && < 0.20

78+

6679 if flag(use-text-show)

6780 cpp-options: -DUSE_TEXT_SHOW

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

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

8598 hs-source-dirs: test

8699 ghc-options: -Wall

87100 default-language: Haskell2010

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

101+ build-tool-depends: hspec-discover:hspec-discover >= 2.7.1 && <2.9

89102 -- inherited depndencies

90103 build-depends:

91104 base

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

102115 build-depends: nats

103116

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

105− , hspec >= 2.7.1 && <2.11

118+ , hspec >= 2.7.1 && <2.9

106119 , QuickCheck >= 2.13.1 && <2.15

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

108121

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+