Skip to content

Commit

Permalink
🔪 Parse quantity in cookware
Browse files Browse the repository at this point in the history
  • Loading branch information
@heytherewill
heytherewill committed Nov 23, 2021
1 parent 8568d78 commit 1479fd2
Show file tree
Hide file tree
Showing 6 changed files with 103 additions and 88 deletions.
26 changes: 15 additions & 11 deletions CookLangNet.Tests/Generators.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -25,13 +25,13 @@ type NormalPositiveFloat = NormalPositiveFloat of float with
member x.Get = match x with NormalPositiveFloat f -> f
override x.ToString() = x.Get.ToString()

type SingleWordEquipment = SingleWordEquipment of Equipment with
member x.Get = match x with SingleWordEquipment e -> e
type SingleWordCookware = SingleWordCookware of Cookware with
member x.Get = match x with SingleWordCookware e -> e
member x.Serialize() = x.Get.Serialize()
override x.ToString() = x.Get.ToString()

type MultiWordEquipment = MultiWordEquipment of Equipment with
member x.Get = match x with MultiWordEquipment e -> e
type MultiWordCookware = MultiWordCookware of Cookware with
member x.Get = match x with MultiWordCookware e -> e
member x.Serialize() = x.Get.Serialize()
override x.ToString() = x.Get.ToString()

Expand Down Expand Up @@ -87,7 +87,7 @@ let toAmountOption shouldBeSome quantity shouldContainUnit unit =
let unit = if shouldContainUnit then Some unit else None
if shouldBeSome then Some { Quantity = quantity; Unit = unit } else None

let toEquipment name = { Name = name }
let toCookware includeQuantity name quantity = { Name = name; Quantity = if includeQuantity then Some quantity else None }
let toIngredient name amount = { Name = name; Amount = amount }
let toTimer name duration unit = { Name = name; Duration = duration; Unit = unit }
let stringFunc = Func<_,_>(string)
Expand Down Expand Up @@ -119,13 +119,17 @@ type Default =
let unit = Default.SingleWordString().Generator.Select(stringFunc)
Gen.map4 toAmountOption bool quantity bool unit |> Arb.fromGen

static member MultiWordEquipment () =
Default.SingleLineString()
|> convert (string >> toEquipment >> MultiWordEquipment) (string >> SingleLineString)
static member MultiWordCookware () =
let bool = Default.Bool().Generator
let name = Default.SingleLineString().Generator.Select(stringFunc)
let quantity = Default.NormalPositiveFloat().Generator.Select(fun x -> x.Get)
Gen.map3 toCookware bool name quantity |> Gen.map MultiWordCookware |> Arb.fromGen

static member SingleWordEquipment () =
Default.SingleWordString()
|> convert (string >> toEquipment >> SingleWordEquipment) (string >> SingleWordString)
static member SingleWordCookware () =
let bool = Default.Bool().Generator
let name = Default.SingleWordString().Generator.Select(stringFunc)
let quantity = Default.NormalPositiveFloat().Generator.Select(fun x -> x.Get)
Gen.map3 toCookware bool name quantity |> Gen.map SingleWordCookware |> Arb.fromGen

