diff --git a/CHANGELOG.md b/CHANGELOG.md index 25ded38..759aced 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -7,6 +7,11 @@ and this project adheres to [Semantic Versioning](http://semver.org/spec/v2.0.0. ## [Unreleased] ### Added - Logo +- 4 new methods + 1. Ristretto + 2. Lungo + 3. Turkish + 4. Cupping ## [0.2] - 2024-09-17 ### Added - 5 new methods diff --git a/METHODS.md b/METHODS.md index 2530777..8a9f070 100644 --- a/METHODS.md +++ b/METHODS.md @@ -85,6 +85,34 @@ 60 >=0.2 + + Ristretto + ristretto + 1/1 + 18 + >=0.3 + + + Lungo + lungo + 1/4 + 72 + >=0.3 + + + Turkish + turkish + 1/10 + 50 + >=0.3 + + + Cupping + cupping + 11/200 + 150 + >=0.3 + diff --git a/README.md b/README.md index 0e35be7..8a0d4d1 100644 --- a/README.md +++ b/README.md @@ -199,6 +199,8 @@ Just fill an issue and describe it. We'll check it ASAP!
9- Guide To Cold Brew
10- Cold Brew Concentrate Recipe
11- How to Make Coffee in a Moka Pot
+
12- How to Make Turkish Coffee at Home
+
13- How to Cup Coffee
## Show Your Support diff --git a/mycoffee/params.py b/mycoffee/params.py index a3b7e41..5966181 100644 --- a/mycoffee/params.py +++ b/mycoffee/params.py @@ -52,6 +52,18 @@ "water": 36, "info": "Espresso method" }, + "ristretto": { + "coffee_ratio": 1, + "water_ratio": 1, + "water": 18, + "info": "Ristretto method" + }, + "lungo": { + "coffee_ratio": 1, + "water_ratio": 4, + "water": 72, + "info": "Lungo method" + }, "chemex": { "coffee_ratio": 1, "water_ratio": 15, @@ -99,5 +111,17 @@ "water_ratio": 10, "water": 60, "info": "Moka pot method" + }, + "turkish": { + "coffee_ratio": 1, + "water_ratio": 10, + "water": 50, + "info": "Turkish method" + }, + "cupping": { + "coffee_ratio": 11, + "water_ratio": 200, + "water": 150, + "info": "Cupping method" } } diff --git a/test/functions_test.py b/test/functions_test.py index b0b3f59..ea6d309 100644 --- a/test/functions_test.py +++ b/test/functions_test.py @@ -56,13 +56,17 @@ 2. `chemex` - Chemex method 3. `cold-brew` - Cold brew method 4. `cold-brew-conc` - Cold brew concentrate method -5. `custom` - Custom brewing method -6. `espresso` - Espresso method -7. `french-press` - French press method -8. `moka-pot` - Moka pot method -9. `pour-over` - Pour-over method -10. `siphon` - Siphon method -11. `v60` - V60 method +5. `cupping` - Cupping method +6. `custom` - Custom brewing method +7. `espresso` - Espresso method +8. `french-press` - French press method +9. `lungo` - Lungo method +10. `moka-pot` - Moka pot method +11. `pour-over` - Pour-over method +12. `ristretto` - Ristretto method +13. `siphon` - Siphon method +14. `turkish` - Turkish method +15. `v60` - V60 method >>> test_params = {"method":"v60", "cups":2, "coffee":30, "water":335, "coffee_ratio": 3, "water_ratio":50, "info":"V60 method"} >>> calc_coffee(test_params) 20.1 @@ -156,11 +160,15 @@ 2. `chemex` - Chemex method 3. `cold-brew` - Cold brew method 4. `cold-brew-conc` - Cold brew concentrate method -5. `custom` - Custom brewing method -6. `espresso` - Espresso method -7. `french-press` - French press method -8. `moka-pot` - Moka pot method -9. `pour-over` - Pour-over method -10. `siphon` - Siphon method -11. `v60` - V60 method +5. `cupping` - Cupping method +6. `custom` - Custom brewing method +7. `espresso` - Espresso method +8. `french-press` - French press method +9. `lungo` - Lungo method +10. `moka-pot` - Moka pot method +11. `pour-over` - Pour-over method +12. `ristretto` - Ristretto method +13. `siphon` - Siphon method +14. `turkish` - Turkish method +15. `v60` - V60 method """ diff --git a/test/verified_test.py b/test/verified_test.py index 68930bb..30f8c23 100644 --- a/test/verified_test.py +++ b/test/verified_test.py @@ -101,4 +101,44 @@ >>> moka_pot_coffee = calc_coffee(moka_pot_params) >>> moka_pot_coffee == 6 True +>>> ristretto_params = load_method_params("ristretto") # https://honestcoffeeguide.com/coffee-to-water-ratio-calculator +>>> ristretto_params["coffee_ratio"] == 1 +True +>>> ristretto_params["water_ratio"] == 1 +True +>>> ristretto_params["water"] == 18 +True +>>> ristretto_coffee = calc_coffee(ristretto_params) +>>> ristretto_coffee == 18 +True +>>> lungo_params = load_method_params("lungo") # https://honestcoffeeguide.com/coffee-to-water-ratio-calculator +>>> lungo_params["coffee_ratio"] == 1 +True +>>> lungo_params["water_ratio"] == 4 +True +>>> lungo_params["water"] == 72 +True +>>> lungo_coffee = calc_coffee(lungo_params) +>>> lungo_coffee == 18 +True +>>> turkish_params = load_method_params("turkish") # https://www.drinktrade.com/blogs/education/how-to-make-turkish-coffee +>>> turkish_params["coffee_ratio"] == 1 +True +>>> turkish_params["water_ratio"] == 10 +True +>>> turkish_params["water"] == 50 +True +>>> turkish_coffee = calc_coffee(turkish_params) +>>> turkish_coffee == 5 +True +>>> cupping_params = load_method_params("cupping") # https://www.horshamcoffeeroaster.co.uk/pages/how-to-cup-coffee +>>> cupping_params["coffee_ratio"] == 11 +True +>>> cupping_params["water_ratio"] == 200 +True +>>> cupping_params["water"] == 150 +True +>>> cupping_coffee = calc_coffee(cupping_params) +>>> cupping_coffee == 8.25 +True """