top_100 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f6a3918efad8b3cacb60d1516ebbc5d4d487d074
-  data.tar.gz: 0483d33e3c8a6c5ff042e560ddda3d9028c3101d
+  metadata.gz: 1cdc6f615b54a430d8c734a1c3613b0e09489b7e
+  data.tar.gz: fb4f3c3c601ba5739a01252f5e2e7ebe24b4814f
 SHA512:
-  metadata.gz: 00ae5dcf8c0e9b1dde4de7962efe77a0880b17fee76f77056a4267113a4002cc50e86b704b78629f3491824360868f10c0b075a5cff2c7a88a37157c079770d3
-  data.tar.gz: 44b7acb6b3cdb7d4dbfe0bb81e3b3d667936d13cc121ff2a118619235a4d5b356020dcdef160fd7cc83a87007617268987f145d43baa3f4e3d7b20779424a2c8
+  metadata.gz: 16d01ed501358d0be5a3dd7c37b279c8a4348b5d0e4dc1d568af31a4bd46ad781bf53d150a18171141bc314c0eba679ab5f93fc05c8d3c637a090cf50799c021
+  data.tar.gz: b5b28d3fd233c9fb0a094ed8e7e92e096f8b19e7eb4d5e651980dfea07a4acc83412d65d29000fc174f99f420a8bc4cb5c28ecba039ceb620e302d82fd8f462b

data/.gitignore

@@ -7,3 +7,4 @@
 /pkg/
 /spec/reports/
 /tmp/
+/top_100-2.0.0.gem/

data/lib/top_100/artist.rb

@@ -17,7 +17,7 @@ class Artist
     puts "Name: #{self.name}"
     puts "From: #{self.location}"
     puts "Formed: #{self.date} "
-    song_names = self.songs.map {|s| s.name}
+    song_names = self.songs.map {|song| song.name}
     puts "Currently Trending Songs: #{song_names.join(", ")}"
     puts "Bio: #{self.bio}"
   end
@@ -28,7 +28,7 @@ class Artist
 
   #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.all.each {|artist| return artist if artist.name == artist_name}
     Artist.new(artist_name)
   end
 

data/lib/top_100/billboard_scraper.rb

@@ -1,17 +1,17 @@
 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|
-      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

data/lib/top_100/cli.rb

@@ -31,7 +31,7 @@ class CLI
   end
 
   def present_options
-    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."
+    puts "Options: 1. type in 'exit' to exit. 2. type in 'next' for the next twenty songs. 3. type 'song' to play a song sample. 4. type in the full artist title of a song to learn more about the main artist."
     choice = gets.chomp
     case choice
     when 'exit'

data/lib/top_100/song.rb

@@ -7,18 +7,33 @@ class Song
     @@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 }
+  #slug method used to help make query for spotify API request
+  def slug
+    self.name.gsub(/\s+/, "%20").delete('^a-zA-Z0-9\-').downcase
+  end
 
+
+  def spotify_link
+    response = open("https://api.spotify.com/v1/search?q=#{self.slug}&type=track").read
+    json_info = JSON.parse(response)
+    song_details = json_info["tracks"]["items"].find { |info| self.artist_name.downcase.include?(info["artists"][0]["name"].downcase) }
+    song_details == nil ? nil : song_details["preview_url"]
+  end
+
+  # class methods
+
+  def self.all
+    @@songs
+  end
+
+  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

data/lib/top_100/version.rb

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

data/lib/top_100.rb

@@ -1,5 +1,6 @@
 require 'open-uri'
 require 'nokogiri'
+require 'json'
 
 require_relative "./top_100/version.rb"
 require_relative "./top_100/billboard_scraper.rb"

metadata

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