nutrition_facts 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4aa2734c02d825a5400343a7de98515abfdd1c8d
-  data.tar.gz: 8abe034ba8902df7dec38e4d07e23fe3d834d9e2
+  metadata.gz: 6f9eb3408745741e6137144d92d8016173044634
+  data.tar.gz: 0457e59021cb2594b2e24e4696a17b4bef23e5f4
 SHA512:
-  metadata.gz: 20f94b08bc9ad317d8fb06e518e9452e625bf9722d4a770c7aede9e46bef4c4300e6ef3773c2f10ecf8c671aa865238d50c72a86af60c6e998265c8afcaa1eb7
-  data.tar.gz: a50881a67b0c3ee3798482eac538f8ab665c2cf0cfc7cda1446e4d489901c748af799485eec005ffed7b6d91e795e03a99f3440ead4772bc974140315aaea498
+  metadata.gz: e13b2d1408a869c277802bf9c936685c4d5fd7faeb6ad31d16dc1b9066823820edb249a0b4795c63bd399bbf62c2129bffe47ba6adb4e1542c36ce308f68224a
+  data.tar.gz: efcbbe97c83274a57d7205b24dcb23d416a7ecbed60e5ff45241ca5de8e82cb056cc2b054b93e63d2fd8d693b96b8cf681a025b8328452dac160fba8ae3814fc

data/lib/nutrition_facts/cli.rb

@@ -13,66 +13,43 @@ class NutritionFacts::CLI
 
   def food_search
     puts 'Please type the name of a food to search:'
+    puts ''
     food_name = gets.chomp.gsub(' ', '%20')
     get_food_data(food_name)
-
-    if food_name == 'exit'
-      puts 'Thanks for using NutritionFacts CLI!'
-      puts ''
-    elsif !@food_data.nil?
-      which_item
-    else
-      puts 'That item was not found, please try another search term.'
-      puts ''
-      NutritionFacts::Item.reset
-      food_search
-    end
   end
 
   def get_food_data(food_name)
-    @food_data = NutritionFacts::Item.find_by_name(food_name)
+    @food_items = NutritionFacts::Item.find_by_name(food_name)
+    which_item
   end
 
   def which_item
-    puts ''
-    @food_data.each.with_index do |_data, index|
-      puts "#{index + 1}. #{@food_data[index].item_name}"
-    end
-
-    user_input = nil
-
-    loop do
+    if @food_items.empty?
+      puts 'That item was not found, please try another search term.'
       puts ''
-      puts 'Please enter the number of the food to see more info about that item:'
-      user_input = gets.chomp
-      break if user_input.to_i.between?(0, 10)
+      NutritionFacts::Item.reset
+      food_search
+    else
+      puts ''
+      @food_items.each.with_index do |_data, index|
+        puts "#{index + 1}. #{@food_items[index].item_name}"
+      end
       puts ''
-      puts 'Not sure what you meant, please type the number of the food item.'
+      puts 'Please enter the number of the food to see more info about that item:'
     end
 
-    if user_input.to_i.between?(0, 10)
-      display_item(@food_data[user_input.to_i - 1])
-    else
+    user_input = gets.chomp.downcase
+
+    if user_input.to_i.between?(0, @food_items.count)
+      display_item(@food_items[user_input.to_i - 1])
       loop_or_quit
+    else !user_input.to_i.between?(0, @food_items.count)
+         puts ''
+         puts 'Not sure what you meant, please type the number of the food item.'
+         which_item
     end
   end
 
-  def display_item(food_item_data)
-    puts ''
-    puts food_item_data.item_name.to_s
-    puts '---'
-    puts "Calories: #{food_item_data.nf_calories} kcal"
-    puts "Total Fat: #{food_item_data.nf_total_fat}g"
-    puts "Protein: #{food_item_data.nf_protein}g"
-    puts "Dietary Fiber: #{food_item_data.nf_dietary_fiber}g"
-    puts "Sugar: #{food_item_data.nf_sugars}g"
-    puts "Sodium: #{food_item_data.nf_sodium}mg"
-    puts "Vitamin C: #{food_item_data.nf_vitamin_c_dv}%"
-    puts "Vitamin A: #{food_item_data.nf_vitamin_a_dv}%"
-    puts "Serving Size: #{food_item_data.nf_serving_weight_grams}g"
-    loop_or_quit
-  end
-
   def loop_or_quit
     puts ''
     puts 'Please type "other", "search", or "exit".'
@@ -89,10 +66,27 @@ class NutritionFacts::CLI
       puts ''
       puts 'Thanks for using NutritionFacts CLI!'
       puts ''
+      Kernel.abort
     else
       puts ''
       puts 'Invalid input. Please try again.'
       loop_or_quit
     end
   end
+
+  def display_item(food_item_data)
+    puts ''
+    puts food_item_data.item_name.to_s
+    puts '---'
+    puts "Calories: #{food_item_data.nf_calories} kcal"
+    puts "Total Fat: #{food_item_data.nf_total_fat}g"
+    puts "Protein: #{food_item_data.nf_protein}g"
+    puts "Dietary Fiber: #{food_item_data.nf_dietary_fiber}g"
+    puts "Sugar: #{food_item_data.nf_sugars}g"
+    puts "Sodium: #{food_item_data.nf_sodium}mg"
+    puts "Vitamin C: #{food_item_data.nf_vitamin_c_dv}%"
+    puts "Vitamin A: #{food_item_data.nf_vitamin_a_dv}%"
+    puts "Serving Size: #{food_item_data.nf_serving_weight_grams}g"
+    loop_or_quit
+  end
 end

data/lib/nutrition_facts/item.rb

@@ -15,7 +15,7 @@ class NutritionFacts::Item
   end
 
   def self.find_by_name(name)
-    uri = URI.parse("https://api.nutritionix.com/v1_1/search/#{name}?results=0%3A10&cal_min=0&cal_max=50000&fields=item_name%2Cnf_calories%2Cnf_total_fat%2Cnf_total_carbohydrate%2Cnf_dietary_fiber%2Cnf_sugars%2Cnf_protein%2Cnf_serving_weight_grams%2Cnf_sodium%2Cnf_vitamin_a_dv%2Cnf_vitamin_c_dv&appId=da276553&appKey=f501b79647768ba684af20428a44ef59")
+    uri = URI.parse("https://api.nutritionix.com/v1_1/search/#{name}?results=0%3A9&cal_min=0&cal_max=50000&fields=item_name%2Cnf_calories%2Cnf_total_fat%2Cnf_total_carbohydrate%2Cnf_dietary_fiber%2Cnf_sugars%2Cnf_protein%2Cnf_serving_weight_grams%2Cnf_sodium%2Cnf_vitamin_a_dv%2Cnf_vitamin_c_dv&appId=da276553&appKey=f501b79647768ba684af20428a44ef59")
 
     response = Net::HTTP.get_response(uri)
 

data/lib/nutrition_facts/version.rb

@@ -1,3 +1,3 @@
 module NutritionFacts
-  VERSION = '0.5.0'.freeze
+  VERSION = '0.6.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nutrition_facts
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - Matthew Preiser
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-11 00:00:00.000000000 Z
+date: 2016-04-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler