beer-advocate-cli 0.1.4 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6bcfc6500747d2f76e57fac8e9551ae5a2f0b71b934dec8b6c588656c32841e0
-  data.tar.gz: 226d886ed0abe67fd2450ee5b9e9beb5a7dcfa7b814d60a5375e7efd5b0208b8
+  metadata.gz: f112ae6df99c1023e70365c34df69ada37af7e49d5f425225ee65700c9657457
+  data.tar.gz: deda2a0d0950339c738e1cb2a6c59aea448d59369929dd92ba2f8bb7e48502d9
 SHA512:
-  metadata.gz: 7afeffb1b9b617559fa28f5a9b3ab3325fb1c78a519178c55441ef9b30f8d6ed0bf3e9b2f6a8fb52c8a3dfe6177cdba0b47bf41dca9c1c980f3b3030f4252042
-  data.tar.gz: c85e3233ae73a2599b679266d73b883824ca7cd1ec64d0879a8e2f3323be82f19b14c07afb6ce2dc6c5fe15123d5055828b5913600252f56aa0249fedc7c692d
+  metadata.gz: 5bf06e5b6d1f7e80b203cce20c5400cb7b5536e01ebe98511f5614883898ceba26630ed89e867d386f6758c89cf8832b6ad1f10672ba4064e9a89629d7943ee9
+  data.tar.gz: 84efb5d6e2a69e6a7705c5b5beba8fa01b9d3e1cbfb45cf6373d0934be2ed37e93649c1df43757b6f734e55a6d4cd86f0e9226679e8fa7e21d995e8a69336c48

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    beer-advocate-cli (0.1.4)
+    beer-advocate-cli (0.2.0)
       colorize (~> 0.8.1)
       nokogiri (~> 1.8)
 

data/README.md

@@ -20,8 +20,26 @@ Or install it yourself as:
 
 ## Usage
 
+* ~ Mac Terminal installation not working...any input highly appreciated... ~
+
+If using the Mac Terminal app, ensure Xcode is installed:
+
+xcode-select --install
+
+Then type:
+
+ruby -e "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install)"
+
+brew install ruby
+
+sudo gem install beer-advocate-cli -n /usr/local/bin
+
+* ~ ~ 
+
 To run the CLI, simply type 'beer-advocate'. 
 
+Video walkthrough: https://www.youtube.com/watch?v=0gne-y8op7k&t=2s
+
 ## Development
 
 After checking out the repo, run `bin/setup` to install dependencies. You can also run `bin/console` for an interactive prompt that will allow you to experiment.

data/lib/beer_advocate/cli.rb

@@ -1,8 +1,16 @@
+require 'pry'
+
 require_relative './beer.rb'
 require_relative './scraper.rb'
 require_relative './brewery.rb'
 
 class BeerAdvocate::CLI
+  attr_accessor :beer_list, :beers, :styles, :reviews, :find_beer, :find_brewery, :find_style
+  
+  def initialize
+    @beer_list = BeerAdvocate::Beer.create_from_collection(BeerAdvocate::Scraper.scrape_list_page)
+  end
+  
   def welcome
     puts " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ".light_blue
     beer_advocate_cli_text = "Beer Advocate CLI".yellow.bold
@@ -27,33 +35,39 @@ class BeerAdvocate::CLI
     end
   end
   
-  def show_beers_table
-    puts " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ".light_blue
-    puts "Choose a range: || 1   - Most popular  ".yellow.bold
-    puts "                || 250 - Least popular ".yellow.bold
-    puts " "
-    puts "1. 1-50 | 2. 51-100 | 3. 101-150 | 4. 151-200 | 5. 201-250"
-    puts " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ".light_blue
-    
+  def show_beers_table_input
     case take_input
     when "1"
-      beers = BeerAdvocate::Beer.find_or_create_from_collection(BeerAdvocate::Scraper.scrape_list_page)[0..49]
+      @beers = @beer_list[0..49]
     when "2"
-      beers = BeerAdvocate::Beer.find_or_create_from_collection(BeerAdvocate::Scraper.scrape_list_page)[50..99]
+      @beers = @beer_list[50..99]
     when "3"
-      beers = BeerAdvocate::Beer.find_or_create_from_collection(BeerAdvocate::Scraper.scrape_list_page)[100..149]
+      @beers = @beer_list[100..149]
     when "4"
-      beers = BeerAdvocate::Beer.find_or_create_from_collection(BeerAdvocate::Scraper.scrape_list_page)[150..199]
+      @beers = @beer_list[150..199]
     when "5"
-      beers = BeerAdvocate::Beer.find_or_create_from_collection(BeerAdvocate::Scraper.scrape_list_page)[200..249]
+      @beers = @beer_list[200..249]
     else
-      exit
+      puts ""
+      puts "Invalid. Please type 1-5:".bold
+      show_beers_table_input
     end
+  end
+  
+  def show_beers_table
+    puts " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ".light_blue
+    puts "Choose a range: || 1   - Most popular  ".yellow.bold
+    puts "                || 250 - Least popular ".yellow.bold
+    puts " "
+    puts "1. 1-50 | 2. 51-100 | 3. 101-150 | 4. 151-200 | 5. 201-250"
+    puts " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ".light_blue
+    
+    show_beers_table_input
     
     green_beer = "Name".green.bold
     blue_brewery = "Brewery".light_blue.bold
     abv = abv = " | ABV | "
-    bold_rating = "Score /5".red.bold
+    bold_rating = "Score".red.bold
     the_rest = " | Review count"
     complete_beer = green_beer << " | " << blue_brewery << abv << bold_rating << the_rest
     
@@ -62,7 +76,7 @@ class BeerAdvocate::CLI
     puts complete_beer
     puts " "
     puts " "
-    beers.each do |beer|
+    @beers.each do |beer|
       green_beer1 = "#{beer[:name]}".green.bold
       blue_brewery1 = "#{beer[:brewery]}".light_blue.bold
       abv1 = " | #{beer[:abv]} | "
@@ -78,29 +92,10 @@ class BeerAdvocate::CLI
     puts " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ".light_blue
   end
     
-  
-  def show_beer(beer)
-    beers = BeerAdvocate::Beer.find_or_create_from_collection(BeerAdvocate::Scraper.scrape_list_page)
-    find_beer = beers.find do |listed_beer|
-      listed_beer[:name].downcase == beer.downcase
-    end
-    if find_beer == nil
-      exit
-    end
-    beer_page_details = BeerAdvocate::Scraper.scrape_name_page(find_beer[:name_url])
-    
-    puts " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ".light_blue
-    puts "#{find_beer[:name]}".yellow.bold
-    puts " "
-    puts "Brewery: #{find_beer[:brewery]} || Style: #{find_beer[:style]} || ABV: #{find_beer[:abv]} || Score: #{find_beer[:score]} || Review count: #{find_beer[:review_count]}"
-    puts " "
-    puts "1. Top reviews | 2. Brewery details | 3. Style details".light_blue.bold
-    puts "Choose an option above.".yellow.bold
-    puts " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ".light_blue
+  def show_beer_input
     case take_input
     when "1"
-      reviews = beer_page_details[:top_reviews]
-      reviews.each do |review|
+      @reviews.each do |review|
         puts " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ".light_blue
         puts "#{review}"
         puts " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ".light_blue
@@ -108,62 +103,87 @@ class BeerAdvocate::CLI
       end
       puts "Type 'menu':".yellow.bold
       puts " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ".light_blue
-      take_input
+      menu_from_reviews
     when "2"
       show_brewery(find_beer[:brewery])
     when "3"
       show_style(find_beer[:style])
+    else
+      puts ""
+      puts "Invalid. Please type 1-3:".bold
+      show_beer_input
     end
   end
   
+  def menu_from_reviews
+    if take_input != "menu" || take_input != "exit"
+        puts ""
+        puts "Type 'menu':".bold
+        menu_from_reviews
+    end
+  end
+  
+  def show_beer(beer)
+    @find_beer = @beer_list.find do |listed_beer|
+      listed_beer[:name].downcase == beer.downcase
+    end
+    if @find_beer == nil
+      puts ""
+      puts "Invalid. Please type the beer exactly as it appears in the beer list:".bold
+      show_beer(take_input)
+    end
+    
+    if BeerAdvocate::Scraper.find_url(find_beer[:name_url]) == nil
+      beer_page_details = BeerAdvocate::Scraper.scrape_name_page(find_beer[:name_url])
+    else
+      beer_page_details = BeerAdvocate::Scraper.find_url_details(find_beer[:name_url])
+    end
+    @reviews = beer_page_details[:top_reviews]
+    
+    puts " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ".light_blue
+    puts "#{find_beer[:name]}".yellow.bold
+    puts " "
+    puts "Brewery: #{find_beer[:brewery]} || Style: #{find_beer[:style]} || ABV: #{find_beer[:abv]} || Score: #{find_beer[:score]} || Review count: #{find_beer[:review_count]}"
+    puts " "
+    puts "1. Top reviews | 2. Brewery details | 3. Style details".light_blue.bold
+    puts "Choose an option above.".yellow.bold
+    puts " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ".light_blue
+    
+    show_beer_input
+  end
+  
   def show_styles_list
-    beers = BeerAdvocate::Beer.find_or_create_from_collection(BeerAdvocate::Scraper.scrape_list_page)
-    styles = beers.collect do |beer|
+    @styles = @beer_list.collect do |beer|
       beer[:style]
     end
-    styles.uniq!
-    styles.sort!
+    @styles.uniq!
+    @styles.sort!
     
     puts "- - - - - - - - - - - - - - - - -".light_blue
     puts "Type a style number:".yellow.bold
     puts " "
-    styles.each do |style|
+    @styles.each do |style|
       puts "#{styles.index(style) + 1}. #{style}"
     end
     puts " "
     puts "Type a style number:".yellow.bold
     puts "- - - - - - - - - - - - - - - - -".light_blue
     
+    show_styles_list_input
+  end
+  
+  def show_styles_list_input
     numerized_input = take_input.to_i
-    if numerized_input == 0
-      exit
-    else 
-      show_style(styles[numerized_input - 1])
+    if numerized_input.between?(1, @styles.length)
+      show_style(@styles[numerized_input - 1])
+    else
+      puts ""
+      puts "Invalid. Please type a style number:".bold
+      show_styles_list_input
     end
   end
   
-  def show_style(style)
-    beers = BeerAdvocate::Beer.find_or_create_from_collection(BeerAdvocate::Scraper.scrape_list_page)
-    find_style = beers.find do |listed_beer|
-      listed_beer[:style].downcase == style.downcase
-    end
-    if find_style == nil
-      exit
-    end
-    style_page_details = BeerAdvocate::Scraper.scrape_style_page(find_style[:style_url])
-    
-    puts "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -".light_blue
-    puts "#{find_style[:style]}".yellow.bold
-    puts " "
-    puts "#{style_page_details[:description]}"
-    puts " "
-    puts "#{style_page_details[:abv]}".bold
-    puts "#{style_page_details[:ibu]}".bold
-    puts "#{style_page_details[:glassware]}".bold
-    puts " "
-    puts "Press '1' for a list of beers of this style.".yellow.bold
-    puts "- - - - - - - - - - - - - - - - - - - - - -".light_blue
-    
+  def show_style_input
     case take_input
     when "1"
       beers = BeerAdvocate::Style.find_style(find_style[:style]).beers
@@ -182,7 +202,7 @@ class BeerAdvocate::CLI
       puts complete_beer
       puts " "
       
-      beers.collect! do |beer|
+      new_beers = beers.collect do |beer|
         green_beer1 = "#{beer.name}".green.bold
         interlude1 = " | "
         bold_brewery1 = "#{beer.brewery.name}".red.bold
@@ -191,9 +211,8 @@ class BeerAdvocate::CLI
         complete_beer1 = green_beer1 << interlude1 << bold_brewery1 << interlude1 << abv1 << interlude1 << score1
         complete_beer1
       end
-      beers.uniq!.sort!
       
-      puts beers
+      puts new_beers.uniq.sort
       puts " "
       puts complete_beer
       puts "Type a beer name for more info.".yellow.bold
@@ -201,37 +220,43 @@ class BeerAdvocate::CLI
       puts "#{find_style[:style]}".bold
       puts " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ".light_blue
       show_beer(take_input)
+    else
+      puts ""
+      puts "Type '1':".bold
+      show_style_input
     end
   end
   
-  def show_brewery(brewery)
-    beers = BeerAdvocate::Beer.find_or_create_from_collection(BeerAdvocate::Scraper.scrape_list_page)
-    find_brewery = beers.find do |listed_beer|
-      listed_beer[:brewery].downcase == brewery.downcase
+  def show_style(style)
+    @find_style = beer_list.find do |listed_beer|
+      listed_beer[:style].downcase == style.downcase
     end
