Add extra fields for hops and fermentables

hotzenklotz · Sep 28, 2020 · 5a970df · 5a970df
1 parent 725214b
commit 5a970df
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 0 deletions.
diff --git a/pybeerxml/fermentable.py b/pybeerxml/fermentable.py
@@ -3,6 +3,8 @@
 import logging
 from typing import Pattern, Text, Optional, List, Tuple
 
+from pybeerxml.utils import cast_to_bool
+
 logger = logging.getLogger(__name__)
 
 
@@ -25,6 +27,18 @@ def __init__(self):
         self._yield: Optional[float] = None
         self.color: Optional[float] = None
         self._add_after_boil: Optional[bool] = None  # Should be Bool
+        self.version: Optional[int] = None
+        self.type: Optional[Text] = None
+        self.origin: Optional[Text] = None
+        self.supplier: Optional[Text] = None
+        self.notes: Optional[Text] = None
+        self.coarse_fine_diff: Optional[float] = None
+        self.moisture: Optional[float] = None
+        self.diastatic_power: Optional[float] = None
+        self.protein: Optional[float] = None
+        self.max_in_batch: Optional[float] = None
+        self._recommend_mash: Optional[bool] = None
+        self.ibu_gal_per_lb: Optional[float] = None
 
     @property
     def add_after_boil(self) -> bool:
@@ -93,3 +107,11 @@ def gu(self, liters: float = 1.0) -> Optional[float]:
         weight_lb = self.amount * 2.20462
         volume_gallons = liters * 0.264172
         return self.ppg * weight_lb / volume_gallons
+
+    @property
+    def recommend_mash(self):
+        return self._recommend_mash
+
+    @recommend_mash.setter
+    def recommend_mash(self, value):
+        self._recommend_mash = cast_to_bool(value)
diff --git a/pybeerxml/hop.py b/pybeerxml/hop.py
@@ -11,6 +11,16 @@ def __init__(self):
         self.form: Optional[Text] = None
         self.notes: Optional[Text] = None
         self.time: Optional[float] = None
+        self.version: Optional[int] = None
+        self.type: Optional[Text] = None
+        self.beta: Optional[float] = None
+        self.hsi: Optional[float] = None
+        self.origin: Optional[Text] = None
+        self.substitutes: Optional[Text] = None
+        self.humulene: Optional[float] = None
+        self.caryophyllene: Optional[float] = None
+        self.cohumulone: Optional[float] = None
+        self.myrcene: Optional[float] = None
 
     def utilization_factor(self):
         "Account for better utilization from pellets vs. whole"