small display fixes

app/models/recipe_ingredient.rb

@@ -14,15 +14,9 @@ class RecipeIngredient < ActiveRecord::Base
   end
 
   def display_name
-    if quantity.present? && units.present?
+    str = [quantity, units, name].delete_if { |i| i.blank? }.join(' ')
-      "#{quantity} #{units} #{name}"
+    str << ", #{preparation}" if preparation.present?
-    elsif quantity.present?
+    str
-      "#{quantity} #{name}"
-    elsif units.present?
-      "#{units} #{name}"
-    else
-      name
-    end
   end
 
   def scale(factor, auto_unit = false)

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