compare_supermarkets 0.1.12 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3ce36d625832e4b04b019bf397e7df35849d1c7b12b4f05e78c72bc84145ca93
-  data.tar.gz: 347c7a8717ba07abbd693fe56cebef2c434068aaf33798c2a5043968c3f030e8
+  metadata.gz: 0f7490e1c56c5edabeb3ec9606053b7187c709f8082c1e57e632414a1f459d0f
+  data.tar.gz: 18c85e7f34f0ef20653f3f7b045b99a3cf06a196e58b95bcfa29932dc9fd532c
 SHA512:
-  metadata.gz: 8b2f7314be77c146d49c380ece54ae943e5b84080b95043bbf3eaff49bb7a8614d93b764aa0966c9f3757e34d8fbbb921b3c9b1497ee804dd3d3d3bfce3b9fef
-  data.tar.gz: c263ed632b0be19dae6f50fb56835188faaa6e6760785a0037b7c0f47026db791d69109a8f2ea1894a1746b68a83abcb5308cdc30b4c68f7b8aa1509591aca67
+  metadata.gz: 93cdab62149c48bc0c26bfa010f9f1af0067ef3e2f2a0e0dab02e9b26ea99758e1cbb080e6db51d7e249296437206d8f8e5513741532de5d48d031d5e035f5d9
+  data.tar.gz: 264d1fe7787fb13b2d78a5ee638e4ecac23d87c0df7ef59f864c654b2aebb9c3ccdd1fe542472c4f3026bd1984c69f84b2254d89b3587c8f9ccf312db5724697

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

@@ -200,6 +200,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 +264,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,25 @@ 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 = @supermarket.name == "Coles" ? "https://shop.coles.com.au#{url}" : "https://www.woolworths.com.au#{url}"
         @@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 +39,16 @@ 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

data/lib/compare_supermarkets/scraper.rb

@@ -27,7 +27,8 @@ class CompareSupermarkets::Scraper
             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)
+                    coles = CompareSupermarkets::Supermarket.new("Coles")
+                    coles.add_product(product)
                 end
             end
         ensure
@@ -48,7 +49,8 @@ class CompareSupermarkets::Scraper
             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)
+                        woolworths = CompareSupermarkets::Supermarket.new("Woolworths")
+                        woolworths.add_product(product)
                     end
                 end
             end

data/lib/compare_supermarkets/supermarket.rb

@@ -0,0 +1,41 @@
+class CompareSupermarkets::Supermarket
+    attr_accessor :name
+
+    @@all = []
+
+    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
+        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.2.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: compare_supermarkets
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.2.0
 platform: ruby
 authors:
 - Justin Berger Howes
@@ -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: