yesod 1.2.1.1 → 1.2.2

raw patch · 2 files changed

+19/−10 lines, 2 files

Files

• Yesod/Default/Config.hs +18/−9
• yesod.cabal +1/−1

@@ -4,6 +4,7 @@ module Yesod.Default.Config     ( DefaultEnv (..)     , fromArgs+    , fromArgsSettings     , loadDevelopmentConfig      -- reexport@@ -71,19 +72,19 @@     capitalize [] = []     capitalize (x:xs) = toUpper x : map toLower xs --- | Load the app config from command line parameters-fromArgs :: (Read env, Show env, Enum env, Bounded env)-         => (env -> Object -> Parser extra)-         -> IO (AppConfig env extra)-fromArgs getExtra = do+-- | Load the app config from command line parameters, using the given+-- @ConfigSettings.+--+-- Since 1.2.2+fromArgsSettings :: (Read env, Show env, Enum env, Bounded env)+                 => (env -> IO (ConfigSettings env extra))+                 -> IO (AppConfig env extra)+fromArgsSettings cs = do     args <- parseArgConfig      let env = environment args -    let cs = (configSettings env)-                { csParseExtra = getExtra-                }-    config <- loadConfig cs+    config <- cs env >>= loadConfig      env' <- getEnvironment     let config' =@@ -94,6 +95,14 @@     return $ if port args /= 0                 then config' { appPort = port args }                 else config'++-- | Load the app config from command line parameters+fromArgs :: (Read env, Show env, Enum env, Bounded env)+         => (env -> Object -> Parser extra)+         -> IO (AppConfig env extra)+fromArgs getExtra = fromArgsSettings $ \env -> return (configSettings env)+    { csParseExtra = getExtra+    }  -- | Load your development config (when using @'DefaultEnv'@) loadDevelopmentConfig :: IO (AppConfig DefaultEnv ())

@@ -1,5 +1,5 @@ name:            yesod-version:         1.2.1.1+version:         1.2.2 license:         MIT license-file:    LICENSE author:          Michael Snoyman <michael@snoyman.com>