c9d460c · project-m36 · git.iko.soy

git.iko.soy/project-m36

on master help sign in

WIP: update persistent driver to support http-api-data

c9d460cAgentM11 years ago

Database/Persist/ProjectM36.hs+13

compare with master

unifiedsplit

@@ -32,6 +32,7 @@ import qualified Data.Conduit.List as CL

32import Data.Typeable (typeRep, typeOf, Proxy(..))

33import Data.Time.Calendar (Day)

34import Data.ByteString (ByteString)

35+import Web.HttpApiData (ToHttpApiData(..), FromHttpApiData(..), parseUrlPieceWithPrefix, readTextData)

36type ProjectM36Backend = C.Connection

37type ProjectM36Backend = C.Connection

@@ -255,6 +256,18 @@ keyToUUID key = case keyToValues key of

255 Just uuid -> uuid

256 Just uuid -> uuid

256 _ -> error "unexpected persist value in key construction"

257 _ -> error "unexpected persist value in key construction"

257

258

259+instance ToHttpApiData (BackendKey C.Connection) where

260+ toUrlPiece = T.pack . U.toString . unPM36Key

261+

262+instance FromHttpApiData (BackendKey C.Connection) where

263+ parseUrlPiece input = do

264+ s <- parseUrlPieceWithPrefix "o" input <!> return input

265+ ProjectM36Key <$> readTextData s

266+ where

267+ infixl 3 <!>

268+ Left _ <!> y = y

269+ x <!> _ = x

270+

258instance PersistStore C.Connection where

271instance PersistStore C.Connection where

259 newtype BackendKey C.Connection = ProjectM36Key { unPM36Key :: U.UUID }

272 newtype BackendKey C.Connection = ProjectM36Key { unPM36Key :: U.UUID }

260 deriving (Show, Read, Eq, Ord, PersistField)

273 deriving (Show, Read, Eq, Ord, PersistField)

project-m36.cabal+12−10

@@ -144,7 +144,7 @@ Executable tutd

144 Default-Language: Haskell2010

145

146Executable daemon

147− Build-Depends: project-m36,

147+ Build-Depends: base,

148 distributed-process-client-server,

149 distributed-process-extras,

150 distributed-process-async,

@@ -174,10 +174,12 @@ Executable daemon

174 containers,

175 hashable,

176 unordered-containers,

177− vector

177+ vector,

178+ http-api-data

178 Main-Is: ProjectM36/Daemon/Main.hs

179 Main-Is: ProjectM36/Daemon/Main.hs

179 GHC-Options: -Wall -threaded -rtsopts

180 GHC-Options: -Wall -threaded -rtsopts

180 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall

181 GHC-Prof-Options: -fprof-auto -rtsopts -threaded -Wall

182+ C-sources: ProjectM36/DirectoryFsync.c

181 Default-Language: Haskell2010

183 Default-Language: Haskell2010

182

184

183

185

@@ -205,21 +207,21 @@ Test-Suite test-relation

205 Default-Language: Haskell2010

207 Default-Language: Haskell2010

206 type: exitcode-stdio-1.0

208 type: exitcode-stdio-1.0

207 main-is: test/Relation/Basic.hs

209 main-is: test/Relation/Basic.hs

208− Build-Depends: base,HUnit,Cabal

210+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, unix, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath

209 GHC-Options: -Wall

211 GHC-Options: -Wall

210

212

211Test-Suite test-static-optimizer

213Test-Suite test-static-optimizer

212 Default-Language: Haskell2010

214 Default-Language: Haskell2010

213 type: exitcode-stdio-1.0

215 type: exitcode-stdio-1.0

214 main-is: test/Relation/StaticOptimizer.hs

216 main-is: test/Relation/StaticOptimizer.hs

215− Build-Depends: base,HUnit,Cabal

217+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, unix, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath

216 GHC-Options: -Wall

218 GHC-Options: -Wall

217

219

218Test-Suite test-transactiongraph-persist

220Test-Suite test-transactiongraph-persist

219 Default-Language: Haskell2010

221 Default-Language: Haskell2010

220 type: exitcode-stdio-1.0

222 type: exitcode-stdio-1.0

221 main-is: test/TransactionGraph/Persist.hs

223 main-is: test/TransactionGraph/Persist.hs

222− Build-Depends: base,HUnit,Cabal

224+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, unix, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath

223 GHC-Options: -Wall

225 GHC-Options: -Wall

224 C-sources: ProjectM36/DirectoryFsync.c

226 C-sources: ProjectM36/DirectoryFsync.c

225

227

@@ -227,28 +229,28 @@ Test-Suite test-relation-import-csv

227 Default-Language: Haskell2010

229 Default-Language: Haskell2010

228 type: exitcode-stdio-1.0

230 type: exitcode-stdio-1.0

229 main-is: test/Relation/Import/CSV.hs

231 main-is: test/Relation/Import/CSV.hs

230− Build-Depends: base,HUnit,Cabal

232+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, unix, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath

231 GHC-Options: -Wall

233 GHC-Options: -Wall

232

234

233Test-Suite test-tutoriald-import-tutoriald

235Test-Suite test-tutoriald-import-tutoriald

234 Default-Language: Haskell2010

236 Default-Language: Haskell2010

235 type: exitcode-stdio-1.0

237 type: exitcode-stdio-1.0

236 main-is: test/TutorialD/Interpreter/Import/TutorialD.hs

238 main-is: test/TutorialD/Interpreter/Import/TutorialD.hs

237− Build-Depends: base,HUnit,Cabal

239+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, unix, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath

238 GHC-Options: -Wall

240 GHC-Options: -Wall

239

241

240Test-Suite test-relation-export-csv

242Test-Suite test-relation-export-csv

241 Default-Language: Haskell2010

243 Default-Language: Haskell2010

242 type: exitcode-stdio-1.0

244 type: exitcode-stdio-1.0

243 main-is: test/Relation/Export/CSV.hs

245 main-is: test/Relation/Export/CSV.hs

244− Build-Depends: base,HUnit,Cabal

246+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, unix, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath

245 GHC-Options: -Wall

247 GHC-Options: -Wall

246

248

247Test-Suite test-persistent-driver

249Test-Suite test-persistent-driver

248 Default-Language: Haskell2010

250 Default-Language: Haskell2010

249 type: exitcode-stdio-1.0

251 type: exitcode-stdio-1.0

250 main-is: test/persistent-driver/test.hs

252 main-is: test/persistent-driver/test.hs

251− Build-Depends: base,HUnit,Cabal,template-haskell

253+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, unix, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, template-haskell, transformers, aeson, persistent-template, conduit, persistent, either, path-pieces, http-api-data

252 GHC-Options: -Wall

254 GHC-Options: -Wall

253 C-sources: ProjectM36/DirectoryFsync.c

255 C-sources: ProjectM36/DirectoryFsync.c

254

256

@@ -256,6 +258,6 @@ benchmark bench

256 Default-Language: Haskell2010

258 Default-Language: Haskell2010

257 type: exitcode-stdio-1.0

259 type: exitcode-stdio-1.0

258 main-is: benchmark/Relation.hs

260 main-is: benchmark/Relation.hs

259− build-depends: base,criterion

261+ Build-Depends: base, HUnit, Cabal, containers, hashable, unordered-containers, mtl, vector, vector-binary-instances, time, hashable-time, bytestring, network-transport-tcp, distributed-process, distributed-process-extras, distributed-process-client-server, uuid, stm, deepseq, deepseq-generics, binary, unix, parallel, cassava, attoparsec, gnuplot, directory, temporary, haskeline, parsec, text, base64-bytestring, data-interval, filepath, criterion

260 GHC-Options: -Wall -rtsopts

262 GHC-Options: -Wall -rtsopts

261

263