rspotify 0.4.0 → 0.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a0f489f7b6248799f9c52fab33efa35debd4933a
-  data.tar.gz: c235ab00785d39e994950485cee2b994b2d2addb
+  metadata.gz: f2f691b1533e85a23ec83b8648854b133ee9078b
+  data.tar.gz: 858e2159f410f058f56d6556d43cfc9fb52b1b01
 SHA512:
-  metadata.gz: 04b88d2a1bff87009cbbb22139c9c8290a0a6880cd3edd587013f8d2e6ad0f078c6299fd7688c242426dc5439212e58676546948e735fa88a93606d780b1262f
-  data.tar.gz: 50b468779d68fdab5b7f3bf430a485570831dc231477c899a02a28ad10a5512b5e216e1603b1223ba42a01c8a023491a5367c184fe97d3eb5da2ffeccbf30e46
+  metadata.gz: a92a533beed2d5bdf7a0a753354d17e5ffb8e0aa598004c053c7f64e1a2f1a95ba8a1b89ef4aaa3b93de2c1e38ffd5e069038f4ea94d11c19b0d9342878e5976
+  data.tar.gz: dbbaad8372512bd4f7f4a549700b9caf126524bf5456cee04b80a18500991a93cc88aec6f90293dfb83cd88ea13ac926be69872328d4b318efd0c4eca1a37cb7

data/README.md

@@ -38,7 +38,8 @@ album.images #=> (Image array)
 
 # Find by id
 artist = RSpotify::Artist.find('5K4W6rqBFWDnAN6FQUkS6x')
-artist.genres #=> ["Alternative Rap", "East Coast Rap", ...]
+artist.genres          #=> ["Alternative Rap", "East Coast Rap", ...]
+artist.top_tracks[:US] #=> (Track array)
 
 album = RSpotify::Album.find('0uZ8zQLHru4BiNTL2PQY91')
 album.album_type #=> "single"

data/lib/rspotify/album.rb

@@ -21,14 +21,12 @@ module RSpotify
       @release_date           = options['release_date']
       @release_date_precision = options['release_date_precision']
 
-      if options['artists']
-        artists = options['artists']
-        @artists = artists.map { |a| Artist.new a }
+      @artists = if options['artists']
+        options['artists'].map { |a| Artist.new a }
       end
 
-      if options['tracks']
-        tracks = options['tracks']['items']
-        @tracks = tracks.map { |t| Track.new t }
+      @tracks = if options['tracks'] && options['tracks']['items']
+        options['tracks']['items'].map { |t| Track.new t }
       end
 
       super(options)

data/lib/rspotify/artist.rb

@@ -15,8 +15,15 @@ module RSpotify
       @images     = options['images']
       @name       = options['name']
       @popularity = options['popularity']
+      @top_tracks = {}
 
       super(options)
     end
+
+    def top_tracks(country)
+      return @top_tracks[country] unless @top_tracks[country].nil?
+      json = RSpotify.get("artists/#{@id}/top-tracks?country=#{country}")
+      @top_tracks[country] = json['tracks'].map{ |t| Track.new t }
+    end
   end
 end

data/lib/rspotify/base.rb

@@ -34,7 +34,7 @@ module RSpotify
       @uri           = options['uri']
     end
 
-    def complete_object!
+    def complete!
       pluralized_type = "#{type}s"
       initialize RSpotify.get("#{pluralized_type}/#{@id}")
     end
@@ -46,7 +46,7 @@ module RSpotify
       attr_value = instance_variable_get attr 
       return attr_value unless attr_value.nil?
 
-      complete_object!
+      complete!
       instance_variable_get attr 
     end
 

data/lib/rspotify/playlist.rb

@@ -19,19 +19,18 @@ module RSpotify
       @name          = options['name']
       @public        = options['public']
 
-      if options['owner']
-        @owner = User.new options['owner']
+      @owner = if options['owner']
+        User.new options['owner']
       end
 
-      if options['tracks'] && options['tracks']['items']
-        tracks = options['tracks']['items']
-        @tracks = tracks.map { |t| Track.new t['track'] }
+      @tracks = if options['tracks'] && options['tracks']['items']
+        options['tracks']['items'].map { |t| Track.new t['track'] }
       end
 
       super(options)
     end
 
-    def complete_object!
+    def complete!
       initialize RSpotify.auth_get("users/#{@owner.id}/playlists/#{@id}")
     end
   end

data/lib/rspotify/track.rb

@@ -21,13 +21,12 @@ module RSpotify
       @preview_url       = options['preview_url']
       @track_number      = options['track_number']
 
-      if options['album']
-        @album = Album.new options['album']
+      @album = if options['album']
+        Album.new options['album']
       end
 
-      if options['artists']
-        artists = options['artists']
-        @artists = artists.map { |a| Artist.new a }
+      @artists = if options['artists']
+        options['artists'].map { |a| Artist.new a }
       end
 
       super(options)

data/lib/rspotify/user.rb

@@ -15,8 +15,9 @@ module RSpotify
     end
 
     def playlists
+      return @playlists unless @playlists.nil?
       playlists = RSpotify.auth_get("users/#{@id}/playlists")['items']
-      playlists.map { |p| Playlist.new p }
+      @playlists = playlists.map { |p| Playlist.new p }
     end
   end
 end

data/lib/rspotify/version.rb

@@ -1,3 +1,3 @@
 module RSpotify
-  VERSION = '0.4.0'
+  VERSION = '0.5.0'
 end

data/spec/lib/rspotify/artist_spec.rb

@@ -17,6 +17,14 @@ describe RSpotify::Artist do
       expect(@artist.type)                     .to eq      'artist'
       expect(@artist.uri)                      .to eq      'spotify:artist:7Ln80lUS6He07XvHI8qqHH'
     end
+
+    it 'should find artist with correct top tracks' do
+      top_tracks = @artist.top_tracks(:US)
+      expect(top_tracks)             .to be_an Array
+      expect(top_tracks.size)        .to eq 10
+      expect(top_tracks.first)       .to be_an RSpotify::Track
+      expect(top_tracks.map(&:name)) .to include('Do I Wanna Know?', 'R U Mine?', 'Arabella', 'Knee Socks')
+    end
   end
 
   describe 'Artist#search' do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rspotify
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors:
 - Guilherme Sad