issue #112 - moved ingredient matching logic into ingredient model.

SwiftkickWeb · Jun 9, 2017 · a2994da · a2994da
1 parent 9661287
commit a2994da
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/app/models/grocery_list.rb b/app/models/grocery_list.rb
@@ -10,7 +10,7 @@ def add_ingredient(add_i)
     # if not found, add a new ingredient to the grocery list
 
     self.ingredients.each do |list_i|
-      if list_i.name.singularize == add_i.name.singularize
+      if list_i.matched?(add_i)
         if list_i.unitless? || add_i.unitless?
           if list_i.unitless? && add_i.unitless?
             list_i.amount = sum_i(list_i, add_i)
@@ -32,7 +32,7 @@ def subtract_ingredient(sub_i)
     # if amount = 0, remove entirely
 
     self.ingredients.each do |list_i|
-      if list_i.name.singularize == sub_i.name.singularize
+      if list_i.matched?(sub_i)
         if (list_i.unitized_amount > sub_i.unitized_amount) && list_i.unitized_amount.compatible?(sub_i.unitized_amount)
           list_i.amount = Unit.new( list_i.unitized_amount - sub_i.unitized_amount ).scalar
           return list_i.save

diff --git a/app/models/ingredient.rb b/app/models/ingredient.rb
@@ -42,6 +42,10 @@ def unitized_amount
     end
   end
 
+  def matched?(ing)
+      return self.name.singularize == ing.name.singularize
+  end
+
   def ingreedy_parse(ing_string)
     begin
       parsed_ing = Ingreedy.parse(ing_string)