c9d460c · project-m36 · git.iko.soy

git.iko.soy/project-m36

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

commitc9d460c06ceaa9c2752689faac3f3c4d6c055016 authorAgentM <agentm@themactionfaction.com> dateSun 15 Nov 2015, 14:55 (11 years ago) parenta75d1a1

2 files changed+25−10

compare with master

unifiedsplit

Database/Persist/ProjectM36.hs+13 project-m36.cabal+12−10

Database/Persist/ProjectM36.hs+13

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

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

3333import Data.Time.Calendar (Day)

3434import Data.ByteString (ByteString)

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

3536

3637type ProjectM36Backend = C.Connection

3738

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

255256 Just uuid -> uuid

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

257258

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+

258271instance PersistStore C.Connection where

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

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

project-m36.cabal+12−10

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

144144 Default-Language: Haskell2010

145145

146146Executable daemon

147− Build-Depends: project-m36,

147+ Build-Depends: base,

148148 distributed-process-client-server,

149149 distributed-process-extras,

150150 distributed-process-async,

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

174174 containers,

175175 hashable,

176176 unordered-containers,

177− vector

177+ vector,

178+ http-api-data

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

179180 GHC-Options: -Wall -threaded -rtsopts

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

182+ C-sources: ProjectM36/DirectoryFsync.c

181183 Default-Language: Haskell2010

182184

183185

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

205207 Default-Language: Haskell2010

206208 type: exitcode-stdio-1.0

207209 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

209211 GHC-Options: -Wall

210212

211213Test-Suite test-static-optimizer

212214 Default-Language: Haskell2010

213215 type: exitcode-stdio-1.0

214216 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

216218 GHC-Options: -Wall

217219

218220Test-Suite test-transactiongraph-persist

219221 Default-Language: Haskell2010

220222 type: exitcode-stdio-1.0

221223 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

223225 GHC-Options: -Wall

224226 C-sources: ProjectM36/DirectoryFsync.c

225227

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

227229 Default-Language: Haskell2010

228230 type: exitcode-stdio-1.0

229231 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

231233 GHC-Options: -Wall

232234

233235Test-Suite test-tutoriald-import-tutoriald

234236 Default-Language: Haskell2010

235237 type: exitcode-stdio-1.0

236238 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

238240 GHC-Options: -Wall

239241

240242Test-Suite test-relation-export-csv

241243 Default-Language: Haskell2010

242244 type: exitcode-stdio-1.0

243245 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

245247 GHC-Options: -Wall

246248

247249Test-Suite test-persistent-driver

248250 Default-Language: Haskell2010

249251 type: exitcode-stdio-1.0

250252 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

252254 GHC-Options: -Wall

253255 C-sources: ProjectM36/DirectoryFsync.c

254256

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

256258 Default-Language: Haskell2010

257259 type: exitcode-stdio-1.0

258260 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

260262 GHC-Options: -Wall -rtsopts

261263