top_100 1.1.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 7c57a07c3ddc393b6799747e92fe571f5652880d
-  data.tar.gz: cba9ff3caa5bbe22fbc22af7d98c58701968afa7
+  metadata.gz: f6a3918efad8b3cacb60d1516ebbc5d4d487d074
+  data.tar.gz: 0483d33e3c8a6c5ff042e560ddda3d9028c3101d
 SHA512:
-  metadata.gz: f3ca2a290d65245c7073ff958285ca47100617c94b3ab36ff3aef221cdbb5a5169cdd9db08f99ee6e6692126ff4b5383101cd613cedf5d80fada6b9d73bf387f
-  data.tar.gz: f9b5b464f6de09435880a261f404a883e958c9f1321a0552da0b658101db7fcad8a70f7fd0a2b7c29bcd69c9dae35ad01255d52402a118bbe7df74dd0b544c87
+  metadata.gz: 00ae5dcf8c0e9b1dde4de7962efe77a0880b17fee76f77056a4267113a4002cc50e86b704b78629f3491824360868f10c0b075a5cff2c7a88a37157c079770d3
+  data.tar.gz: 44b7acb6b3cdb7d4dbfe0bb81e3b3d667936d13cc121ff2a118619235a4d5b356020dcdef160fd7cc83a87007617268987f145d43baa3f4e3d7b20779424a2c8

data/README.md

@@ -1,6 +1,6 @@
 # Top100
 
-This gem allows the user to interact with the Billboard's Top 100 via the command line interface. Users can acquire a real time list of trending songs and acquire more information about the artists responsible for the works. Information is acquired through the use of the Nokogiri gem and OpenUri in order to data scrape information from the Billboard website.
+This gem allows the user to interact with the Billboard's Top 100 via the command line interface. Users can acquire a real time list of trending songs and acquire more information about the artists responsible for the works. Users can also open up Spotify links in their default browser of any songs they wish to hear. Information is acquired through the use of the Nokogiri gem and OpenUri in order to scrape data and information from the Billboard website.
 
 ## Installation
 
@@ -30,4 +30,4 @@ To install this gem onto your local machine, run `bundle exec rake install`. To
 
 ## Contributing
 
-Bug reports and pull requests are welcome on GitHub at https://github.com/[USERNAME]/top_100.
+Bug reports and pull requests are welcome on GitHub at https://github.com/viparthasarathy/top_100.

data/bin/top_100

@@ -3,4 +3,4 @@
 require "bundler/setup"
 require "top_100"
 
-Top100::CLI.new.call
+CLI.new.call

data/exe/top_100

@@ -3,4 +3,4 @@
 require "bundler/setup"
 require "top_100"
 
-Top100::CLI.new.call
+CLI.new.call

data/lib/top_100/artist.rb

@@ -1,32 +1,35 @@
-class Top100::Artist
+class Artist
   attr_accessor :songs, :name, :location, :date, :bio
-  CURRENT_HITS = Top100::BillboardScraper.new.scrape_from_chart_page
+  @@artists = []
 
-  def initialize(artist_hash)
-    artist_hash.each {|key, value| self.send("#{key}=", value)}
-    @songs = []
-    self.add_current_hits
-  end
-
-  def add_current_hits
-    CURRENT_HITS.each { |hit| self.songs << hit[:song_name] if hit[:song_artist].include?(self.name) }
+  #Songs already initialized, search for matching songs using name.
+  def initialize(artist_name)
+    @songs = Song.all.select {|song| song.artist_name == artist_name}
+    if @songs.empty?
+      self.name = nil
+    else
+      BillboardScraper.scrape_from_artist_bio_page(@songs[0].artist_bio_url).each {|key, value| self.send("#{key}=", value)}
+      @@artists << self
+    end
   end
 
   def display_details
     puts "Name: #{self.name}"
     puts "From: #{self.location}"
     puts "Formed: #{self.date} "
-    puts "Currently Trending Songs: #{self.songs.join(", ")}"
+    song_names = self.songs.map {|s| s.name}
+    puts "Currently Trending Songs: #{song_names.join(", ")}"
     puts "Bio: #{self.bio}"
   end
 
-  def self.create_artist(rank)
-    info_hash = CURRENT_HITS.find { |hit| hit[:current_rank] == rank }
-    unless info_hash == nil
-      artist_hash = Top100::BillboardScraper.new.scrape_from_artist_bio_page(info_hash[:artist_bio_link])
-      artist = self.new(artist_hash)
-      artist
-    end
+  def self.all
+    @@artists
+  end
+
+  #Artists have unique names, search for a match using the name or create a new Artist object.
+  def self.find_or_create(artist_name)
+    Artist.all.each {|a| return a if a.name == artist_name}
+    Artist.new(artist_name)
   end
 
 end

data/lib/top_100/billboard_scraper.rb

@@ -1,32 +1,35 @@
-class Top100::BillboardScraper
+class BillboardScraper
 
-  def scrape_from_chart_page
-    html = open('http://www.billboard.com/charts/hot-100')
-    nokogiri_object = Nokogiri::HTML(html)
-    charts_array = Array.new
+  def self.scrape_from_chart_page
+    nokogiri_object = Nokogiri::HTML(open('http://www.billboard.com/charts/hot-100'))
     nokogiri_object.css('div.chart-row__primary').each do |song|
-      charts_array << {
-        current_rank: song.css('span.chart-row__current-week').text,
-        song_name: song.css('h2.chart-row__song').text,
-        song_artist: song.css('a.chart-row__link').text.strip,
-        artist_bio_link: song.css('a.chart-row__link').attribute('href').value + '/biography'
+      url = song.css('a.chart-row__player-link')
+      name = song.css('h3.chart-row__artist').text.strip.split(//)
+      song_hash = {
+        rank: song.css('span.chart-row__current-week').text,
+        name: song.css('h2.chart-row__song').text,
+        artist_bio_url: song.css('a.chart-row__link').attribute('href').value + '/biography',
+        artist_name: song.css('h3.chart-row__artist').text.strip,
+        # missing url for some songs due to copyright issues, save url as nil for such songs
+        url: url.empty? ? nil : url.attribute('href').value
       }
+      Song.new(song_hash)
     end
-    charts_array
   end
 
-
-  def scrape_from_artist_bio_page(url)
-    html = open(url)
-    bio = Nokogiri::HTML(html)
+  def self.scrape_from_artist_bio_page(url)
+    bio = Nokogiri::HTML(open(url))
+    location_date = bio.css('dl.facts > dd').text
+    info = bio.css('article.bio_content').text
     artist = {
       name: bio.css('h1.title').text,
-      location: bio.css('dl.facts > dd').text.split("  ")[0].strip,
-      date: bio.css('dl.facts > dd').text.match(/\d+/)[0],
+      # missing information for some artists, need to catch that by checking if nokogiri returned empty strings.
+      location: location_date.empty? ? "Not Specified" : location_date.split("  ")[0].strip,
+      date: location_date.empty? ? "Not Specified" : location_date.match(/\d+/)[0],
+      #issues with .empty? for bio due to return  values of long whitespace strings, so using regex to filter those out instead.
+      # calling split on info to separate bio aside and main text which does not have a different grouping outside 'article.bio_content'
+      bio: info.match(/\A\s*\z/) ? "Not Specified" : info.split("      ")[-1].strip
     }
-    bio.css('aside.bio_sidebar').remove
-    artist[:bio] = bio.css('article.bio_content').text.strip
-    artist
   end
 
 end

data/lib/top_100/cli.rb

@@ -1,14 +1,12 @@
-class Top100::CLI
-  attr_accessor :tracker, :current_hits, :scraper
+class CLI
+  attr_accessor :tracker
 
 
   def initialize
     @tracker = 0
-    @scraper = Top100::BillboardScraper.new
-    @current_hits = self.scraper.scrape_from_chart_page
+    BillboardScraper.scrape_from_chart_page
   end
 
-
   def call
     puts "Welcome to the Billboard Hot 100. Now outputting the top twenty songs..."
     display_chart
@@ -20,40 +18,41 @@ class Top100::CLI
       puts "There are no more songs to display."
     else
       20.times do
-        hit = self.current_hits[self.tracker]
-        puts "##{hit[:current_rank]}: #{hit[:song_name]} by #{hit[:song_artist]}."
-        puts "--------------------------------"
+        Song.all[self.tracker].display
         self.tracker += 1
       end
     end
   end
 
-  def display_artist(rank)
-    artist = Top100::Artist.create_artist(rank)
-    if artist == nil
-      puts "Invalid input"
-    else
-      artist.display_details
-    end
+  def display_artist(name)
+    artist = Artist.find_or_create(name)
+    artist.name == nil ? puts("Artist not found.") : artist.display_details
     puts "--------------------------------"
   end
 
   def present_options
-    puts "Options: 1. type in 'exit' to exit. 2. type in 'next' for the next twenty songs. 3. type in the number of a song for an artist you would like to learn more about."
+    puts "Options: 1. type in 'exit' to exit. 2. type in 'next' for the next twenty songs. 3. type 'song' to choose a song to play. 4. type in the full artist title of a song to learn more about the main artist."
     choice = gets.chomp
-    if choice == 'exit'
+    case choice
+    when 'exit'
       puts "Now exiting..."
-    elsif choice == 'next'
+    when 'next'
       display_chart
       present_options
-    elsif choice.match(/\d+/)
-      display_artist(choice.match(/\d+/)[0])
+    when 'song'
+      puts "Enter the chart number of the song you would like to play."
+      rank = gets.chomp
+      Song.play(rank)
       present_options
     else
-      puts "Unknown command. Try again."
+      begin
+        display_artist(choice)
+        # catches issues using OpenURI to access certain artist pages or issues with making frequent requests
+        rescue OpenURI::HTTPError => error
+          puts "Sorry, we're having trouble displaying this artist's details."
+      end
       present_options
     end
   end
 
-
 end

data/lib/top_100/song.rb

@@ -0,0 +1,33 @@
+class Song
+  attr_accessor :rank, :name, :artist_name, :artist_bio_url, :url
+  @@songs = []
+
+  def initialize(song_hash)
+    song_hash.each {|key, value| self.send("#{key}=", value)}
+    @@songs << self
+  end
+
+  def self.all
+    @@songs
+  end
+
+  def display
+    puts "##{self.rank}: #{self.name} by #{self.artist_name}."
+    puts "--------------------------------"
+  end
+
+  def self.play(rank)
+    song = Song.all.find {|s| s.rank == rank }
+
+    if song.nil?
+      puts "You've entered an invalid chart name."
+    #check if song has a valid url, copyright issues with certain songs
+    elsif !!song.url
+      puts "Playing song..."
+      `open #{song.url}`
+    else
+      puts "Sorry, that artist does not have their song on Spotify."
+    end
+  end
+
+end

data/lib/top_100/version.rb

@@ -1,3 +1,3 @@
 module Top100
-  VERSION = "1.1.0"
+  VERSION = "2.0.0"
 end

data/lib/top_100.rb

@@ -5,3 +5,4 @@ require_relative "./top_100/version.rb"
 require_relative "./top_100/billboard_scraper.rb"
 require_relative "./top_100/artist.rb"
 require_relative "./top_100/cli.rb"
+require_relative "./top_100/song.rb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: top_100
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 2.0.0
 platform: ruby
 authors:
 - viparthasarathy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-03-26 00:00:00.000000000 Z
+date: 2016-04-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -88,6 +88,7 @@ files:
 - lib/top_100/artist.rb
 - lib/top_100/billboard_scraper.rb
 - lib/top_100/cli.rb
+- lib/top_100/song.rb
 - lib/top_100/version.rb
 - top_100.gemspec
 homepage: https://github.com/viparthasarathy/top-100