lastfm 1.26.0 → 1.27.4

data/spec/method_specs/artist_spec.rb

@@ -4,182 +4,194 @@ describe '#artist' do
   before { init_lastfm }
 
   it 'should return an instance of Lastfm::Artist' do
-    @lastfm.artist.should be_an_instance_of(Lastfm::MethodCategory::Artist)
+    expect(@lastfm.artist).to be_an_instance_of(Lastfm::MethodCategory::Artist)
+  end
+
+  describe '#get_correction' do
+    it 'should get corrections' do
+      expect(@lastfm).to receive(:request).with('artist.getCorrection', {
+        :artist => 'Guns N Roses'
+      }).and_return(make_response('artist_get_correction'))
+
+      corrections = @lastfm.artist.get_correction(:artist => 'Guns N Roses')
+      expect(corrections[0]['artist']['name']).to eq("Guns N' Roses")
+      expect(corrections[0]['artist']['url']).to eq('http://www.last.fm/music/Guns+N%27+Roses')
+    end
   end
 
   describe '#get_top_tracks' do
     it 'should get top tracks' do
-      @lastfm.should_receive(:request).with('artist.getTopTracks', {
+      expect(@lastfm).to receive(:request).with('artist.getTopTracks', {
         :artist => 'Cher'
       }).and_return(make_response('artist_get_top_tracks'))
 
       top_tracks = @lastfm.artist.get_top_tracks(:artist => 'Cher')
-      top_tracks.size.should > 1
+      expect(top_tracks.size).to be > 1
     end
   end
 
   describe '#get_top_albums' do
     it 'should get top albums' do
-      @lastfm.should_receive(:request).with('artist.getTopAlbums', {
+      expect(@lastfm).to receive(:request).with('artist.getTopAlbums', {
         :artist => 'Cher'
       }).and_return(make_response('artist_get_top_albums'))
 
       top_albums = @lastfm.artist.get_top_albums(:artist => 'Cher')
-      top_albums.size.should > 1
+      expect(top_albums.size).to be > 1
     end
   end
 
   describe '#get_top_fans' do
     it 'should get top fans' do
-      @lastfm.should_receive(:request).with('artist.getTopFans', {
+      expect(@lastfm).to receive(:request).with('artist.getTopFans', {
         :artist => 'Cher'
       }).and_return(make_response('artist_get_top_fans'))
 
       top_fans = @lastfm.artist.get_top_fans(:artist => 'Cher')
-      top_fans.should have(50).items
-      top_fans.first['name'].should eql('D3xperience')
+      expect(top_fans.size).to eql(50)
+      expect(top_fans.first['name']).to eql('D3xperience')
     end
   end
 
   describe '#get_info' do
     it 'should get info' do
-      @lastfm.should_receive(:request).with('artist.getInfo', {
+      expect(@lastfm).to receive(:request).with('artist.getInfo', {
         :artist => 'Cher'
       }).and_return(make_response('artist_get_info'))
 
       artist = @lastfm.artist.get_info(:artist => 'Cher')
-      artist['name'].should == 'Cher'
-      artist['mbid'].should == 'bfcc6d75-a6a5-4bc6-8282-47aec8531818'
-      artist['url'].should == 'http://www.last.fm/music/Cher'
-      artist['image'].size.should == 5
+      expect(artist['name']).to eq('Cher')
+      expect(artist['mbid']).to eq('bfcc6d75-a6a5-4bc6-8282-47aec8531818')
+      expect(artist['url']).to eq('http://www.last.fm/music/Cher')
+      expect(artist['image'].size).to eq(5)
     end
   end
 
   describe '#get_events' do
     it 'should get events' do
-      @lastfm.should_receive(:request).with('artist.getEvents', {
+      expect(@lastfm).to receive(:request).with('artist.getEvents', {
         :artist => 'Cher'
       }).and_return(make_response('artist_get_events'))
 
       events = @lastfm.artist.get_events(:artist => 'Cher')
-      events.size.should == 1
-      events[0]['title'].should == 'Cher'
-      events[0]['artists'].size.should == 2
-      events[0]['artists']['headliner'].should == 'Cher'
-      events[0]['venue']['name'].should == 'The Colosseum At Caesars Palace'
-      events[0]['venue']['location']['city'].should == 'Las Vegas(, NV)'
-      events[0]['venue']['location']['point']['lat'].should == '36.116143'
-      events[0]['image'].size.should == 4
-      events[0]['image'][0]['size'].should == 'small'
-      events[0]['image'][0]['content'].should == 'http://userserve-ak.last.fm/serve/34/34814037.jpg'
-      events[0]['startDate'].should == 'Sat, 23 Oct 2010 19:30:00'
-      events[0]['tickets']['ticket']['supplier'].should == 'TicketMaster'
-      events[0]['tickets']['ticket']['content'].should == 'http://www.last.fm/affiliate/byid/29/1584537/12/ws.artist.events.b25b959554ed76058ac220b7b2e0a026'
-      events[0]['tags']['tag'].should == ['pop', 'dance', 'female vocalists', '80s', 'cher']
+      expect(events.size).to eq(1)
+      expect(events[0]['title']).to eq('Cher')
+      expect(events[0]['artists'].size).to eq(2)
+      expect(events[0]['artists']['headliner']).to eq('Cher')
+      expect(events[0]['venue']['name']).to eq('The Colosseum At Caesars Palace')
+      expect(events[0]['venue']['location']['city']).to eq('Las Vegas(, NV)')
+      expect(events[0]['venue']['location']['point']['lat']).to eq('36.116143')
+      expect(events[0]['image'].size).to eq(4)
+      expect(events[0]['image'][0]['size']).to eq('small')
+      expect(events[0]['image'][0]['content']).to eq('http://userserve-ak.last.fm/serve/34/34814037.jpg')
+      expect(events[0]['startDate']).to eq('Sat, 23 Oct 2010 19:30:00')
+      expect(events[0]['tickets']['ticket']['supplier']).to eq('TicketMaster')
+      expect(events[0]['tickets']['ticket']['content']).to eq('http://www.last.fm/affiliate/byid/29/1584537/12/ws.artist.events.b25b959554ed76058ac220b7b2e0a026')
+      expect(events[0]['tags']['tag']).to eq(['pop', 'dance', 'female vocalists', '80s', 'cher'])
     end
   end
 
   describe '#get_images' do
     it 'should get images' do
-      @lastfm.should_receive(:request).with('artist.getImages', {
+      expect(@lastfm).to receive(:request).with('artist.getImages', {
         :artist => 'Cher',
       }).and_return(make_response('artist_get_images'))
 
       images = @lastfm.artist.get_images(:artist => 'Cher')
-      images.count.should == 2
-      images[1]['title'].should == 'Early years'
-      images[1]['url'].should == 'http://www.last.fm/music/Cher/+images/34877783'
-      images[1]['dateadded'].should == 'Tue, 8 Sep 2009 05:40:36'
-      images[1]['format'].should == 'jpg'
-      images[1]['owner']['type'].should == 'user'
-      images[1]['owner']['name'].should == 'djosci_coelho'
-      images[1]['owner']['url'].should == 'http://www.last.fm/user/djosci_coelho'
-      images[1]['sizes']['size'].length.should == 6
+      expect(images.count).to eq(2)
+      expect(images[1]['title']).to eq('Early years')
+      expect(images[1]['url']).to eq('http://www.last.fm/music/Cher/+images/34877783')
+      expect(images[1]['dateadded']).to eq('Tue, 8 Sep 2009 05:40:36')
+      expect(images[1]['format']).to eq('jpg')
+      expect(images[1]['owner']['type']).to eq('user')
+      expect(images[1]['owner']['name']).to eq('djosci_coelho')
+      expect(images[1]['owner']['url']).to eq('http://www.last.fm/user/djosci_coelho')
+      expect(images[1]['sizes']['size'].length).to eq(6)
     end
   end
 
   describe '#get_similar' do
     it 'should get similar artists' do
-      @lastfm.should_receive(:request).with('artist.getSimilar', {
+      expect(@lastfm).to receive(:request).with('artist.getSimilar', {
         :artist => 'kid606'
       }).and_return(make_response('artist_get_similar'))
 
       artists = @lastfm.artist.get_similar(:artist => 'kid606')
-      artists.size.should == 2
-      artists[1]['name'].should == 'Venetian Snares'
-      artists[1]['mbid'].should == '56abaa47-0101-463b-b37e-e961136fec39'
-      artists[1]['match'].should == '100'
-      artists[1]['url'].should == '/music/Venetian+Snares'
-      artists[1]['image'].should == ['http://userserve-ak.last.fm/serve/160/211799.jpg']
+      expect(artists.size).to eq(2)
+      expect(artists[1]['name']).to eq('Venetian Snares')
+      expect(artists[1]['mbid']).to eq('56abaa47-0101-463b-b37e-e961136fec39')
+      expect(artists[1]['match']).to eq('100')
+      expect(artists[1]['url']).to eq('/music/Venetian+Snares')
+      expect(artists[1]['image']).to eq(['http://userserve-ak.last.fm/serve/160/211799.jpg'])
     end
   end
 
   describe '#get_tags' do
     it 'should get artist tags' do
-      @lastfm.should_receive(:request).with('artist.getTags', {
+      expect(@lastfm).to receive(:request).with('artist.getTags', {
         :artist => 'zebrahead',
         :user => 'test',
         :autocorrect => nil
       }).and_return(make_response('artist_get_tags'))
 
       tags = @lastfm.artist.get_tags(:artist => 'zebrahead', :user => 'test')
-      tags.size.should == 2
-      tags[0]['name'].should == 'punk'
-      tags[1]['name'].should == 'Awesome'
+      expect(tags.size).to eq(2)
+      expect(tags[0]['name']).to eq('punk')
+      expect(tags[1]['name']).to eq('Awesome')
     end
   end
 
   describe '#get_top_tags' do
     context 'with artist' do
       it 'should get artist top tags' do
-        @lastfm.should_receive(:request).with('artist.getTopTags', {
+        expect(@lastfm).to receive(:request).with('artist.getTopTags', {
             :artist => 'Giorgio Moroder',
             :autocorrect => nil
           }).and_return(make_response('artist_get_top_tags'))
 
         tags = @lastfm.artist.get_top_tags(:artist => 'Giorgio Moroder')
-        tags.size.should == 5
-        tags[0]['name'].should == 'electronic'
-        tags[0]['count'].should == '100'
-        tags[0]['url'].should == 'http://www.last.fm/tag/electronic'
-        tags[1]['name'].should == 'Disco'
-        tags[1]['count'].should == '97'
-        tags[1]['url'].should == 'http://www.last.fm/tag/disco'
+        expect(tags.size).to eq(5)
+        expect(tags[0]['name']).to eq('electronic')
+        expect(tags[0]['count']).to eq('100')
+        expect(tags[0]['url']).to eq('http://www.last.fm/tag/electronic')
+        expect(tags[1]['name']).to eq('Disco')
+        expect(tags[1]['count']).to eq('97')
+        expect(tags[1]['url']).to eq('http://www.last.fm/tag/disco')
       end
     end
 
     context 'with mbid' do
       it 'should get artist top tags' do
-        @lastfm.should_receive(:request).with('artist.getTopTags', {
+        expect(@lastfm).to receive(:request).with('artist.getTopTags', {
             :mbid => 'xxxxx',
             :autocorrect => nil
           }).and_return(make_response('artist_get_top_tags'))
 
         tags = @lastfm.artist.get_top_tags(:mbid => 'xxxxx')
-        tags.size.should == 5
-        tags[0]['name'].should == 'electronic'
-        tags[0]['count'].should == '100'
-        tags[0]['url'].should == 'http://www.last.fm/tag/electronic'
-        tags[1]['name'].should == 'Disco'
-        tags[1]['count'].should == '97'
-        tags[1]['url'].should == 'http://www.last.fm/tag/disco'
+        expect(tags.size).to eq(5)
+        expect(tags[0]['name']).to eq('electronic')
+        expect(tags[0]['count']).to eq('100')
+        expect(tags[0]['url']).to eq('http://www.last.fm/tag/electronic')
+        expect(tags[1]['name']).to eq('Disco')
+        expect(tags[1]['count']).to eq('97')
+        expect(tags[1]['url']).to eq('http://www.last.fm/tag/disco')
       end
     end
   end
 
   describe '#search' do
     it 'should search' do
-      @lastfm.should_receive(:request).with('artist.search', {
+      expect(@lastfm).to receive(:request).with('artist.search', {
         :artist => 'RADWIMPS',
         :limit => 10,
         :page => 3,
       }).and_return(make_response('artist_search'))
 
       tracks = @lastfm.artist.search(:artist => 'RADWIMPS', :limit => 10, :page => 3)
-      tracks['results']['for'].should == 'RADWIMPS'
-      tracks['results']['totalResults'].should == '3'
-      tracks['results']['artistmatches']['artist'].size.should == 3
-      tracks['results']['artistmatches']['artist'][0]['name'].should == 'RADWIMPS'
+      expect(tracks['results']['for']).to eq('RADWIMPS')
+      expect(tracks['results']['totalResults']).to eq('3')
+      expect(tracks['results']['artistmatches']['artist'].size).to eq(3)
+      expect(tracks['results']['artistmatches']['artist'][0]['name']).to eq('RADWIMPS')
     end
   end
 end

data/spec/method_specs/chart_spec.rb

@@ -4,78 +4,78 @@ describe '#chart' do
   before { init_lastfm }
 
   it 'should return an instance of Lastfm::Chart' do
-    @lastfm.chart.should be_an_instance_of(Lastfm::MethodCategory::Chart)
+    expect(@lastfm.chart).to be_an_instance_of(Lastfm::MethodCategory::Chart)
   end
 
   describe '#get_hyped_artists' do
     it 'should get hyped artists' do
-      @lastfm.should_receive(:request).with('chart.getHypedArtists', {
+      expect(@lastfm).to receive(:request).with('chart.getHypedArtists', {
           :limit => 10,
           :page => 3
       }).and_return(make_response('chart_get_hyped_artists'))
 
       hyped_artists = @lastfm.chart.get_hyped_artists(:limit => 10, :page => 3)
-      hyped_artists.size.should > 1
+      expect(hyped_artists.size).to be > 1
     end
   end
 
   describe '#get_hyped_tracks' do
     it 'should get hyped tracks' do
-      @lastfm.should_receive(:request).with('chart.getHypedTracks', {
+      expect(@lastfm).to receive(:request).with('chart.getHypedTracks', {
           :limit => 10,
           :page => 3
       }).and_return(make_response('chart_get_hyped_tracks'))
 
       hyped_tracks = @lastfm.chart.get_hyped_tracks(:limit => 10, :page => 3)
-      hyped_tracks.size.should > 1
+      expect(hyped_tracks.size).to be > 1
     end
   end
 
   describe '#get_loved_tracks' do
     it 'should get loved tracks' do
-      @lastfm.should_receive(:request).with('chart.getLovedTracks', {
+      expect(@lastfm).to receive(:request).with('chart.getLovedTracks', {
           :limit => 10,
           :page => 3
       }).and_return(make_response('chart_get_loved_tracks'))
 
       loved_tracks = @lastfm.chart.get_loved_tracks(:limit => 10, :page => 3)
-      loved_tracks.size.should > 1
+      expect(loved_tracks.size).to be > 1
     end
   end
 
   describe '#get_top_artists' do
     it 'should get top artists' do
-      @lastfm.should_receive(:request).with('chart.getTopArtists', {
+      expect(@lastfm).to receive(:request).with('chart.getTopArtists', {
           :limit => 10,
           :page => 3
       }).and_return(make_response('chart_get_top_artists'))
 
       top_artists = @lastfm.chart.get_top_artists(:limit => 10, :page => 3)
-      top_artists.size.should > 1
+      expect(top_artists.size).to be > 1
     end
   end
 
   describe '#get_top_tags' do
     it 'should get top tags' do
-      @lastfm.should_receive(:request).with('chart.getTopTags', {
+      expect(@lastfm).to receive(:request).with('chart.getTopTags', {
           :limit => 10,
           :page => 3
       }).and_return(make_response('chart_get_top_tags'))
 
       top_tags = @lastfm.chart.get_top_tags(:limit => 10, :page => 3)
-      top_tags.size.should > 1
+      expect(top_tags.size).to be > 1
     end
   end
 
   describe '#get_top_tracks' do
     it 'should get top tracks' do
-      @lastfm.should_receive(:request).with('chart.getTopTracks', {
+      expect(@lastfm).to receive(:request).with('chart.getTopTracks', {
           :limit => 10,
           :page => 3
       }).and_return(make_response('chart_get_top_tracks'))
 
       top_tracks = @lastfm.chart.get_top_tracks(:limit => 10, :page => 3)
-      top_tracks.size.should > 1
+      expect(top_tracks.size).to be > 1
     end
   end
 end

data/spec/method_specs/event_spec.rb

@@ -2,16 +2,16 @@ describe '#event' do
   before { init_lastfm }
 
   it 'should return an instance of Lastfm::Event' do
-    @lastfm.event.should be_an_instance_of(Lastfm::MethodCategory::Event)
+    expect(@lastfm.event).to be_an_instance_of(Lastfm::MethodCategory::Event)
   end
 
   describe '#get_info' do
     it 'should get info' do
-      @lastfm.should_receive(:request).with('event.getInfo', {
+      expect(@lastfm).to receive(:request).with('event.getInfo', {
         :event => 1073657
       }).and_return(make_response('event_get_info'))
       info = @lastfm.event.get_info(:event => 1073657)
-      info['title'].should == 'Neko Case'
+      expect(info['title']).to eq('Neko Case')
     end
   end
 end

data/spec/method_specs/geo_spec.rb

@@ -4,12 +4,12 @@ describe '#geo' do
   before { init_lastfm }
 
   it 'should return an instance of Lastfm::Geo' do
-    @lastfm.geo.should be_an_instance_of(Lastfm::MethodCategory::Geo)
+    expect(@lastfm.geo).to be_an_instance_of(Lastfm::MethodCategory::Geo)
   end
 
   describe '#get_events' do
     it 'should get events' do
-      @lastfm.should_receive(:request).with('geo.getEvents', {
+      expect(@lastfm).to receive(:request).with('geo.getEvents', {
         :location => 'Boulder',
         :distance => nil,
         :limit => nil,
@@ -17,17 +17,17 @@ describe '#geo' do
       }).and_return(make_response('geo_get_events'))
 
       events = @lastfm.geo.get_events(:location => 'Boulder')
-      events.size.should == 1
-      events[0]['title'].should == 'Transistor Festival'
-      events[0]['artists'].size.should == 2
-      events[0]['artists']['headliner'].should == 'Not Breathing'
-      events[0]['venue']['name'].should == 'The Walnut Room'
-      events[0]['venue']['location']['city'].should == 'Denver, CO'
-      events[0]['venue']['location']['point']['lat'].should == '39.764316'
-      events[0]['image'].size.should == 4
-      events[0]['image'][0]['size'].should == 'small'
-      events[0]['image'][0]['content'].should == 'http://userserve-ak.last.fm/serve/34/166214.jpg'
-      events[0]['startDate'].should == 'Fri, 10 Jun 2011 01:58:01'
+      expect(events.size).to eq(1)
+      expect(events[0]['title']).to eq('Transistor Festival')
+      expect(events[0]['artists'].size).to eq(2)
+      expect(events[0]['artists']['headliner']).to eq('Not Breathing')
+      expect(events[0]['venue']['name']).to eq('The Walnut Room')
+      expect(events[0]['venue']['location']['city']).to eq('Denver, CO')
+      expect(events[0]['venue']['location']['point']['lat']).to eq('39.764316')
+      expect(events[0]['image'].size).to eq(4)
+      expect(events[0]['image'][0]['size']).to eq('small')
+      expect(events[0]['image'][0]['content']).to eq('http://userserve-ak.last.fm/serve/34/166214.jpg')
+      expect(events[0]['startDate']).to eq('Fri, 10 Jun 2011 01:58:01')
     end
   end
 end

data/spec/method_specs/group_spec.rb

@@ -4,19 +4,19 @@ describe '#group' do
   before { init_lastfm }
 
   it 'should return an instance of Lastfm::Group' do
-    @lastfm.group.should be_an_instance_of(Lastfm::MethodCategory::Group)
+    expect(@lastfm.group).to be_an_instance_of(Lastfm::MethodCategory::Group)
   end
 
   describe '#get_members' do
     it 'should get the members\' info' do
-      @lastfm.should_receive(:request).with('group.getMembers', {
+      expect(@lastfm).to receive(:request).with('group.getMembers', {
         :group => 'Linux',
         :limit => nil,
         :page => nil
       }).and_return(make_response('group_get_members'))
       members = @lastfm.group.get_members(:group => 'Linux')
-      members[0]['name'].should == 'RJ'
-      members.size.should == 1
+      expect(members[0]['name']).to eq('RJ')
+      expect(members.size).to eq(1)
     end
   end
 end

data/spec/method_specs/library_spec.rb

@@ -4,12 +4,12 @@ describe '#library' do
   before { init_lastfm }
 
   it 'should return an instance of Lastfm::Library' do
-    @lastfm.library.should be_an_instance_of(Lastfm::MethodCategory::Library)
+    expect(@lastfm.library).to be_an_instance_of(Lastfm::MethodCategory::Library)
   end
 
   describe '#get_tracks' do
     it 'should get the tracks\' info' do
-      @lastfm.should_receive(:request).with('library.getTracks', {
+      expect(@lastfm).to receive(:request).with('library.getTracks', {
         :user => 'test',
         :artist => 'foo',
         :album => 'bar',
@@ -17,21 +17,21 @@ describe '#library' do
         :page => nil
       }).and_return(make_response('library_get_tracks'))
       tracks = @lastfm.library.get_tracks(:user => 'test', :artist => 'foo', :album => 'bar')
-      tracks[0]['name'].should == 'Learning to Live'
-      tracks.size.should == 1
+      expect(tracks[0]['name']).to eq('Learning to Live')
+      expect(tracks.size).to eq(1)
     end
   end
 
   describe '#get_artists' do
     it 'should get the artists\' info' do
-      @lastfm.should_receive(:request).with('library.getArtists', {
+      expect(@lastfm).to receive(:request).with('library.getArtists', {
         :user => 'test',
         :limit => nil,
         :page => nil
       }).and_return(make_response('library_get_artists'))
       artists = @lastfm.library.get_artists(:user => 'test')
-      artists[1]['name'].should == 'Dark Castle'
-      artists.size.should == 2
+      expect(artists[1]['name']).to eq('Dark Castle')
+      expect(artists.size).to eq(2)
     end
   end
 end