coffeebreak 0.1.0 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f658c012f3f01d6a7bc3f0150fc0a607bf2447840e525b9abaae4a4f03656d5
-  data.tar.gz: ff13fe7744ac797fc8a3f12abb2e70c6e72a851753c1585db5a611bab629c0c0
+  metadata.gz: cb3fd9e88e5939a78f2cb43a60ba50b7ac2e04aab1c63a29f4d7eed727077236
+  data.tar.gz: 39c57c76437976c2b47d77e75c1605b6ccccdf11baa222351e1dd20d4ccd2cf2
 SHA512:
-  metadata.gz: b014fba445925d12925bdc950475049967f474d67474ca8deb160b3fd0d0eeb6b4c104965ab43c1c1ff7faf2fdd7f24f302cd13850453825f1ea42808178fd5e
-  data.tar.gz: e4aff878840ee7f4bab211fb7dbd25dbbc10b4e38d33dee98d8cd29b778b39daedada911aad608c71fd88a5488620d19f6caa4e50341316453e0bad9392f390a
+  metadata.gz: 82e9f93d8ddceb3296c143e13aa07ae6929a0610e9f0cfb714102aee3a8c06f16cad6e4424c33340fc27da42ea87113a40ab36567286406ce3d2ce5437eed944
+  data.tar.gz: e4bbc40f1a37b82731366cf7a310f1ae0f1a3075e236532a63b4ab20345a4c7cd2114d3b46024ea6aa80619b2c450338653acdf25fdd1fea2a27d95510f80b11

data/lib/beans.rb

@@ -4,15 +4,19 @@ class CoffeeBreak::Beans
 
     # Display collection of coffee with corresponding attributes
      
-    attr_accessor :name, :label, :price, :details
+    attr_accessor :name, :label, :price, :details, :link
 
-    @@all = []
+    # Stores every instance of Beans and anything collected from scrape methods will display in CLI.
 
-        def initialize(name, label, price, details) 
+    @@all = [] 
+
+        def initialize(name, label, price, link, details=nil) 
             @name = name
             @label = label 
             @price = price
             @details = details
+            @link = link
+            @@all << self 
         end 
 
         def self.all

data/lib/cli.rb

@@ -1,5 +1,4 @@
 require_relative "./scraper.rb"
-require_relative "./scraper2.rb"
 
 module CoffeeBreak
   class CLI
@@ -10,11 +9,10 @@ module CoffeeBreak
         system("clear") # Clears terminal before starting CLI program
         loading_message
         
-        Scraper.new.scrape
-        Scraper_2.new.scrape_second_page
+        Scraper.new.scrape # Displays product list from 1st page.
         
         greeting 
-        while menu != 'exit' # Terminal stays open unless user ends program
+        while menu != 'exit' # Checks to see if user will exit program. Otherwise, terminal stays open to show menu.
           
       end
     end
@@ -52,54 +50,58 @@ module CoffeeBreak
         list_options
         input = gets.strip.downcase
 
-        if input == "i"
-          puts " "
-          # Blank space to show below if user makes valid. 
-
-        elsif input != "exit"
-          i = Integer(input , exception: false) 
-          # Parsed input to raise exception when not false
-          if !i.nil? 
-            puts i 
-            # Prints number user entered. 
-            display_coffee(i-1)
-            # Count starts at 0 for the computer, 1 for the user.
-            display_again 
-
-          else  # Raises argument if input is wrong
+          if input == "i"
             puts " "
-            puts "Oops! Please try again."
-            puts " " 
+            # Blank space to show below if user makes valid.
+
+            elsif input != "exit"
+              i = Integer(input , exception: false)
+              # Parsed input to raise exception when not false
+              puts " "
+              if i.between?(1,17)
+                puts i
+                # Prints number user entered. 
+                display_coffee(i-1)
+                # Count starts at 0 for the computer, 1 for the user.
+                display_again 
+                else 
+                  # Raises argument if input is wrong
+                  puts " "
+                  puts "Oops! Please try again."
+                  puts " " 
             
+                end
+              end
+              input # User prompted to give input.
             end
-          end
-            input # User prompted to give input.
-        end
-      end 
-    end 
+          end 
+        end 
     
       def list_options
         CoffeeBreak::Beans.all.each_with_index do |product, index| 
           # Products are listed in numerical order with product name.
           puts "#{index+1} #{product.name}"
-        
+          # Data obtained from scrape method displays the name of "product" by order.
         end
       end
 
       def display_coffee(index)
+        bean = CoffeeBreak::Beans.all[index]
+        CoffeeBreak::Scraper.new.scrape_details(bean)
+
         puts " "
         puts "You chose:"
         puts " "
-        puts "#{CoffeeBreak::Beans.all[index].name}" 
+        puts "#{bean.name}" 
         puts " "
-        puts "#{CoffeeBreak::Beans.all[index].label}"
+        puts "#{bean.label}"
         puts " "
-        puts "#{CoffeeBreak::Beans.all[index].price}"
+        puts "#{bean.price}"
         puts " "
-        puts "#{CoffeeBreak::Beans.all[index].details}"
+        puts "#{bean.details}"
         puts " "
 
-        end 
+      end 
           
       def display_again 
         puts "Would you like to see the menu again? [y/n]"
@@ -111,12 +113,13 @@ module CoffeeBreak
             puts " "
             menu
 
-          elsif answer == "n"
+          elsif answer == "n" || answer == "exit"
             exit_program
           else 
             puts " "
             puts "Uh-oh! Please try again."
             puts " "
 
-        end  
-      end
+      end  
+
+end

data/lib/scraper.rb

@@ -7,22 +7,47 @@ module CoffeeBreak
         def scrape
             doc = Nokogiri::HTML(URI.open("https://playeronecoffee.com/collections/all-coffee/"))
 
-            doc.css(".grid-view-item").each do |tag| # Access each tag from below.
+            doc.css(".grid-view-item").each do |tag| # Filter through the page to access specific elements.
                 
                 name = tag.css(".grid-view-item__title").text.upcase # Text in UPPERCASE letters.
-                label = tag.css("div.grid-view-item__level span.label").text.upcase # CSS Selector searches document, looking for desired Div classes.
+                label = tag.css("div.grid-view-item__level span.label").text.upcase # CSS Selector searches document, looking for desired Div class LABEL.
                 price = tag.css("div.grid-view-item__meta span.product-price__price").text # Displays price per specific product.
-                link = "https://playeronecoffee.com"+ tag.css("a.grid-view-item__link")[0][:href] # Grabs href to iterate through product links.
-                details = Nokogiri::HTML(URI.open(link)).css("div.product-single__description p").text # Opens product link to provide details.
+                link = "https://playeronecoffee.com"+ tag.css("a.grid-view-item__link")[0][:href] # Grabs href to obtain desired product links.
+                # details = Nokogiri::HTML(URI.open(link)).css("div.product-single__description p").text # Opens link, access element, and provide details.
                 
-                product = Beans.new(name, label, price, details) 
-                # Puts all scraped data tags to Beans format.
+                product = Beans.new(name, label, price, link) 
+                # Product variable used to store all scraped data from tags onto argument format for Beans. 
 
-                Beans.all << product 
-                # Stores scraped data onto Beans class.
+                # Beans.all << product 
+                # Everything about "product" will be stored onto the object, Beans. 
 
             end
+            self.scrape_second_page
         end
+        
+        def scrape_details(product)
+            details = Nokogiri::HTML(URI.open(product.link)).css("div.product-single__description p").text
+            product.details = details
+        end  
+
+        def scrape_second_page 
+
+            doc = Nokogiri::HTML(URI.open("https://playeronecoffee.com/collections/all-coffee?page=2"))
+
+            doc.css(".grid-view-item").each do |tag| 
+                
+                name = tag.css(".grid-view-item__title").text.upcase
+                label = tag.css("div.grid-view-item__level span.label").text.upcase 
+                price = tag.css("div.grid-view-item__meta span.product-price__price").text 
+                link = "https://playeronecoffee.com"+ tag.css("a.grid-view-item__link")[0][:href] 
+                # details = Nokogiri::HTML(URI.open(link)).css("div.product-single__description p").text 
+                
+                product = Beans.new(name, label, price, link)
+
+                # Beans.all << product 
+            
+            end 
+        end 
 
     end 
 end 

data/lib/version.rb

@@ -1,3 +1,3 @@
 module CoffeeBreak
-  VERSION = "0.1.0"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: coffeebreak
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.0
 platform: ruby
 authors:
 - Shirlen Detablan
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2020-07-15 00:00:00.000000000 Z
+date: 2020-07-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -55,12 +55,12 @@ files:
 - bin/coffee_time
 - bin/console
 - bin/setup
+- coffeebreak-0.1.0.gem
 - coffeebreak.gemspec
 - lib/beans.rb
 - lib/cli.rb
 - lib/coffeebreak.rb
 - lib/scraper.rb
-- lib/scraper2.rb
 - lib/version.rb
 homepage: https://github.com/Ro5hi/coffee_break
 licenses:

data/lib/scraper2.rb

@@ -1,28 +0,0 @@
-require 'nokogiri'
-require 'open-uri'
-
-module CoffeeBreak
-    class Scraper_2
-
-        # Grabs additional products and info from the second page in the url.
-
-        def scrape_second_page
-            doc = Nokogiri::HTML(URI.open("https://playeronecoffee.com/collections/all-coffee?page=2"))
-
-            doc.css(".grid-view-item").each do |tag| 
-                
-                name = tag.css(".grid-view-item__title").text.upcase
-                label = tag.css("div.grid-view-item__level span.label").text.upcase 
-                price = tag.css("div.grid-view-item__meta span.product-price__price").text 
-                link = "https://playeronecoffee.com"+ tag.css("a.grid-view-item__link")[0][:href] 
-                details = Nokogiri::HTML(URI.open(link)).css("div.product-single__description p").text 
-                
-                product = Beans.new(name, label, price, details)
-
-                Beans.all << product 
-
-            end
-        end
-
-    end 
-end