scotty-fay 0.0.2 → 0.1.0

raw patch · 4 files changed

+24/−14 lines, 4 filesdep −scotty-faydep ~scotty

Dependencies removed: scotty-fay

Dependency ranges changed: scotty

Files

• scotty-fay.cabal +14/−9
• src/Web/Scotty/Fay.hs +0/−2
• src/Web/Scotty/Fay/Internal.hs +3/−3
• test/Main.hs +7/−0

@@ -1,5 +1,5 @@ name:           scotty-fay-version:        0.0.2+version:        0.1.0 build-type:     Simple cabal-version:  >= 1.10 @@ -44,20 +44,25 @@ test-suite scotty-fay-tests   type:                 exitcode-stdio-1.0   main-is:              Main.hs-  hs-source-dirs:       test+  hs-source-dirs:       src test   default-language:     Haskell2010   ghc-options:          -Wall   default-extensions:   OverloadedStrings,                         Rank2Types   build-depends:        base,-                        scotty-fay,+                        scotty >= 0.6.0 && < 0.7.0,+                        fay    >= 0.18  && < 0.19,+                        fay-jquery,+                        bytestring,+                        data-default,+                        http-types,+                        wai,+                        transformers,+                        text,+                        directory,+                        filepath,                         wai-test,                         test-framework,                         test-framework-hunit,-                        HUnit,-                        directory,-                        wai,-                        transformers,-                        http-types,-                        scotty+                        HUnit 

@@ -1,6 +1,5 @@ module Web.Scotty.Fay     ( module Web.Scotty.Fay.Config-    , compileFile     , serveFay     , serveFay'     ) where@@ -50,4 +49,3 @@                     Error err        -> raiseErr err                     FileNotFound msg -> notFoundMsg msg             Nothing -> notFoundMsg "scotty-fay: requested path is invalid"-    where

@@ -34,15 +34,15 @@         f acc dir = do             dirs <- acc             exists <- doesDirectoryExist dir-            if exists+            if not exists                 then return (dir : dirs)                 else return dirs  nonExistentWarning :: [FilePath] -> String nonExistentWarning dirs = concat-    [ "The following include dirs:"+    [ "The following include dirs:\n\t"     , showAll dirs-    , "do not exist. scotty-fay might not work very well."+    , "\ndo not exist. scotty-fay might not work very well."     ]     where showAll = concat . intersperse "\n\t" 

@@ -12,6 +12,8 @@ import qualified Test.HUnit.Base as H import System.Directory +import Web.Scotty.Fay.Internal+ main :: IO () main = do     dir <- getCurrentDirectory@@ -126,3 +128,8 @@ test_configuringBasePath =     assertEq "/js" $         (configBasePath . buildConfig $ (under "/js" . from "src"))++test_getNonExistent :: H.Assertion+test_getNonExistent = do+    results <- getNonExistent ["non-existent2", "non-existent1", "src"]+    assertSameElems ["non-existent1", "non-existent2"] results