From 00cf9f295352df109f59df1b2d9ecab87ccee76e Mon Sep 17 00:00:00 2001
From: Greg Weber <greg@gregweber.info>
Date: Sun, 25 Dec 2011 22:27:57 -0300
Subject: [PATCH] remove old TODO

---
 yesod-default/Yesod/Default/Main.hs       |  3 ---
 yesod/scaffold/Application.hs.cg          |  8 ++------
 yesod/scaffold/Settings/StaticFiles.hs.cg | 19 +++++++++++++++----
 yesod/scaffold/config/mongoDB.yml.cg      |  2 +-
 yesod/scaffold/config/postgresql.yml.cg   |  2 +-
 yesod/scaffold/config/settings.yml.cg     |  2 +-
 yesod/scaffold/config/sqlite.yml.cg       |  2 +-
 yesod/scaffold/tiny/Application.hs.cg     |  8 ++------
 8 files changed, 23 insertions(+), 23 deletions(-)

diff --git a/yesod-default/Yesod/Default/Main.hs b/yesod-default/Yesod/Default/Main.hs
index c9f09c57..a7df69ab 100644
--- a/yesod-default/Yesod/Default/Main.hs
+++ b/yesod-default/Yesod/Default/Main.hs
@@ -60,9 +60,6 @@ defaultMain load withSite = do
 --   >     Settings.withConnectionPool conf $ \p -> do
 --   >         runConnectionPool (runMigration yourMigration) p
 --   >         defaultRunner f $ YourSite conf logger p
---
---   TODO: ifdef WINDOWS
---
 defaultRunner :: (YesodDispatch y y, Yesod y)
               => (Application -> IO a)
               -> y -- ^ your foundation type
diff --git a/yesod/scaffold/Application.hs.cg b/yesod/scaffold/Application.hs.cg
index 0fb3f48d..8f9e0372 100644
--- a/yesod/scaffold/Application.hs.cg
+++ b/yesod/scaffold/Application.hs.cg
@@ -6,7 +6,7 @@ module Application
 
 import Import
 import Settings
-import Yesod.Static
+import Settings.StaticFiles (staticSite)
 import Yesod.Auth
 import Yesod.Default.Config
 import Yesod.Default.Main
@@ -29,11 +29,7 @@ mkYesodDispatch "~sitearg~" resources~sitearg~
 -- migrations handled by Yesod.
 with~sitearg~ :: AppConfig DefaultEnv () -> Logger -> (Application -> IO ()) -> IO ()
 with~sitearg~ conf logger f = do
-#ifdef DEVELOPMENT
-    s <- staticDevel Settings.staticDir
-#else
-    s <- static Settings.staticDir
-#endif
+    s <- staticSite
     dbconf <- withYamlEnvironment "config/~dbConfigFile~.yml" (appEnv conf)
             $ either error return . Database.Persist.Base.loadConfig
     Database.Persist.Base.withPool (dbconf :: Settings.PersistConfig) $ \p -> do~runMigration~
diff --git a/yesod/scaffold/Settings/StaticFiles.hs.cg b/yesod/scaffold/Settings/StaticFiles.hs.cg
index f4f01920..e36c3389 100644
--- a/yesod/scaffold/Settings/StaticFiles.hs.cg
+++ b/yesod/scaffold/Settings/StaticFiles.hs.cg
@@ -1,10 +1,21 @@
 module Settings.StaticFiles where
 
 import Yesod.Static (staticFiles, StaticRoute (StaticRoute))
+import qualified Yesod.Static as Static
+import Settings (staticDir)
 
--- | This generates easy references to files in the static directory at compile time.
---   The upside to this is that you have compile-time verification that referenced files
---   exist. However, any files added to your static directory during run-time can't be
+-- | use this to create your static file serving site
+staticSite :: IO Static
+staticSite =
+#ifdef DEVELOPMENT
+  Static.staticDevel staticDir
+#else
+  Static.static staticDir
+#endif
+
+-- | This generates easy references to files in the static directory at compile time,
+--   giving you compile-time verification that referenced files exist.
+--   Warning: any files added to your static directory during run-time can't be
 --   accessed this way. You'll have to use their FilePath or URL to access them.
-$(staticFiles "static")
+$(staticFiles Settings.staticDir)
 
diff --git a/yesod/scaffold/config/mongoDB.yml.cg b/yesod/scaffold/config/mongoDB.yml.cg
index a7ba4064..b97d7dfa 100644
--- a/yesod/scaffold/config/mongoDB.yml.cg
+++ b/yesod/scaffold/config/mongoDB.yml.cg
@@ -9,7 +9,7 @@ Default: &defaults
 Development:
   <<: *defaults
 
-Testing:
+Test:
   database: ~project~_test
   <<: *defaults
 
diff --git a/yesod/scaffold/config/postgresql.yml.cg b/yesod/scaffold/config/postgresql.yml.cg
index 56b718f5..aceae393 100644
--- a/yesod/scaffold/config/postgresql.yml.cg
+++ b/yesod/scaffold/config/postgresql.yml.cg
@@ -9,7 +9,7 @@ Default: &defaults
 Development:
   <<: *defaults
 
-Testing:
+Test:
   database: ~project~_test
   <<: *defaults
 
diff --git a/yesod/scaffold/config/settings.yml.cg b/yesod/scaffold/config/settings.yml.cg
index 86d8d29a..816a2db6 100644
--- a/yesod/scaffold/config/settings.yml.cg
+++ b/yesod/scaffold/config/settings.yml.cg
@@ -5,7 +5,7 @@ Default: &defaults
 Development:
   <<: *defaults
 
-Testing:
+Test:
   <<: *defaults
 
 Staging:
diff --git a/yesod/scaffold/config/sqlite.yml.cg b/yesod/scaffold/config/sqlite.yml.cg
index 499afd76..ebee1fa8 100644
--- a/yesod/scaffold/config/sqlite.yml.cg
+++ b/yesod/scaffold/config/sqlite.yml.cg
@@ -5,7 +5,7 @@ Default: &defaults
 Development:
   <<: *defaults
 
-Testing:
+Test:
   database: ~project~_test.sqlite3
   <<: *defaults
 
diff --git a/yesod/scaffold/tiny/Application.hs.cg b/yesod/scaffold/tiny/Application.hs.cg
index 55da0704..503b0c89 100644
--- a/yesod/scaffold/tiny/Application.hs.cg
+++ b/yesod/scaffold/tiny/Application.hs.cg
@@ -6,7 +6,7 @@ module Application
 
 import Import
 import Settings
-import Yesod.Static
+import Settings.StaticFiles (staticSite)
 import Yesod.Default.Config
 import Yesod.Default.Main (defaultDevelApp, defaultRunner)
 import Yesod.Default.Handlers (getFaviconR, getRobotsR)
@@ -28,11 +28,7 @@ mkYesodDispatch "~sitearg~" resources~sitearg~
 -- migrations handled by Yesod.
 with~sitearg~ :: AppConfig DefaultEnv () -> Logger -> (Application -> IO ()) -> IO ()
 with~sitearg~ conf logger f = do
-#ifdef DEVELOPMENT
-    s <- staticDevel Settings.staticDir
-#else
-    s <- static Settings.staticDir
-#endif
+    s <- staticSite
     let h = ~sitearg~ conf logger s
     defaultRunner f h