top_100 2.1.1 → 3.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 48ca9ee2f35c7db065e9293b2b0c4bde84665a5c
-  data.tar.gz: a35e02a87a2b7270e64afe78dba11861da9f3b49
+  metadata.gz: 5fe32f7a0fab14ff549576f8d75ff1c06c8e0a83
+  data.tar.gz: ec46bebc741cb4276bbede3ff8bb9e48ebdb72d5
 SHA512:
-  metadata.gz: 0a91f26ddf7c9cbe4e820e543c59da0c1fd8d909f2d2c7caa3df6bd2afd1b3afd9dd5e2b4f4341a9f8dddeae51b94025ce076bc6da659420c7b2bce668ade2ca
-  data.tar.gz: da1fcabcdb1dbd68b8e3c49511af171455e366f430984d9a41487740ee8d29416948c34ad36bdc0912772c9015d082cbd93946c13d4f8ab39bc8c60158727227
+  metadata.gz: 13c94798d79400eba455a74c85f55153c0e5dfa63d1ef58ed8adeff494b17c7f359f8a6cbc461ae20ccf8c0e9821a7c77648b0de2b4f37c42d6a5c431cbb07d2
+  data.tar.gz: ec2ee9e2c5a2cd7bf452d028630dad6c1a5091c0c63cc6c93785257626de9535701c0c3ab0e6a27510cc30582f73980f62dcff0faf573d8e32c221c71e4fa576

data/lib/top_100/artist.rb

@@ -8,7 +8,7 @@ class Artist
     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)}
+      BillboardScraper.scrape_from_artist_bio_page(@songs[0].artist_url).each {|key, value| self.send("#{key}=", value)}
       @@artists << self
     end
   end

data/lib/top_100/billboard_scraper.rb

@@ -1,17 +1,19 @@
 class BillboardScraper
 
-
   # will only use class methods, no need to create instances as there's nothing unique between these scrapers and we only need one.
-
   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|
-      name = song.css('h3.chart-row__artist').text.strip.split(//)
+    billboard_page = Nokogiri::HTML(open('http://www.billboard.com/charts/hot-100'))
+    rss = RSS::Parser.parse(open('http://www.billboard.com/rss/charts/hot-100'))
+    rss.items.each_with_index do |song, index|
+      #account for any song titles that might happen to have ': ' in their title.
+      name = song.title.split(": ")[1..-1].join(": ")
+      rank = song.title.split(": ")[0]
       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,
+        rank: rank,
+        name: name,
+        #feed doesn't seem to offer an artist value, requiring us to extract artist name from description instead.
+        artist_name: song.description.split("#{name} by ")[1].split(" ranks ##{rank}")[0],
+        artist_url: billboard_page.css('h3.chart-row__artist a.chart-row__link')[index].attribute('href').value + '/biography',
       }
       Song.new(song_hash)
     end

data/lib/top_100/song.rb

@@ -1,5 +1,5 @@
 class Song
-  attr_accessor :rank, :name, :artist_name, :artist_bio_url, :url
+  attr_accessor :rank, :name, :artist_name, :artist_url, :url
   @@songs = []
 
   def initialize(song_hash)
@@ -33,15 +33,17 @@ class Song
 
   def self.play(rank)
     song = Song.all.find {|song| song.rank == rank }
-    song.url = song.spotify_link
     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."
+      song.url = song.spotify_link
+      #check if song has a valid url, copyright issues with certain songs
+      if !!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 = "2.1.1"
+  VERSION = "3.0.0"
 end

data/lib/top_100.rb

@@ -1,7 +1,8 @@
-require 'open-uri'
+require 'rss'
 require 'nokogiri'
 require 'json'
 
+
 require_relative "./top_100/version.rb"
 require_relative "./top_100/billboard_scraper.rb"
 require_relative "./top_100/artist.rb"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: top_100
 version: !ruby/object:Gem::Version
-  version: 2.1.1
+  version: 3.0.0
 platform: ruby
 authors:
 - viparthasarathy
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-04-14 00:00:00.000000000 Z
+date: 2016-04-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler