liquery 0.8.6 → 0.8.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0677a9fc850822572a868555203a15c5d072079124af8f46b4edd663b49cdb7f
-  data.tar.gz: 4063d9b0ed11c2b7574d1adfe5b94c753da2fe4dbfd9577679428c5b372a87e1
+  metadata.gz: b64a9be0b8c33a8c4de89049079cb63841ee80fafd971cf4fd9e3bd6e5753bee
+  data.tar.gz: b0dab2bfc79660b28029c89187cacb7e4c13603864cd083fcc22abd44d346882
 SHA512:
-  metadata.gz: 647e49b66d6e27b77bfa5077e3f3ea2fbbfec94a2dcdb3cd69f475cd9cbbd067ae119fc6b77ea1b8599708356094d855258f712d40fb40b05ab28107dd643c9a
-  data.tar.gz: e461d0c438fb4ee4a65269b156118d3ec4763affc3eaf095a6a960ac2e29848834edaae56ab86225e3397a0a2cfc15740bfb1e91232a211e5e22e3854dc9b655
+  metadata.gz: c7cf0ad09d958b96524dcc0c8d59662040ec47e38d4ecbe1a3d728e10c908cdada6bb8b8d4ca591eaa2c8045f77e78a0a33922422e0ffe29c1181819f9219711
+  data.tar.gz: 0d61c184c2a4d825d59abae64d662160216bdd25fd08ff0db162faab808e38038269ab9599a810342930bbbb6636ee73a290498bdf88b3e8ba649f6e4e773c6e

data/config/environment.rb

@@ -1,5 +1,4 @@
 require_relative "../lib/LiquerY/CLI"
-require_relative "../lib/LiquerY/database"
 require_relative "../lib/LiquerY/drink"
 require_relative "../lib/LiquerY/DrinkAPI"
 require_relative "../lib/LiquerY/User"

data/lib/LiquerY/DrinkAPI.rb

@@ -0,0 +1,17 @@
+class DrinkAPI
+  attr_reader :id_array
+  def initialize
+    data = open("https://www.thecocktaildb.com/api/json/v1/1/filter.php?c=Cocktail").read
+    doc = JSON.parse(data)
+    #key is ["drinks"] value is array of ingredients
+    @id_array = doc.first.last.each.with_object([]) do |id_hash, array|
+      array << id_hash["idDrink"]
+    end
+  end
+
+  def make_hash
+    self.id_array.each.with_object({}) do |id, drink_hash|
+      drink_hash[id] = JSON.parse(open("https://www.thecocktaildb.com/api/json/v1/1/lookup.php?i=#{id}").read).values.first[0]
+    end
+  end
+end

data/lib/LiquerY/User.rb

@@ -0,0 +1,58 @@
+class User
+  attr_accessor :liked_drinks, :liked_ingredients, :disliked_drinks, :quiz_results, :okay_drinks, :great_drinks
+
+  @@all = []
+
+  def initialize
+    self.liked_drinks = []
+    self.liked_ingredients = []
+    self.disliked_drinks = []
+    @@all << self
+  end
+
+  def self.all
+    @@all
+  end
+
+  def self.current_user
+    @@all[-1]
+  end
+
+  def list_liked_drinks
+    puts "Drinks you like:".cyan
+    puts "\n\t#{self.print_list(self.liked_drinks.uniq)}".light_blue
+    puts "\nDrinks we've recommended:".cyan
+    puts "\n\t#{self.print_list(self.quiz_results)}".light_blue
+  end
+
+  def list_disliked_drinks
+    "Drinks you dislike: #{self.names(disliked_drinks)}."
+  end
+
+  def print_list(array)
+    array.each.with_object("") do |drink, string|
+      if array.size == 1
+        string << drink.strDrink
+      elsif array.size == 2 && drink == array[0]
+        string << "#{drink.strDrink} "
+      elsif drink == array[-1]
+        string << "and #{drink.strDrink}"
+      else
+        string << "#{drink.strDrink}, "
+      end
+    end
+  end
+
+  def names(drink_array)
+    drink_array.map {|drink| drink.strDrink}
+  end
+
+  def recent_choice
+    self.liked_drinks[-1]
+  end
+
+  def add_to_liked_ingredients
+    @liked_ingredients.concat((self.liked_drinks.map {|d| d.all_ingredients}).flatten.uniq)
+  end
+
+end

data/lib/LiquerY/drink.rb

@@ -0,0 +1,129 @@
+class Drink
+  attr_accessor :idDrink, :strDrink, :all_ingredients, :strIngredient1, :strIngredient2, :strIngredient3, :strIngredient4, :strIngredient5, :strIngredient6, :strIngredient7, :strIngredient8, :strIngredient9, :strMeasure1, :strMeasure2, :strMeasure3, :strMeasure4, :strMeasure5, :strMeasure6, :strMeasure7, :strMeasure8, :strInstructions, :palate
+
+  TEST_DRINKS = ["Boulevardier", "Cosmopolitan", "Dirty Martini", "Espresso Martini", "French Negroni", "Gimlet", "Gin Rickey", "Greyhound", "Lemon Drop", "Manhattan", "Martini", "Mojito", "Old Fashioned", "Pisco Sour", "The Last Word"]
+  DUMMY_DRINK = Drink.new.tap {|d| d.all_ingredients = ["a single bogus and insane ingredient that won't match anything"]}
+
+  @@all = []
+
+  def self.all
+    @@all.empty? ? Drink.new_from_hash : @@all
+  end
+
+  def self.new_from_hash(hash = DrinkAPI.new.make_hash)
+    hash.each do |id, drink_array|
+      drink = self.new
+      drink.all_ingredients = []
+
+      correct_and_set_data(drink, drink_array)
+
+      concat_ingredients(drink)
+
+      filter_and_set_by_palate(drink)
+
+      @@all << drink unless drink.idDrink == "14133" #To filter out "Cosmopolitan Martini, which for some reason is included in the database twice under different spellings."
+    end
+    @@all
+  end
+
+  def self.select_for_test
+    self.all.select {|d| TEST_DRINKS.include?(d.strDrink)}
+  end
+
+  def print_ingredients
+    self.all_ingredients.each.with_object("") do |ing, string|
+      if ing == self.all_ingredients[-1]
+        string << "and #{ing}."
+      else
+        string << "#{ing}, "
+      end
+    end
+  end
+
+  def self.search_by_drink_name(name)
+    name_match = FuzzyMatch.new(Drink.all.map{|d| d.strDrink}).find("#{name}")
+    if Drink.all.find {|d| d.strDrink == name}
+      Drink.all.find {|d| d.strDrink == name}
+    elsif name_match
+      Drink.all.find {|d| d.strDrink == name_match }
+    end
+  end
+
+  def self.search_by_alcohol_name(name)
+    name_match = FuzzyMatch.new(Drink.all.map{|d| d.all_ingredients}.flatten).find("#{name}")
+    if Drink.all.map {|d| d.all_ingredients}.flatten.include?(name)
+      Drink.all.select {|d| d.all_ingredients.include?(name)}
+    elsif name_match
+      Drink.all.select {|d| d.all_ingredients.include?(name_match)}
+    end
+  end
+
+  def self.find_ingredients_by_drink_name(name)
+    drink = self.search_by_drink_name(name)
+    system "clear"
+    puts "Drink Ingredients:".light_blue
+    puts "\n#{drink.strDrink} --".cyan
+    puts "#{drink.print_ingredients}".cyan
+  end
+
+  def self.find_recipe_by_drink_name(name)
+    drink = self.search_by_drink_name(name)
+    system "clear"
+    puts "Drink Recipe:".light_blue
+    puts "\n#{drink.strDrink} --".cyan
+    puts "Ingredients: ".cyan + "#{drink.print_ingredients}".light_blue
+    puts "#{drink.strInstructions}".cyan
+  end
+
+  def self.search_by_palate(palate)
+    Drink.all.select {|d| d.palate == palate}
+  end
+
+  private
+
+  def self.correct_and_set_data(drink, drink_array)
+    drink_array.each do |method, arg| ###REMOVE THIS ZERO WHEN YOU PULL FROM API!!!
+      if !(["strDrink", "strInstructions"].include?(method))
+        if drink.respond_to?("#{method}") && arg.is_a?(String) && arg.include?("Absolut")
+          drink.send("#{method}=", "Vodka") #Had to hardcode this in
+          #because for almost every drink they list a generic liquor
+          #as an ingredient, except for, frustratingly, certain vodka
+          #drinks, for which they give a brand name Absolut variety
+          #that messes up my algorithm
+        elsif drink.respond_to?("#{method}") && arg.is_a?(String) && (arg.include?("lemon") || arg.include?("Lemon"))
+          drink.send("#{method}=", "Lemon Juice")
+          drink.send("strIngredient9=", "Simple Syrup")
+        elsif drink.respond_to?("#{method}") && arg.is_a?(String) && (arg.include?("Sugar") || arg.include?("Simple"))
+          drink.send("#{method}=", "Simple Syrup")
+        elsif drink.respond_to?("#{method}") && arg.is_a?(String) && arg.include?("Lime")
+          drink.send("#{method}=", "Lime Juice")
+        elsif drink.respond_to?("#{method}") && arg != " " && arg != ""
+          drink.send("#{method}=", arg)
+        end
+      elsif drink.respond_to?("#{method}") && arg != " " && arg != ""
+        drink.send("#{method}=", arg)
+      end
+    end
+  end
+
+  def self.filter_and_set_by_palate(drink)
+    if (drink.all_ingredients.map {|d|d.downcase} & ["cream", "milk", "kahlua", "bailey", "bailey\'s irish cream", "creme de cacao", "white creme de menthe", "hot chocolate", "coffee liqueur", "chocolate liqueur", "pina colada mix"]).any?
+      drink.palate = "creamy"
+    elsif (drink.all_ingredients.map {|d|d.downcase} & ["lime juice", "lemon juice"]).any? && !(drink.all_ingredients.map {|d|d.downcase}.include?("simple syrup")) || (drink.all_ingredients.map {|d|d.downcase} & ["sour mix", "sweet and sour", "pisco"]).any?
+        drink.palate = "bright"
+    elsif (drink.all_ingredients.map {|d|d.downcase} & ["simple syrup", "grenadine", "creme de cassis", "apple juice", "cranberry juice", "pineapple juice", "maraschino cherry", "maraschino liqueur", "grape soda", "kool-aid"]).any?
+      drink.palate = "sweet"
+    else
+      drink.palate = "dry"
+    end
+  end
+
+  def self.concat_ingredients(drink)
+    drink.instance_variables.map{|v|v.to_s.tr('@', '')}.select{|v| v.match(/^strIng/)}.each do |v|
+      unless (drink.send("#{v}") == nil || drink.all_ingredients.include?(drink.send("#{v}")))
+        drink.all_ingredients << drink.send("#{v}")
+      end
+    end
+  end
+
+end

data/lib/LiquerY/version.rb

@@ -0,0 +1,3 @@
+module Liquery
+  VERSION = "0.8.8"
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: liquery
 version: !ruby/object:Gem::Version
-  version: 0.8.6
+  version: 0.8.8
 platform: ruby
 authors:
 - Andrew Johnson
@@ -119,6 +119,10 @@ files:
 - bin/liquery
 - config/environment.rb
 - lib/LiquerY/CLI.rb
+- lib/LiquerY/DrinkAPI.rb
+- lib/LiquerY/User.rb
+- lib/LiquerY/drink.rb
+- lib/LiquerY/version.rb
 - lib/liquery.rb
 homepage: https://github.com/aaj3f/LiquerY
 licenses: