art_throughout_the_years 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: fb396ae7fb49549030b6ac87b1afff55bcbd5ac02daa54cc619fe27e40f30e22
-  data.tar.gz: efaae192519c07131612f74d7b074f26e3e9abb41bb8339c9eb8dcf79f750127
+  metadata.gz: 1d1801fc1f2c289ebd44d3cc181b2c4e0fc7a56283fe2f43795b2c17c6d054c8
+  data.tar.gz: 49ee02f3f2ffdc15b97adf5d66b545581a068d9fb497c7c3bf888917d265943a
 SHA512:
-  metadata.gz: d3ba00910a6eaabb7baf87924f14ccfbede128ab57e47b93f0d232d146766a198efc440552eadba26b90ae202ca76c11e071fd5696c7f31ca3c8ed25425f3eda
-  data.tar.gz: 82003ac3e823346ea5f749b5ae963fc72f98a23910613864feb46dd00894ab002e5a316af61694873ac5a13c2c1692508552b17749f8b0735bba576134c9355c
+  metadata.gz: 5483bc8579ec37c8c81047c549f571d9774073fb4d30ee9e230fb496fcdf1c99dbe76761b591cdcb9337724e32d16453c7adb0b645a7dc8ca7911371ec24799c
+  data.tar.gz: 880731aed1cbe4804fd0da112c6dd0977b9dc7873a66bc4c155c8f1861a8ad4b880f3d26741dbd760ee8285e83b1725625109012876d048f841333552a43fbfc

data/config/environment.rb

@@ -1,5 +1,7 @@
 require 'nokogiri'
 require 'open-uri'
+require 'pry'
+require 'colorize'
 
 require_relative '../lib/scraper'
 require_relative '../lib/works_of_art'

data/lib/cli.rb

@@ -1,53 +1,63 @@
 class ArtThroughoutTheYears::CLI
-  
-  def call
-    ArtThroughoutTheYears::Scraper.scrape_art
-    start
-    list_pieces
-    print_artwork
-  end
 
-  def start
-    puts ""
-    puts "************* ~The Most Popular Paintings Throughout History~ *************"
-    puts ""
-  end
+ def call
+   ArtThroughoutTheYears::Scraper.scrape_art
+   start
+   list_pieces
+   print_artwork
+ end
 
-  def list_pieces
-    puts "Please enter 'list' to view the list of painting below"
-    puts ""
-    input = gets.strip
-    if input == "list"
-      puts ""
-      pieces = ArtThroughoutTheYears::WorksofArt.all
-      pieces.each.with_index(1) {|piece, index| puts "#{index} #{piece.title_artist_year}"}
-    else input == "exit"
-      system "clear"
-      exit
-      list_pieces
+ def start
+   puts ""
+   puts "-------- ~The Most Popular Paintings in History~ --------".bold.underline.green
+   puts ""
+ end
+
+ def list_pieces
+   puts "To see a list of works of art type list.".bold.italic.blue
+   input = gets.strip
+   if input =="list"
+     puts ""
+     works = ArtThroughoutTheYears::WorksofArt.all.each.with_index(1) do |work, index|
+       puts "#{index}) #{work.title}".cyan
+     end
+   end
+ end
+
+ def print_artwork
+   puts "Please enter the number of the listed work you would like to view or exit.".bold.italic.blue
+   input = gets.strip
+   if input.to_i < 24
+     work = ArtThroughoutTheYears::WorksofArt.find(input.to_i)
+     puts ""
+     puts "Work: --#{work.title.bold.cyan}--"
+     puts ""
+     puts "Information: --#{work.description}--"
+     puts ""
+     next_choice
+    elsif input == "exit"
+     puts "Thank you for visiting!".bold.italic.blue
+    else input.to_i > 23
+      puts "Please enter a valid number of listed work."
+      print_artwork
     end
   end
   
-  def print_artwork
-    puts ""
-    puts "Please enter the number of the listed work you would like to view."
+  def next_choice
+    puts "Please enter another number of the listed work or enter exit to leave the program.".bold.italic.blue
     input = gets.strip
-    if input > 0
-      artwork = ArtThroughoutTheYears::WorksofArt.find_by_index(input.to_i - 1)
-      puts ""
-      puts "-------------- #{artwork.title_artist_year} --------------"
-      puts ""
-      puts "Information: #{artwork.description}"
-      puts ""
-      print_artwork
-    elsif input == "Exit"
+    if input.to_i < 24
+      work = ArtThroughoutTheYears::WorksofArt.find(input.to_i)
       puts ""
-      puts "Thank you for visiting, have a good day!"
+      puts "Work: --#{work.title.bold.cyan}--"
       puts ""
-    else 
+      puts "Information: --#{work.description}--"
       puts ""
-      puts "View the list below"
-      list_pieces
+      next_choice
+    elsif input == "exit"
+      puts "Thank you for visiting, have a nice day!".bold.italic.blue
+    else
+      next_choice
     end
   end
-end
+end

data/lib/scraper.rb

@@ -1,12 +1,14 @@
+require 'pry'
 class ArtThroughoutTheYears::Scraper
   
   def self.scrape_art
     doc = Nokogiri::HTML(open("https://www.timeout.com/newyork/art/top-famous-paintings-in-art-history-ranked"))
-    doc.css('div.main_content.md-col-7.md-offset-1.xs-relative.xs-pt4.md-pt0').each do |art|
-    
-      title_artist_year = art.css("span.title-underline.theme-underline-static").text
-      description = art.css("div.xs-text-7.xs-line-height-6.xs-text-charcoal").text
-      ArtThroughoutTheYears::WorksofArt.new(index, title_artist_year, description)
+    doc.css('article .listCard').each do |art_node|
+      
+      title = art_node.css('h3').text.strip
+      description = art_node.css("p").text.strip
+      ArtThroughoutTheYears::WorksofArt.new(title, description)
     end
   end
-end
+end
+

data/lib/works_of_art.rb

@@ -1,9 +1,9 @@
 class ArtThroughoutTheYears::WorksofArt
-  attr_accessor :title_artist_year, :description
+  attr_accessor :title, :description
   
   @@all = []
-  def initialize(title_artist_year, description)
-    @title_artist_year = title_artist_year
+  def initialize(title=nil, description=nil)
+    @title = title
     @description = description
     @@all << self
   end
@@ -12,7 +12,11 @@ class ArtThroughoutTheYears::WorksofArt
     @@all
   end
   
-  def self.find_by_index(index)
-    @@all[index]
+  def self.new_from_index_page(r)
+    self.new(art.css("div.MFP-Home-Content-Artwork-Text").text)
+  end
+  
+  def self.find(id)
+    @@all[id-1]
   end
 end

metadata

@@ -1,15 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: art_throughout_the_years
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - "'Christina Gonzalez'"
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-12-27 00:00:00.000000000 Z
+date: 2020-01-02 00:00:00.000000000 Z
 dependencies:
+- !ruby/object:Gem::Dependency
+  name: colorize
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+- !ruby/object:Gem::Dependency
+  name: pry
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :development
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: bundler
   requirement: !ruby/object:Gem::Requirement
@@ -100,7 +128,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Art Throughout The Years