static member MultiWordNoAmountIngredient () =
let name = Default.SingleLineString().Generator.Select(stringFunc)
Expand Down
40 changes: 20 additions & 20 deletions CookLangNet.Tests/IntegrationTests.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -45,140 +45,140 @@ module ParseStringTests =
{
Directions = "Prepare the tofu. Use a tofu press. Or, wrap the tofu in a clean dish towel or several layers of paper towels, weigh it down with a heavy cookbook or a large plate weighed down by a few cans of beans. Press the tofu for 30 minutes. Tear the tofu into chunks with your hands and transfer the tofu chunks to a large bowl."
Ingredients = [ { Name = "tofu" ; Amount = None } ]
Equipment = [ { Name = "tofu press" } ; { Name = "large bowl" } ]
Cookware = [ { Quantity = None; Name = "tofu press" } ; { Name = "large bowl"; Quantity = None } ]
Timers = [ { Name = "pressing tofu" ; Duration = (float 30); Unit = "minutes" } ]
Comment = "The tofu chunks shouldn’t be too large or too small (see photos for reference), but it’s totally fine if they’re not all the same size."
}
{
Directions = "Make the tikka spice blend. Heat a small or medium frying pan over medium heat. Once warm, add the whole spices (cumin and coriander seeds, cloves, peppercorns, cardamom seeds, cinnamon sticks, and fenugreek leaves)."
Ingredients = [ { Name = "cumin" ; Amount = None } ; { Name = "coriander seeds" ; Amount = None }; { Name = "cloves" ; Amount = None } ; { Name = "peppercorns" ; Amount = None } ; { Name = "cardamom seeds" ; Amount = None } ; { Name = "cinnamon sticks" ; Amount = None } ; { Name = "fenugreek leaves" ; Amount = None }]
Equipment = [ { Name = "frying pan" } ]
Cookware = [ { Quantity = None; Name = "frying pan" } ]
Timers = []
Comment = ""
}
{
Directions = "Toast, shaking the pan frequently, until they are very fragrant and toasty, and the lighter seeds have browned, about 3 minutes. Transfer the seeds out of the pan and allow to cool."
Ingredients = []
Equipment = []
Cookware = []
Timers = [ { Name = "" ; Duration = 3.0 ; Unit = "minutes" } ]
Comment = ""
}
{
Directions = "Once cool, add to a spice grinder or a mortar & pestle and crush until finely ground. Pour into a bowl, add the ground spices (Indian red chile powder, turmeric, paprika, nutmeg, and ginger), and toss all the spices to combine."
Ingredients = [ { Name = "Indian red chile powder" ; Amount = None } ; { Name = "turmeric" ; Amount = None } ; { Name = "paprika" ; Amount = None } ; { Name = "nutmeg" ; Amount = None } ; { Name = "ginger" ; Amount = None } ; ]
Equipment = [ { Name = "spice grinder" } ; { Name = "mortar" } ]
Cookware = [ { Quantity = None; Name = "spice grinder" } ; { Name = "mortar"; Quantity = None } ]
Timers = []
Comment = ""
}
{
Directions = "Make the Tikka marinade. In a medium bowl, mix together the spice blend with the yogurt, garlic, ginger, lemon juice, oil, and salt. Pour the marinade over the tofu chunks and use your hands to very gently coat all the crevices of the tofu, taking care to not mash it."
Ingredients = [ { Name = "yogurt" ; Amount = None } ; { Name = "garlic" ; Amount = None } ; { Name = "ginger" ; Amount = None } ; { Name = "lemon juice" ; Amount = None } ; { Name = "oil" ; Amount = None } ; { Name = "salt" ; Amount = None } ]
Equipment = []
Cookware = []
Timers = []
Comment = ""
}
{
Directions = "Cover and refrigerate for 2 hours, or up to 8 hours."
Ingredients = []
Equipment = []
Cookware = []
Timers = [ { Name = "" ; Duration = float 2; Unit = "hours" } ; { Name = "" ; Duration = float 8; Unit = "hours" } ]
Comment = ""
}
{
Directions = "When ready to bake the tofu, arrange an oven rack 6 inches from the heat source (usually, the second rack). Add a 12-inch cast iron skillet to the rack and preheat the oven to 500ºF/260ºC."
Ingredients = []
Equipment = [ { Name = "oven" } ; { Name = "12-inch cast iron skillet" } ]
Cookware = [ { Quantity = None; Name = "oven" } ; { Name = "12-inch cast iron skillet"; Quantity = None } ]
Timers = []
Comment = ""
}
{
Directions = "Once the skillet is smoking hot, transfer it to the stove or a pot holder. Turn the broiler to high."
Ingredients = []
Equipment = [ { Name = "broiler" } ]
Cookware = [ { Quantity = None; Name = "broiler" } ]
Timers = []
Comment = ""
}
{
Directions = "Add enough oil to lightly coat the bottom of the pan. Add the marinated tofu to the pan, leaving excess marinade behind. It will be pretty tightly packed into the pan."
Ingredients = [ { Name = "oil" ; Amount = None } ]
Equipment = []
Cookware = []
Timers = []
Comment = ""
}
{
Directions = "Return the pan to the second oven rack and broil until the tofu is cooked through and charred in some spots on top, about 11 minutes."
Ingredients = []
Equipment = []
Cookware = []
Timers = [ { Name = "" ; Duration = float 11; Unit = "minutes" } ]
Comment = "After the 5-minute mark, I recommend checking every 1-2 minutes to prevent burning since every oven is different."
}
{
Directions = "MAKE THE MASALA. Heat the 3 tablespoons of oil in a deep 12-inch sauté pan over medium-high heat. Once hot, add the cumin seeds and cook for 1 minute, swirling the pan frequently. Add the dried chilies and cook for another 30 seconds, swirling frequently to prevent burning."
Ingredients = [ { Name = "cumin seeds" ; Amount = None } ; { Name = "dried chilies" ; Amount = None } ]
Equipment = [ { Name = "12-inch sauté pan" } ]
Cookware = [ { Quantity = None; Name = "12-inch sauté pan" } ]
Timers = [ { Name = "" ; Duration = float 30 ; Unit = "seconds" } ]
Comment = ""
}
{
Directions = "Add the onions with a couple pinches of salt and cook until golden brown, about 6 minutes (if the onions start browning too quickly, lower the heat to medium)."
Ingredients = [ { Name = "onions" ; Amount = None } ; { Name = "salt" ; Amount = None } ]
Equipment = []
Cookware = []
Timers = [ { Name = "" ; Duration = float 6 ; Unit = "minutes" } ]
Comment = ""
}
{
Directions = "Add in a few splashes of water to stop the onions from browning too much, then add the garlic, ginger, diced serrano pepper, and turmeric, and cook for 1 minute, tossing frequently. Add the red chili powder, coriander, and tomato paste. Stir frequently for 30 to 60 seconds."
Ingredients = [ { Name = "garlic" ; Amount = None } ; { Name = "ginger" ; Amount = None } ; { Name = "serrano pepper" ; Amount = None } ; { Name = "turmeric" ; Amount = None } ; { Name = "red chili powder" ; Amount = None } ; { Name = "coriander" ; Amount = None } ; { Name = "tomato paste" ; Amount = None } ]
Equipment = []
Cookware = []
Timers = [ { Name = "" ; Duration = (float 1) ; Unit = "minute" } ]
Comment = ""
}
{
Directions = "Add the tomatoes and their juices, and cook until broken down and softened, 2.5 minutes."
Ingredients = [ { Name = "tomatoes" ; Amount = None } ]
Equipment = []
Cookware = []
Timers = [ { Name = "" ; Duration = float 2.5f; Unit = "minutes" } ]
Comment = ""
}
{
Directions = "Add the cilantro stems (save the leaves for the garnish), 3 tablespoons of water, and 1 ½ teaspoons kosher salt, and stir. Cover the pan and bring to a simmer."
Ingredients = [ { Name = "cilantro stems" ; Amount = None } ; { Name = "kosher salt" ; Amount = None } ]
Equipment = []
Cookware = []
Timers = []
Comment = ""
}
{
Directions = "Simmer the masala for 15 minutes, opening the pot to stir occasionally, until the liquid has mostly evaporated. Scoop out the dried red chilies and discard."
Ingredients = []
Equipment = []
Cookware = []
Timers = []
Comment = ""
}
{
Directions = "Add in the coconut milk, garam masala, and vegan butter. Crush the fenugreek leaves in your hand to release the aroma and add to the masala. Increase the heat slightly and stir until everything is combined and the butter is melted."
Ingredients = [ { Name = "coconut milk" ; Amount = None } ; { Name = "garam masala" ; Amount = None } ; { Name = "vegan butter" ; Amount = None } ; { Name = "fenugreek leaves" ; Amount = None } ]
Equipment = []
Cookware = []
Timers = []
Comment = ""
}
{
Directions = "If you prefer a smoother texture, feel free to run an immersion blender through the masala."
Ingredients = []
Equipment = [ { Name = "immersion blender" } ]
Cookware = [ { Quantity = None; Name = "immersion blender" } ]
Timers = []
Comment = ""
}
{
Directions = "Add the baked tofu, the thinly sliced serrano pepper (if using for spicy spicy!), and lemon juice. Simmer for 2 minutes and coat the tofu in the sauce. Taste, and if it’s a bit too acidic, add a tiny bit of sugar."
Ingredients = [ { Name = "lemon juice" ; Amount = None } ; { Name = "sugar" ; Amount = Some { Quantity = float 0.5f ; Unit = Some "teaspoon" } } ]
Equipment = []
Cookware = []
Timers = []
Comment = ""
}
{
Directions = "Garnish the masala with the cilantro leaves and season to taste with salt. Serve tofu tikka masala over rice and/or with Indian flatbread."
Ingredients = [ { Name = "cilantro leaves" ; Amount = None } ; { Name = "rice" ; Amount = None } ; { Name = "Indian flatbread" ; Amount = None }]
Equipment = []
Cookware = []
Timers = []
Comment = ""
}
Expand Down
34 changes: 17 additions & 17 deletions CookLangNet.Tests/ParserTests.fs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,31 +67,31 @@ module StepParser =

module Equipment =
let internal testEquipmentParser stringToParse expectedValue expectedState =
testParserWithState equipment stringToParse expectedValue expectedState
testParserWithState cookware stringToParse expectedValue expectedState

[<Property(Arbitrary = [|typeof<Generators.Default>|])>]
let ``Parses single word pieces of equipment delimited by space`` (equipment: SingleWordEquipment) =
let stringToParse = equipment.Serialize() + " "
let expectedUserState = { State.Empty with ParsedEquipment = [ equipment.Get ] }
testEquipmentParser stringToParse (equipment.ToString()) expectedUserState
let ``Parses single word pieces of cookware delimited by space`` (cookware: SingleWordCookware) =
let stringToParse = cookware.Serialize() + " "
let expectedUserState = { State.Empty with ParsedCookware = [ cookware.Get ] }
testEquipmentParser stringToParse (cookware.ToString()) expectedUserState

[<Property(Arbitrary = [|typeof<Generators.Default>|])>]
let ``Parses single word pieces of equipment delimited by a comma``(equipment: SingleWordEquipment) =
let stringToParse = equipment.Serialize() + ","
let expectedUserState = { State.Empty with ParsedEquipment = [ equipment.Get ] }
testEquipmentParser stringToParse (equipment.ToString()) expectedUserState
let ``Parses single word pieces of cookware delimited by a comma``(cookware: SingleWordCookware) =
let stringToParse = cookware.Serialize() + ","
let expectedUserState = { State.Empty with ParsedCookware = [ cookware.Get ] }
testEquipmentParser stringToParse (cookware.ToString()) expectedUserState

[<Property(Arbitrary = [|typeof<Generators.Default>|])>]
let ``Parses single word pieces of equipment delimited by a period``(equipment: SingleWordEquipment) =
let stringToParse = equipment.Serialize() + "."
let expectedUserState = { State.Empty with ParsedEquipment = [ equipment.Get ] }
testEquipmentParser stringToParse (equipment.ToString()) expectedUserState
let ``Parses single word pieces of cookware delimited by a period``(cookware: SingleWordCookware) =
let stringToParse = cookware.Serialize() + "."
let expectedUserState = { State.Empty with ParsedCookware = [ cookware.Get ] }
testEquipmentParser stringToParse (cookware.ToString()) expectedUserState

[<Property(Arbitrary = [|typeof<Generators.Default>|])>]
let ``Parses multi-word pieces of equipment`` (equipment: MultiWordEquipment) =
let stringToParse = sprintf "#%s{}" (equipment.ToString())
let expectedUserState = { State.Empty with ParsedEquipment = [ equipment.Get ] }
testEquipmentParser stringToParse (equipment.ToString()) expectedUserState
let ``Parses multi-word pieces of cookware`` (cookware: MultiWordCookware) =
let stringToParse = cookware.Serialize()
let expectedUserState = { State.Empty with ParsedCookware = [ cookware.Get ] }
testEquipmentParser stringToParse (cookware.ToString()) expectedUserState

module Ingredient =
let internal testIngredientParser stringToParse expectedValue expectedState =
Expand Down
Loading

0 comments on commit 1479fd2

Please sign in to comment.