Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Linsen, you have arrived #126

Merged
merged 12 commits into from
Jun 4, 2024
Merged

Linsen, you have arrived #126

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
02128e7
Started on linsen
The1Penguin May 29, 2024
f25bd67
Now fetches first part of the food
The1Penguin May 30, 2024
a3c9089
Now works
The1Penguin May 30, 2024
d9d1f6d
Mjahaja
The1Penguin May 30, 2024
f99f05e
Return the cabal
The1Penguin May 30, 2024
f4818cc
We have gathered here today
The1Penguin May 30, 2024
30700ea
Added test and now strips whitespace
The1Penguin May 30, 2024
6bfd82e
Based on some comments of Ekeroot
The1Penguin May 30, 2024
5b4e3c7
In case the index of food doesn't work
The1Penguin May 30, 2024
b6fa09e
Fix one issue
The1Penguin Jun 1, 2024
92d28ab
Now shouldn't produce errors
The1Penguin Jun 3, 2024
8feb0a9
More tests
The1Penguin Jun 3, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 5 additions & 3 deletions src/Model/Linsen.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,8 @@

module Model.Linsen
(
fetchAndCreateLinsen
parse
, fetchAndCreateLinsen
)
where

Expand All @@ -24,7 +25,8 @@ import Data.Bifunctor ( first )
import qualified Data.ByteString.Lazy.Char8 as BL8
import Data.Functor ( (<&>) )
import Data.Text.Lazy ( Text
, replace )
, replace
, strip )
import Data.Thyme.Calendar ( Day )
import Network.HTTP.Req
import Model.Types ( NoMenu(..)
Expand Down Expand Up @@ -86,7 +88,7 @@ parse day =
>=> \case
[] -> pure mempty
vs -> last vs .: "text"
<&> replace "/ " ", "
<&> strip . replace "/ " ", "

fetchAndCreateLinsen
:: (MonadHttp m, MonadIO m, MonadThrow m)
Expand Down
20 changes: 20 additions & 0 deletions test/Main.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@ import Data.Aeson ( decode )
import Data.Maybe ( fromJust )
import Data.Thyme.Time.Core ( fromGregorian )
import Model.Karen ( parse )
import qualified Model.Linsen as L ( parse )
import Model.Types ( Menu(..)
, NoMenu
)
Expand Down Expand Up @@ -48,6 +49,25 @@ main = hspec $ do
)
)

describe "Cafe Linsen" $ it
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Tests <3

"parses a blob of JSON without error"
(do
s1 <- BL.readFile "test/linsen.json"
testFun
[ Menu
(T.pack "Natt Överbakad Högrev.")
(T.pack "Rotfrukter, Timjansky, Persilja, Pommes Chateau.")
, Menu
(T.pack "Stekt Fisk.")
(T.pack "Remouladsås, Citron, Dill, Picklade Morötter, Rostad Potatis.")
, Menu
(T.pack "Chana Masala.")
(T.pack "Kikärtor, Grönsaker, Potatis Pakora, Nannbröd, Ris")
] (L.parse
(fromGregorian 2024 05 31)
(fromJust $ decode s1))
)

describe "The Wijkander's"
$ it "Parses two blobs of HTML correctly on fridays"
$ do
Expand Down
Loading
Loading