lastfm 1.27.3 → 1.27.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 147a742ed4bc98a34afd011ec2a27d9dc927a905
-  data.tar.gz: 9453ede5c8f07680fd82b780b95e37e74d596079
+  metadata.gz: 97fb464cf27713555c45f696a2c7489906c6d8dc
+  data.tar.gz: 93856d36bde02f40e1b9180f151e29363fc51ef8
 SHA512:
-  metadata.gz: 54946841482df488dd3ebbb639863362aa1c37b9f44e4739322babc2c955ff25b9eb91f1f8b6e2d5c8580c0dbfdc6846491061aa729e67f80099fd3cc1956859
-  data.tar.gz: e03e1f766ce0b57cc0ae55af7558d153329c382be08c17074f9ea04d4b13ecd1c44fd60a2bace4fc5f50149c6d615723da4239b348df0b0447f6b59312cade20
+  metadata.gz: 0f0c940d644e5fd4f4c55d0c77ef4e1fa8be5e5252e9e00a2552296745ab4f892478da72d09021b752a7770035c76e065cd8941d900b3d16c2bf6afaa04e3259
+  data.tar.gz: 874c706e479275dbff678f62bee3dd87767e8c074722dd4bc08161a1981becbb80608a118f35abdd536353781cbed9c654be7de32a98cb06786289ad29db9d8e

data/.rspec

@@ -1,2 +1,2 @@
--c
--fs
+--color
+--format documentation

data/lastfm.gemspec

@@ -12,12 +12,12 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.name          = %q{lastfm}
   gem.require_paths = ["lib"]
-  gem.version       = "1.27.3"
+  gem.version       = "1.27.4"
   gem.license       = 'MIT'
 
   gem.add_dependency "xml-simple"
   gem.add_dependency "httparty"
 
-  gem.add_development_dependency('rspec', ['~> 2.8.0'])
-  gem.add_development_dependency('rake', '< 11.0')
+  gem.add_development_dependency('rspec', ['~> 3.4.0'])
+  gem.add_development_dependency('rake', '< 12.3.3')
 end

data/spec/lastfm_spec.rb

@@ -5,105 +5,105 @@ describe "Lastfm" do
 
   describe '.new' do
     it 'should instantiate' do
-      @lastfm.should be_an_instance_of(Lastfm)
+      expect(@lastfm).to be_an_instance_of(Lastfm)
     end
   end
 
   describe '#request' do
     it 'should post' do
-      mock_response = mock(HTTParty::Response)
-      HTTPRequest.should_receive(:post).with('/', :body => {
+      mock_response = double(HTTParty::Response)
+      expect(HTTPRequest).to receive(:post).with('/', :body => {
         :foo => 'bar',
         :method => 'xxx.yyy',
         :api_key => 'xxx',
       }).and_return(mock_response)
-      mock_response.should_receive(:body).and_return(@response_xml)
+      expect(mock_response).to receive(:body).and_return(@response_xml)
       @lastfm.request('xxx.yyy', { :foo => 'bar' }, :post, false, false)
     end
 
     it 'should post with signature' do
-      mock_response = mock(HTTParty::Response)
-      HTTPRequest.should_receive(:post).with('/', :body => {
+      mock_response = double(HTTParty::Response)
+      expect(HTTPRequest).to receive(:post).with('/', :body => {
         :foo => 'bar',
         :method => 'xxx.yyy',
         :api_key => 'xxx',
         :api_sig => Digest::MD5.hexdigest('api_keyxxxfoobarmethodxxx.yyyyyy'),
       }).and_return(mock_response)
-      mock_response.should_receive(:body).and_return(@response_xml)
+      expect(mock_response).to receive(:body).and_return(@response_xml)
       @lastfm.request('xxx.yyy', { :foo => 'bar' }, :post, true, false)
     end
 
     it 'should post with signature and session (request with authentication)' do
-      mock_response = mock(HTTParty::Response)
+      mock_response = double(HTTParty::Response)
       @lastfm.session = 'abcdef'
-      HTTPRequest.should_receive(:post).with('/', :body => {
+      expect(HTTPRequest).to receive(:post).with('/', :body => {
         :foo => 'bar',
         :method => 'xxx.yyy',
         :api_key => 'xxx',
         :api_sig => Digest::MD5.hexdigest('api_keyxxxfoobarmethodxxx.yyyskabcdefyyy'),
         :sk => 'abcdef',
       }).and_return(mock_response)
-      mock_response.should_receive(:body).and_return(@response_xml)
+      expect(mock_response).to receive(:body).and_return(@response_xml)
       @lastfm.request('xxx.yyy', { :foo => 'bar' }, :post, true, true)
     end
 
     it 'should get' do
-      mock_response = mock(HTTParty::Response)
-      HTTPRequest.should_receive(:get).with('/', :query => {
+      mock_response = double(HTTParty::Response)
+      expect(HTTPRequest).to receive(:get).with('/', :query => {
           :foo => 'bar',
           :method => 'xxx.yyy',
           :api_key => 'xxx',
         }).and_return(mock_response)
-      mock_response.should_receive(:body).and_return(@response_xml)
+      expect(mock_response).to receive(:body).and_return(@response_xml)
       @lastfm.request('xxx.yyy', { :foo => 'bar' }, :get, false, false)
     end
 
     it 'should get with signature (request for authentication)' do
-      mock_response = mock(HTTParty::Response)
-      HTTPRequest.should_receive(:get).with('/', :query => {
+      mock_response = double(HTTParty::Response)
+      expect(HTTPRequest).to receive(:get).with('/', :query => {
         :foo => 'bar',
         :method => 'xxx.yyy',
         :api_key => 'xxx',
         :api_sig => Digest::MD5.hexdigest('api_keyxxxfoobarmethodxxx.yyyyyy'),
       }).and_return(mock_response)
-      mock_response.should_receive(:body).and_return(@response_xml)
+      expect(mock_response).to receive(:body).and_return(@response_xml)
       @lastfm.request('xxx.yyy', { :foo => 'bar' }, :get, true, false)
     end
 
     it 'should get with signature and session' do
-      mock_response = mock(HTTParty::Response)
+      mock_response = double(HTTParty::Response)
       @lastfm.session = 'abcdef'
-      HTTPRequest.should_receive(:get).with('/', :query => {
+      expect(HTTPRequest).to receive(:get).with('/', :query => {
         :foo => 'bar',
         :method => 'xxx.yyy',
         :api_key => 'xxx',
         :api_sig => Digest::MD5.hexdigest('api_keyxxxfoobarmethodxxx.yyyskabcdefyyy'),
         :sk => 'abcdef',
       }).and_return(mock_response)
-      mock_response.should_receive(:body).and_return(@response_xml)
+      expect(mock_response).to receive(:body).and_return(@response_xml)
       @lastfm.request('xxx.yyy', { :foo => 'bar' }, :get, true, true)
     end
 
     it 'should raise an error if an api error is ocuured' do
-      mock_response = mock(HTTParty::Response)
-      mock_response.should_receive(:body).and_return(open(fixture('ng.xml')).read)
-      HTTPRequest.should_receive(:post).and_return(mock_response)
+      mock_response = double(HTTParty::Response)
+      expect(mock_response).to receive(:body).and_return(open(fixture('ng.xml')).read)
+      expect(HTTPRequest).to receive(:post).and_return(mock_response)
 
-      lambda {
+      expect {
         @lastfm.request('xxx.yyy', { :foo => 'bar' }, :post)
-      }.should raise_error(Lastfm::ApiError, 'Invalid API key - You must be granted a valid key by last.fm') {|error|
-        error.code.should == 10
+      }.to raise_error(Lastfm::ApiError, 'Invalid API key - You must be granted a valid key by last.fm') {|error|
+        expect(error.code).to eq(10)
       }
     end
   end
 
   describe '#auth' do
     it 'should return an instance of Lastfm::Auth' do
-      @lastfm.auth.should be_an_instance_of(Lastfm::MethodCategory::Auth)
+      expect(@lastfm.auth).to be_an_instance_of(Lastfm::MethodCategory::Auth)
     end
 
     it 'should get token' do
-      @lastfm.should_receive(:request).
+      expect(@lastfm).to receive(:request).
         with('auth.getToken', {}, :get, true).
         and_return(make_response(<<XML))
 <?xml version="1.0" encoding="utf-8"?>
@@ -111,11 +111,11 @@ describe "Lastfm" do
 <token>xxxyyyzzz</token></lfm>
 XML
 
-      @lastfm.auth.get_token.should == 'xxxyyyzzz'
+      expect(@lastfm.auth.get_token).to eq('xxxyyyzzz')
     end
 
     it 'should get session' do
-      @lastfm.should_receive(:request).
+      expect(@lastfm).to receive(:request).
         with('auth.getSession', { :token => 'xxxyyyzzz' }, :get, true).
         and_return(make_response(<<XML))
 <?xml version="1.0" encoding="utf-8"?>
@@ -128,12 +128,12 @@ XML
 </lfm>
 XML
       session = @lastfm.auth.get_session('xxxyyyzzz')
-      session['name'].should == 'MyLastFMUsername'
-      session['key'].should == 'zzzyyyxxx'
+      expect(session['name']).to eq('MyLastFMUsername')
+      expect(session['key']).to eq('zzzyyyxxx')
     end
 
     it 'should get mobile session' do
-      @lastfm.should_receive(:request).
+      expect(@lastfm).to receive(:request).
         with('auth.getMobileSession', { :username => 'xxxyyyzzz', :password => 'sekretz' }, :post, true, false, true).
         and_return(make_response(<<XML))
 <?xml version="1.0" encoding="utf-8"?>
@@ -146,8 +146,8 @@ XML
 </lfm>
 XML
       session = @lastfm.auth.get_mobile_session('xxxyyyzzz', 'sekretz')
-      session['name'].should == 'MyLastFMUsername'
-      session['key'].should == 'zzzyyyxxx'
+      expect(session['name']).to eq('MyLastFMUsername')
+      expect(session['key']).to eq('zzzyyyxxx')
     end
   end
 end

data/spec/method_category_spec.rb

@@ -6,6 +6,6 @@ describe 'Lastfm::MethodCategory' do
   end
 
   it 'should have instance of Lastfm' do
-    Lastfm::MethodCategory::Base.new(@lastfm).instance_eval { @lastfm }.should equal(@lastfm)
+    expect(Lastfm::MethodCategory::Base.new(@lastfm).instance_eval { @lastfm }).to equal(@lastfm)
   end
 end

data/spec/method_specs/album_spec.rb

@@ -5,28 +5,28 @@ describe '#album' do
   before { init_lastfm }
 
   it 'should return an instance of Lastfm::Album' do
-    @lastfm.album.should be_an_instance_of(Lastfm::MethodCategory::Album)
+    expect(@lastfm.album).to be_an_instance_of(Lastfm::MethodCategory::Album)
   end
 
   describe '#add_tags' do
     it 'should add tags' do
-      @lastfm.should_receive(:request).with('album.addTags', {
+      expect(@lastfm).to receive(:request).with('album.addTags', {
         :artist => 'foo artist',
         :album => 'foo track',
         :tags => 'aaa,bbb,ccc'
       }, :post, true, true).and_return(@ok_response)
 
-      @lastfm.album.add_tags(
+      expect(@lastfm.album.add_tags(
         :artist => 'foo artist',
         :album => 'foo track',
         :tags => 'aaa,bbb,ccc'
-        ).should be_true
+        )).to be_truthy
     end
   end
 
   describe '#get_buylinks' do
     it 'should get buylinks' do
-      @lastfm.should_receive(:request).with('album.getBuylinks', {
+      expect(@lastfm).to receive(:request).with('album.getBuylinks', {
         :artist => 'radiohead',
         :album => 'in rainbows',
         :country => 'united kingdom',
@@ -39,23 +39,23 @@ describe '#album' do
         :country => 'united kingdom'
       )
 
-      buylinks['physicals'].size.should == 1
-      buylinks['physicals']['affiliation']['supplierName'].should == 'Amazon'
-      buylinks['physicals']['affiliation']['price']['currency'].should == 'GBP'
-      buylinks['physicals']['affiliation']['price']['amount'].should == '6.34'
-      buylinks['physicals']['affiliation']['price']['formatted'].should == '£6.34'
-      buylinks['physicals']['affiliation']['buyLink'].should == 'http://www.last.fm/affiliate/byid/8/3418994/1/ws.album.buylinks.f4e2585261d8d10d3297e181d68940fc'
-
-      buylinks['downloads'].size.should == 1
-      buylinks['downloads']['affiliation']['supplierName'].should == 'Amazon MP3'
-      buylinks['downloads']['affiliation']['price']['currency'].should == 'GBP'
-      buylinks['downloads']['affiliation']['price']['amount'].should == '7.99'
-      buylinks['downloads']['affiliation']['price']['formatted'].should == '£7.99'
-      buylinks['downloads']['affiliation']['buyLink'].should == 'http://www.last.fm/affiliate/byid/8/3418994/44/ws.album.buylinks.f4e2585261d8d10d3297e181d68940fc'
+      expect(buylinks['physicals'].size).to eq(1)
+      expect(buylinks['physicals']['affiliation']['supplierName']).to eq('Amazon')
+      expect(buylinks['physicals']['affiliation']['price']['currency']).to eq('GBP')
+      expect(buylinks['physicals']['affiliation']['price']['amount']).to eq('6.34')
+      expect(buylinks['physicals']['affiliation']['price']['formatted']).to eq('£6.34')
+      expect(buylinks['physicals']['affiliation']['buyLink']).to eq('http://www.last.fm/affiliate/byid/8/3418994/1/ws.album.buylinks.f4e2585261d8d10d3297e181d68940fc')
+
+      expect(buylinks['downloads'].size).to eq(1)
+      expect(buylinks['downloads']['affiliation']['supplierName']).to eq('Amazon MP3')
+      expect(buylinks['downloads']['affiliation']['price']['currency']).to eq('GBP')
+      expect(buylinks['downloads']['affiliation']['price']['amount']).to eq('7.99')
+      expect(buylinks['downloads']['affiliation']['price']['formatted']).to eq('£7.99')
+      expect(buylinks['downloads']['affiliation']['buyLink']).to eq('http://www.last.fm/affiliate/byid/8/3418994/44/ws.album.buylinks.f4e2585261d8d10d3297e181d68940fc')
     end
     
     it 'should get buylinks by mbid' do
-      @lastfm.should_receive(:request).with('album.getBuylinks', {
+      expect(@lastfm).to receive(:request).with('album.getBuylinks', {
         :mbid => 'radiohead',
         :country => 'united kingdom',
         :autocorrect => nil
@@ -66,19 +66,19 @@ describe '#album' do
         :country => 'united kingdom'
       )
 
-      buylinks['physicals'].size.should == 1
-      buylinks['physicals']['affiliation']['supplierName'].should == 'Amazon'
-      buylinks['physicals']['affiliation']['price']['currency'].should == 'GBP'
-      buylinks['physicals']['affiliation']['price']['amount'].should == '6.34'
-      buylinks['physicals']['affiliation']['price']['formatted'].should == '£6.34'
-      buylinks['physicals']['affiliation']['buyLink'].should == 'http://www.last.fm/affiliate/byid/8/3418994/1/ws.album.buylinks.f4e2585261d8d10d3297e181d68940fc'
-
-      buylinks['downloads'].size.should == 1
-      buylinks['downloads']['affiliation']['supplierName'].should == 'Amazon MP3'
-      buylinks['downloads']['affiliation']['price']['currency'].should == 'GBP'
-      buylinks['downloads']['affiliation']['price']['amount'].should == '7.99'
-      buylinks['downloads']['affiliation']['price']['formatted'].should == '£7.99'
-      buylinks['downloads']['affiliation']['buyLink'].should == 'http://www.last.fm/affiliate/byid/8/3418994/44/ws.album.buylinks.f4e2585261d8d10d3297e181d68940fc'
+      expect(buylinks['physicals'].size).to eq(1)
+      expect(buylinks['physicals']['affiliation']['supplierName']).to eq('Amazon')
+      expect(buylinks['physicals']['affiliation']['price']['currency']).to eq('GBP')
+      expect(buylinks['physicals']['affiliation']['price']['amount']).to eq('6.34')
+      expect(buylinks['physicals']['affiliation']['price']['formatted']).to eq('£6.34')
+      expect(buylinks['physicals']['affiliation']['buyLink']).to eq('http://www.last.fm/affiliate/byid/8/3418994/1/ws.album.buylinks.f4e2585261d8d10d3297e181d68940fc')
+
+      expect(buylinks['downloads'].size).to eq(1)
+      expect(buylinks['downloads']['affiliation']['supplierName']).to eq('Amazon MP3')
+      expect(buylinks['downloads']['affiliation']['price']['currency']).to eq('GBP')
+      expect(buylinks['downloads']['affiliation']['price']['amount']).to eq('7.99')
+      expect(buylinks['downloads']['affiliation']['price']['formatted']).to eq('£7.99')
+      expect(buylinks['downloads']['affiliation']['buyLink']).to eq('http://www.last.fm/affiliate/byid/8/3418994/44/ws.album.buylinks.f4e2585261d8d10d3297e181d68940fc')
     end
 
     it 'should raise ArgumentError without country' do
@@ -95,56 +95,56 @@ describe '#album' do
 
   describe '#get_info' do
     it 'should get info by artist and album' do
-      @lastfm.should_receive(:request).with('album.getInfo', {
+      expect(@lastfm).to receive(:request).with('album.getInfo', {
         :artist => 'Cher', :album => 'Believe'
       }).and_return(make_response('album_get_info'))
 
       album = @lastfm.album.get_info(:artist => 'Cher', :album => 'Believe')
-      album['name'].should == 'Believe'
-      album['artist'].should == 'Cher'
-      album['id'].should == '2026126'
-      album['mbid'].should == '61bf0388-b8a9-48f4-81d1-7eb02706dfb0'
-      album['url'].should == 'http://www.last.fm/music/Cher/Believe'
-      album['image'].size.should == 5
-      album['releasedate'].should == '6 Apr 1999, 00:00'
-      album['tracks']['track'].size.should == 10
-      album['tracks']['track'][0]['name'].should == 'Believe'
-      album['tracks']['track'][0]['duration'].should == '239'
-      album['tracks']['track'][0]['url'].should == 'http://www.last.fm/music/Cher/_/Believe'
+      expect(album['name']).to eq('Believe')
+      expect(album['artist']).to eq('Cher')
+      expect(album['id']).to eq('2026126')
+      expect(album['mbid']).to eq('61bf0388-b8a9-48f4-81d1-7eb02706dfb0')
+      expect(album['url']).to eq('http://www.last.fm/music/Cher/Believe')
+      expect(album['image'].size).to eq(5)
+      expect(album['releasedate']).to eq('6 Apr 1999, 00:00')
+      expect(album['tracks']['track'].size).to eq(10)
+      expect(album['tracks']['track'][0]['name']).to eq('Believe')
+      expect(album['tracks']['track'][0]['duration']).to eq('239')
+      expect(album['tracks']['track'][0]['url']).to eq('http://www.last.fm/music/Cher/_/Believe')
     end
 
     it 'should get info by mbid' do
-      @lastfm.should_receive(:request).with('album.getInfo', {
+      expect(@lastfm).to receive(:request).with('album.getInfo', {
         :mbid => 'xxxxx'
       }).and_return(make_response('album_get_info'))
 
       album = @lastfm.album.get_info(:mbid => 'xxxxx')
-      album['name'].should == 'Believe'
-      album['artist'].should == 'Cher'
-      album['id'].should == '2026126'
-      album['mbid'].should == '61bf0388-b8a9-48f4-81d1-7eb02706dfb0'
-      album['url'].should == 'http://www.last.fm/music/Cher/Believe'
-      album['image'].size.should == 5
-      album['releasedate'].should == '6 Apr 1999, 00:00'
-      album['tracks']['track'].size.should == 10
-      album['tracks']['track'][0]['name'].should == 'Believe'
-      album['tracks']['track'][0]['duration'].should == '239'
-      album['tracks']['track'][0]['url'].should == 'http://www.last.fm/music/Cher/_/Believe'
+      expect(album['name']).to eq('Believe')
+      expect(album['artist']).to eq('Cher')
+      expect(album['id']).to eq('2026126')
+      expect(album['mbid']).to eq('61bf0388-b8a9-48f4-81d1-7eb02706dfb0')
+      expect(album['url']).to eq('http://www.last.fm/music/Cher/Believe')
+      expect(album['image'].size).to eq(5)
+      expect(album['releasedate']).to eq('6 Apr 1999, 00:00')
+      expect(album['tracks']['track'].size).to eq(10)
+      expect(album['tracks']['track'][0]['name']).to eq('Believe')
+      expect(album['tracks']['track'][0]['duration']).to eq('239')
+      expect(album['tracks']['track'][0]['url']).to eq('http://www.last.fm/music/Cher/_/Believe')
     end
     
     it 'works without release date' do
-      @lastfm.should_receive(:request).with('album.getInfo', {
+      expect(@lastfm).to receive(:request).with('album.getInfo', {
         :mbid => 'xxxxx'
       }).and_return(make_response('album_get_info_without_release_date'))
 
       album = @lastfm.album.get_info(:mbid => 'xxxxx')
-      album['name'].should == 'Believe'
+      expect(album['name']).to eq('Believe')
     end
   end
 
   describe '#get_shouts' do
     it 'should get shouts' do
-      @lastfm.should_receive(:request).with('album.getShouts', {
+      expect(@lastfm).to receive(:request).with('album.getShouts', {
         :artist => 'Cher',
         :album => 'Believe',
         :autocorrect => nil,
@@ -155,16 +155,16 @@ describe '#album' do
       shouts = @lastfm.album.get_shouts(
         :artist => 'Cher',
         :album => 'Believe')
-      shouts.size.should == 2
-      shouts[0]['body'].should == 'A perfect Pop/Dance Masterpiece'
-      shouts[0]['author'].should == 'top20fanatico'
-      shouts[0]['date'].should == 'Wed, 7 Jan 2015 12:45:35'
+      expect(shouts.size).to eq(2)
+      expect(shouts[0]['body']).to eq('A perfect Pop/Dance Masterpiece')
+      expect(shouts[0]['author']).to eq('top20fanatico')
+      expect(shouts[0]['date']).to eq('Wed, 7 Jan 2015 12:45:35')
     end
   end
 
   describe '#get_tags' do
     it 'should get tags' do
-      @lastfm.should_receive(:request).with('album.getTags', {
+      expect(@lastfm).to receive(:request).with('album.getTags', {
         :artist => 'Cher',
         :album => 'Believe',
         :autocorrect => nil
@@ -173,15 +173,15 @@ describe '#album' do
       tags = @lastfm.album.get_tags(
         :artist => 'Cher',
         :album => 'Believe')
-      tags.size.should == 2
-      tags[0]['name'].should == 'sourabh'
-      tags[0]['url'].should == 'http://www.last.fm/tag/sourabh'
+      expect(tags.size).to eq(2)
+      expect(tags[0]['name']).to eq('sourabh')
+      expect(tags[0]['url']).to eq('http://www.last.fm/tag/sourabh')
     end
   end
 
   describe '#get_top_tags' do
     it 'should get top tags' do
-      @lastfm.should_receive(:request).with('album.getTopTags', {
+      expect(@lastfm).to receive(:request).with('album.getTopTags', {
         :artist => 'Radiohead',
         :album => 'The Bends',
         :autocorrect => nil
@@ -190,31 +190,31 @@ describe '#album' do
       tags = @lastfm.album.get_top_tags(
         :artist => 'Radiohead',
         :album => 'The Bends')
-      tags.size.should == 2
-      tags[0]['name'].should == 'albums I own'
-      tags[0]['count'].should == '100'
-      tags[0]['url'].should == 'http://www.last.fm/tag/albums%20i%20own'
+      expect(tags.size).to eq(2)
+      expect(tags[0]['name']).to eq('albums I own')
+      expect(tags[0]['count']).to eq('100')
+      expect(tags[0]['url']).to eq('http://www.last.fm/tag/albums%20i%20own')
     end
   end
 
   describe '#remove_tag' do
     it 'should remove tag' do
-      @lastfm.should_receive(:request).with('album.removeTag', {
+      expect(@lastfm).to receive(:request).with('album.removeTag', {
         :artist => 'foo artist',
         :album => 'foo track',
         :tag => 'aaa'
       }, :post, true, true).and_return(@ok_response)
 
-      @lastfm.album.remove_tag(
+      expect(@lastfm.album.remove_tag(
         :artist => 'foo artist',
         :album => 'foo track',
-        :tag => 'aaa').should be_true
+        :tag => 'aaa')).to be_truthy
     end
   end
 
   describe '#search' do
     it 'should search' do
-      @lastfm.should_receive(:request).with('album.search', {
+      expect(@lastfm).to receive(:request).with('album.search', {
         :album => 'Believe',
         :limit => nil,
         :page => nil,
@@ -222,14 +222,14 @@ describe '#album' do
 
       albums = @lastfm.album.search(:album => 'Believe')
       
-      albums['results']['for'].should == 'Believe'
-      albums['results']['totalResults'].should == '3926'
-      albums['results']['albummatches']['album'].size.should == 2
-      albums['results']['albummatches']['album'][0]['name'].should == 'Believe'
+      expect(albums['results']['for']).to eq('Believe')
+      expect(albums['results']['totalResults']).to eq('3926')
+      expect(albums['results']['albummatches']['album'].size).to eq(2)
+      expect(albums['results']['albummatches']['album'][0]['name']).to eq('Believe')
     end
 
     it 'should always return an array of albums' do
-      @lastfm.should_receive(:request).with('album.search', {
+      expect(@lastfm).to receive(:request).with('album.search', {
         :album => 'Believe',
         :limit => nil,
         :page => nil,
@@ -237,14 +237,14 @@ describe '#album' do
 
       albums = @lastfm.album.search(:album => 'Believe')
       
-      albums['results']['for'].should == 'Believe'
-      albums['results']['totalResults'].should == '3926'
-      albums['results']['albummatches']['album'].size.should == 1
-      albums['results']['albummatches']['album'][0]['name'].should == 'Believe'
+      expect(albums['results']['for']).to eq('Believe')
+      expect(albums['results']['totalResults']).to eq('3926')
+      expect(albums['results']['albummatches']['album'].size).to eq(1)
+      expect(albums['results']['albummatches']['album'][0]['name']).to eq('Believe')
     end
     
     it 'should return an empty array if no match found' do
-      @lastfm.should_receive(:request).with('album.search', {
+      expect(@lastfm).to receive(:request).with('album.search', {
         :album => 'Believe',
         :limit => nil,
         :page => nil,
@@ -252,15 +252,15 @@ describe '#album' do
 
       albums = @lastfm.album.search(:album => 'Believe')
       
-      albums['results']['for'].should == 'Believe'
-      albums['results']['totalResults'].should == '0'
-      albums['results']['albummatches']['album'].size.should == 0
+      expect(albums['results']['for']).to eq('Believe')
+      expect(albums['results']['totalResults']).to eq('0')
+      expect(albums['results']['albummatches']['album'].size).to eq(0)
     end
   end
 
   describe '#share' do
     it 'should share' do
-      @lastfm.should_receive(:request).with('album.share', {
+      expect(@lastfm).to receive(:request).with('album.share', {
         :artist => 'bar artist',
         :album => 'bar album',
         :recipient => 'bar@example.com',
@@ -268,12 +268,12 @@ describe '#album' do
         :public => nil,
       }, :post, true, true).and_return(@ok_response)
 
-      @lastfm.album.share(
+      expect(@lastfm.album.share(
         :artist => 'bar artist',
         :album => 'bar album',
         :recipient => 'bar@example.com',
         :message => 'this is a message',
-      ).should be_true
+      )).to be_truthy
     end
   end
 end