Skip to content

Rewrite #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
jkarni wants to merge 27 commits into
base: master
Choose a base branch
from
Open

Rewrite #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
27 commits
Select commit Hold shift + click to select a range
013de64
Start rewrite
jkarni Oct 30, 2016
35fab1e
Compiling again
jkarni Nov 17, 2016
d007573
Fix benchmark
jkarni Nov 17, 2016
3424e7a
Compile time checks
jkarni Nov 19, 2016
c5a9234
Split
jkarni Nov 20, 2016
9a5d2ca
Show instances
jkarni Nov 20, 2016
80c79bf
more Show work
jkarni Nov 20, 2016
c699c29
Move sum-error to same repo
jkarni Nov 20, 2016
c821e61
Move benchmarks
jkarni Nov 20, 2016
bf9a8cb
Sum error classes and tests
jkarni Nov 20, 2016
212747a
instances galore
jkarni Nov 20, 2016
eaa354c
SumError type synonym
jkarni Nov 20, 2016
8fad99f
Documentation
jkarni Nov 20, 2016
6d73593
Start forum
jkarni Nov 22, 2016
b0cbc0e
Force things to compile
jkarni Nov 22, 2016
83aacc8
Fix insert into
jkarni Nov 22, 2016
33ec0f4
Move Sql types to type level
jkarni Nov 26, 2016
2961ebe
Export book
jkarni Nov 26, 2016
94914f0
Move forum out
jkarni Nov 26, 2016
72f3314
wip
jkarni Dec 5, 2016
229e538
Better instances
jkarni Dec 6, 2016
e09db45
wip
jkarni Dec 7, 2016
3ccaaf7
Union fixes and more tests
jkarni Dec 7, 2016
15177a6
bookkeeper-aeson
jkarni Dec 7, 2016
083af9f
Stack file with ghc 8.0.2
jkarni Dec 7, 2016
a761c53
doctest fixes
jkarni Mar 2, 2017
86d8b5e
update travis.yml
jkarni Mar 2, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
85 changes: 17 additions & 68 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,76 +1,25 @@
# This file has been generated -- see https://github.com/hvr/multi-ghc-travis
language: c
sudo: false

cache:
directories:
- $HOME/.cabsnap
- $HOME/.cabal/packages

before_cache:
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/build-reports.log
- rm -fv $HOME/.cabal/packages/hackage.haskell.org/00-index.tar
env:
- STACK_YAML=stack.yaml

matrix:
include:
- env: CABALVER=1.24 GHCVER=8.0.1
compiler: ": #GHC 8.0.1"
addons: {apt: {packages: [cabal-install-1.24,ghc-8.0.1], sources: [hvr-ghc]}}

before_install:
- unset CC
- export PATH=/opt/ghc/$GHCVER/bin:/opt/cabal/$CABALVER/bin:$PATH
addons:
apt:
packages: libgmp-dev

install:
- cabal --version
- echo "$(ghc --version) [$(ghc --print-project-git-commit-id 2> /dev/null || echo '?')]"
- if [ -f $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz ];
then
zcat $HOME/.cabal/packages/hackage.haskell.org/00-index.tar.gz >
$HOME/.cabal/packages/hackage.haskell.org/00-index.tar;
fi
- travis_retry cabal update -v
- sed -i 's/^jobs:/-- jobs:/' ${HOME}/.cabal/config
- cabal install --only-dependencies --enable-tests --enable-benchmarks --dry -v > installplan.txt
- sed -i -e '1,/^Resolving /d' installplan.txt; cat installplan.txt

# check whether current requested install-plan matches cached package-db snapshot
- if diff -u installplan.txt $HOME/.cabsnap/installplan.txt;
then
echo "cabal build-cache HIT";
rm -rfv .ghc;
cp -a $HOME/.cabsnap/ghc $HOME/.ghc;
cp -a $HOME/.cabsnap/lib $HOME/.cabsnap/share $HOME/.cabsnap/bin $HOME/.cabal/;
else
echo "cabal build-cache MISS";
rm -rf $HOME/.cabsnap;
mkdir -p $HOME/.ghc $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin;
cabal install --only-dependencies --enable-tests --enable-benchmarks;
fi
# stack
- mkdir -p ~/.local/bin
- export PATH=~/.local/bin:$PATH
- travis_retry curl -L https://www.stackage.org/stack/linux-x86_64 | tar xz --wildcards --strip-components=1 -C ~/.local/bin '*/stack'
- stack --version

# snapshot package-db on cache miss
- if [ ! -d $HOME/.cabsnap ];
then
echo "snapshotting package-db to build-cache";
mkdir $HOME/.cabsnap;
cp -a $HOME/.ghc $HOME/.cabsnap/ghc;
cp -a $HOME/.cabal/lib $HOME/.cabal/share $HOME/.cabal/bin installplan.txt $HOME/.cabsnap/;
fi

# Here starts the actual work to be performed for the package under test;
# any command which exits with a non-zero exit code causes the build to fail.
script:
- if [ -f configure.ac ]; then autoreconf -i; fi
- cabal configure --enable-tests --enable-benchmarks -v2 # -v2 provides useful information for debugging
- cabal build # this builds all libraries and executables (including tests/benchmarks)
- cabal test
- cabal check
- cabal sdist # tests that a source-distribution can be generated

# Check that the resulting source distribution can be built & installed.
# If there are no other `.tar.gz` files in `dist`, this can be even simpler:
# `cabal install --force-reinstalls dist/*-*.tar.gz`
- SRC_TGZ=$(cabal info . | awk '{print $2;exit}').tar.gz &&
(cd dist && cabal install --force-reinstalls "$SRC_TGZ")
- stack setup --no-terminal
- stack build --ghc-options=-Werror --no-terminal
- stack test --ghc-options=-Werror --no-terminal --coverage
- stack haddock --no-terminal

# EOF
cache:
directories:
- $HOME/.stack
1 change: 1 addition & 0 deletions bookkeeper-aeson/.ghci
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
:set -isrc -itest -idoctest/ghci-wrapper/src
4 changes: 4 additions & 0 deletions bookkeeper-aeson/.gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
/dist/
/dist-newstyle/
/.stack-work/

30 changes: 30 additions & 0 deletions bookkeeper-aeson/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Copyright Julian K. Arni (c) 2015

All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.

* Neither the name of Julian K. Arni nor the names of other
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
0 Setup.hs → bookkeeper-aeson/Setup.hs
View file
Open in desktop
File renamed without changes.
74 changes: 74 additions & 0 deletions bookkeeper-aeson/bookkeeper-aeson.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,74 @@
-- This file has been generated from package.yaml by hpack version 0.15.0.
--
-- see: https://github.com/sol/hpack

name: bookkeeper-aeson
version: 0.1.0.0
synopsis: Aeson instances for bookkeeper
description: This package provides ToJSON and FromJSON instances for bookkeeper's @Book@ type.
homepage: http://github.com/turingjump/bookkeeper#readme
bug-reports: https://github.com/jkarni/bookkeeper-aeson/issues
author: Julian K. Arni
maintainer: jkarni@gmail.com
copyright: (c) Julian K. Arni
license: BSD3
license-file: LICENSE
tested-with: GHC == 8.0.2
build-type: Simple
cabal-version: >= 1.10

source-repository head
type: git
location: https://github.com/jkarni/bookkeeper-aeson

library
hs-source-dirs:
src
default-extensions: AutoDeriveTypeable ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings OverloadedLabels RankNTypes ScopedTypeVariables TypeFamilies TypeOperators MagicHash
ghc-options: -Wall
build-depends:
base >= 4.9 && < 4.10
, aeson
, bookkeeper
, text
exposed-modules:
Bookkeeper.Aeson
default-language: Haskell2010

test-suite doctest
type: exitcode-stdio-1.0
main-is: Doctest.hs
hs-source-dirs:
test
default-extensions: AutoDeriveTypeable ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings OverloadedLabels RankNTypes ScopedTypeVariables TypeFamilies TypeOperators MagicHash
ghc-options: -Wall
build-depends:
base >= 4.9 && < 4.10
, aeson
, bookkeeper
, text
, doctest >= 0.9 && < 0.12
, Glob >= 0.7 && < 0.8
, yaml == 0.8.*
other-modules:
Spec
default-language: Haskell2010

test-suite spec
type: exitcode-stdio-1.0
main-is: Spec.hs
hs-source-dirs:
test
default-extensions: AutoDeriveTypeable ConstraintKinds DataKinds DefaultSignatures DeriveFoldable DeriveFunctor DeriveGeneric DeriveTraversable FlexibleContexts FlexibleInstances FunctionalDependencies GADTs KindSignatures MultiParamTypeClasses OverloadedStrings OverloadedLabels RankNTypes ScopedTypeVariables TypeFamilies TypeOperators MagicHash
ghc-options: -Wall
build-depends:
base >= 4.9 && < 4.10
, aeson
, bookkeeper
, text
, bookkeeper-aeson
, hspec > 2 && < 3
, QuickCheck >= 2.8 && < 2.10
other-modules:
Doctest
default-language: Haskell2010
65 changes: 65 additions & 0 deletions bookkeeper-aeson/package.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,65 @@
name: bookkeeper-aeson
version: 0.1.0.0
synopsis: Aeson instances for bookkeeper
description: >
This package provides ToJSON and FromJSON instances for bookkeeper's
@Book@ type.
homepage: http://github.com/turingjump/bookkeeper#readme
license: BSD3
license-file: LICENSE
author: Julian K. Arni
maintainer: jkarni@gmail.com
copyright: (c) Julian K. Arni
github: jkarni/bookkeeper-aeson
tested-with: GHC == 8.0.2

ghc-options: -Wall

dependencies:
- base >= 4.9 && < 4.10
- aeson
- bookkeeper
- text

default-extensions:
- AutoDeriveTypeable
- ConstraintKinds
- DataKinds
- DefaultSignatures
- DeriveFoldable
- DeriveFunctor
- DeriveGeneric
- DeriveTraversable
- FlexibleContexts
- FlexibleInstances
- FunctionalDependencies
- GADTs
- KindSignatures
- MultiParamTypeClasses
- OverloadedStrings
- OverloadedLabels
- RankNTypes
- ScopedTypeVariables
- TypeFamilies
- TypeOperators
- MagicHash

library:
source-dirs: src
other-modules: []

tests:
spec:
main: Spec.hs
source-dirs: test
dependencies:
- bookkeeper-aeson
- hspec > 2 && < 3
- QuickCheck >= 2.8 && < 2.10
doctest:
main: Doctest.hs
source-dirs: test
dependencies:
- doctest >= 0.9 && < 0.12
- Glob >= 0.7 && < 0.8
- yaml == 0.8.*
48 changes: 48 additions & 0 deletions bookkeeper-aeson/src/Bookkeeper/Aeson.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
{-# LANGUAGE UndecidableInstances #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
module Bookkeeper.Aeson where

import Bookkeeper
import Bookkeeper.Internal.Types
import Data.Aeson
import Data.Bifunctor
import Data.Proxy
import qualified Data.Text as T
import GHC.TypeLits

-- | @ToJSON@ instance for @Book@s. Does the obvious thing:
--
-- >>> encode julian
-- "{\"age\":28,\"name\":\"Julian K. Arni\"}"
instance (All (ToJSON `Compose` f) a, BKeys a) => ToJSON (Book' f a) where
toJSON b = object $ first T.pack <$> list
where
list = bcollapseWithKeys
$ bmapConstraint (Proxy :: Proxy (ToJSON `Compose` f)) (Const . toJSON) b

-- | @FromJSON@ instance for @Book@s. Does the obvious thing:
--
-- >>> decode "{\"age\":28,\"name\":\"Julian K. Arni\"}" :: Maybe Person
-- Just Book {#age = Identity 28, #name = Identity "Julian K. Arni"}
instance {-# OVERLAPPING #-}
(KnownSymbol key, FromJSON (f value))
=> FromJSON (Book' f '[key :=> value]) where
parseJSON (Object v) = go <$> v .: key
where
key = T.pack $ symbolVal (Proxy :: Proxy key)
go x = BCons x BNil
parseJSON _ = fail "expecting object"

instance {-# OVERLAPPABLE #-}
(KnownSymbol key, FromJSON (f value), FromJSON (Book' f rest))
=> FromJSON (Book' f (key :=> value ': rest)) where
parseJSON o@(Object v) = go $ v .: key
where
key = T.pack $ symbolVal (Proxy :: Proxy key)
go x = BCons <$> x <*> parseJSON o
parseJSON _ = fail "expecting object"

-- $setup
-- >>> import Data.Function ((&))
-- >>> type Person = Book '[ "name" :=> String , "age" :=> Int ]
-- >>> let julian :: Person = emptyBook & #age =: 28 & #name =: "Julian K. Arni"
26 changes: 26 additions & 0 deletions bookkeeper-aeson/test/Doctest.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,26 @@
module Main (main) where

-- Runs doctest on all files in "src" dir. Assumes:
-- (a) You are using hpack
-- (b) The top-level "default-extensions" are the only extensions besides the
-- ones in the files.

import System.FilePath.Glob (glob)
import Test.DocTest (doctest)
import Data.Yaml

newtype Exts = Exts { getExts :: [String] }
deriving (Eq, Show, Read)

instance FromJSON Exts where
parseJSON (Object v) = Exts <$> v .: "default-extensions"
parseJSON _ = fail "expecting object"

main :: IO ()
main = do
hpack' <- decodeFile "package.yaml"
hpack <- case hpack' of
Nothing -> return $ Exts []
Just v -> return v
files <- glob "src/**/*.hs"
doctest $ files ++ fmap ("-X" ++) (getExts hpack)
0 test/Spec.hs → bookkeeper-aeson/test/Spec.hs
View file
Open in desktop
File renamed without changes.
30 changes: 30 additions & 0 deletions bookkeeper/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,30 @@
Copyright Julian K. Arni (c) 2015

All rights reserved.

Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:

* Redistributions of source code must retain the above copyright
notice, this list of conditions and the following disclaimer.

* Redistributions in binary form must reproduce the above
copyright notice, this list of conditions and the following
disclaimer in the documentation and/or other materials provided
with the distribution.

* Neither the name of Julian K. Arni nor the names of other
contributors may be used to endorse or promote products derived
from this software without specific prior written permission.

THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
"AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
(INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
2 changes: 2 additions & 0 deletions bookkeeper/Setup.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
import Distribution.Simple
main = defaultMain
3 changes: 2 additions & 1 deletion bench/Main.hs → bookkeeper/bench/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,9 +2,10 @@ module Main where

import Bookkeeper
import Criterion.Main
import GHC.Prim

type PersonB = Book '[ "name" :=> String, "age" :=> Int ]
data PersonR = PersonR { name :: String, age :: {-# NOUNPACK #-} Int } deriving (Eq, Show)
data PersonR = PersonR { name :: !String, age :: {-# NOUNPACK #-} !Int } deriving (Eq, Show)

pb :: PersonB
pb = emptyBook
Expand Down
Loading