compare_supermarkets 0.3.1 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9bbf654fdd40a10a41089214f44231f0e8c5cd8656d2aab638cbb6f7de7d2a23
-  data.tar.gz: cacc2dcf4343553a0114ef6b9aa9bad3b298e130913f7dcf5345189504da681d
+  metadata.gz: 1791e9c3f62f3acd466b46d1c3a1cbce45f05788a1749e7f8c287d0ebf053abb
+  data.tar.gz: bf7badf710b0be6ad961db733eba0800933935245e8b8de93f45d6a8958f016b
 SHA512:
-  metadata.gz: a7b08c8f7f9b5ab53b2d491303db0b52e09bf2bfb3721671c064f4f8a2fda2a262b15695b074a22fe7d18982ad68152f6df7ff1f9949a1ff4d662ecc7587f5d3
-  data.tar.gz: 8a7fe54602b4f222d8b67d0de4928c8101d90834fb1df7ddadf03847e459816dbe93620a78998ed7fbda20975643a0b5896ebd939bed9c95f1181e27bb953964
+  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, Woolworths and IGA? (Y/N)"
+        puts "Would you like to compare prices between Coles and Woolworths (Y/N)"
         input = gets.strip.downcase
         puts ""
         if input == "y"
@@ -49,6 +49,8 @@ class CompareSupermarkets::CLI
             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 ""
@@ -58,7 +60,7 @@ class CompareSupermarkets::CLI
             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
@@ -111,8 +114,6 @@ class CompareSupermarkets::CLI
         puts ""
         puts "5 - Only Woolworths items"
         puts ""
-        puts "6 - Only IGA items"
-        puts ""
         input = gets.strip
         puts ""
         choice(input)
@@ -137,10 +138,6 @@ class CompareSupermarkets::CLI
             how_to_sort ? direction = "asc" : direction = "desc"
             choice = CompareSupermarkets::Product.woolworths_sorted_by_price
             print_items(choice, direction)
-        elsif input == "6"
-            how_to_sort ? direction = "asc" : direction = "desc"
-            choice = CompareSupermarkets::Product.iga_sorted_by_price
-            print_items(choice, direction)
         elsif input == ""
             invalid_input
             how_to_display

data/lib/compare_supermarkets/scraper.rb

@@ -6,81 +6,58 @@ class CompareSupermarkets::Scraper
         @search_term = search_term
     end
 
-    def self.search_supermarkets(search_term)
-        supermarkets = ["Coles", "Woolworths", "IGA"]
+    def self.search_supermarkets(supermarkets, search_term)
         supermarkets.each do |supermarket|
-            search_for(supermarket, search_term)
+        Kernel.const_get("CompareSupermarkets::#{supermarket}Scraper").search_browser(search_term)
         end
     end
 
-    def self.search_for(supermarket, search_term)
-        open_browser(supermarket, search_term)
-    end
-
-    def self.open_browser(supermarket, search_term)
+    def self.handle_waiting(supermarket, class_name, all_products, search, check)
         browser = Watir::Browser.new :chrome
-        if supermarket.downcase == "coles"
-            search = "https://shop.coles.com.au/a/national/everything/search/#{search_term}"
-            class_name = "products"
-        elsif supermarket.downcase == "woolworths"
-            search = "https://www.woolworths.com.au/shop/search/products?searchTerm=#{search_term}"
-            class_name = "layoutWrapper"
-        else
-            search = "https://new.igashop.com.au/sm/pickup/rsid/53363/results?q=#{search_term}"
-            class_name = ["Listing-sc-1vfhaq2", "iQljRa"]
-        end
-        browser.goto(search)
-        self.handle_waiting(browser, supermarket, class_name, search_term)
-    end
-
-    def self.handle_waiting(browser, supermarket, class_name, search_term)
         begin
+            browser.goto(search)
             js_doc = browser.element(class: class_name).wait_until(&:present?)
         rescue
-            puts "#{supermarket} does not have any #{search_term}"
-            puts ""
-            puts ""
-            if supermarket.downcase != "iga"
-                puts "Let's check the next one"
-            end
+            puts "This product cannot be found"
             puts ""
         else
+            new_supermarket = Kernel.const_get("CompareSupermarkets::#{supermarket}").new(supermarket)
             products = Nokogiri::HTML(js_doc.inner_html)
-            self.add_supermarket_products(supermarket, products, search_term)
+            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.add_supermarket_products(supermarket, products, search_term)
-        new_supermarket = CompareSupermarkets::Supermarket.new(supermarket)
-        self.which_supermarket(supermarket, products).each do |product|
-            if check?(supermarket, product, search_term)
-                new_supermarket.add_product(product)
-            end
-        end
-        if new_supermarket.products.count == 0
-            puts "#{supermarket} do not have any #{search_term}"
-        end
-    end
+class CompareSupermarkets::ColesScraper < CompareSupermarkets::Scraper
 
-    def self.check?(supermarket, product, search_term)
-        if supermarket.downcase == "coles"
-            check = product.css(".product-name").text != ""
-        elsif supermarket.downcase == "woolworths"
-            check = product.css(".shelfProductTile-descriptionLink").text != ""
-        else
-            check = product.css(".sc-hKFyIo.bdDYJz").text.downcase[search_term]
-        end
+    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
 
-    def self.which_supermarket(supermarket, products)
-        if supermarket.downcase == "coles"
-            all_products = products.css(".product")
-        elsif supermarket.downcase == "woolworths"
-            all_products = products.css(".shelfProductTile-content")
-        else
-            all_products = products.css(".ColListing-sc-lcurnl.kYBrWq")
-        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

@@ -13,39 +13,8 @@ class CompareSupermarkets::Supermarket
         @@all
     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.chomp(' '),
-                product.css(".product-image-link").attribute('href'),
-                product.css(".dollar-value").text,
-                product.css(".cent-value").text.delete_prefix('.'))
-        elsif self.name == "Woolworths"
-            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)
-        else
-            price_css = if product.css(".ProductCardPrice-sc-zgh1l1.hwVjs").text.delete_prefix("$").split(".").first
-                        ".ProductCardPrice-sc-zgh1l1.hwVjs" 
-                    else
-                        ".ProductCardPrice-sc-zgh1l1.jYaBFk"
-                    end
-            new_product = CompareSupermarkets::Product.new(self,
-                product.css(".sc-hKFyIo.bdDYJz").text.split(', ').first,
-                product.css(".ProductCardPriceInfo-sc-1o21dmb.iDDqhD").text.delete_prefix("$").gsub("/", " / "),
-                product.css(".sc-hKFyIo.bdDYJz").text.split(', ').last,
-                product.css(".ProductCardHiddenLink-sc-y1ynto.hGUSDV").attribute('href').value,
-                product.css(price_css).text.delete_prefix("$").split(".").first,
-                product.css(price_css).text.split(".").last.chomp(" avg/ea")
-            )
-        end
-        @products << new_product
+    def self.out_of_stock
+        @out_of_stock.count
     end
 
     def products
@@ -56,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.3.1"
+  VERSION = "0.4.1"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compare_supermarkets
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.1
 platform: ruby
 authors:
 - Justin Berger Howes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-30 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,15 +101,15 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.142.7
-  type: :development
+  type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.142.7
-description: Will search Woolworths, Coles and IGA online stores for prices based
-  on an input search parameter **Google Chrome Required**
+description: Will search Woolworths and Coles online stores for prices based on an
+  input search parameter **Google Chrome Required**
 email:
 - happymelonbox@gmail.com
 executables: