fender_guitar_catalogue 0.1.0 → 0.2.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 22bf1facc1bccf8ad98b16d83197d37b081bd8ca8466ae3f6c2a275b0b136138
-  data.tar.gz: 132def13d3ab1824f882786b19337697de97e9f0f1d8687fedebb25fc9e3e2ec
+  metadata.gz: 3ab854fa683b6d7667074525772251b088a944501a4ef55f0247a7ba8b4adc59
+  data.tar.gz: daa714308ce8020b6b02f49cfe93386082d4362871381f90412530a717b7e283
 SHA512:
-  metadata.gz: 2daec96601ac7a813cd4e6b54e6909f6a2f408caad11b11de7e67a8e7e2f9342c807b639b0d164f2827d41ce8e18b441b50a182290638d6e27221d027293ffef
-  data.tar.gz: bf3ef5e6412eaf9d0831791c8ea7159df176e2cd8ada2a3ebdd1529634a5a16379c7d8ca3b35490d4522883d9932c34ee0430382ce33e784cb0e705521832b1d
+  metadata.gz: c86f00ad7b97fccfdab3393700033aa246d2996ef540ef8a7016f2e8bdacf562d6993a84a7db1e82e368328805b416e8aba0ac47d1e96a4094a6137f44fb1a73
+  data.tar.gz: 72359903f10f3cf2d2432a6df697d2ffe3f354ee1343d9b9d35d8496bc7278e7bcb9057e08ec12c4bab0d9870c7902046dac93bac66c0cc6ffeb309d7dca1d90

data/lib/fender_guitar_catalogue/cli.rb

@@ -30,7 +30,7 @@ class CLI
             puts ""
             show_details
         elsif input == "4"
-            puts "Goodbye"
+            puts "Goodbye!"
         else
             puts "Invalid selection."
             menu
@@ -41,7 +41,7 @@ class CLI
         puts "Which guitar would you like information on?"
         input = gets.chomp.to_i
         puts ""
-        if input > 149 || input < 1
+        if input < 1 || input > Guitar.all.count
             puts "!Invalid selection - Please choose a different model!"
             puts ""
             show_details
@@ -56,16 +56,16 @@ class CLI
     input = gets.chomp
     puts ""
         if input.downcase == "y"
-            system("clear")
             Guitar.all.clear
+            system("clear")
             menu
         elsif input.downcase == "n"
             puts "Goodbye"
+            system("clear")
         else 
             puts "Invalid selection."
             anything_else
         end
     end
-
     
 end

data/lib/fender_guitar_catalogue/scraper.rb

@@ -1,54 +1,40 @@
 class Scraper
-    
-BASE_URL = "https://www.fender.com/en-AU/"
-
-def get_page(url = BASE_URL)
-    Nokogiri::HTML(open(url))
-end
 
-def scrape_test
-    doc = get_page(url = "#{BASE_URL}electric-guitars/?start=0&sz=200")
-
-    doc.css(".product-tile").each.with_index(1).map do |guitar, i|
-        model = guitar.css(".pdp-link").text.strip
-        price = guitar.css(".price").text.strip
-        url = guitar.css("a.product-tile-image").attr("href").value
+    GUITAR_TYPE = { 
+        "bass" => "electric-basses/?start=0&sz=200",
+        "electric" => "electric-guitars/?start=0&sz=200",
+        "acoustic" => "acoustic-guitars/?start=0&sz=200"
+    }
+    
+    BASE_URL = "https://www.fender.com/en-AU/"
 
-        puts "#{i}. #{model}"
-        Guitar.new(model: model, price: price, url: url)
+    def get_page(url = BASE_URL)
+        Nokogiri::HTML(URI.open(url))
     end
-end
 
-def scrape(type)
-
-    if type == "bass"
-        doc = get_page(url = "#{BASE_URL}electric-basses/?start=0&sz=200")
-    elsif type == "electric"
-        doc = get_page(url = "#{BASE_URL}electric-guitars/?start=0&sz=200")
-    elsif type == "acoustic"
-        doc = get_page(url = "#{BASE_URL}acoustic-guitars/?start=0&sz=200")
+    def scrape(type)
+        doc = get_page(url = "#{BASE_URL}#{GUITAR_TYPE[type]}")
+    
+        doc.css(".product-tile").each.with_index(1).map do |guitar, i|
+            model = guitar.css(".pdp-link").text.strip
+            price = guitar.css(".price").text.strip
+            url = guitar.css("a.product-tile-image").attr("href").value
+
+            puts "#{i}. #{model}"
+            Guitar.new(model: model, price: price, url: url)
+        end
     end
 
-    doc.css(".product-tile").each.with_index(1).map do |guitar, i|
-        model = guitar.css(".pdp-link").text.strip
-        price = guitar.css(".price").text.strip
-        url = guitar.css("a.product-tile-image").attr("href").value
+    def scrape_content(url)
+        page_url = "#{BASE_URL}#{url}"
+        doc = get_page(page_url)
 
-        puts "#{i}. #{model}"
-        Guitar.new(model: model, price: price, url: url)
+        puts "#{doc.css(".row.long-description p").text.strip.gsub("Click here to learn more about this artist model.", "")}"
+        puts ""
+        puts "~Features~"
+        puts ""
+        li = "#{doc.css(".js-feature-bullets li")}"
+        puts li.gsub("<li>","* ").gsub("</li>","")
     end
-end
-
-def scrape_content(url)
-    page_url = "#{BASE_URL}#{url}"
-    doc = get_page(page_url)
-
-    puts "#{doc.css(".row.long-description p").text.strip.gsub("Click here to learn more about this artist model.", "")}"
-    puts ""
-    puts "~Features~"
-    puts ""
-    li = "#{doc.css(".js-feature-bullets li")}"
-    puts li.gsub("<li>","* ").gsub("</li>","")
-end
 
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: fender_guitar_catalogue
 version: !ruby/object:Gem::Version
-  version: 0.1.0
+  version: 0.2.1
 platform: ruby
 authors:
 - Matthew McAleer
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-06-03 00:00:00.000000000 Z
+date: 2022-10-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rspec
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 1.13.8
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '2.2'
+        version: 1.13.8
 - !ruby/object:Gem::Dependency
   name: open-uri
   requirement: !ruby/object:Gem::Requirement
@@ -65,11 +65,11 @@ files:
 - lib/fender_guitar_catalogue/cli.rb
 - lib/fender_guitar_catalogue/guitar.rb
 - lib/fender_guitar_catalogue/scraper.rb
-homepage: http://rubygems.org/gems/
+homepage: https://rubygems.org/gems/fender_guitar_catalogue
 licenses:
 - MIT
 metadata:
-  homepage_uri: http://rubygems.org/gems/
+  homepage_uri: https://rubygems.org/gems/fender_guitar_catalogue
 post_install_message:
 rdoc_options: []
 require_paths:
@@ -85,7 +85,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.6
+rubygems_version: 3.3.22
 signing_key:
 specification_version: 4
 summary: Fender Guitar Catalogue