lastfm 1.3.0 → 1.4.0

data/spec/method_specs/user_spec.rb

@@ -0,0 +1,214 @@
+require File.expand_path(File.dirname(__FILE__) + '/../spec_helper')
+
+describe '#user' do
+  before { init_lastfm }
+
+  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 == '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_personal_tags' do
+    it 'should get user\'s tagged artists' do
+      @lastfm.should_receive(:request).with('user.getPersonalTags', {
+        :user => 'test',
+        :tag => 'rock',
+        :taggingtype => 'artist',
+        :limit => nil,
+        :page => nil
+      }).and_return(make_response('user_get_personal_tags_artists'))
+
+      artists = @lastfm.user.get_personal_tags('test', 'rock')
+      artists[0]['name'].should == 'Afghan Whigs'
+      artists[0]['url'].should == 'http://www.last.fm/music/Afghan+Whigs'
+      artists[1]['name'].should == 'Jeff The Brotherhood'
+      artists.size.should == 5
+    end
+
+    it 'should get user\'s tagged albums' do
+      @lastfm.should_receive(:request).with('user.getPersonalTags', {
+        :user => 'test',
+        :tag => 'hip-hop',
+        :taggingtype => 'album',
+        :limit => nil,
+        :page => nil
+      }).and_return(make_response('user_get_personal_tags_albums'))
+
+      albums = @lastfm.user.get_personal_tags('test', 'hip-hop', 'album')
+      albums[0]['name'].should == 'DJ Bizkid Presents: The Best of Atmosphere'
+      albums.size.should == 1
+    end
+    
+    it 'should get user\'s tagged tracks' do
+      @lastfm.should_receive(:request).with('user.getPersonalTags', {
+        :user => 'test',
+        :tag => 'jazz',
+        :taggingtype => 'track',
+        :limit => nil,
+        :page => nil
+      }).and_return(make_response('user_get_personal_tags_tracks'))
+
+      tracks = @lastfm.user.get_personal_tags('test', 'jazz', 'track')
+      tracks[0]['name'].should == 'Come Together'
+      tracks[1]['name'].should == 'Dione'
+      tracks[1]['duration'].should == '450'
+      tracks.size.should == 5
+    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 == '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 == 5
+      neighbours[0]['name'].should == '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 == 'Kylie Minogue'
+      tracks.size.should == 2
+    end
+  end
+  
+  describe '#get_top_tags' do
+    it 'should get user\'s top tags' do
+      @lastfm.should_receive(:request).with('user.getTopTags', {
+        :user => 'test',
+        :limit => nil
+      }).and_return(make_response('user_get_top_tags'))
+      tags = @lastfm.user.get_top_tags('test')
+      tags[0]['name'].should == 'rock'
+      tags[0]['count'].should == '19'
+      tags[1]['count'].should == '15'
+      tags.size.should == 5
+    end
+  end
+end

data/spec/response_spec.rb

@@ -1,6 +1,6 @@
 require File.expand_path(File.dirname(__FILE__) + '/spec_helper')
 
-describe "Lastfm::Response" do
+describe 'Lastfm::Response' do
   before do
     @ok = open(fixture('ok.xml')).read
     @ng = open(fixture('ng.xml')).read
@@ -23,7 +23,7 @@ describe "Lastfm::Response" do
 
     it 'should parse response body as xml' do
       xml = @response.xml
-      xml['similartracks']['track'].size.should eql(7)
+      xml['similartracks']['track'].size.should == 7
     end
   end
 
@@ -37,11 +37,11 @@ describe "Lastfm::Response" do
     end
 
     it 'should have message' do
-      @response.message.should eql('Invalid API key - You must be granted a valid key by last.fm')
+      @response.message.should == 'Invalid API key - You must be granted a valid key by last.fm'
     end
 
     it 'should have error number' do
-      @response.error.should eql(10)
+      @response.error.should == 10
     end
   end
 end

data/spec/spec_helper.rb

@@ -12,4 +12,19 @@ RSpec.configure do |config|
 
     Lastfm::Response.new(xml_filename_or_string)
   end
+  
+  def init_lastfm
+    @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_xml = <<XML
+<?xml version="1.0" encoding="utf-8"?>
+<lfm status="ok">
+</lfm>
+XML
+    @ok_response = make_response(ok_response_xml)
+  end
 end

data/spec/util_spec.rb

@@ -11,11 +11,11 @@ describe Lastfm::Util do
         ['foo', nil],
         [:foo],
         [[:bar, 'xxx'], [:baz, nil]
-        ]).should eql({
+        ]).should == {
           :foo => 'foo',
           :bar => 'xxx',
           :baz => nil,
-        })
+        }
     end
 
     it 'should use proc object to set optional value' do
@@ -23,10 +23,10 @@ describe Lastfm::Util do
         ['foo', nil],
         [:foo],
         [[:bar, Proc.new { 'xxx' }]
-        ]).should eql({
+        ]).should == {
           :foo => 'foo',
           :bar => 'xxx',
-        })
+        }
     end
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lastfm
 version: !ruby/object:Gem::Version
-  version: 1.3.0
+  version: 1.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-02-26 00:00:00.000000000 Z
+date: 2012-03-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70299718961480 !ruby/object:Gem::Requirement
+  requirement: &70152548903840 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70299718961480
+  version_requirements: *70152548903840
 - !ruby/object:Gem::Dependency
   name: xml-simple
-  requirement: &70299718960660 !ruby/object:Gem::Requirement
+  requirement: &70152548903220 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70299718960660
+  version_requirements: *70152548903220
 - !ruby/object:Gem::Dependency
   name: activesupport
-  requirement: &70299718959900 !ruby/object:Gem::Requirement
+  requirement: &70152549401280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +43,10 @@ dependencies:
         version: 3.0.3
   type: :runtime
   prerelease: false
-  version_requirements: *70299718959900
+  version_requirements: *70152549401280
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70299718975280 !ruby/object:Gem::Requirement
+  requirement: &70152549400600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 2.8.0
   type: :development
   prerelease: false
-  version_requirements: *70299718975280
+  version_requirements: *70152549400600
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &70299718974480 !ruby/object:Gem::Requirement
+  requirement: &70152549399960 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -65,10 +65,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *70299718974480
+  version_requirements: *70152549399960
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &70299718973600 !ruby/object:Gem::Requirement
+  requirement: &70152549399280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70299718973600
+  version_requirements: *70152549399280
 description: A ruby interface for Last.fm web services version 2.0
 email: youpy@buycheapviagraonlinenow.com
 executables: []
@@ -99,8 +99,10 @@ files:
 - lib/lastfm/method_category/artist.rb
 - lib/lastfm/method_category/auth.rb
 - lib/lastfm/method_category/base.rb
+- lib/lastfm/method_category/event.rb
 - lib/lastfm/method_category/geo.rb
 - lib/lastfm/method_category/library.rb
+- lib/lastfm/method_category/tag.rb
 - lib/lastfm/method_category/track.rb
 - lib/lastfm/method_category/user.rb
 - lib/lastfm/response.rb
@@ -108,11 +110,15 @@ files:
 - spec/fixtures/album_get_info.xml
 - spec/fixtures/artist_get_events.xml
 - spec/fixtures/artist_get_info.xml
+- spec/fixtures/artist_get_similar.xml
+- spec/fixtures/artist_get_tags.xml
+- spec/fixtures/event_get_info.xml
 - spec/fixtures/geo_get_events.xml
 - spec/fixtures/library_get_artists.xml
 - spec/fixtures/library_get_tracks.xml
 - spec/fixtures/ng.xml
 - spec/fixtures/ok.xml
+- spec/fixtures/tag_get_top_artists.xml
 - spec/fixtures/track_get_correction.xml
 - spec/fixtures/track_get_info.xml
 - spec/fixtures/track_get_info_force_array.xml
@@ -125,12 +131,25 @@ files:
 - spec/fixtures/user_get_info.xml
 - spec/fixtures/user_get_loved_tracks.xml
 - spec/fixtures/user_get_neighbours.xml
+- spec/fixtures/user_get_personal_tags.xml
+- spec/fixtures/user_get_personal_tags_albums.xml
+- spec/fixtures/user_get_personal_tags_artists.xml
+- spec/fixtures/user_get_personal_tags_tracks.xml
 - spec/fixtures/user_get_recent_tracks.xml
 - spec/fixtures/user_get_top_albums.xml
 - spec/fixtures/user_get_top_artists.xml
+- spec/fixtures/user_get_top_tags.xml
 - spec/fixtures/user_get_top_tracks.xml
 - spec/lastfm_spec.rb
 - spec/method_category_spec.rb
+- spec/method_specs/album_spec.rb
+- spec/method_specs/artist_spec.rb
+- spec/method_specs/event_spec.rb
+- spec/method_specs/geo_spec.rb
+- spec/method_specs/library_spec.rb
+- spec/method_specs/tag_spec.rb
+- spec/method_specs/track_spec.rb
+- spec/method_specs/user_spec.rb
 - spec/response_spec.rb
 - spec/spec_helper.rb
 - spec/util_spec.rb
@@ -148,7 +167,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 791443162221732736
+      hash: 877929140514225915
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: