nuttycom/aftok - Change 64C6AWH66FDKU6UE6Z6JPX2J2GBM2JOPTH2GL6LHKAIUBGNGDZ5AC

Rename Ananke -> Quixotic, project reboot.

Created by Kris Nuttycombe on October 19, 2014

64C6AWH66FDKU6UE6Z6JPX2J2GBM2JOPTH2GL6LHKAIUBGNGDZ5AC

Dependencies

In channels

main

Change contents

File deletion: ananke.cabal

BF:BFD[3.2] → [4.2388:2424]

BF:BFD[4.2424] → [4.213:213]

B:BD[4.213] → [4.214:267]

B:BD[4.267] → [5.14:225]

∅:D[5.225] → [4.356:395]

B:BD[4.356] → [4.356:395]

B:BD[4.395] → [5.226:302]

∅:D[5.302] → [4.467:554]

B:BD[4.467] → [4.467:554]

∅:D[2.30] → [4.693:694]

B:BD[4.693] → [4.693:694]

B:BD[4.694] → [6.43:85]

∅:D[2.67] → [6.85:111]

B:BD[6.85] → [6.85:111]

∅:D[2.650] → [6.180:181]

B:BD[6.180] → [6.180:181]

B:BD[4.742] → [7.1:17]

∅:D[7.17] → [6.546:621]

B:BD[6.546] → [6.546:621]

B:BD[6.621] → [2.651:687]

∅:D[2.687] → [6.621:648]

B:BD[6.621] → [6.621:648]

B:BD[6.648] → [7.18:48]

∅:D[8.87] → [4.801:802]

∅:D[6.837] → [4.801:802]

∅:D[2.964] → [4.801:802]

B:BD[4.801] → [4.801:802]

B:BD[4.802] → [6.838:897]

B:BD[6.897] → [2.965:1001]

∅:D[2.1001] → [6.897:956]

B:BD[6.897] → [6.897:956]

B:BD[6.956] → [2.1002:1276]

B:BD[7.48] → [2.688:964]

B:BD[6.111] → [2.68:650]

B:BD[6.85] → [2.31:67]

B:BD[4.554] → [2.1:30]

Name:                ananke
Version:             0.1
Synopsis:            The Ananke Collaboration Platform
Description:         A service to enable groups of trusted contributors to be paid for their efforts in collaboratively developing commercial applications.
License:             AllRightsReserved
Author:              Kris Nuttycombe
Maintainer:          kris@hylotech.com
Stability:           Experimental
Category:            Web
Build-type:          Simple
library
  default-language:   Haskell2010
  hs-source-dirs:     src
Test-Suite spec
  default-language:   Haskell2010
  type:               exitcode-stdio-1.0
  ghc-options:        -Wall -Werror
  hs-source-dirs:     test
  main-is:            Spec.hs
Executable ananke-server
  default-language:   Haskell2010
  ghc-options:        -Wall -Werror
  hs-source-dirs:     server
  main-is:            Main.hs
  build-depends:      base
                    , text
                    , time
                    , mtl
                    , bytestring  >= 0.9.1   && < 0.11
                    , scotty >=0.7 && <0.8
                    , sqlite == 0.5.2.2
                    , ananke
  build-depends:      base
                    , hspec >= 1.8.1
                    , ananke
                    , aeson
                    , bifunctors
                    , containers
                    , iso8601-time
                    , text
                    , time
  exposed-modules:    Ananke
                      Ananke.TimeLog
                      Ananke.Interval
  build-depends:      base                      >= 4.4     && < 5
                    , lens                      >= 3.7.6   && < 3.11
                    , bifunctors
                    , aeson                     >= 0.7.0.2
                    , text                      >= 0.11    && < 0.12
                    , time                      >= 1.1     && < 1.5
                    , iso8601-time              == 0.1.1
                    , containers                == 0.5.*
  ghc-options:        -Wall -Werror
Cabal-version:       >= 1.20

File addition: quixotic.cabal (----------)

[3.2]

Name:          quixotic
Version:       0.1
Synopsis:      The Quixotic Collaboration Platform
Description:   A service to enable groups of trusted contributors to be paid for their efforts 
               in collaboratively developing commercial applications.
License:       AllRightsReserved
Author:        Kris Nuttycombe
Maintainer:    kris@nutty.lang
Stability:     Experimental
Category:      Web
Build-type:    Simple
Cabal-version: >= 1.20
library
  default-language:   Haskell2010
  ghc-options:        -Wall -Werror
  hs-source-dirs:     src
  exposed-modules:    Quixotic
                      Quixotic.Database
                      Quixotic.Database.SQLite
                      Quixotic.Interval
                      Quixotic.TimeLog
  build-depends:      base                 >= 4.7.0.1
                    , bifunctors
                    , aeson                >= 0.8.0.2
                    , cassandra-cql        >= 0.4.0.1
                    , containers           >= 0.5.5.1
                    , either               >= 4.3.1
                    , lens                 >= 4.4.0.2
                    , old-locale
                    , sqlite               == 0.5.2.2
                    , text                 >= 1.2.0.0
                    , time                 >= 1.4.2    && < 1.5
Test-Suite spec
  default-language:   Haskell2010
  type:               exitcode-stdio-1.0
  ghc-options:        -Wall -Werror
  hs-source-dirs:     test
  main-is:            Spec.hs
  build-depends:      quixotic
                    , base
                    , aeson
                    , containers
                    , text
                    , time
                    , hspec >= 1.8.1
Executable quixotic-server
  default-language:   Haskell2010
  ghc-options:        -Wall -Werror
  hs-source-dirs:     server
  main-is:            Main.hs
  build-depends:      quixotic
                    , base
                    , aeson
                    , containers
                    , either
                    , mtl
                    , text
                    , time
                    , optparse-applicative >= 0.9.0    && < 0.10
                    , bytestring           >= 0.9.1    && < 0.11
                    , scotty               >= 0.9.0

Replacement in server/Main.hs at line 5 [4.5188]

B:BD[4.5260] → [2.1341:1363]

import Data.Text.Lazy

[4.5260]

[2.1363]

import Control.Monad
import Control.Monad.Trans (liftIO)
import Control.Monad.Trans.Either
import qualified Data.Aeson as A
import Data.Map
import Data.Time.Clock
import Data.Time.Format
import Quixotic
import Quixotic.Database
import Quixotic.TimeLog

Replacement in server/Main.hs at line 16 [4.5188]

B:BD[2.1381] → [2.1381:1477]

import Data.Time.Clock
import Database.SQLite
import Control.Monad.Trans (liftIO)
import Ananke

[2.1381]

[4.5492]


port :: Int
port = 8028

Replacement in server/Main.hs at line 21 [4.5188]

B:BD[2.1492] → [2.1492:1579]

main = do
  db <- openConnection "ananke.db"
  _  <- defineTableOpt db True eventTable

[2.1492]

[2.1579]


dbMain :: a -> ADB a -> IO ()
dbMain db adb = do

Replacement in server/Main.hs at line 32 [4.5188]

B:BD[2.1816] → [2.1816:1977]

    post "/logStart/:btcAddr" $ do
      addr <- param "btcAddr"
      timestamp <- liftIO getCurrentTime
      liftIO $ recordStart db (btcAddr addr) timestamp

[2.1816]

[4.5695]

    post "/logStart/:btcAddr" $ handleLogRequest adb StartWork
    post "/logEnd/:btcAddr" $ handleLogRequest db StopWork

Insertion in server/Main.hs at line 35 [4.5188]
[4.5696]
[4.5717]
```
    get "/payouts" $ currentPayouts adb
```

Replacement in server/Main.hs at line 37 [4.5188]

B:BD[4.5718] → [2.1978:2061]

recordStart :: SQLiteHandle -> BtcAddr -> UTCTime -> IO ()
recordStart = undefined

[4.5718]

[4.6062]

handleLogRequest :: ADB a -> (UTCTime -> WorkEvent) -> ActionM ()
handleLogRequest db ev = do 
  BtcAddrParam addr <- param "btcAddr"
  timestamp <- liftIO getCurrentTime
  liftIO . recordEvent db $ LogEntry addr (ev timestamp)

Replacement in server/Main.hs at line 43 [4.5188]

B:BD[4.6063] → [2.2062:2086]

port :: Int
port = 8028

[4.6063]

[4.6168]

currentPayouts :: ADB a -> ActionM ()
currentPayouts db = do 
  ptime <- liftIO getCurrentTime
  let dep = linearDepreciation (Months 6) (Months 60) 
  widx <- undefined 
  json . PayoutsResponse $ payouts dep ptime widx

Replacement in server/Main.hs at line 50 [4.5188]

B:BD[4.6169] → [2.2087:2339]

∅:D[2.2339] → [4.6169:6170]

B:BD[4.6169] → [4.6169:6170]

B:BD[4.6170] → [2.2340:2399]

eventTable :: SQLTable
eventTable = Table "workEvents" [ Column "btcAddr"   (SQLVarChar 256) []
                                , Column "event"     (SQLVarChar 64) []
                                , Column "eventTime" (SQLDateTime DATETIME) [] ] []
newtype BtcAddrParam = BtcAddrParam { btcAddr :: BtcAddr }

[4.6169]

[4.8456]

newtype BtcAddrParam = BtcAddrParam BtcAddr

Replacement in server/Main.hs at line 53 [4.5188]

B:BD[2.2437] → [2.2437:2542]

  parseParam t = maybe (Left "Invalid BTC address") (Right . BtcAddrParam) $ (parseBtcAddr . toStrict) t

[2.2437]

[4.8536]

  parseParam t = maybe (Left "Invalid BTC address") (Right . BtcAddrParam) $ (parseBtcAddr . LT.toStrict) t
newtype PayoutsResponse = PayoutsResponse Payouts

Insertion in server/Main.hs at line 57 [4.5188]

[4.8537]

instance A.ToJSON PayoutsResponse where
  toJSON (PayoutsResponse p) = A.toJSON (mapKeys address p)

File deletion: Ananke
BF:BFD[4.4286] → [5.827:844]
BF:BFD[5.844] → [5.826:826]
File addition: Quixotic (d--x------)
[4.4286]
File addition: Database (d--x------)
[0.3568]

File addition: SQLite.hs (----------)

[0.3590]

module Quixotic.Database.SQLite (sqliteADB) where
import Control.Monad
import Control.Monad.Trans.Either
import qualified Data.Text as T
import Data.Time.Clock
import Data.Time.Format
import Database.SQLite
import Quixotic
import qualified Quixotic.Database as D
import Quixotic.TimeLog
import System.Locale
sqliteADB :: String -> IO (D.ADB IO SQLiteHandle)
sqliteADB dbName = do
  db <- openConnection "quixotic.db"
  return $ D.ADB recordEvent readWorkIndex 
recordEvent :: SQLiteHandle -> LogEntry -> IO ()
recordEvent h (LogEntry ba ev) = 
  void $ insertRow h "workEvents" [ ("btcAddr", T.unpack (address ba))
                                  , ("event", eventName ev)
                                  , ("eventTime", formatSqlTime (logTime ev)) ]
readWorkIndex :: SQLiteHandle -> EitherT String IO WorkIndex
readWorkIndex db = do
  rows <- EitherT $ execStatement db "SELECT btcAddr, event, eventTime from workEvents"
  undefined
formatSqlTime :: UTCTime -> String
formatSqlTime t = formatTime defaultTimeLocale "%c" t
eventTable :: SQLTable
eventTable = Table "workEvents" [ Column "btcAddr"   (SQLVarChar 256) []
                                , Column "event"     (SQLVarChar 64) []
                                , Column "eventTime" (SQLDateTime DATETIME) [] ] []

File addition: Database.hs (----------)

[0.3568]

module Quixotic.Database 
  ( ADB(..)
  ) where
import Control.Monad.Trans.Either
import Quixotic.TimeLog
data ADB m a = ADB 
  { recordEvent :: a -> LogEntry -> m ()
  , readWorkIndex :: a -> EitherT String m WorkIndex
  }

File move: Interval.hs → Interval.hs
BF:BFD[5.826] → [6.1746:1781]
BF:BF[6.1781] → [6.1422:1422]
[0.3568]
[6.1422]
Replacement in src/Quixotic/Interval.hs at line 1 [6.1422]
B:BD[6.1422] → [6.1423:1447]
```
module Ananke.Interval 
```
[6.1422]
[9.3]
```
module Quixotic.Interval 
```
File move: TimeLog.hs → TimeLog.hs
BF:BFD[5.826] → [5.2420:2454]
BF:BF[5.2454] → [5.846:846]
[0.3568]
[5.846]
Replacement in src/Quixotic/TimeLog.hs at line 3 [5.846]
B:BD[5.884] → [5.884:907]
```
module Ananke.TimeLog 
```
[5.884]
[5.907]
```
module Quixotic.TimeLog 
```
Insertion in src/Quixotic/TimeLog.hs at line 9 [5.846]
[10.24]
[5.961]
```
  , Months(Months)
  , Payouts
  , eventName
```
Replacement in src/Quixotic/TimeLog.hs at line 17 [5.846]
B:BD[5.998] → [5.998:1012]
B:BD[5.1012] → [6.1785:1808]
```
import Ananke
import Ananke.Interval
```
[5.998]
[11.4]
```
import Quixotic
import Quixotic.Interval
```

Insertion in src/Quixotic/TimeLog.hs at line 33 [5.846]

[2.2736]

[5.1282]


eventName :: WorkEvent -> String
eventName (StartWork _) = "start"
eventName (StopWork  _) = "stop"

File move: Ananke.hs → Quixotic.hs
BF:BFD[4.4286] → [5.2849:2882]
BF:BF[5.2882] → [5.2457:2457]
[4.4286]
[5.2457]
Replacement in src/Quixotic.hs at line 1 [5.2457]
B:BD[5.2457] → [5.2458:2472]
```
module Ananke
```
[5.2457]
[5.2472]
```
module Quixotic
```
Replacement in test/Ananke/TimeLogSpec.hs at line 3 [5.3665]
B:BD[7.149] → [7.149:181]
```
module Ananke.TimeLogSpec where
```
[7.149]
[12.2656]
```
module Quixotic.TimeLogSpec where
```

Replacement in test/Ananke/TimeLogSpec.hs at line 6 [5.3665]

B:BD[7.200] → [7.200:269]

import Ananke
import Ananke.Interval as I
import Ananke.TimeLog as L

[7.200]

[7.269]

import Quixotic
import Quixotic.Interval as I
import Quixotic.TimeLog as L

Rename Ananke -> Quixotic, project reboot.

Dependencies

In channels

Change contents

File deletion: ananke.cabal

File addition: quixotic.cabal (----------)

Replacement in server/Main.hs at line 5 [4.5188]

Replacement in server/Main.hs at line 16 [4.5188]

Replacement in server/Main.hs at line 21 [4.5188]

Replacement in server/Main.hs at line 32 [4.5188]

Insertion in server/Main.hs at line 35 [4.5188]

Replacement in server/Main.hs at line 37 [4.5188]

Replacement in server/Main.hs at line 43 [4.5188]

Replacement in server/Main.hs at line 50 [4.5188]

Replacement in server/Main.hs at line 53 [4.5188]

Insertion in server/Main.hs at line 57 [4.5188]

File deletion: Ananke

File addition: Quixotic (d--x------)

File addition: Database (d--x------)

File addition: SQLite.hs (----------)

File addition: Database.hs (----------)

File move: Interval.hs → Interval.hs

Replacement in src/Quixotic/Interval.hs at line 1 [6.1422]

File move: TimeLog.hs → TimeLog.hs

Replacement in src/Quixotic/TimeLog.hs at line 3 [5.846]

Insertion in src/Quixotic/TimeLog.hs at line 9 [5.846]

Replacement in src/Quixotic/TimeLog.hs at line 17 [5.846]

Insertion in src/Quixotic/TimeLog.hs at line 33 [5.846]

File move: Ananke.hs → Quixotic.hs

Replacement in src/Quixotic.hs at line 1 [5.2457]

Replacement in test/Ananke/TimeLogSpec.hs at line 3 [5.3665]

Replacement in test/Ananke/TimeLogSpec.hs at line 6 [5.3665]