newegg_scraper_chsbr 0.2.2 → 0.2.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b6f2133128bd60c1e34d9d7ed98d65aa0bd5c305c804a4491738c22ea6b48931
-  data.tar.gz: f431eac85ce8616a3143537293e3b552a50056bb83b7afd84d6f0be525387b90
+  metadata.gz: f34ca8fd0dbc560e05743c291654c9bdd092cc8c30c534978898666fdad5eaa3
+  data.tar.gz: 55eec0e26900218bf9ad0ae8ae37c65863add7639365a3df818ece9625e0aaa9
 SHA512:
-  metadata.gz: 32761b7f137118cd0b9ff915b745078f28ed74402ded5cfee1163196a6412e5904e53a5c8be73a8c818e637fa98884f483c714c3c62297a4c9b0dbded09d5fbd
-  data.tar.gz: deefa949cc5df1ea06cd1bf75a6977277b76573ac2ad9c1b5a2fc6fb01dc921bb7ed4163c9a1f1df5518f19cbaeddbc5df6b6afc7a7e58f643205bc42ef5f7f9
+  metadata.gz: b50c23b2586cb80492649ed42cfce04f1f1e099baa4d99ddf9539fcfd0b66013f989e47ed56fd2a6f2fc0f9fe8428a338ac6e5d0b16acd993acb6fc8c06f39a9
+  data.tar.gz: 1bf45a023b6508aa5c2bd90996928291667945e4c6e588c7776da5f5dbc6232e684f9f598fbc865b605d4fd9054d97b808fdb08554497c59e895297bb9d45b24

data/lib/newegg_scraper_chsbr/cli.rb

@@ -1,4 +1,3 @@
-
 class NeweggScraperChsbr::CLI
     attr_reader :user
     def initialize
@@ -18,8 +17,12 @@ class NeweggScraperChsbr::CLI
         while @counter == 'y'
             get_price_range
             get_init_data_for_user
-            NeweggScraperChsbr::Cpu.display_cpu(@user)
-            @user.choose_cpu
+            printed_cpus = NeweggScraperChsbr::Cpu.display_cpu(@user)
+
+
+            @user.choose_cpu(printed_cpus)
+    
+            
             NeweggScraperChsbr::Cpu.display_cpu_with_extras(@user)
             puts "If you would like to restart the program please enter : #{@counter}.\nTo exit type n or exit."
             @counter = gets.strip

data/lib/newegg_scraper_chsbr/cpu.rb

@@ -23,6 +23,7 @@ class NeweggScraperChsbr::Cpu
     end
     def self.display_cpu(user) 
         counter = 1
+        printed_cpus = []
         @@all.each do | computer |
             if user.max_price.to_i != 0 && user.min_price.to_i == 0
                 
@@ -32,23 +33,40 @@ class NeweggScraperChsbr::Cpu
             if user.max_price.to_i == 0 &&
                 user.min_price.to_i == 0 &&
                 (NeweggScraperChsbr::Cpu.cpu_maker(user.cpu_make) == "Intel" || NeweggScraperChsbr::Cpu.cpu_maker(user.cpu_make) == "AMD")
-                    computer.name.name.include?(NeweggScraperChsbr::Cpu.cpu_maker(user.cpu_make)) ? puts("\n  #{counter}:\n     Name: #{computer.name.name}\n     Price: #{computer.price.price}") : nil
-            elsif user.max_price.to_i == 0 &&
-                user.min_price.to_i == 0 &&
-                user.cpu_make == 'x'
+                    if computer.name.name.include?(NeweggScraperChsbr::Cpu.cpu_maker(user.cpu_make))
+                        puts("\n  #{counter}:\n     Name: #{computer.name.name}\n     Price: #{computer.price.price}")
+                        printed_cpus << counter
+                    else
+                        nil
+                    end
+            elsif user.max_price.to_i == 0 && user.min_price.to_i == 0 && user.cpu_make == 'x'
+                    
                     puts("\n   #{counter}:\n     Name: #{computer.name.name}\n     Price: #{computer.price.price}")
+                    printed_cpus << counter
             elsif user.max_price.to_i >= computer.price.convert_price &&
                 user.min_price.to_i <= computer.price.convert_price &&
                 (NeweggScraperChsbr::Cpu.cpu_maker(user.cpu_make) == "Intel" || NeweggScraperChsbr::Cpu.cpu_maker(user.cpu_make) == "AMD")
-                    computer.name.name.include?(NeweggScraperChsbr::Cpu.cpu_maker(user.cpu_make)) ? puts("\n  #{counter}:\n     Name: #{computer.name.name}\n     Price: #{computer.price.price}") : nil
+                    if computer.name.name.include?(NeweggScraperChsbr::Cpu.cpu_maker(user.cpu_make)) 
+                        puts("\n  #{counter}:\n     Name: #{computer.name.name}\n     Price: #{computer.price.price}")
+                        printed_cpus << counter
+                    else
+                        nil
+                    end
             
             elsif user.max_price.to_i >= computer.price.convert_price &&
                 user.min_price.to_i <= computer.price.convert_price &&
                 user.cpu_make == 'x'
                     puts("\n  #{counter}:\n     Name: #{computer.name.name}\n     Price: #{computer.price.price}")
+                    printed_cpus << counter
+
+            elsif printed_cpus.size == 0
+                puts "You did not match any CPU criteria."
             end
+
             counter += 1
+            
         end
+        printed_cpus
 
     end
     def self.display_cpu_with_extras(user)

data/lib/newegg_scraper_chsbr/data_grabber.rb

@@ -70,7 +70,7 @@ class NeweggScraperChsbr::DataGrabber
         end
     end
     def isCoolerOrMB?(name) 
-        name.include?("Water") || name.include?("Air") || name.include?("Motherboard")  
+        name.include?("Water") || name.include?("Air") || name.include?("Motherboard") || name.include?("AIO") || name.include?("FLY")
     end
     def getPrice
         scraped_info = NeweggScraperChsbr::Scraper.new

data/lib/newegg_scraper_chsbr/user.rb

@@ -7,19 +7,23 @@ class NeweggScraperChsbr::User
         @max_price = max_price
         @chosen_cpu = []
     end
-    def choose_cpu
+    def choose_cpu(printed_cpus)
         puts "Please enter the number of the CPU you'd like to see more about."
         chosen = gets.strip
         while !is_numeric?(chosen)
             puts "Please enter the number of the CPU you'd like to see more about."
             chosen = gets.strip
         end
+        if !printed_cpus.include?(chosen.to_i)
+            puts "You chose a CPU outside of your budget please choose another."
+            choose_cpu(printed_cpus)
+        end
         @chosen_cpu << chosen.to_i
         puts "Would you like to see more about another CPU?\nEnter y to do so.\nEnter n to see details about the chosen CPU(s)"
             input = gets.strip
             
         if input == 'y'
-            choose_cpu
+            choose_cpu(printed_cpus)
         end
         
     end

data/lib/newegg_scraper_chsbr/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module NeweggScraperChsbr
-  VERSION = "0.2.2"
+  VERSION = "0.2.3"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: newegg_scraper_chsbr
 version: !ruby/object:Gem::Version
-  version: 0.2.2
+  version: 0.2.3
 platform: ruby
 authors:
 - Lrd134