compare_supermarkets 0.1.12 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ce36d625832e4b04b019bf397e7df35849d1c7b12b4f05e78c72bc84145ca93
-  data.tar.gz: 347c7a8717ba07abbd693fe56cebef2c434068aaf33798c2a5043968c3f030e8
+  metadata.gz: 9bbf654fdd40a10a41089214f44231f0e8c5cd8656d2aab638cbb6f7de7d2a23
+  data.tar.gz: cacc2dcf4343553a0114ef6b9aa9bad3b298e130913f7dcf5345189504da681d
 SHA512:
-  metadata.gz: 8b2f7314be77c146d49c380ece54ae943e5b84080b95043bbf3eaff49bb7a8614d93b764aa0966c9f3757e34d8fbbb921b3c9b1497ee804dd3d3d3bfce3b9fef
-  data.tar.gz: c263ed632b0be19dae6f50fb56835188faaa6e6760785a0037b7c0f47026db791d69109a8f2ea1894a1746b68a83abcb5308cdc30b4c68f7b8aa1509591aca67
+  metadata.gz: a7b08c8f7f9b5ab53b2d491303db0b52e09bf2bfb3721671c064f4f8a2fda2a262b15695b074a22fe7d18982ad68152f6df7ff1f9949a1ff4d662ecc7587f5d3
+  data.tar.gz: 8a7fe54602b4f222d8b67d0de4928c8101d90834fb1df7ddadf03847e459816dbe93620a78998ed7fbda20975643a0b5896ebd939bed9c95f1181e27bb953964

data/config/environment.rb

@@ -9,5 +9,6 @@ require_relative '../lib/compare_supermarkets/scraper'
 require_relative '../lib/compare_supermarkets/product'
 require_relative '../lib/compare_supermarkets/cli'
 require_relative '../lib/compare_supermarkets/version'
+require_relative '../lib/compare_supermarkets/supermarket'
 
 Watir.default_timeout = 0

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, Woolworths and IGA? (Y/N)"
         input = gets.strip.downcase
         puts ""
         if input == "y"
@@ -42,7 +42,7 @@ 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."
@@ -52,8 +52,8 @@ class CompareSupermarkets::CLI
             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
@@ -111,6 +111,8 @@ class CompareSupermarkets::CLI
         puts ""
         puts "5 - Only Woolworths items"
         puts ""
+        puts "6 - Only IGA items"
+        puts ""
         input = gets.strip
         puts ""
         choice(input)
@@ -135,6 +137,10 @@ 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
@@ -200,6 +206,7 @@ class CompareSupermarkets::CLI
             how_to_display
         elsif input == "2"
             CompareSupermarkets::Product.clear_all
+            CompareSupermarkets::Supermarket.clear_all
             start
         elsif input == ""
             invalid_input
@@ -263,7 +270,7 @@ class CompareSupermarkets::CLI
     def print_items(choice, direction)
         direction == "asc" ? choice = choice : choice = choice.reverse
         choice.each do |item|
-            p "Supermarket: #{item.supermarket}"
+            p "Supermarket: #{item.supermarket.name}"
             p "Item name: #{item.name}"
             p "Item price: $#{item.dollar_value}.#{item.cent_value}"
             p "Item unit size: #{item.unit_size}"

data/lib/compare_supermarkets/product.rb

@@ -1,10 +1,7 @@
 class CompareSupermarkets::Product
-    attr_writer :price
-    attr_reader :supermarket, :name, :price, :unit_size, :url, :dollar_value, :cent_value
+    attr_accessor :supermarket, :name, :price, :unit_size, :url, :dollar_value, :cent_value
 
     @@all = []
-    @@coles_all = []
-    @@woolworths_all = []
 
     def initialize (supermarket = nil, name = nil, price=nil, unit_size = nil, url = nil, dollar_value=nil, cent_value=nil)
         @supermarket = supermarket
@@ -13,45 +10,31 @@ class CompareSupermarkets::Product
         @unit_size = unit_size
         @dollar_value = dollar_value
         @cent_value = cent_value
-        @url = @supermarket == "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
-        if @supermarket == "Coles"
-            @@coles_all << self
-        else
-            @@woolworths_all << self
-        end
     end
 
     def self.all
-        @all
+        @@all
     end
 
     def self.count
         @@all.count
     end
 
-    def self.coles_new_from_search(product)
-        product_to_compare = self.new("Coles",
-            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('.'))
+    def supermarket_name
+        self.supermarket ? self.supermarket.name : nil
     end
 
-    def self.woolworths_new_from_search(product)
-        product_to_compare = self.new("Woolworths",
-            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
 
     def self.all_items_sorted_by_price
-        sorted = @@all.sort_by! do |s|
+        sorted = self.all.sort_by! do |s|
             price_to_sort = s.dollar_value + '.' + s.cent_value
             price_to_sort.to_f
         end
@@ -62,14 +45,24 @@ class CompareSupermarkets::Product
     end
 
     def self.coles_sorted_by_price
-        @@coles_all.sort_by! do |s|
+        coles_items = self.all.select{|product| product.supermarket_name == "Coles"}
+        coles_items.sort_by! do |s|
         price_to_sort = s.dollar_value + '.' + s.cent_value
         price_to_sort.to_f
         end
     end
 
     def self.woolworths_sorted_by_price
-        @@woolworths_all.sort_by! do |s|
+        woolworths_items = self.all.select{|product| product.supermarket_name == "Woolworths"}
+        woolworths_items.sort_by! do |s|
+            price_to_sort = s.dollar_value + '.' + s.cent_value
+            price_to_sort.to_f
+        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

data/lib/compare_supermarkets/scraper.rb

@@ -7,53 +7,80 @@ class CompareSupermarkets::Scraper
     end
 
     def self.search_supermarkets(search_term)
-        self.search_coles_for(search_term)
-        self.search_woolworths_for(search_term)
+        supermarkets = ["Coles", "Woolworths", "IGA"]
+        supermarkets.each do |supermarket|
+            search_for(supermarket, search_term)
+        end
+    end
+
+    def self.search_for(supermarket, search_term)
+        open_browser(supermarket, search_term)
     end
 
-    def self.search_coles_for(search_term)
+    def self.open_browser(supermarket, search_term)
         browser = Watir::Browser.new :chrome
-        browser.goto("https://shop.coles.com.au/a/national/everything/search/#{search_term}")
+        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
-            coles_js_doc = browser.element(class: "products").wait_until(&:present?)
+            js_doc = browser.element(class: class_name).wait_until(&:present?)
         rescue
-            puts "Coles does not have this product"
+            puts "#{supermarket} does not have any #{search_term}"
             puts ""
-            puts "Let's check Woolworths"
             puts ""
+            if supermarket.downcase != "iga"
+                puts "Let's check the next one"
+            end
             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 != ""
-                    CompareSupermarkets::Product.coles_new_from_search(product)
-                end
-            end
+            products = Nokogiri::HTML(js_doc.inner_html)
+            self.add_supermarket_products(supermarket, products, search_term)
         ensure
             browser.close
         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?
-                        CompareSupermarkets::Product.woolworths_new_from_search(product)
-                    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
-        ensure
-            browser.close
+        end
+        if new_supermarket.products.count == 0
+            puts "#{supermarket} do not have any #{search_term}"
+        end
+    end
+
+    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
+    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
 end

data/lib/compare_supermarkets/supermarket.rb

@@ -0,0 +1,59 @@
+class CompareSupermarkets::Supermarket
+    attr_accessor :name
+
+    @@all = []
+
+    def initialize(name=nil)
+        @name = name
+        @@all << self
+        @products = []
+    end
+
+    def self.all
+        @@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
+    end
+
+    def products
+        CompareSupermarkets::Product.all.select{|product| product.supermarket == self}
+    end
+
+    def self.clear_all
+        @@all.clear
+    end
+
+end

data/lib/compare_supermarkets/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compare_supermarkets
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.3.1
 platform: ruby
 authors:
 - Justin Berger Howes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-09-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -108,8 +108,8 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: 3.142.7
-description: Will search Woolworths and Coles online stores for prices based on an
-  input search parameter **Google Chrome Required**
+description: Will search Woolworths, Coles and IGA online stores for prices based
+  on an input search parameter **Google Chrome Required**
 email:
 - happymelonbox@gmail.com
 executables:
@@ -125,6 +125,7 @@ files:
 - lib/compare_supermarkets/cli.rb
 - lib/compare_supermarkets/product.rb
 - lib/compare_supermarkets/scraper.rb
+- lib/compare_supermarkets/supermarket.rb
 - lib/compare_supermarkets/version.rb
 homepage: http://rubygems.org/gems/compare_supermarkets
 licenses: