lastfm 1.3.0 → 1.4.0

data/spec/fixtures/user_get_personal_tags.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lfm status="ok">
+  <taggings user="RJ" tag="rock" page="1" perPage="50" totalPages="1" total="14">
+    <artists>
+      <artist>
+        <name>Afghan Whigs</name>
+        <mbid/>
+        <url>http://www.last.fm/music/Afghan+Whigs</url>
+        <streamable>1</streamable>
+        <image size="small">http://userserve-ak.last.fm/serve/34/65473.jpg</image>
+        <image size="medium">http://userserve-ak.last.fm/serve/64/65473.jpg</image>
+        <image size="large">http://userserve-ak.last.fm/serve/126/65473.jpg</image>
+        <image size="extralarge">http://userserve-ak.last.fm/serve/252/65473.jpg</image>
+        <image size="mega">http://userserve-ak.last.fm/serve/_/65473/Afghan+Whigs.jpg</image>
+      </artist>
+      <artist>
+        <name>Jeff The Brotherhood</name>
+        <mbid>51b13b20-dc03-4d51-8c6d-f3b0c52476a6</mbid>
+        <url>http://www.last.fm/music/Jeff+The+Brotherhood</url>
+        <streamable>0</streamable>
+        <image size="small">http://userserve-ak.last.fm/serve/34/42786999.jpg</image>
+        <image size="medium">http://userserve-ak.last.fm/serve/64/42786999.jpg</image>
+        <image size="large">http://userserve-ak.last.fm/serve/126/42786999.jpg</image>
+        <image size="extralarge">http://userserve-ak.last.fm/serve/252/42786999.jpg</image>
+        <image size="mega">http://userserve-ak.last.fm/serve/500/42786999/Jeff+The+Brotherhood+JTBKAHANtext.jpg</image>
+      </artist>
+    </artists>
+  </taggings>
+</lfm>

data/spec/fixtures/user_get_personal_tags_albums.xml

@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lfm status="ok">
+  <taggings user="RJ" tag="hip-hop" page="1" perPage="50" totalPages="1" total="1">
+    <albums>
+      <album>
+        <name>DJ Bizkid Presents: The Best of Atmosphere</name>
+        <mbid>d7bc8315-a032-435b-a551-ec39a3998443</mbid>
+        <url>http://www.last.fm/music/Atmosphere/DJ+Bizkid+Presents%3A+The+Best+of+Atmosphere</url>
+        <artist>
+          <name>Atmosphere</name>
+          <mbid>ef954679-5ee7-4016-acef-7ac71f2fa3d8</mbid>
+          <url>http://www.last.fm/music/Atmosphere</url>
+        </artist>
+        <image size="small">http://cdn.last.fm/flatness/catalogue/noimage/2/default_album_medium.png</image>
+        <image size="medium">http://cdn.last.fm/flatness/catalogue/noimage/2/default_album_medium.png</image>
+        <image size="large">http://cdn.last.fm/flatness/catalogue/noimage/2/default_album_medium.png</image>
+        <image size="extralarge">http://cdn.last.fm/flatness/catalogue/noimage/2/default_album_medium.png</image>
+      </album>
+    </albums>
+  </taggings>
+</lfm>

data/spec/fixtures/user_get_personal_tags_artists.xml

@@ -0,0 +1,62 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lfm status="ok">
+  <taggings user="RJ" tag="rock" page="1" perPage="50" totalPages="1" total="5">
+    <artists>
+      <artist>
+        <name>Afghan Whigs</name>
+        <mbid/>
+        <url>http://www.last.fm/music/Afghan+Whigs</url>
+        <streamable>1</streamable>
+        <image size="small">http://userserve-ak.last.fm/serve/34/65473.jpg</image>
+        <image size="medium">http://userserve-ak.last.fm/serve/64/65473.jpg</image>
+        <image size="large">http://userserve-ak.last.fm/serve/126/65473.jpg</image>
+        <image size="extralarge">http://userserve-ak.last.fm/serve/252/65473.jpg</image>
+        <image size="mega">http://userserve-ak.last.fm/serve/_/65473/Afghan+Whigs.jpg</image>
+      </artist>
+      <artist>
+        <name>Jeff The Brotherhood</name>
+        <mbid>51b13b20-dc03-4d51-8c6d-f3b0c52476a6</mbid>
+        <url>http://www.last.fm/music/Jeff+The+Brotherhood</url>
+        <streamable>0</streamable>
+        <image size="small">http://userserve-ak.last.fm/serve/34/42786999.jpg</image>
+        <image size="medium">http://userserve-ak.last.fm/serve/64/42786999.jpg</image>
+        <image size="large">http://userserve-ak.last.fm/serve/126/42786999.jpg</image>
+        <image size="extralarge">http://userserve-ak.last.fm/serve/252/42786999.jpg</image>
+        <image size="mega">http://userserve-ak.last.fm/serve/500/42786999/Jeff+The+Brotherhood+JTBKAHANtext.jpg</image>
+      </artist>
+      <artist>
+        <name>Morphine</name>
+        <mbid>42689657-cbec-4f66-a9ed-80f939ea23ed</mbid>
+        <url>http://www.last.fm/music/Morphine</url>
+        <streamable>1</streamable>
+        <image size="small">http://userserve-ak.last.fm/serve/34/37674353.jpg</image>
+        <image size="medium">http://userserve-ak.last.fm/serve/64/37674353.jpg</image>
+        <image size="large">http://userserve-ak.last.fm/serve/126/37674353.jpg</image>
+        <image size="extralarge">http://userserve-ak.last.fm/serve/252/37674353.jpg</image>
+        <image size="mega">http://userserve-ak.last.fm/serve/500/37674353/Morphine.jpg</image>
+      </artist>
+      <artist>
+        <name>John Hammond</name>
+        <mbid>d83e599c-2d5a-44ec-b727-587e1455b1b5</mbid>
+        <url>http://www.last.fm/music/John+Hammond</url>
+        <streamable>1</streamable>
+        <image size="small">http://userserve-ak.last.fm/serve/34/22931645.jpg</image>
+        <image size="medium">http://userserve-ak.last.fm/serve/64/22931645.jpg</image>
+        <image size="large">http://userserve-ak.last.fm/serve/126/22931645.jpg</image>
+        <image size="extralarge">http://userserve-ak.last.fm/serve/252/22931645.jpg</image>
+        <image size="mega">http://userserve-ak.last.fm/serve/500/22931645/John+Hammond+jhjr.jpg</image>
+      </artist>
+      <artist>
+        <name>G3</name>
+        <mbid>ec676b1e-9586-479d-926b-25face38e87f</mbid>
+        <url>http://www.last.fm/music/G3</url>
+        <streamable>1</streamable>
+        <image size="small">http://userserve-ak.last.fm/serve/34/45853299.png</image>
+        <image size="medium">http://userserve-ak.last.fm/serve/64/45853299.png</image>
+        <image size="large">http://userserve-ak.last.fm/serve/126/45853299.png</image>
+        <image size="extralarge">http://userserve-ak.last.fm/serve/252/45853299.png</image>
+        <image size="mega">http://userserve-ak.last.fm/serve/500/45853299/G3.png</image>
+      </artist>
+    </artists>
+  </taggings>
+</lfm>

data/spec/fixtures/user_get_personal_tags_tracks.xml

@@ -0,0 +1,87 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lfm status="ok">
+  <taggings user="RJ" tag="jazz" page="1" perPage="50" totalPages="1" total="5">
+    <tracks>
+      <track>
+        <name>Come Together</name>
+        <duration>316</duration>
+        <mbid/>
+        <url>http://www.last.fm/music/Brian+Bromberg/_/Come+Together</url>
+        <streamable fulltrack="0">1</streamable>
+        <artist>
+          <name>Brian Bromberg</name>
+          <mbid>69ed9582-7b72-4b7b-8e30-816c06e5f89b</mbid>
+          <url>http://www.last.fm/music/Brian+Bromberg</url>
+        </artist>
+        <image size="small">http://userserve-ak.last.fm/serve/34s/33026873.jpg</image>
+        <image size="medium">http://userserve-ak.last.fm/serve/64s/33026873.jpg</image>
+        <image size="large">http://userserve-ak.last.fm/serve/126/33026873.jpg</image>
+        <image size="extralarge">http://userserve-ak.last.fm/serve/300x300/33026873.jpg</image>
+      </track>
+      <track>
+        <name>Dione</name>
+        <duration>450</duration>
+        <mbid/>
+        <url>http://www.last.fm/music/Calum+Marshall/_/Dione</url>
+        <streamable fulltrack="1">1</streamable>
+        <artist>
+          <name>Calum Marshall</name>
+          <mbid/>
+          <url>http://www.last.fm/music/Calum+Marshall</url>
+        </artist>
+        <image size="small">http://userserve-ak.last.fm/serve/34s/34604249.jpg</image>
+        <image size="medium">http://userserve-ak.last.fm/serve/64s/34604249.jpg</image>
+        <image size="large">http://userserve-ak.last.fm/serve/126/34604249.jpg</image>
+        <image size="extralarge">http://userserve-ak.last.fm/serve/300x300/34604249.jpg</image>
+      </track>
+      <track>
+        <name>Living Hope</name>
+        <duration>306</duration>
+        <mbid/>
+        <url>http://www.last.fm/music/Dennis+Chambers/_/Living+Hope</url>
+        <streamable fulltrack="0">1</streamable>
+        <artist>
+          <name>Dennis Chambers</name>
+          <mbid>919553a3-2c2f-4b2e-b0ea-efe8e2573e9c</mbid>
+          <url>http://www.last.fm/music/Dennis+Chambers</url>
+        </artist>
+        <image size="small">http://userserve-ak.last.fm/serve/34s/33038159.jpg</image>
+        <image size="medium">http://userserve-ak.last.fm/serve/64s/33038159.jpg</image>
+        <image size="large">http://userserve-ak.last.fm/serve/126/33038159.jpg</image>
+        <image size="extralarge">http://userserve-ak.last.fm/serve/300x300/33038159.jpg</image>
+      </track>
+      <track>
+        <name>Morning Dance</name>
+        <duration>256</duration>
+        <mbid/>
+        <url>http://www.last.fm/music/Spyro+Gyra/_/Morning+Dance</url>
+        <streamable fulltrack="0">1</streamable>
+        <artist>
+          <name>Spyro Gyra</name>
+          <mbid>9a7c8025-1af8-42cd-8df8-857220610bc5</mbid>
+          <url>http://www.last.fm/music/Spyro+Gyra</url>
+        </artist>
+        <image size="small">http://userserve-ak.last.fm/serve/34s/32950969.jpg</image>
+        <image size="medium">http://userserve-ak.last.fm/serve/64s/32950969.jpg</image>
+        <image size="large">http://userserve-ak.last.fm/serve/126/32950969.jpg</image>
+        <image size="extralarge">http://userserve-ak.last.fm/serve/300x300/32950969.jpg</image>
+      </track>
+      <track>
+        <name>Walk on By</name>
+        <duration>290</duration>
+        <mbid/>
+        <url>http://www.last.fm/music/Peter+White/_/Walk+on+By</url>
+        <streamable fulltrack="0">1</streamable>
+        <artist>
+          <name>Peter White</name>
+          <mbid>2833d222-f057-43a5-a90b-e44f0df63acb</mbid>
+          <url>http://www.last.fm/music/Peter+White</url>
+        </artist>
+        <image size="small">http://images.amazon.com/images/P/B0000516VZ.01._SCMZZZZZZZ_.jpg</image>
+        <image size="medium">http://images.amazon.com/images/P/B0000516VZ.01._SCMZZZZZZZ_.jpg</image>
+        <image size="large">http://images.amazon.com/images/P/B0000516VZ.01._SCMZZZZZZZ_.jpg</image>
+        <image size="extralarge">http://images.amazon.com/images/P/B0000516VZ.01._SCMZZZZZZZ_.jpg</image>
+      </track>
+    </tracks>
+  </taggings>
+</lfm>

data/spec/fixtures/user_get_recent_tracks.xml

@@ -1,3 +1,4 @@
+<?xml version="1.0"?>
 <lfm status="ok">
   <recenttracks user="RJ" page="1" perPage="10" totalPages="3019">
     <track nowplaying="true">
@@ -20,4 +21,4 @@
       <image size="extralarge">http://userserve-ak.last.fm/serve/300x300/8822309.jpg</image>
     </track>
   </recenttracks>
-</lfm>
+</lfm>

data/spec/fixtures/user_get_top_albums.xml

@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <lfm status="ok">
-<topalbums user="test" type="overall">
+  <topalbums user="test" type="overall">
     <album rank="1">
-        <name>The Wall</name>
-        <playcount>536</playcount>
-        <mbid>639f0d06-53bd-32a5-8f65-1db785743ab0</mbid>  
-        <url>http://www.last.fm/music/Pink+Floyd/The+Wall</url>
-        <artist>
-          <name>Pink Floyd</name>
-          <mbid>83d91898-7763-47d7-b03b-b92132375c47</mbid>
-          <url>http://www.last.fm/music/Pink+Floyd</url>
-        </artist>
-        <image size="small">http://userserve-ak.last.fm/serve/34s/70211546.png</image>
+      <name>The Wall</name>
+      <playcount>536</playcount>
+      <mbid>639f0d06-53bd-32a5-8f65-1db785743ab0</mbid>
+      <url>http://www.last.fm/music/Pink+Floyd/The+Wall</url>
+      <artist>
+        <name>Pink Floyd</name>
+        <mbid>83d91898-7763-47d7-b03b-b92132375c47</mbid>
+        <url>http://www.last.fm/music/Pink+Floyd</url>
+      </artist>
+      <image size="small">http://userserve-ak.last.fm/serve/34s/70211546.png</image>
     </album>
     <album rank="2">
-        <name>The Perfect Element, Part I</name>
-        <playcount>524</playcount>
-        <mbid>3039a1a9-a8d2-4560-81c7-b0af31f692b3</mbid>  
-        <url>http://www.last.fm/music/Pain+Of+Salvation/The+Perfect+Element%2C+Part+I</url>
-        <artist>
-          <name>Pain of Salvation</name>
-          <mbid>f7c65346-9631-4220-9188-5e90baae58d5</mbid>
-          <url>http://www.last.fm/music/Pain+of+Salvation</url>
-        </artist>
-        <image size="small">http://userserve-ak.last.fm/serve/34s/66884232.png</image>
+      <name>The Perfect Element, Part I</name>
+      <playcount>524</playcount>
+      <mbid>3039a1a9-a8d2-4560-81c7-b0af31f692b3</mbid>
+      <url>http://www.last.fm/music/Pain+Of+Salvation/The+Perfect+Element%2C+Part+I</url>
+      <artist>
+        <name>Pain of Salvation</name>
+        <mbid>f7c65346-9631-4220-9188-5e90baae58d5</mbid>
+        <url>http://www.last.fm/music/Pain+of+Salvation</url>
+      </artist>
+      <image size="small">http://userserve-ak.last.fm/serve/34s/66884232.png</image>
     </album>
-</topalbums>
+  </topalbums>
 </lfm>

data/spec/fixtures/user_get_top_artists.xml

@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="utf-8"?>
 <lfm status="ok">
-<topartists user="test" type="overall">
+  <topartists user="test" type="overall">
     <artist rank="1">
-        <name>Pain of Salvation</name>
-        <playcount>1354</playcount>
-        <mbid>28503ab7-8bf2-4666-a7bd-2644bfc7cb1d</mbid>
-        <url>f7c65346-9631-4220-9188-5e90baae58d5</url>
-        <streamable>1</streamable>
-        <image size="small">http://userserve-ak.last.fm/serve/34/53572699.png</image>
+      <name>Pain of Salvation</name>
+      <playcount>1354</playcount>
+      <mbid>28503ab7-8bf2-4666-a7bd-2644bfc7cb1d</mbid>
+      <url>f7c65346-9631-4220-9188-5e90baae58d5</url>
+      <streamable>1</streamable>
+      <image size="small">http://userserve-ak.last.fm/serve/34/53572699.png</image>
     </artist>
-        <artist rank="2">
-        <name>Opeth</name>
-        <playcount>1186</playcount>
-        <mbid>c14b4180-dc87-481e-b17a-64e4150f90f6</mbid>
-        <url>http://www.last.fm/music/Opeth</url>
-        <streamable>1</streamable>
-        <image size="small">http://userserve-ak.last.fm/serve/34/66663756.png</image>
+    <artist rank="2">
+      <name>Opeth</name>
+      <playcount>1186</playcount>
+      <mbid>c14b4180-dc87-481e-b17a-64e4150f90f6</mbid>
+      <url>http://www.last.fm/music/Opeth</url>
+      <streamable>1</streamable>
+      <image size="small">http://userserve-ak.last.fm/serve/34/66663756.png</image>
     </artist>
-        <artist rank="3">
-        <name>Nevermore</name>
-        <playcount>959</playcount>
-        <mbid>7d093650-89be-4108-842b-ba7f5367504b</mbid>
-        <url>http://www.last.fm/music/Nevermore</url>
-        <streamable>1</streamable>
-        <image size="small">http://userserve-ak.last.fm/serve/34/239749.jpg</image>
+    <artist rank="3">
+      <name>Nevermore</name>
+      <playcount>959</playcount>
+      <mbid>7d093650-89be-4108-842b-ba7f5367504b</mbid>
+      <url>http://www.last.fm/music/Nevermore</url>
+      <streamable>1</streamable>
+      <image size="small">http://userserve-ak.last.fm/serve/34/239749.jpg</image>
     </artist>
-</topartists>
+  </topartists>
 </lfm>

data/spec/fixtures/user_get_top_tags.xml

@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lfm status="ok">
+  <toptags user="RJ">
+    <tag>
+      <name>rock</name>
+      <count>19</count>
+      <url>www.last.fm/tag/rock</url>
+    </tag>
+    <tag>
+      <name>jazz</name>
+      <count>15</count>
+      <url>www.last.fm/tag/jazz</url>
+    </tag>
+    <tag>
+      <name>metal</name>
+      <count>10</count>
+      <url>www.last.fm/tag/metal</url>
+    </tag>
+    <tag>
+      <name>soul</name>
+      <count>8</count>
+      <url>www.last.fm/tag/soul</url>
+    </tag>
+    <tag>
+      <name>female vocalists</name>
+      <count>8</count>
+      <url>www.last.fm/tag/female%20vocalists</url>
+    </tag>
+  </toptags>
+</lfm>

data/spec/fixtures/user_get_top_tracks.xml

@@ -1,30 +1,31 @@
 <?xml version="1.0" encoding="utf-8"?>
 <lfm status="ok">
-<toptracks user="skr" type="7day" page="1" perPage="50" totalPages="6" total="271">
-
-                        <track rank="1">
-    <name>No Light, No Light (TV On The Radio Remix)</name>
-    <duration></duration>
-            <playcount>5</playcount>
-            <mbid></mbid>
-    <url>http://www.last.fm/music/Florence%2B%252B%2Bthe%2BMachine/_/No+Light%2C+No+Light+%28TV+On+The+Radio+Remix%29</url>
-    <streamable fulltrack="0">0</streamable>
-            <artist>
+  <toptracks user="skr" type="7day" page="1" perPage="50" totalPages="6" total="271">
+    <track rank="1">
+      <name>No Light, No Light (TV On The Radio Remix)</name>
+      <duration/>
+      <playcount>5</playcount>
+      <mbid/>
+      <url>http://www.last.fm/music/Florence%2B%252B%2Bthe%2BMachine/_/No+Light%2C+No+Light+%28TV+On+The+Radio+Remix%29</url>
+      <streamable fulltrack="0">0</streamable>
+      <artist>
         <name>Florence + the Machine</name>
         <mbid>5fee3020-513b-48c2-b1f7-4681b01db0c6</mbid>
         <url>http://www.last.fm/music/Florence%2B%252B%2Bthe%2BMachine</url>
-    </artist>
-                </track>                        <track rank="2">
-    <name>Backwords (Porcelain Raft cover)</name>
-    <duration>230</duration>
-            <playcount>5</playcount>
-            <mbid></mbid>
-    <url>http://www.last.fm/music/Oupa%2B%2526%2BTony%2BCrow/_/Backwords+%28Porcelain+Raft+cover%29</url>
-    <streamable fulltrack="0">0</streamable>
-            <artist>
+      </artist>
+    </track>
+    <track rank="2">
+      <name>Backwords (Porcelain Raft cover)</name>
+      <duration>230</duration>
+      <playcount>5</playcount>
+      <mbid/>
+      <url>http://www.last.fm/music/Oupa%2B%2526%2BTony%2BCrow/_/Backwords+%28Porcelain+Raft+cover%29</url>
+      <streamable fulltrack="0">0</streamable>
+      <artist>
         <name>Oupa &amp; Tony Crow</name>
-        <mbid></mbid>
+        <mbid/>
         <url>http://www.last.fm/music/Oupa%2B%2526%2BTony%2BCrow</url>
-    </artist>
-                </track>                        
-                </toptracks></lfm>
+      </artist>
+    </track>
+  </toptracks>
+</lfm>

data/spec/lastfm_spec.rb

@@ -1,22 +1,10 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
 describe "Lastfm" do
-  before do
-    @lastfm = Lastfm.new('xxx', 'yyy')
-    @response_xml = <<XML
-<?xml version="1.0" encoding="utf-8"?>
-<lfm status="ok">
-<foo>bar</foo></lfm>
-XML
-    @ok_response = make_response(<<XML)
-<?xml version="1.0" encoding="utf-8"?>
-<lfm status="ok">
-</lfm>
-XML
-  end
+  before { init_lastfm }
 
   it 'should have base_uri' do
-    Lastfm.base_uri.should eql('http://ws.audioscrobbler.com/2.0')
+    Lastfm.base_uri.should == 'http://ws.audioscrobbler.com/2.0'
   end
 
   describe '.new' do
@@ -29,10 +17,10 @@ XML
     it 'should post' do
       mock_response = mock(HTTParty::Response)
       @lastfm.class.should_receive(:post).with('/', :body => {
-          :foo => 'bar',
-          :method => 'xxx.yyy',
-          :api_key => 'xxx',
-        }).and_return(mock_response)
+        :foo => 'bar',
+        :method => 'xxx.yyy',
+        :api_key => 'xxx',
+      }).and_return(mock_response)
       mock_response.should_receive(:body).and_return(@response_xml)
       @lastfm.request('xxx.yyy', { :foo => 'bar' }, :post, false, false)
     end
@@ -40,11 +28,11 @@ XML
     it 'should post with signature' do
       mock_response = mock(HTTParty::Response)
       @lastfm.class.should_receive(:post).with('/', :body => {
-          :foo => 'bar',
-          :method => 'xxx.yyy',
-          :api_key => 'xxx',
-          :api_sig => Digest::MD5.hexdigest('api_keyxxxfoobarmethodxxx.yyyyyy'),
-        }).and_return(mock_response)
+        :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)
       @lastfm.request('xxx.yyy', { :foo => 'bar' }, :post, true, false)
     end
@@ -53,12 +41,12 @@ XML
       mock_response = mock(HTTParty::Response)
       @lastfm.session = 'abcdef'
       @lastfm.class.should_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)
+        :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)
       @lastfm.request('xxx.yyy', { :foo => 'bar' }, :post, true, true)
     end
@@ -77,11 +65,11 @@ XML
     it 'should get with signature (request for authentication)' do
       mock_response = mock(HTTParty::Response)
       @lastfm.class.should_receive(:get).with('/', :query => {
-          :foo => 'bar',
-          :method => 'xxx.yyy',
-          :api_key => 'xxx',
-          :api_sig => Digest::MD5.hexdigest('api_keyxxxfoobarmethodxxx.yyyyyy'),
-        }).and_return(mock_response)
+        :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)
       @lastfm.request('xxx.yyy', { :foo => 'bar' }, :get, true, false)
     end
@@ -90,12 +78,12 @@ XML
       mock_response = mock(HTTParty::Response)
       @lastfm.session = 'abcdef'
       @lastfm.class.should_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)
+        :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)
       @lastfm.request('xxx.yyy', { :foo => 'bar' }, :get, true, true)
     end
@@ -127,7 +115,7 @@ XML
 <token>xxxyyyzzz</token></lfm>
 XML
 
-      @lastfm.auth.get_token.should eql('xxxyyyzzz')
+      @lastfm.auth.get_token.should == 'xxxyyyzzz'
     end
 
     it 'should get session' do
@@ -144,8 +132,8 @@ XML
 </lfm>
 XML
       session = @lastfm.auth.get_session('xxxyyyzzz')
-      session['name'].should eql('MyLastFMUsername')
-      session['key'].should eql('zzzyyyxxx')
+      session['name'].should == 'MyLastFMUsername'
+      session['key'].should == 'zzzyyyxxx'
     end
 
     it 'should get mobile session' do
@@ -162,479 +150,8 @@ XML
 </lfm>
 XML
       session = @lastfm.auth.get_mobile_session('xxxyyyzzz', 'xxxxAuthTokenxxxx')
-      session['name'].should eql('MyLastFMUsername')
-      session['key'].should eql('zzzyyyxxx')
-    end
-  end
-
-  describe '#track' do
-    it 'should return an instance of Lastfm::Track' do
-      @lastfm.track.should be_an_instance_of(Lastfm::MethodCategory::Track)
-    end
-
-    it 'should add tags' do
-      @lastfm.should_receive(:request).with('track.addTags', {
-          :artist => 'foo artist',
-          :track => 'foo track',
-          :tags => 'aaa,bbb,ccc'
-        }, :post, true, true).and_return(@ok_response)
-
-      @lastfm.track.add_tags('foo artist', 'foo track', 'aaa,bbb,ccc').should be_true
-    end
-
-    it 'should ban' do
-      @lastfm.should_receive(:request).with('track.ban', {
-          :artist => 'foo artist',
-          :track => 'foo track',
-        }, :post, true, true).and_return(@ok_response)
-
-      @lastfm.track.ban('foo artist', 'foo track').should be_true
-    end
-
-    it 'should get info' do
-      @lastfm.should_receive(:request).with('track.getInfo', {
-          :artist => 'Cher',
-          :track => 'Believe',
-          :username => 'youpy',
-        }).and_return(make_response('track_get_info'))
-
-      track = @lastfm.track.get_info('Cher', 'Believe', 'youpy')
-      track['name'].should eql('Believe')
-      track['album']['image'].size.should eql(4)
-      track['album']['image'].first['size'].should eql('small')
-      track['album']['image'].first['content'].should eql('http://userserve-ak.last.fm/serve/64s/8674593.jpg')
-      track['toptags']['tag'].size.should eql(5)
-      track['toptags']['tag'].first['name'].should eql('pop')
-    end
-
-    it 'should get correction' do
-      @lastfm.should_receive(:request).with('track.getCorrection', {
-          :artist => 'White Stripes',
-          :track => 'One More Cup of Coffee',
-          :username => 'wainekerr',
-        }).and_return(make_response('track_get_correction'))
-
-      correction = @lastfm.track.get_correction('White Stripes', 'One More Cup of Coffee', 'wainekerr')
-      correction['track']['name'].should eql('One More Cup of Coffee')
-      correction['track']['artist']['name'].should eql('The White Stripes')
-      correction['track']['url'].should eql('www.last.fm/music/The+White+Stripes/_/One+More+Cup+of+Coffee')
-    end
-
-    it 'should get xml with force array option' do
-      @lastfm.should_receive(:request).with('track.getInfo', {
-          :artist => 'Cher',
-          :track => 'Believe',
-          :username => 'youpy',
-        }).and_return(make_response('track_get_info_force_array'))
-
-      track = @lastfm.track.get_info('Cher', 'Believe', 'youpy')
-      track['album']['image'].size.should eql(1)
-      track['album']['image'].first['size'].should eql('small')
-      track['album']['image'].first['content'].should eql('http://userserve-ak.last.fm/serve/64s/8674593.jpg')
-      track['toptags']['tag'].size.should eql(1)
-      track['toptags']['tag'].first['name'].should eql('pop')
-    end
-
-    it 'should get similar' do
-      @lastfm.should_receive(:request).with('track.getSimilar', {
-          :artist => 'Cher',
-          :track => 'Believe',
-        }).and_return(make_response('track_get_similar'))
-
-      tracks = @lastfm.track.get_similar('Cher', 'Believe')
-      tracks.size.should eql(250)
-      tracks.first['name'].should eql('Strong Enough')
-      tracks.first['image'][1]['content'].should eql('http://userserve-ak.last.fm/serve/64s/8674593.jpg')
-      tracks[1]['image'][0]['content'].should eql('http://userserve-ak.last.fm/serve/34s/8674593.jpg')
-    end
-
-    it 'should get tags' do
-      @lastfm.should_receive(:request).with('track.getTags', {
-          :artist => 'foo artist',
-          :track => 'foo track',
-        }, :get, true, true).and_return(make_response('track_get_tags'))
-
-      tags = @lastfm.track.get_tags('foo artist', 'foo track')
-      tags.size.should eql(2)
-      tags[0]['name'].should eql('swedish')
-      tags[0]['url'].should eql('http://www.last.fm/tag/swedish')
-    end
-
-    it 'should get top fans' do
-      @lastfm.should_receive(:request).with('track.getTopFans', {
-          :artist => 'foo artist',
-          :track => 'foo track',
-        }).and_return(make_response('track_get_top_fans'))
-
-      users = @lastfm.track.get_top_fans('foo artist', 'foo track')
-      users.size.should eql(2)
-      users[0]['name'].should eql('Through0glass')
-    end
-
-    it 'should get top tags' do
-      @lastfm.should_receive(:request).with('track.getTopTags', {
-          :artist => 'foo artist',
-          :track => 'foo track',
-        }).and_return(make_response('track_get_top_tags'))
-
-      tags = @lastfm.track.get_top_tags('foo artist', 'foo track')
-      tags.size.should eql(2)
-      tags[0]['name'].should eql('alternative')
-      tags[0]['count'].should eql('100')
-      tags[0]['url'].should eql('www.last.fm/tag/alternative')
-    end
-
-    it 'should love' do
-      @lastfm.should_receive(:request).with('track.love', {
-          :artist => 'foo artist',
-          :track => 'foo track',
-        }, :post, true, true).and_return(@ok_response)
-
-      @lastfm.track.love('foo artist', 'foo track').should be_true
-    end
-
-    it 'should remove tag' do
-      @lastfm.should_receive(:request).with('track.removeTag', {
-          :artist => 'foo artist',
-          :track => 'foo track',
-          :tag => 'aaa'
-        }, :post, true, true).and_return(@ok_response)
-
-      @lastfm.track.remove_tag('foo artist', 'foo track', 'aaa').should be_true
-    end
-
-    it 'should search' do
-      @lastfm.should_receive(:request).with('track.search', {
-          :artist => nil,
-          :track => 'Believe',
-          :limit => 10,
-          :page => 3,
-        }).and_return(make_response('track_search'))
-
-      tracks = @lastfm.track.search('Believe', nil, 10, 3)
-      tracks['results']['for'].should eql('Believe')
-      tracks['results']['totalResults'].should eql('40540')
-      tracks['results']['trackmatches']['track'].size.should eql(2)
-      tracks['results']['trackmatches']['track'][0]['name'].should eql('Make Me Believe')
-    end
-
-    it 'should share' do
-      @lastfm.should_receive(:request).with('track.share', {
-          :artist => 'foo artist',
-          :track => 'foo track',
-          :message => 'this is a message',
-          :recipient => 'foo@example.com',
-        }, :post, true, true).and_return(@ok_response)
-
-      @lastfm.track.share('foo artist', 'foo track', 'foo@example.com', 'this is a message').should be_true
-    end
-
-    it 'should scrobble' do
-      time = Time.now
-      @lastfm.should_receive(:request).with('track.scrobble', {
-          :artist => 'foo artist',
-          :track => 'foo track',
-          :album => 'foo album',
-          :mbid => '0383dadf-2a4e-4d10-a46a-e9e041da8eb3',
-          :timestamp => time,
-          :trackNumber => 1,
-          :duration => nil,
-          :albumArtist => nil,
-        }, :post, true, true).and_return(@ok_response)
-
-      @lastfm.track.scrobble('foo artist', 'foo track', time, 'foo album', 1, '0383dadf-2a4e-4d10-a46a-e9e041da8eb3', nil, nil)
-    end
-
-
-    it 'should update now playing' do
-      @lastfm.should_receive(:request).with('track.updateNowPlaying', {
-          :artist => 'foo artist',
-          :track => 'foo track',
-          :album => 'foo album',
-          :mbid => '0383dadf-2a4e-4d10-a46a-e9e041da8eb3',
-          :trackNumber => 1,
-          :duration => nil,
-          :albumArtist => nil,
-        }, :post, true, true).and_return(@ok_response)
-
-      @lastfm.track.update_now_playing('foo artist', 'foo track', 'foo album', 1, '0383dadf-2a4e-4d10-a46a-e9e041da8eb3', nil, nil)
-    end
-  end
-
-  describe '#artist' do
-    it 'should return an instance of Lastfm::Artist' do
-      @lastfm.artist.should be_an_instance_of(Lastfm::MethodCategory::Artist)
-    end
-
-    it 'should get info' do
-      @lastfm.should_receive(:request).with('artist.getInfo', {
-          :artist => 'Cher'
-        }).and_return(make_response('artist_get_info'))
-
-      artist = @lastfm.artist.get_info('Cher')
-      artist['name'].should eql('Cher')
-      artist['mbid'].should eql('bfcc6d75-a6a5-4bc6-8282-47aec8531818')
-      artist['url'].should eql('http://www.last.fm/music/Cher')
-      artist['image'].size.should eql(5)
-    end
-
-    it 'should get events' do
-      @lastfm.should_receive(:request).with('artist.getEvents', {
-          :artist => 'Cher'
-        }).and_return(make_response('artist_get_events'))
-
-      events = @lastfm.artist.get_events('Cher')
-      events.size.should eql(1)
-      events[0]['title'].should eql('Cher')
-      events[0]['artists'].size.should == 2
-      events[0]['artists']['headliner'].should eql('Cher')
-      events[0]['venue']['name'].should eql('The Colosseum At Caesars Palace')
-      events[0]['venue']['location']['city'].should eql('Las Vegas(, NV)')
-      events[0]['venue']['location']['point']['lat'].should eql("36.116143")
-      events[0]['image'].size.should eql(4)
-      events[0]['image'][0]['size'].should eql('small')
-      events[0]['image'][0]['content'].should eql('http://userserve-ak.last.fm/serve/34/34814037.jpg')
-      events[0]['startDate'].should eql("Sat, 23 Oct 2010 19:30:00")
-      events[0]['tickets']['ticket']['supplier'].should eql("TicketMaster")
-      events[0]['tickets']['ticket']['content'].should eql("http://www.last.fm/affiliate/byid/29/1584537/12/ws.artist.events.b25b959554ed76058ac220b7b2e0a026")
-      events[0]['tags']['tag'].should == ["pop", "dance", "female vocalists", "80s", "cher"]
-    end
-  end
-
-  describe '#album' do
-    it 'should return an instance of Lastfm::Album' do
-      @lastfm.album.should be_an_instance_of(Lastfm::MethodCategory::Album)
-    end
-
-    it 'should get info' do
-      @lastfm.should_receive(:request).with('album.getInfo', {
-          :artist => 'Cher', :album => 'Believe'
-        }).and_return(make_response('album_get_info'))
-
-      album = @lastfm.album.get_info('Cher', 'Believe')
-      album['name'].should eql('Believe')
-      album['artist'].should eql('Cher')
-      album['id'].should eql('2026126')
-      album['mbid'].should eql('61bf0388-b8a9-48f4-81d1-7eb02706dfb0')
-      album['url'].should eql('http://www.last.fm/music/Cher/Believe')
-      album['image'].size.should eql(5)
-      album['releasedate'].should eql('6 Apr 1999, 00:00')
-      album['tracks']['track'].size.should eql(10)
-      album['tracks']['track'][0]['name'].should eql('Believe')
-      album['tracks']['track'][0]['duration'].should eql('239')
-      album['tracks']['track'][0]['url'].should eql('http://www.last.fm/music/Cher/_/Believe')
-    end
-
-  end
-
-  describe '#geo' do
-    it 'should return an instance of Lastfm::Geo' do
-      @lastfm.geo.should be_an_instance_of(Lastfm::MethodCategory::Geo)
-    end
-
-    it 'should get events' do
-      @lastfm.should_receive(:request).with('geo.getEvents', {
-        :location => 'Boulder',
-        :distance => nil,
-        :limit => nil,
-        :page => nil
-      }).and_return(make_response('geo_get_events'))
-
-      events = @lastfm.geo.get_events('Boulder')
-      events.size.should eql(1)
-      events[0]['title'].should eql('Transistor Festival')
-      events[0]['artists'].size.should == 2
-      events[0]['artists']['headliner'].should eql('Not Breathing')
-      events[0]['venue']['name'].should eql('The Walnut Room')
-      events[0]['venue']['location']['city'].should eql('Denver, CO')
-      events[0]['venue']['location']['point']['lat'].should eql("39.764316")
-      events[0]['image'].size.should eql(4)
-      events[0]['image'][0]['size'].should eql('small')
-      events[0]['image'][0]['content'].should eql('http://userserve-ak.last.fm/serve/34/166214.jpg')
-      events[0]['startDate'].should eql("Fri, 10 Jun 2011 01:58:01")
-    end
-  end
-
-  describe '#user' do
-    it 'should return an instance of Lastfm::User' do
-      @lastfm.user.should be_an_instance_of(Lastfm::MethodCategory::User)
-    end
-
-    describe '#get_info' do
-      it 'should get user info' do
-        @lastfm.should_receive(:request).with('user.getInfo', {:user => 'test'}).and_return(make_response('user_get_info'))
-        info = @lastfm.user.get_info('test')
-        info['id'].should eql('1000002')
-      end
-    end
-
-    describe '#get_top_artists' do
-      it 'should get user\'s top artists' do
-        @lastfm.should_receive(:request).with('user.getTopArtists', {
-            :user => 'test',
-            :period => 'overall',
-            :limit => nil,
-            :page => nil
-          }).and_return(make_response('user_get_top_artists'))
-
-        artists = @lastfm.user.get_top_artists('test', 'overall', nil, nil)
-
-        artists.size.should == 3
-        artists[0]['name'].should == "Pain of Salvation"
-        artists[0]['playcount'].should == '1354'
-
-        artists[1]['name'].should == "Opeth"
-        artists[1]['playcount'].should == '1186'
-
-        artists[2]['name'].should == "Nevermore"
-        artists[2]['playcount'].should == '959'
-      end
-    end
-
-    describe '#get_top_albums' do
-      it 'should get user\'s top albums' do
-        @lastfm.should_receive(:request).with('user.getTopAlbums', {
-            :user => 'test',
-            :period => 'overall',
-            :limit => nil,
-            :page => nil
-          }).and_return(make_response('user_get_top_albums'))
-
-        albums = @lastfm.user.get_top_albums('test', 'overall', nil, nil)
-
-        albums.size.should == 2
-
-        albums[0]['rank'].should == '1'
-        albums[0]['name'].should == 'The Wall'
-        albums[0]['artist']['name'].should == 'Pink Floyd'
-
-        albums[1]['rank'].should == '2'
-        albums[1]['name'].should == 'The Perfect Element, Part I'
-        albums[1]['artist']['name'].should == 'Pain of Salvation'
-      end
-    end
-    
-    describe '#get_top_tracks' do
-      it 'should get user\'s top tracks' do
-        @lastfm.should_receive(:request).with('user.getTopTracks', {
-            :user => 'test',
-            :period => '7day',
-            :limit => nil,
-            :page => nil
-          }).and_return(make_response('user_get_top_tracks'))
-
-        tracks = @lastfm.user.get_top_tracks('test', '7day', nil, nil)
-
-        tracks.size.should == 2
-
-        tracks[0]['rank'].should == '1'
-        tracks[0]['name'].should == 'No Light, No Light (TV On The Radio Remix)'
-        tracks[0]['artist']['name'].should == 'Florence + the Machine'
-
-        tracks[1]['rank'].should == '2'
-        tracks[1]['name'].should == 'Backwords (Porcelain Raft cover)'
-        tracks[1]['artist']['name'].should == 'Oupa & Tony Crow'
-      end
-    end
-    
-    describe '#get_loved_tracks' do
-      it 'should get user\'s loved tracks' do
-        @lastfm.should_receive(:request).with('user.getLovedTracks', {
-            :user => 'test',
-            :period => nil,
-            :limit => nil,
-            :page => nil
-          }).and_return(make_response('user_get_loved_tracks'))
-
-        tracks = @lastfm.user.get_loved_tracks('test', nil, nil, nil)
-
-        tracks.size.should == 2
-
-        tracks[0]['rank'].should == nil
-        tracks[0]['name'].should == 'I Spy'
-        tracks[0]['artist']['name'].should == 'Mikhael Paskalev'
-
-        tracks[1]['rank'].should == nil
-        tracks[1]['name'].should == 'Working Titles'
-        tracks[1]['artist']['name'].should == 'Damien Jurado'
-      end
-    end    
-
-    describe '#get_friends' do
-      it 'should get user\'s friends' do
-        @lastfm.should_receive(:request).with('user.getFriends', {
-            :user => 'test',
-            :recenttracks => nil,
-            :page => nil,
-            :limit => nil
-          }).and_return(make_response('user_get_friends'))
-        friends = @lastfm.user.get_friends('test')
-        friends.size.should == 1
-        friends[0]['name'].should eql('polaroide')
-      end
-    end
-
-    describe '#get_neighbours' do
-      it 'should get user\'s neighbours' do
-        @lastfm.should_receive(:request).with('user.getNeighbours', {
-            :user => 'rj',
-            :recenttracks => nil,
-            :page => nil,
-            :limit => nil
-          }).and_return(make_response('user_get_neighbours'))
-        neighbours = @lastfm.user.get_neighbours('rj')
-        neighbours.size.should == 50
-        neighbours[0]['name'].should eql('willywongi')
-      end
-    end
-
-    describe '#get_recent_tracks' do
-      it 'should get user\'s recent tracks' do
-        @lastfm.should_receive(:request).with('user.getRecentTracks', {
-            :user => 'test',
-            :page => nil,
-            :limit => nil,
-            :to => nil,
-            :from => nil
-          }).and_return(make_response('user_get_recent_tracks'))
-        tracks = @lastfm.user.get_recent_tracks('test')
-        tracks[1]['artist']['content'].should eql('Kylie Minogue')
-        tracks.size.should == 2
-      end
-    end
-  end
-
-  describe '#library' do
-    it 'should return an instance of Lastfm::Library' do
-      @lastfm.library.should 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', {
-            :user => 'test',
-            :artist => 'foo',
-            :album => 'bar',
-            :limit => nil,
-            :page => nil
-          }).and_return(make_response('library_get_tracks'))
-        tracks = @lastfm.library.get_tracks('test', 'foo', 'bar')
-        tracks[0]['name'].should eql('Learning to Live')
-        tracks.size.should == 1
-      end
-    end
-
-    describe '#get_artists' do
-      it 'should get the artists\' info' do
-        @lastfm.should_receive(:request).with('library.getArtists', {
-          :user => 'test',
-          :limit => nil,
-          :page => nil
-        }).and_return(make_response('library_get_artists'))
-        artists = @lastfm.library.get_artists('test')
-        artists[1]['name'].should eql('Dark Castle')
-        artists.size.should == 2
-      end
+      session['name'].should == 'MyLastFMUsername'
+      session['key'].should == 'zzzyyyxxx'
     end
   end
 end