-    if find_brewery == nil
-      exit
+    
+    if BeerAdvocate::Scraper.find_url(find_style[:style_url]) == nil
+      style_page_details = BeerAdvocate::Scraper.scrape_style_page(find_style[:style_url])
+    else
+      style_page_details = BeerAdvocate::Scraper.find_url_details(find_style[:style_url])
     end
-    brewery_page_details = BeerAdvocate::Scraper.scrape_brewery_page(find_brewery[:brewery_url])
     
-    puts "- - - - - - - - - - - - - - - - - - - - - - - - - -".light_blue
-    puts "#{find_brewery[:brewery]}".yellow.bold
-    puts " "
-    puts "#{brewery_page_details[:type]}"
-    puts " "
-    puts "#{brewery_page_details[:address]}"
+    puts "- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -".light_blue
+    puts "#{find_style[:style]}".yellow.bold
     puts " "
-    puts "#{brewery_page_details[:phone_number]}"
+    puts "#{style_page_details[:description]}"
     puts " "
-    puts "#{brewery_page_details[:website]}"
+    puts "#{style_page_details[:abv]}".bold
+    puts "#{style_page_details[:ibu]}".bold
+    puts "#{style_page_details[:glassware]}".bold
     puts " "
-    puts "Press '1' for a list of beers from this brewery.".yellow.bold
-    puts "- - - - - - - - - - - - - - - - - - - - - - - - - -".light_blue
+    puts "Press '1' for a list of beers of this style.".yellow.bold
+    puts "- - - - - - - - - - - - - - - - - - - - - -".light_blue
     
+    show_style_input
+  end
+  
+  def show_brewery_input
     case take_input
     when "1"
-      beers = BeerAdvocate::Brewery.find_brewery(find_brewery[:brewery]).beers
-      
+      beers = BeerAdvocate::Brewery.find_brewery(@find_brewery[:brewery]).beers
       green_beer = "Name".green.bold
       interlude = " | "
       bold_style = "Style".red.bold
@@ -246,7 +271,7 @@ class BeerAdvocate::CLI
       puts complete_beer
       puts " "
       
-      beers.collect! do |beer|
+      colored_beers = beers.collect do |beer|
         green_beer1 = "#{beer.name}".green.bold
         interlude1 = " | "
         bold_style1 = "#{beer.style.name}".red.bold
@@ -255,9 +280,8 @@ class BeerAdvocate::CLI
         complete_beer1 = green_beer1 << interlude1 << bold_style1 << interlude1 << abv1 << interlude1 << score1
         complete_beer1
       end
-      beers.uniq!.sort!
       
-      puts beers
+      puts colored_beers.uniq.sort
       puts " "
       puts complete_beer
       puts "Type a beer name for more info.".yellow.bold
@@ -265,17 +289,60 @@ class BeerAdvocate::CLI
       puts "#{find_brewery[:brewery]}".bold
       puts " - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - ".light_blue
       show_beer(take_input)
+    else
+      puts ""
+      puts "Type '1':".bold
+      show_brewery_input
     end
   end
   
+  def show_brewery(brewery)
+    @find_brewery = @beer_list.find do |listed_beer|
+      listed_beer[:brewery].downcase == brewery.downcase
+    end
+    
+    if find_brewery == nil
+      puts ""
+      puts "Invalid. Please type the brewery exactly as it appears in the beer list:".bold
+      show_brewery(take_input)
+    end
+    
+    if BeerAdvocate::Scraper.find_url(find_brewery[:brewery_url]) == nil
+      brewery_page_details = BeerAdvocate::Scraper.scrape_brewery_page(find_brewery[:brewery_url])
+    else
+      brewery_page_details = BeerAdvocate::Scraper.find_url_details(find_brewery[:brewery_url])
+    end
+    
+    #binding.pry
+    
+    puts "- - - - - - - - - - - - - - - - - - - - - - - - - -".light_blue
+    puts "#{find_brewery[:brewery]}".yellow.bold
+    puts " "
+    puts "#{brewery_page_details[:type]}"
+    puts " "
+    puts "#{brewery_page_details[:address]}"
+    puts " "
+    puts "#{brewery_page_details[:phone_number]}"
+    puts " "
+    puts "#{brewery_page_details[:website]}"
+    puts " "
+    puts "Press '1' for a list of beers from this brewery.".yellow.bold
+    puts "- - - - - - - - - - - - - - - - - - - - - - - - - -".light_blue
+    
+    show_brewery_input
+  end
+  
   def beer_table_interaction
     show_beers_table
     show_beer(take_input)
   end
   
   def run
-    BeerAdvocate::Beer.create_from_collection(BeerAdvocate::Scraper.scrape_list_page)
     welcome
+    welcome_input
+  end
+  
+  def welcome_input
     case take_input
     when "1"
       beer_table_interaction
@@ -289,12 +356,10 @@ class BeerAdvocate::CLI
       puts ""
       puts "Type brewery name:".bold
       show_brewery(take_input)
-    end
-  end
-  
-  class InputError < StandardError
-    def message
-      "Sorry, input invalid."
+    else
+      puts ""
+      puts "Invalid. Please type 1-4:".bold
+      welcome_input
     end
   end
 end

data/lib/beer_advocate/scraper.rb

@@ -1,7 +1,28 @@
 class BeerAdvocate::Scraper
   BEER_ADVOCATE_URL = "https://www.beeradvocate.com/lists/popular/"
 
+  @@scraped_urls = []
+  
+  def self.scraped_urls
+    @@scraped_urls
+  end
+  
+  def self.find_url(url)
+    self.scraped_urls.find do |scraped_url_hash| 
+      scraped_url_hash.keys.to_s.split('"')[1] == url
+    end
+  end
+  
+  def self.find_url_details(url)
+    found_url = self.scraped_urls.find do |scraped_url_hash| 
+      scraped_url_hash.keys.to_s.split('"')[1] == url
+    end
+    found_url[url.to_sym]
+  end
+
   def self.scrape_list_page
+    puts "SCRAPING #{BEER_ADVOCATE_URL} ************"
+    
     html = open(BEER_ADVOCATE_URL)
     beer_list_page = Nokogiri::HTML(html)
     
@@ -27,6 +48,8 @@ class BeerAdvocate::Scraper
   end
 
   def self.scrape_name_page(name_url)
+    puts "SCRAPING #{name_url} ************"
+    
     html = open(name_url)
     name_page = Nokogiri::HTML(html)
     
@@ -47,10 +70,16 @@ class BeerAdvocate::Scraper
     name_hash[:top_reviews] = name_hash[:top_reviews][1..9]
     name_hash[:top_reviews].delete_if {|review| review.length < 40}
     
+    scraped_url_hash = {}
+    scraped_url_hash[name_url.to_sym] = name_hash
+    self.scraped_urls << scraped_url_hash
+    
     name_hash
   end
   
   def self.scrape_brewery_page(brewery_url)
+    puts "SCRAPING #{brewery_url} ************"
+    
     html = open(brewery_url)
     brewery_page = Nokogiri::HTML(html)
     
@@ -65,10 +94,16 @@ class BeerAdvocate::Scraper
     brewery_hash[:phone_number] = jumbled_phone_number.split("|")[0].strip
     brewery_hash[:website] = jumbled_phone_number.split("\n")[1].strip
     
+    scraped_url_hash = {}
+    scraped_url_hash[brewery_url.to_sym] = brewery_hash
+    self.scraped_urls << scraped_url_hash
+    
     brewery_hash
   end
   
   def self.scrape_style_page(style_url)
+    puts "SCRAPING #{style_url} ************"
+    
     html = open(style_url)
     style_page = Nokogiri::HTML(html)
     
@@ -81,6 +116,10 @@ class BeerAdvocate::Scraper
     style_hash[:ibu] = jumbled_details[1].strip
     style_hash[:glassware] = jumbled_details[2].strip
     
+    scraped_url_hash = {}
+    scraped_url_hash[style_url.to_sym] = style_hash
+    self.scraped_urls << scraped_url_hash
+    
     style_hash
   end
 end

data/lib/beer_advocate/version.rb

@@ -1,3 +1,3 @@
 module BeerAdvocate
-  VERSION = "0.1.4"
-end
+  VERSION = "0.2.0"
+end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: beer-advocate-cli
 version: !ruby/object:Gem::Version
-  version: 0.1.4
+  version: 0.2.0
 platform: ruby
 authors:
 - Nate Tan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-04-29 00:00:00.000000000 Z
+date: 2019-05-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler