compare_supermarkets 0.1.9 → 0.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 21d751bb1877f2aec5c1b3f80dcf680b41006b4e2be969d0fc31f9d6c1ae390d
-  data.tar.gz: b0daf658c23f131b73f159af94b50de565e210e6e91b71e69bc495ac1dd1a36f
+  metadata.gz: 0f7490e1c56c5edabeb3ec9606053b7187c709f8082c1e57e632414a1f459d0f
+  data.tar.gz: 18c85e7f34f0ef20653f3f7b045b99a3cf06a196e58b95bcfa29932dc9fd532c
 SHA512:
-  metadata.gz: 94187db55938eaca84e23d48616391e182f64d90d3c148911a68db6de43076c6d7afb108474c77f2e83cb1bf7b8ae7f76374d68108a1c393758ab6774b39f67a
-  data.tar.gz: cbd9fbb88dfcafb951950ca7b5be1739be62849e2247a739d8d00eb2f1c950733d3a0d8f00f2b5bbcb527ec0dab28d6798cc5926bc40286c5b1abf5f741c3b94
+  metadata.gz: 93cdab62149c48bc0c26bfa010f9f1af0067ef3e2f2a0e0dab02e9b26ea99758e1cbb080e6db51d7e249296437206d8f8e5513741532de5d48d031d5e035f5d9
+  data.tar.gz: 264d1fe7787fb13b2d78a5ee638e4ecac23d87c0df7ef59f864c654b2aebb9c3ccdd1fe542472c4f3026bd1984c69f84b2254d89b3587c8f9ccf312db5724697

data/bin/setup

@@ -3,4 +3,5 @@
 set -euo pipefail
 IFS=$'\n\t'
 
-bundle install
+bundle install
+brew install --cask chromedriver #required for watir to work

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.9"
+  VERSION = "0.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: compare_supermarkets
 version: !ruby/object:Gem::Version
-  version: 0.1.9
+  version: 0.2.0
 platform: ruby
 authors:
 - Justin Berger Howes
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-27 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -80,47 +80,38 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
-description: |
-  Will search Woolworths and Coles online stores for prices based on an input search parameter
-    # CompareSupermarkets
-
-  Ever wondered 'I wonder if my shampoo is cheaper at Coles or Woolworths...?' ? But can't be
-  bothered searching both websites and comparing? Well that's what this gem does for you. Simply
-  install and follow the prompts.
-
-  ## Installation
-
-  Add this line to your application's Gemfile:
-
-  ```ruby
-  gem 'compare_supermarkets'
-  ```
-
-  And then execute:
-
-      $ bundle install
-
-  Or install it yourself as:
-
-      $ gem install compare_supermarkets
-
-  ## Usage
-
-  To use compare_supermarkets call $ 'compare_supermarkets'
-  and follow the prompts. The more specific you are the faster the search results appear
-  and there will be less items to compare.
-
-
-  ## Contributing
-
-  Bug reports and pull requests are welcome on GitHub at https://github.com/happymelonbox/compare_supermarkets
-
-  ## License
-
-  The gem is available as open source under the terms of the [MIT License](https://opensource.org
-  /licenses/MIT).
+- !ruby/object:Gem::Dependency
+  name: watir
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.19.1
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 6.19.1
+- !ruby/object:Gem::Dependency
+  name: selenium-webdriver
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !ruby/object:Gem::Version
+        version: 3.142.7
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - "~>"
+      - !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**
 email:
-- howes.j.j@gmail.com
+- happymelonbox@gmail.com
 executables:
 - compare_supermarkets
 extensions: []
@@ -134,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: