web: move code to Hledger.Web for importability, consistency

hledger-web/Hledger/Web.hs

@@ -0,0 +1,33 @@
+{-|
+Re-export the modules of the hledger-web program.
+-}
+
+module Hledger.Web (
+                     module Hledger.Web.App,
+                     module Hledger.Web.AppRun,
+                     module Hledger.Web.EmbeddedFiles,
+                     module Hledger.Web.Handlers,
+                     module Hledger.Web.Settings,
+                     module Hledger.Web.StaticFiles,
+                     tests_Hledger_Web
+              )
+where
+import Test.HUnit
+
+import Hledger.Web.App
+import Hledger.Web.AppRun
+import Hledger.Web.EmbeddedFiles
+import Hledger.Web.Handlers
+import Hledger.Web.Settings
+import Hledger.Web.StaticFiles
+
+tests_Hledger_Web :: Test
+tests_Hledger_Web = TestList
+ [
+ --  tests_Hledger_Web_App
+ -- ,tests_Hledger_Web_AppRun
+ -- ,tests_Hledger_Web_EmbeddedFiles
+ -- ,tests_Hledger_Web_Handlers
+ -- ,tests_Hledger_Web_Settings
+ -- ,tests_Hledger_Web_StaticFiles
+ ]

hledger-web/Hledger/Web/App.hs

@@ -1,13 +1,12 @@
 {-# LANGUAGE QuasiQuotes, TemplateHaskell, TypeFamilies #-}
 {-# LANGUAGE OverloadedStrings #-}
-module App
+module Hledger.Web.App
     ( App (..)
     , AppRoute (..)
     , resourcesApp
     , Handler
     , Widget
     , module Yesod.Core
-    , module Settings
     , StaticRoute (..)
     , lift
     , liftIO
@@ -25,9 +24,8 @@ import Yesod.Helpers.Static
 
 import Hledger.Cli.Options
 import Hledger.Data
-
+import Hledger.Web.Settings
-import Settings
+import Hledger.Web.StaticFiles
-import StaticFiles
 
 -- | The site argument for your application. This can be a good place to
 -- keep settings and values requiring initialization before your application
@@ -111,7 +109,7 @@ instance Yesod App where
     -- users receiving stale content.
     addStaticContent ext' _ content = do
         let fn = base64md5 content ++ '.' : T.unpack ext'
-        let statictmp = Settings.staticdir ++ "/tmp/"
+        let statictmp = Hledger.Web.Settings.staticdir ++ "/tmp/"
         liftIO $ createDirectoryIfMissing True statictmp
         let fn' = statictmp ++ fn
         exists <- liftIO $ doesFileExist fn'

hledger-web/Hledger/Web/AppRun.hs

@@ -2,7 +2,7 @@
 {-# LANGUAGE MultiParamTypeClasses #-}
 {-# LANGUAGE OverloadedStrings #-}
 {-# OPTIONS_GHC -fno-warn-orphans #-}
-module AppRun (
+module Hledger.Web.AppRun (
                withApp
               ,withDevelApp
               ,withWaiHandlerDevelApp
@@ -16,10 +16,9 @@ import Yesod.Helpers.Static
 
 import Hledger
 import Hledger.Cli
-
+import Hledger.Web.App
-import App
+import Hledger.Web.Handlers
-import Handlers
+import Hledger.Web.Settings
-import Settings
 
 -- This line actually creates our YesodSite instance. It is the second half
 -- of the call to mkYesodData which occurs in App.hs. Please see
@@ -37,8 +36,8 @@ withApp a f = toWaiApp a >>= f
 withDevelApp :: Dynamic
 withDevelApp = toDyn (withApp a :: (Application -> IO ()) -> IO ())
    where a = App{
-              getStatic=static Settings.staticdir
+              getStatic=static Hledger.Web.Settings.staticdir
-             ,appRoot=Settings.defapproot
+             ,appRoot=Hledger.Web.Settings.defapproot
              ,appOpts=[]
              ,appArgs=[]
              ,appJournal=nulljournal
@@ -52,7 +51,7 @@ withWaiHandlerDevelApp func = do
   ej <- readJournalFile Nothing f
   let Right j = ej
   let a = App{
-              getStatic=static Settings.staticdir
+              getStatic=static Hledger.Web.Settings.staticdir
              ,appRoot=Settings.defapproot
              ,appOpts=[File f]
              ,appArgs=[]

hledger-web/Hledger/Web/EmbeddedFiles.hs

@@ -8,7 +8,7 @@ startup, when needed. This simplifies installation for end-users, and
 customisation too.
 
 -}
-module EmbeddedFiles
+module Hledger.Web.EmbeddedFiles
     (
      files
     ,createFilesIfMissing
@@ -20,7 +20,7 @@ import Data.FileEmbed (embedDir)
 import System.Directory
 import System.FilePath
 
-import Settings (datadir)
+import Hledger.Web.Settings (datadir)
 
 -- | An embedded copy of all files below the the hledger-web data
 -- directory (@.hledger/web/@) at compile time, as (FilePath,ByteString)

hledger-web/Hledger/Web/Handlers.hs

@@ -5,7 +5,7 @@ hledger-web's request handlers, and helpers.
 
 -}
 
-module Handlers where
+module Hledger.Web.Handlers where
 
 import Control.Applicative ((<$>), (<*>))
 import Data.Aeson
@@ -28,13 +28,12 @@ import Yesod.Json
 
 import Hledger hiding (today)
 import Hledger.Cli
-
+import Hledger.Web.App
-import App
+import Hledger.Web.Settings
-import Settings
 
 
 getFaviconR :: Handler ()
-getFaviconR = sendFile "image/x-icon" $ Settings.staticdir </> "favicon.ico"
+getFaviconR = sendFile "image/x-icon" $ Hledger.Web.Settings.staticdir </> "favicon.ico"
 
 getRobotsR :: Handler RepPlain
 getRobotsR = return $ RepPlain $ toContent ("User-agent: *" :: ByteString)

hledger-web/Hledger/Web/Settings.hs

@@ -8,7 +8,7 @@
 -- In addition, you can configure a number of different aspects of Yesod
 -- by overriding methods in the Yesod typeclass. That instance is
 -- declared in the hledger-web.hs file.
-module Settings
+module Hledger.Web.Settings
     ( hamletFile
     , cassiusFile
     , juliusFile

hledger-web/Hledger/Web/StaticFiles.hs

@@ -9,10 +9,10 @@ way; use their FilePath or URL to access them.
 This is a separate module to satisfy template haskell requirements.
 
 -}
-module StaticFiles where
+module Hledger.Web.StaticFiles where
 
 import Yesod.Helpers.Static
 
-import Settings (staticdir)
+import Hledger.Web.Settings (staticdir)
 
 $(staticFiles staticdir)

hledger-web/hledger-web.cabal

@@ -51,15 +51,17 @@ executable hledger-web
   else
       ghc-options:   -W -threaded
   other-modules:
-                     App
+                     Hledger.Web
-                     EmbeddedFiles
+                     Hledger.Web.App
-                     Settings
+                     Hledger.Web.AppRun
-                     StaticFiles
+                     Hledger.Web.EmbeddedFiles
-                     Handlers
+                     Hledger.Web.Settings
+                     Hledger.Web.StaticFiles
+                     Hledger.Web.Handlers
   build-depends:
                   hledger == 0.15
                  ,hledger-lib == 0.15
-                 -- ,HUnit
+                 ,HUnit
                  ,base >= 4 && < 5
                  ,bytestring
                  -- ,containers
@@ -103,10 +105,11 @@ library
     else
         Buildable: False
     exposed-modules: 
-                     AppRun
+                     Hledger.Web.AppRun
     other-modules:
-                     App
+                     Hledger.Web
-                     EmbeddedFiles
+                     Hledger.Web.App
-                     Settings
+                     Hledger.Web.EmbeddedFiles
-                     StaticFiles
+                     Hledger.Web.Settings
-                     Handlers
+                     Hledger.Web.StaticFiles
+                     Hledger.Web.Handlers

hledger-web/hledger-web.hs

@@ -26,10 +26,7 @@ import Hledger.Cli
 import Hledger.Data
 import Prelude hiding (putStr, putStrLn)
 import Hledger.Utils.UTF8 (putStr, putStrLn)
-
+import Hledger.Web
-import App
-import AppRun (withApp)
-import EmbeddedFiles (createFilesIfMissing)
 
 
 progname_web = progname_cli ++ "-web"