compare_supermarkets 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1791e9c3f62f3acd466b46d1c3a1cbce45f05788a1749e7f8c287d0ebf053abb
-  data.tar.gz: bf7badf710b0be6ad961db733eba0800933935245e8b8de93f45d6a8958f016b
+  metadata.gz: 9d8890834ce5a37d23206a1a513f3c57ec0caea90593373662baefdfc2062794
+  data.tar.gz: a6ed1f030433fed9f6cbde6629f384f3e312fb3e3f0edcfa4d193aa4585c4416
 SHA512:
-  metadata.gz: fd5dc190434e70a8c8df56d6b0d20908db2f55f977d7afe3509ea7b13799b3b4bda6012da2dcaff30cdf34ac4a3e78b1f48c2b1778b8b8d10edbb3a58fdb1b54
-  data.tar.gz: ec6273911b70374dca339d606a2588e71bd80c876561d4dece1f2065296f67ea0776056a82c84d95eb17a4e32e03e7bb5740e3fae2c6ef6e26e53b7ea5540885
+  metadata.gz: 483653e82b680078090c4b8234086fa8b0bf8a89a8e635902b3b3482f70117f7f1342367a89299c994a3f4029648896191f2a99df417a241a16f9a278d60e47c
+  data.tar.gz: df5dd2e030710133081f2c5d0e4a413daee5e05958bde06d05c90440d4fa23ddc35e953efbaaecaa72fdc55e19f47d4815550de6ee19581bc77cdc5f92d3e501

data/lib/compare_supermarkets/cli.rb

@@ -1,7 +1,7 @@
 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 ""
@@ -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 ""
@@ -151,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 ""
@@ -240,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,13 +10,7 @@ class CompareSupermarkets::Product
         @unit_size = unit_size
         @dollar_value = dollar_value
         @cent_value = cent_value
-        @url = if @supermarket.name == "Coles" 
-                    "https://shop.coles.com.au#{url}"
-                elsif @supermarket.name == "Woolworths" 
-                    "https://www.woolworths.com.au#{url}"
-                else
-                    url
-                end
+        @url = url
         @@all << self
     end
 

data/lib/compare_supermarkets/scraper.rb

@@ -8,55 +8,62 @@ class CompareSupermarkets::Scraper
 
     def self.search_supermarkets(supermarkets, search_term)
         supermarkets.each do |supermarket|
-        Kernel.const_get("CompareSupermarkets::#{supermarket}Scraper").search_browser(search_term)
+            new_supermarket = Kernel.const_get("CompareSupermarkets::#{supermarket}Scraper").new(search_term)
+            new_supermarket.search_browser
         end
     end
 
-    def self.handle_waiting(supermarket, class_name, all_products, search, check)
+    def handle_waiting(supermarket, class_name, all_products, search, search_term, check)
         browser = Watir::Browser.new :chrome
         begin
-            browser.goto(search)
+            browser.goto(search+search_term)
             js_doc = browser.element(class: class_name).wait_until(&:present?)
         rescue
             puts "This product cannot be found"
             puts ""
         else
-            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)
+                    new_supermarket = Kernel.const_get("CompareSupermarkets::#{supermarket}").new(product)
+                    new_supermarket.add_product
                 end
             end
-            if new_supermarket.products.count == 0
+            if Kernel.const_get("CompareSupermarkets::#{supermarket}").all_products.count == 0
                 puts "#{supermarket} do not have this item"
             end
         ensure
             browser.close
         end
     end
+
+    def search_browser
+        handle_waiting(@supermarket, @class_name, @all_products, @search, @search_term, @check)
+    end
 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)
+    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 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)
+    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,22 +2,22 @@ class CompareSupermarkets::Supermarket
     attr_accessor :name
 
     @@all = []
+    @@products = []
 
     def initialize(name=nil)
         @name = name
         @@all << self
-        @products = []
     end
 
     def self.all
         @@all
     end
 
-    def self.out_of_stock
-        @out_of_stock.count
+    def self.all_products
+        @@products
     end
 
-    def products
+    def self.products
         CompareSupermarkets::Product.all.select{|product| product.supermarket == self}
     end
 
@@ -25,38 +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 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
+    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 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
+    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.4.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.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Justin Berger Howes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-10-22 00:00:00.000000000 Z
+date: 2021-10-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler