Skip to content

Commit 59472d7

Browse files
author
Felix Van der Jeugt
committed
naming convention and let it crash
1 parent b6dc1b4 commit 59472d7

File tree

2 files changed

+6
-7
lines changed

2 files changed

+6
-7
lines changed

src/NumberSix/Handlers/Weather.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{-# LANGUAGE OverloadedStrings #-}
33
module NumberSix.Handlers.Weather
44
( handler
5-
, get_weather
5+
, getWeather
66
, Weather (..)
77
, Temperature (..)
88
) where
@@ -75,8 +75,8 @@ instance Show Description where
7575

7676

7777
--------------------------------------------------------------------------------
78-
get_weather :: Text -> IO (Maybe Weather)
79-
get_weather query = do
78+
getWeather :: Text -> IO (Maybe Weather)
79+
getWeather query = do
8080
result <- ((parseJsonEither <$> http url id) :: IO (Either String Weather))
8181
`catch` (\ex -> return $ Left $ show (ex :: HttpException))
8282
either (const $ return Nothing) (return . Just) result
@@ -88,7 +88,7 @@ get_weather query = do
8888
--------------------------------------------------------------------------------
8989
weather :: Text -> IO Text
9090
weather query = do
91-
result <- get_weather query
91+
result <- getWeather query
9292
maybe randomError (return . pprint) result
9393
where
9494
pprint :: Weather -> Text

tests/NumberSix/Handlers/Weather/Tests.hs

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ module NumberSix.Handlers.Weather.Tests
66

77

88
--------------------------------------------------------------------------------
9-
import Data.Maybe (fromJust, isJust)
9+
import Data.Maybe (fromJust)
1010
import Test.Framework (Test, testGroup)
1111
import Test.HUnit (assert)
1212

@@ -22,8 +22,7 @@ tests :: Test
2222
tests = testGroup "NumberSix.Handlers.Weather.Tests"
2323
[ cases "weather"
2424
[ do
25-
result <- get_weather "gent"
26-
assert $ isJust result
25+
result <- getWeather "gent"
2726
let (Weather (Temperature t) _) = fromJust result
2827
assert $ -15 <= t && t <= 60
2928
]

0 commit comments

Comments
 (0)