From 9cc9fb2c2f466a072c18685552c05f5a0c1049d9 Mon Sep 17 00:00:00 2001
From: Dan Elbert <dan.elbert@gmail.com>
Date: Sat, 30 Jan 2016 21:51:32 -0600
Subject: [PATCH] small display fixes

---
 app/models/recipe_ingredient.rb | 12 +++---------
 lib/tasks/usda.rake             |  1 +
 2 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/app/models/recipe_ingredient.rb b/app/models/recipe_ingredient.rb
index fe87f53..9919eb9 100644
--- a/app/models/recipe_ingredient.rb
+++ b/app/models/recipe_ingredient.rb
@@ -14,15 +14,9 @@ class RecipeIngredient < ActiveRecord::Base
   end
 
   def display_name
-    if quantity.present? && units.present?
-      "#{quantity} #{units} #{name}"
-    elsif quantity.present?
-      "#{quantity} #{name}"
-    elsif units.present?
-      "#{units} #{name}"
-    else
-      name
-    end
+    str = [quantity, units, name].delete_if { |i| i.blank? }.join(' ')
+    str << ", #{preparation}" if preparation.present?
+    str
   end
 
   def scale(factor, auto_unit = false)
diff --git a/lib/tasks/usda.rake b/lib/tasks/usda.rake
index c94cc59..346d8d6 100644
--- a/lib/tasks/usda.rake
+++ b/lib/tasks/usda.rake
@@ -2,6 +2,7 @@ namespace :usda do
 
   desc 'Empties usda_foods table, imports all data, and then updates any linked ingredients'
   task import: :environment do
+    require 'usda_importer'
     importer = UsdaImporter.new(Rails.root.join('vendor', 'data', 'usda'))
     importer.import
   end