compare_supermarkets 0.2.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 0f7490e1c56c5edabeb3ec9606053b7187c709f8082c1e57e632414a1f459d0f
-  data.tar.gz: 18c85e7f34f0ef20653f3f7b045b99a3cf06a196e58b95bcfa29932dc9fd532c
+  metadata.gz: 1791e9c3f62f3acd466b46d1c3a1cbce45f05788a1749e7f8c287d0ebf053abb
+  data.tar.gz: bf7badf710b0be6ad961db733eba0800933935245e8b8de93f45d6a8958f016b
 SHA512:
-  metadata.gz: 93cdab62149c48bc0c26bfa010f9f1af0067ef3e2f2a0e0dab02e9b26ea99758e1cbb080e6db51d7e249296437206d8f8e5513741532de5d48d031d5e035f5d9
-  data.tar.gz: 264d1fe7787fb13b2d78a5ee638e4ecac23d87c0df7ef59f864c654b2aebb9c3ccdd1fe542472c4f3026bd1984c69f84b2254d89b3587c8f9ccf312db5724697
+  metadata.gz: fd5dc190434e70a8c8df56d6b0d20908db2f55f977d7afe3509ea7b13799b3b4bda6012da2dcaff30cdf34ac4a3e78b1f48c2b1778b8b8d10edbb3a58fdb1b54
+  data.tar.gz: ec6273911b70374dca339d606a2588e71bd80c876561d4dece1f2065296f67ea0776056a82c84d95eb17a4e32e03e7bb5740e3fae2c6ef6e26e53b7ea5540885

data/bin/console

@@ -3,6 +3,3 @@
 require "bundler/setup"
 require "pry"
 Pry.start
-
-# require "irb"
-# IRB.start

data/bin/setup

@@ -3,5 +3,4 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-bundle install
-brew install --cask chromedriver #required for watir to work
+bundle install

data/config/environment.rb

@@ -2,9 +2,6 @@ require 'pry'
 require 'nokogiri'
 require 'watir'
 
-#gem install selenium-webdriver - required for watir to work
-#brew install --cask chromedriver - required for watir to work
-
 require_relative '../lib/compare_supermarkets/scraper'
 require_relative '../lib/compare_supermarkets/product'
 require_relative '../lib/compare_supermarkets/cli'

data/lib/compare_supermarkets/cli.rb

@@ -5,7 +5,7 @@ class CompareSupermarkets::CLI
         puts ""
         puts "Type q at any time to exit."
         puts ""
-        puts "Would you like to compare prices between Coles and Woolies? (Y/N)"
+        puts "Would you like to compare prices between Coles and Woolworths (Y/N)"
         input = gets.strip.downcase
         puts ""
         if input == "y"
@@ -42,23 +42,25 @@ class CompareSupermarkets::CLI
         self.search_supermarkets(input)
         puts ""
         puts ""
-        if CompareSupermarkets::Product.count > 10
+        if CompareSupermarkets::Product.count > 20
             puts ""
             puts "Ooo, jeez, seems like we have a lot of results."
             puts "We have #{CompareSupermarkets::Product.count} results for you."
             puts "If you were a little more specific with your search"
             puts "term, we would have less to sort through..."
             puts ""
+            puts "If you still want to see all of these results, select N"
+            puts ""
             change_search_term
         elsif CompareSupermarkets::Product.count == 0
             puts ""
-            puts "Ohhh man! Doesn't seem like either supermarket carry"
-            puts "that product."
+            puts "Ohhh man! Doesn't seem like any of these supermarkets"
+            puts "carry that product."
             puts ""
             change_search_term
         else
             puts ""
-            puts "Great! We have #{CompareSupermarkets::Product.count} items for you."
+            puts "Great! We have #{CompareSupermarkets::Product.count} items in stock for you."
             puts ""
             puts ""
             puts ""
@@ -67,7 +69,8 @@ class CompareSupermarkets::CLI
     end
 
     def search_supermarkets(input)
-        CompareSupermarkets::Scraper.search_supermarkets(input)
+        supermarkets = ["Coles", "Woolworths"]
+        CompareSupermarkets::Scraper.search_supermarkets(supermarkets, input)
     end
 
     def change_search_term

data/lib/compare_supermarkets/product.rb

@@ -10,7 +10,13 @@ class CompareSupermarkets::Product
         @unit_size = unit_size
         @dollar_value = dollar_value
         @cent_value = cent_value
-        @url = @supermarket.name == "Coles" ? "https://shop.coles.com.au#{url}" : "https://www.woolworths.com.au#{url}"
+        @url = if @supermarket.name == "Coles" 
+                    "https://shop.coles.com.au#{url}"
+                elsif @supermarket.name == "Woolworths" 
+                    "https://www.woolworths.com.au#{url}"
+                else
+                    url
+                end
         @@all << self
     end
 
@@ -54,6 +60,14 @@ class CompareSupermarkets::Product
         end
     end
 
+    def self.iga_sorted_by_price
+        iga_items = self.all.select{|product| product.supermarket_name == "IGA"}
+        iga_items.sort_by! do |s|
+            price_to_sort = s.dollar_value + '.' + s.cent_value
+            price_to_sort.to_f
+        end
+    end
+
     def self.clear_all
         @@all.clear
     end

data/lib/compare_supermarkets/scraper.rb

@@ -6,56 +6,58 @@ class CompareSupermarkets::Scraper
         @search_term = search_term
     end
 
-    def self.search_supermarkets(search_term)
-        self.search_coles_for(search_term)
-        self.search_woolworths_for(search_term)
+    def self.search_supermarkets(supermarkets, search_term)
+        supermarkets.each do |supermarket|
+        Kernel.const_get("CompareSupermarkets::#{supermarket}Scraper").search_browser(search_term)
+        end
     end
 
-    def self.search_coles_for(search_term)
+    def self.handle_waiting(supermarket, class_name, all_products, search, check)
         browser = Watir::Browser.new :chrome
-        browser.goto("https://shop.coles.com.au/a/national/everything/search/#{search_term}")
         begin
-            coles_js_doc = browser.element(class: "products").wait_until(&:present?)
+            browser.goto(search)
+            js_doc = browser.element(class: class_name).wait_until(&:present?)
         rescue
-            puts "Coles does not have this product"
-            puts ""
-            puts "Let's check Woolworths"
-            puts ""
+            puts "This product cannot be found"
             puts ""
         else
-            coles_products = Nokogiri::HTML(coles_js_doc.inner_html)
-            all_coles_products = coles_products.css(".product")
-            all_coles_products.each do |product|
-                if product.css(".product-name").text != ""
-                    coles = CompareSupermarkets::Supermarket.new("Coles")
-                    coles.add_product(product)
+            new_supermarket = Kernel.const_get("CompareSupermarkets::#{supermarket}").new(supermarket)
+            products = Nokogiri::HTML(js_doc.inner_html)
+            products.css(all_products).each do |product|
+                if product.css(check).text != ""
+                    new_supermarket.add_product(product)
                 end
             end
+            if new_supermarket.products.count == 0
+                puts "#{supermarket} do not have this item"
+            end
         ensure
             browser.close
         end
     end
+end
 
-    def self.search_woolworths_for(search_term)
-        browser = Watir::Browser.new :chrome
-        browser.goto("https://www.woolworths.com.au/shop/search/products?searchTerm=#{search_term}")
-        begin
-            woolworths_js_doc = browser.element(class: "layoutWrapper").wait_until(&:present?)
-        rescue
-            puts "Woolworths does not have this product"
-        else
-            woolworths_products = Nokogiri::HTML(woolworths_js_doc.inner_html)
-            woolworths_all_products = woolworths_products.css(".shelfProductTile-content")
-            woolworths_all_products.each do |product|
-                if product.css(".shelfProductTile-descriptionLink").text != ""
-                    if product.css(".unavailableSection.width-full.ng-star-inserted").empty?
-                        woolworths = CompareSupermarkets::Supermarket.new("Woolworths")
-                        woolworths.add_product(product)
-                    end
-                end
-            end
-        ensure
-            browser.close
-        end
+class CompareSupermarkets::ColesScraper < CompareSupermarkets::Scraper
+
+    def self.search_browser(search_term)
+        search = "https://shop.coles.com.au/a/national/everything/search/#{search_term}"
+        class_name = "products"
+        all_products = ".product"
+        check = ".product-name"
+        self.handle_waiting('Coles', class_name, all_products, search, check)
     end
+
 end
+
+class CompareSupermarkets::WoolworthsScraper < CompareSupermarkets::Scraper
+
+    def self.search_browser(search_term)
+        search = "https://www.woolworths.com.au/shop/search/products?searchTerm=#{search_term}"
+        all_products = ".shelfProductTile-content"
+        class_name = "layoutWrapper"
+        check = ".shelfProductTile-descriptionLink"
+        self.handle_waiting('Woolworths', class_name, all_products, search, check)
+    end
+
+end
+

data/lib/compare_supermarkets/supermarket.rb

@@ -9,25 +9,12 @@ class CompareSupermarkets::Supermarket
         @products = []
     end
 
-    def add_product(product)
-        if self.name == "Coles"
-            new_product = CompareSupermarkets::Product.new(self,
-                product.css(".product-name").text,
-                product.css(".package-price").text.delete_prefix('$').gsub('per', '/'),
-                product.css(".package-size.accessibility-inline").text,
-                product.css(".product-image-link").attribute('href'),
-                product.css(".dollar-value").text,
-                product.css(".cent-value").text.delete_prefix('.'))
-        else
-            new_product = CompareSupermarkets::Product.new(self,
-                product.css(".shelfProductTile-descriptionLink").text,
-                product.css(".shelfProductTile-cupPrice.ng-star-inserted").text.delete_prefix(' $').chomp(" "),
-                product.css(".shelfProductTile-descriptionLink").text.split(" ").last,
-                product.css(".shelfProductTile-descriptionLink").attribute('href').value,
-                product.css(".price-dollars").text,
-                product.css(".price-cents").text)
-        end
-        @products << new_product
+    def self.all
+        @@all
+    end
+
+    def self.out_of_stock
+        @out_of_stock.count
     end
 
     def products
@@ -38,4 +25,38 @@ class CompareSupermarkets::Supermarket
         @@all.clear
     end
 
+end
+
+class CompareSupermarkets::Coles < CompareSupermarkets::Supermarket
+
+    def add_product(product)
+        supermarket = self
+        name = product.css(".product-name").text
+        price = product.css(".package-price").text.delete_prefix('$').gsub('per', '/')
+        unit_size = product.css(".package-size.accessibility-inline").text.chomp(' ')
+        url = product.css(".product-image-link").attribute('href')
+        dollar_value = product.css(".dollar-value").text
+        cent_value = product.css(".cent-value").text.delete_prefix('.')
+        if dollar_value != "0" && cent_value != "0"
+            new_product = CompareSupermarkets::Product.new(supermarket, name, price, unit_size, url, dollar_value, cent_value)
+            @products << new_product
+        end
+    end
+end
+
+class CompareSupermarkets::Woolworths < CompareSupermarkets::Supermarket
+
+    def add_product(product)
+        supermarket = self
+        name = product.css(".shelfProductTile-descriptionLink").text
+        price = product.css(".shelfProductTile-cupPrice.ng-star-inserted").text.delete_prefix(' $').chomp(" ")
+        unit_size = product.css(".shelfProductTile-descriptionLink").text.split(" ").last
+        url = product.css(".shelfProductTile-descriptionLink").attribute('href').value
+        dollar_value = product.css(".price-dollars").text
+        cent_value = product.css(".price-cents").text
+        if dollar_value != "0" && cent_value != "0"
+            new_product = CompareSupermarkets::Product.new(supermarket, name, price, unit_size, url, dollar_value, cent_value)
+            @products << new_product
+        end
+    end
 end

data/lib/compare_supermarkets/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module CompareSupermarkets
-  VERSION = "0.2.0"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compare_supermarkets
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Justin Berger Howes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-10-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -53,33 +53,33 @@ dependencies:
       - !ruby/object:Gem::Version
         version: 3.10.0
 - !ruby/object:Gem::Dependency
-  name: nokogiri
+  name: pry
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.8
-  type: :development
+        version: '0'
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.10.8
+        version: '0'
 - !ruby/object:Gem::Dependency
-  name: pry
+  name: nokogiri
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
-  type: :development
+        version: 1.10.8
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 1.10.8
 - !ruby/object:Gem::Dependency
   name: watir
   requirement: !ruby/object:Gem::Requirement
@@ -87,7 +87,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 6.19.1
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
@@ -101,7 +101,7 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.142.7
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements: