compare_supermarkets 0.2.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 03a77c0e97c8e992eadc1d00e7d9da010e2a1d8bd60e8b50548161cd25417f17
-  data.tar.gz: 98103223d9737ee4a5e256e5908b50fc62225b63465acdcdffaf7f6d9876603b
+  metadata.gz: 9d8890834ce5a37d23206a1a513f3c57ec0caea90593373662baefdfc2062794
+  data.tar.gz: a6ed1f030433fed9f6cbde6629f384f3e312fb3e3f0edcfa4d193aa4585c4416
 SHA512:
-  metadata.gz: 9b699078cc6395acc8af0781b0d9aed79cf2db7a20180d19c8f448986e92ed2f68b4e27a1dc3a5970451782b61d3f4ed6dae46a4bfbc7e38061fd7359f3e46e3
-  data.tar.gz: 89901059141fa825b3e7c58a1e58301389b940c7ab16a397562934639e0f63b1b081c0ce7578ee04c758663a84ff2c606903fb3001493418bc8a54f0ed138c7c
+  metadata.gz: 483653e82b680078090c4b8234086fa8b0bf8a89a8e635902b3b3482f70117f7f1342367a89299c994a3f4029648896191f2a99df417a241a16f9a278d60e47c
+  data.tar.gz: df5dd2e030710133081f2c5d0e4a413daee5e05958bde06d05c90440d4fa23ddc35e953efbaaecaa72fdc55e19f47d4815550de6ee19581bc77cdc5f92d3e501

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

@@ -1,11 +1,11 @@
 class CompareSupermarkets::CLI
     def call
         puts ""
-        puts "Welcome to The Supermarket Comparer"
+        puts "Welcome to Compare_Supermarkets"
         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"
@@ -29,7 +29,7 @@ class CompareSupermarkets::CLI
     def start
         puts ""
         puts "Great!"
-        puts "Please enter the name of the item you wish to compare"
+        puts "Please enter the name of the item you wish to compare (example: red tractor oats or purple sweet potato)"
         input = gets.strip.downcase
         puts ""
         puts ""
@@ -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
@@ -148,7 +151,7 @@ class CompareSupermarkets::CLI
 
     def finished
         puts ""
-        puts "Is this what you were looking for?(Y/N)"
+        puts "Is this what you were looking for? (Y/N)"
         input = gets.strip.downcase
         if input == "y"
             puts ""
@@ -237,6 +240,7 @@ class CompareSupermarkets::CLI
     def how_to_sort
         puts ""
         puts "How would you like your results sorted?"
+        puts ""
         puts "1 - Cheapest to most expensive"
         puts "2 - Most expensive to cheapest"
         puts ""

data/lib/compare_supermarkets/product.rb

@@ -10,7 +10,7 @@ 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 = url
         @@all << self
     end
 
@@ -54,6 +54,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,65 @@ 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|
+            new_supermarket = Kernel.const_get("CompareSupermarkets::#{supermarket}Scraper").new(search_term)
+            new_supermarket.search_browser
+        end
     end
 
-    def self.search_coles_for(search_term)
+    def handle_waiting(supermarket, class_name, all_products, search, search_term, 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+search_term)
+            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)
+            products = Nokogiri::HTML(js_doc.inner_html)
+            products.css(all_products).each do |product|
+                if product.css(check).text != ""
+                    new_supermarket = Kernel.const_get("CompareSupermarkets::#{supermarket}").new(product)
+                    new_supermarket.add_product
                 end
             end
+            if Kernel.const_get("CompareSupermarkets::#{supermarket}").all_products.count == 0
+                puts "#{supermarket} do not have this item"
+            end
         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?
-                        woolworths = CompareSupermarkets::Supermarket.new("Woolworths")
-                        woolworths.add_product(product)
-                    end
-                end
-            end
-        ensure
-            browser.close
-        end
+    def search_browser
+        handle_waiting(@supermarket, @class_name, @all_products, @search, @search_term, @check)
+    end
+end
+
+class CompareSupermarkets::ColesScraper < CompareSupermarkets::Scraper
+
+    def initialize(search_term)
+        @supermarket = 'Coles'
+        @search = "https://shop.coles.com.au/a/national/everything/search/"
+        @search_term = search_term
+        @class_name = "products"
+        @all_products = ".product"
+        @check = ".product-name"
+    end
+
+end
+
+class CompareSupermarkets::WoolworthsScraper < CompareSupermarkets::Scraper
+
+    def initialize(search_term)
+        @supermarket = 'Woolworths'
+        @search = "https://www.woolworths.com.au/shop/search/products?searchTerm="
+        @search_term = search_term
+        @class_name = "layoutWrapper"
+        @all_products = ".shelfProductTile-content"
+        @check = ".shelfProductTile-descriptionLink"
     end
+
 end
+

data/lib/compare_supermarkets/supermarket.rb

@@ -2,35 +2,22 @@ class CompareSupermarkets::Supermarket
     attr_accessor :name
 
     @@all = []
+    @@products = []
 
     def initialize(name=nil)
         @name = name
         @@all << self
-        @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
     end
 
-    def products
+    def self.all
+        @@all
+    end
+
+    def self.all_products
+        @@products
+    end
+
+    def self.products
         CompareSupermarkets::Product.all.select{|product| product.supermarket == self}
     end
 
@@ -38,4 +25,38 @@ class CompareSupermarkets::Supermarket
         @@all.clear
     end
 
+    def add_product
+        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::Coles < CompareSupermarkets::Supermarket
+
+    def initialize(product)
+        @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 = "https://shop.coles.com.au#{@product.css(".product-image-link").attribute('href')}"
+        @dollar_value = @product.css(".dollar-value").text
+        @cent_value = @product.css(".cent-value").text.delete_prefix('.')
+    end
+end
+
+class CompareSupermarkets::Woolworths < CompareSupermarkets::Supermarket
+
+    def initialize(product)
+        @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 = "https://www.woolworths.com.au#{@product.css(".shelfProductTile-descriptionLink").attribute('href').value}"
+        @dollar_value = @product.css(".price-dollars").text
+        @cent_value = @product.css(".price-cents").text
+    end
 end

data/lib/compare_supermarkets/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compare_supermarkets
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Justin Berger Howes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-28 00:00:00.000000000 Z
+date: 2021-10-23 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: