summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Application.hs3
-rw-r--r--CHANGES5
-rw-r--r--Hledger/Web/Main.hs5
-rw-r--r--hledger-web.cabal72
4 files changed, 45 insertions, 40 deletions
diff --git a/Application.hs b/Application.hs
index 821aabd..a8185e4 100644
--- a/Application.hs
+++ b/Application.hs
@@ -6,6 +6,7 @@ module Application
, makeFoundation
) where
+import Data.Default
import Data.IORef
import Import
import Yesod.Default.Config
@@ -79,7 +80,7 @@ makeFoundation conf opts = do
getApplicationDev :: IO (Int, Application)
getApplicationDev = do
f <- head `fmap` journalFilePathFromOpts defcliopts -- XXX head should be safe for now
- j <- either error' id `fmap` readJournalFile Nothing Nothing True f
+ j <- either error' id `fmap` readJournalFile def f
defaultDevelApp loader (makeApplication defwebopts j)
where
loader = Yesod.Default.Config.loadConfig (configSettings Development)
diff --git a/CHANGES b/CHANGES
index e62ca81..12e2642 100644
--- a/CHANGES
+++ b/CHANGES
@@ -1,6 +1,11 @@
User-visible changes in hledger-web. See also hledger, hledger-lib.
+# 1.9.2 (2018/4/30)
+
+* use hledger-lib 1.9.1
+
+
# 1.9.1 (2018/4/13)
* fix compilation with yesod < 1.6
diff --git a/Hledger/Web/Main.hs b/Hledger/Web/Main.hs
index 28099eb..fe9d36d 100644
--- a/Hledger/Web/Main.hs
+++ b/Hledger/Web/Main.hs
@@ -23,6 +23,7 @@ import Network.Wai.Handler.Launch (runHostPortUrl)
import Control.Applicative ((<$>))
#endif
import Control.Monad
+import Data.Default
import Data.Text (pack)
import System.Exit (exitSuccess)
import System.IO (hFlush, stdout)
@@ -62,11 +63,9 @@ withJournalDo' opts@WebOpts {cliopts_ = cliopts} cmd = do
let fn = cmd opts
. pivotByOpts cliopts
. anonymiseByOpts cliopts
- . journalApplyAliases (aliasesFromOpts cliopts)
<=< journalApplyValue (reportopts_ cliopts)
<=< journalAddForecast cliopts
- . generateAutomaticPostings (reportopts_ cliopts)
- readJournalFile Nothing Nothing True f >>= either error' fn
+ readJournalFile def f >>= either error' fn
-- | The web command.
web :: WebOpts -> Journal -> IO ()
diff --git a/hledger-web.cabal b/hledger-web.cabal
index f37aefb..3b389fe 100644
--- a/hledger-web.cabal
+++ b/hledger-web.cabal
@@ -2,10 +2,10 @@
--
-- see: https://github.com/sol/hpack
--
--- hash: ff770abdfef6363c5943add80204995ba6d7bd67d15564d2d1089f37c79b66b5
+-- hash: 1872196bf7e9ff50fae0f3ea64ea81d1155799a2779617be58c9acf7f6aabce8
name: hledger-web
-version: 1.9.1
+version: 1.9.2
synopsis: Web interface for the hledger accounting tool
description: This is hledger's web interface.
It provides a more user-friendly and collaborative UI than the
@@ -120,8 +120,27 @@ flag threaded
default: True
library
+ exposed-modules:
+ Application
+ Foundation
+ Handler.AddForm
+ Handler.Common
+ Handler.JournalR
+ Handler.RegisterR
+ Handler.RootR
+ Handler.SidebarR
+ Handler.Utils
+ Hledger.Web
+ Hledger.Web.Main
+ Hledger.Web.WebOptions
+ Import
+ Settings
+ Settings.Development
+ Settings.StaticFiles
+ other-modules:
+ Paths_hledger_web
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
- cpp-options: -DVERSION="1.9.1"
+ cpp-options: -DVERSION="1.9.2"
build-depends:
HUnit
, base >=4.8 && <4.12
@@ -136,8 +155,8 @@ library
, directory
, filepath
, hjsmin
- , hledger >=1.9 && <2.0
- , hledger-lib >=1.9 && <2.0
+ , hledger >=1.9.1 && <2.0
+ , hledger-lib >=1.9.1 && <2.0
, http-client
, http-conduit
, json
@@ -163,33 +182,16 @@ library
cpp-options: -DDEVELOPMENT
if flag(dev)
ghc-options: -O0
- exposed-modules:
- Application
- Foundation
- Handler.AddForm
- Handler.Common
- Handler.JournalR
- Handler.RegisterR
- Handler.RootR
- Handler.SidebarR
- Handler.Utils
- Hledger.Web
- Hledger.Web.Main
- Hledger.Web.WebOptions
- Import
- Settings
- Settings.Development
- Settings.StaticFiles
- other-modules:
- Paths_hledger_web
default-language: Haskell2010
executable hledger-web
main-is: main.hs
+ other-modules:
+ Paths_hledger_web
hs-source-dirs:
app
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
- cpp-options: -DVERSION="1.9.1"
+ cpp-options: -DVERSION="1.9.2"
build-depends:
HUnit
, base >=4.8 && <4.12
@@ -204,8 +206,8 @@ executable hledger-web
, directory
, filepath
, hjsmin
- , hledger >=1.9 && <2.0
- , hledger-lib >=1.9 && <2.0
+ , hledger >=1.9.1 && <2.0
+ , hledger-lib >=1.9.1 && <2.0
, hledger-web
, http-client
, http-conduit
@@ -236,17 +238,19 @@ executable hledger-web
buildable: False
if flag(threaded)
ghc-options: -threaded
- other-modules:
- Paths_hledger_web
default-language: Haskell2010
test-suite test
type: exitcode-stdio-1.0
main-is: main.hs
+ other-modules:
+ HomeTest
+ TestImport
+ Paths_hledger_web
hs-source-dirs:
tests
ghc-options: -Wall -fno-warn-unused-do-bind -fno-warn-name-shadowing -fno-warn-missing-signatures -fno-warn-type-defaults -fno-warn-orphans
- cpp-options: -DVERSION="1.9.1"
+ cpp-options: -DVERSION="1.9.2"
build-depends:
HUnit
, base >=4.8 && <4.12
@@ -261,8 +265,8 @@ test-suite test
, directory
, filepath
, hjsmin
- , hledger >=1.9 && <2.0
- , hledger-lib >=1.9 && <2.0
+ , hledger >=1.9.1 && <2.0
+ , hledger-lib >=1.9.1 && <2.0
, hledger-web
, hspec
, http-client
@@ -291,8 +295,4 @@ test-suite test
cpp-options: -DDEVELOPMENT
if flag(dev)
ghc-options: -O0
- other-modules:
- HomeTest
- TestImport
- Paths_hledger_web
default-language: Haskell2010