fruit-info 0.1.6 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 14edf24625be9c5f471ad5c2907fe315348685673588542129172bebbc91c580
-  data.tar.gz: 9cee80fba89a37300a887dfcd716a019116e99ee0ee735662830998abf0bca81
+  metadata.gz: 13b2a93a47f9040aefb4976f067932d7e45fdf8fcbb0e41ee3798ad9615f99f8
+  data.tar.gz: ae6028b74f34e5ba57a4e54a98eb651686dd1bfd318428cbb7200b1b860ec47e
 SHA512:
-  metadata.gz: 51dbca0c566aaf8c7cd72e14694be6af09a03323bc72d89362cb149952a5b869c4af742d95f4e00621dd93886d68e074f56dcd7bcba878f1b4cdcb24d7ea9d8f
-  data.tar.gz: 86278e51c80ad788dc46414e0a19d9af951b7083c37a096dea2f4022ae8c360a8ac0d7cae343e12793474b40ba9048d175824518d1582fb88ce8f454ed8536cf
+  metadata.gz: 77c4bffeaa3c5f6903eedea89b6fa055f249cb34e5c252ca7d5cfae01e4ccf4e7c4784fdcfa12599e35366d7e7e1755c7e7fe5aed39cbe7d6a0d827d1d5aca40
+  data.tar.gz: c36e7c69dcc9fd411443783079928f8e6779134b3e4467568ea754c6ea30e810a859f5d8f4bcbe354fc1310bc56e15d8559cfbea497fc47f89ba346fb8626c53

data/config/environment.rb

@@ -5,6 +5,6 @@ require 'pry'
 require 'json'
 require 'colorize'
 
-require_relative '../lib/fruit.rb'
-require_relative '../lib/cli.rb'
-require_relative '../lib/fruityvice_api.rb'
+require_relative '../lib/fruit'
+require_relative '../lib/cli'
+require_relative '../lib/fruityvice_api'

data/lib/cli.rb

@@ -7,18 +7,18 @@ module FruitInfo
       FruityviceAPI.new.make_fruits
       puts 'Welcome to fruit!'
       input = nil
-      while input != 'q'
+      while input != 'q' || input != 'exit'
         puts 'Press ' + 'a'.red + ' to see all fruit'
         puts 'Press ' + 's'.yellow + ' to see all fruit listed with their scientific names'
         puts 'Press ' + 'n'.light_yellow + ' to see all fruit listed with their nutrional information'
         puts 'Press ' + 'm'.green + ' to see the fruits with most nutrition'
         puts 'Press ' + 'l'.cyan + ' to see the fruits with least nutrition'
         puts 'Type the ' + 'name of a fruit '.blue + 'to see all of its information'
-        puts 'Press ' + 'q'.magenta + " to quit\n"
+        puts 'Press ' + 'q'.magenta + ' or type ' + 'exit'.magenta + " to quit\n"
         print 'What would you like to do: '
         input = gets.strip.downcase
         case input
-        when 'q'
+        when 'q', 'exit'
           return
         when 'a'
           display_all_fruit
@@ -31,7 +31,7 @@ module FruitInfo
         when 'l'
           display_the_least
         else
-          if !Fruit.all.find { |fruit| fruit.name.downcase == input}.nil?
+          if !Fruit.all.find { |fruit| fruit.name.downcase == input }.nil?
             display_one_fruit(Fruit.all.find { |fruit| fruit.name.downcase == input })
           else
             puts "\nNot a valid option or fruit in database\n".red
@@ -39,7 +39,7 @@ module FruitInfo
         end
       end
     end
-  
+
     def display_the_least
       puts "\nThe fruits with the least nutrition per 100g".colorize(:magenta)
       least_carb = Fruit.min('carbohydrates')
@@ -47,14 +47,14 @@ module FruitInfo
       least_fat = Fruit.min('fat')
       least_calories = Fruit.min('calories')
       least_sugar = Fruit.min('sugar')
-    
+
       puts "\nLeast carbohydrates: #{least_carb.name} @ #{least_carb.nutritions['carbohydrates']}g".colorize(least_carb.color)
       puts "Least protein: #{least_protein.name} @ #{least_protein.nutritions['protein']}g".colorize(least_protein.color)
       puts "Least fat: #{least_fat.name} @ #{least_fat.nutritions['fat']}g".colorize(least_fat.color)
       puts "Least calories: #{least_calories.name} @ #{least_calories.nutritions['calories']}".colorize(least_calories.color)
       puts "Least sugar: #{least_sugar.name} @ #{least_sugar.nutritions['sugar']}g\n".colorize(least_sugar.color)
     end
-  
+
     def display_the_most
       puts "\nThe fruits with the most nutrition per 100g".colorize(:cyan)
       most_carb = Fruit.max('carbohydrates')
@@ -62,14 +62,14 @@ module FruitInfo
       most_fat = Fruit.max('fat')
       most_calories = Fruit.max('calories')
       most_sugar = Fruit.max('sugar')
-    
+
       puts "\nMost carbohydrates: #{most_carb.name} @ #{most_carb.nutritions['carbohydrates']}g".colorize(most_carb.color)
       puts "Most protein: #{most_protein.name} @ #{most_protein.nutritions['protein']}g".colorize(most_protein.color)
       puts "Most fat: #{most_fat.name} @ #{most_fat.nutritions['fat']}g".colorize(most_fat.color)
       puts "Most calories: #{most_calories.name} @ #{most_calories.nutritions['calories']}".colorize(most_calories.color)
       puts "Most sugar: #{most_sugar.name} @ #{most_sugar.nutritions['sugar']}g\n".colorize(most_sugar.color)
     end
-  
+
     def display_one_fruit(fruit)
       puts "\n#{fruit.name} - #{fruit.order} #{fruit.family} #{fruit.genus}".colorize(fruit.color)
       fruit.nutritions.each do |k, v|
@@ -81,13 +81,13 @@ module FruitInfo
       end
       puts ''
     end
-  
+
     def display_all_fruit
       puts ''
       Fruit.all.each { |fruit| puts fruit.name.to_s.colorize(fruit.color) }
       puts ''
     end
-  
+
     def display_nutrional_info
       puts ''
       Fruit.all.each do |fruit|
@@ -102,11 +102,13 @@ module FruitInfo
         puts ''
       end
     end
-  
+
     def display_fruits_with_scientific_names
       puts ''
-      Fruit.all.each { |fruit| puts "#{fruit.name}: #{fruit.order} #{fruit.family} #{fruit.genus}".colorize(fruit.color) }
+      Fruit.all.each do |fruit|
+        puts "#{fruit.name}: #{fruit.order} #{fruit.family} #{fruit.genus}".colorize(fruit.color)
+      end
       puts ''
     end
   end
-end
+end

data/lib/fruit.rb

@@ -4,6 +4,7 @@
 module FruitInfo
   class Fruit
     attr_accessor :genus, :name, :id, :family, :order, :nutritions, :color
+
     @@all = []
     def initialize(attributes)
       attributes.each { |k, v| send("#{k}=", v) }
@@ -20,38 +21,40 @@ module FruitInfo
     end
 
     def add_color
-      case name
-      when 'Apricot'
-        self.color = :yellow
-      when 'Banana'
-        self.color = :light_yellow
-      when 'Blueberry'
-        self.color = :blue
-      when 'Cherry'
-        self.color = :red
-      when 'Apple'
-        self.color = :green
-      when 'Lemon'
-        self.color = :light_yellow
-      when 'Mango'
-        self.color = :yellow
-      when 'Orange'
-        self.color = :yellow
-      when 'Pear'
-        self.color = :green
-      when 'Pineapple'
-        self.color = :light_yellow
-      when 'Raspberry'
-        self.color = :light_red
-      when 'Strawberry'
-        self.color = :red
-      when 'Tomato'
-        self.color = :red
-      when 'Watermelon'
-        self.color = :light_green
-      else
-        self.color = :white
-      end
+      self.color = case name
+                   when 'Apricot'
+                     :yellow
+                   when 'Banana'
+                     :light_yellow
+                   when 'Blueberry'
+                     :blue
+                   when 'Cherry'
+                     :red
+                   when 'Apple'
+                     :green
+                   when 'Lemon'
+                     :light_yellow
+                   when 'Mango'
+                     :yellow
+                   when 'Orange'
+                     :yellow
+                   when 'Pear'
+                     :green
+                   when 'Pineapple'
+                     :light_yellow
+                   when 'Raspberry'
+                     :light_red
+                   when 'Strawberry'
+                     :red
+                   when 'Tomato'
+                     :red
+                   when 'Watermelon'
+                     :light_green
+                   when 'Guava'
+                     :light_green
+                   else
+                     :white
+                   end
     end
 
     def self.all
@@ -62,4 +65,4 @@ module FruitInfo
       fruits.each { |fruit| new(fruit) }
     end
   end
-end
+end

data/lib/fruityvice_api.rb

@@ -6,11 +6,17 @@ module FruitInfo
     BASE_URL = 'https://www.fruityvice.com/api/fruit/all'
 
     def access_fruityviceapi
-      JSON.parse(HTTParty.get(BASE_URL, verify: false))
+      resp = HTTParty.get(BASE_URL, verify: false)
+      return JSON.parse(resp.to_s) if resp
+
+      nil
     end
 
     def make_fruits
-      Fruit.new_from_api(access_fruityviceapi)
+      fruit_json = access_fruityviceapi
+      return unless fruit_json
+
+      Fruit.new_from_api(fruit_json)
     end
   end
-end
+end

metadata

@@ -1,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: fruit-info
 version: !ruby/object:Gem::Version
-  version: 0.1.6
+  version: 0.1.8
 platform: ruby
 authors:
 - Samuel Grasse-Haroldsen
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-12-26 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: colorize
@@ -30,14 +29,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.24'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '0.18'
+        version: '0.24'
 - !ruby/object:Gem::Dependency
   name: json
   requirement: !ruby/object:Gem::Requirement
@@ -83,7 +82,6 @@ homepage: https://github.com/SamG-H/fruit-cli-gem
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -91,15 +89,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.3.0
+      version: 3.3.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
-signing_key: 
+rubygems_version: 4.0.16
 specification_version: 4
 summary: A gem utilizing the fruityvice api
 test_files: []