Merge pull request #8 from RyanNoelk/dev

dev to master
RyanNoelk · Apr 7, 2017 · 311fa6b · 311fa6b
2 parents 24a92b5 + eddf3b9
commit 311fa6b
Show file tree

Hide file tree

Showing 4 changed files with 5 additions and 14 deletions.
diff --git a/recipe_scrapers/allrecipes.py b/recipe_scrapers/allrecipes.py
@@ -35,8 +35,8 @@ def ingredients(self):
             try:
                 array = ingredient.split(' ', 2)
                 ingredient_dict = {
-                    'amount': round(float(sum(Fraction(s) for s in array[0].split())), 3),
-                    'type': array[1],
+                    'quantity': round(float(sum(Fraction(s) for s in array[0].split())), 3),
+                    'measurement': array[1],
                     'title': array[2]
                 }
             except:

diff --git a/recipe_scrapers/budgetbytes.py b/recipe_scrapers/budgetbytes.py
@@ -35,8 +35,8 @@ def ingredients(self):
             try:
                 array = ingredient.split(' ', 2)
                 ingredient_dict = {
-                    'amount': round(unicodedata.numeric(array[0]), 3),
-                    'type': array[1],
+                    'quantity': round(unicodedata.numeric(array[0]), 3),
+                    'measurement': array[1],
                     'title': array[2]
                 }
             except:

diff --git a/run_tester.py b/run_tester.py
diff --git a/setup.py b/setup.py
@@ -10,7 +10,7 @@
 setup(
     name='openeats-recipe-scraper',
     url='https://github.com/RyanNoelk/recipe-scraper/',
-    version='1.0.3',
+    version='1.0.4',
     description='Python package, scraping recipes from all over the internet',
     keywords='python recipes scraper harvest',
     long_description=README,