lastfm 1.17.0 → 1.18.0

data/lastfm.gemspec

@@ -12,7 +12,7 @@ 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.17.0"
+  gem.version       = "1.18.0"
 
   gem.add_dependency "xml-simple"
   gem.add_dependency "httparty"

data/lib/lastfm/method_category/album.rb

@@ -1,8 +1,12 @@
 class Lastfm
   module MethodCategory
     class Album < Base
-      regular_method :get_info, [:artist, :album], [] do |response|
+      regular_method(
+        :get_info,
+        :required => any_params([:artist, :album], :mbid)
+      ) do |response|
         result = response.xml['album']
+
         result['releasedate'].lstrip! unless result['releasedate'].empty?
         result
       end

data/lib/lastfm/method_category/artist.rb

@@ -1,39 +1,74 @@
 class Lastfm
   module MethodCategory
     class Artist < Base
-      regular_method :get_top_tracks, [:artist], [] do |response|
+      regular_method(
+        :get_top_tracks,
+        :required => [:artist]
+      ) do |response|
         response.xml['toptracks']['track']
       end
 
-      regular_method :get_top_albums, [:artist], [] do |response|
+      regular_method(
+        :get_top_albums,
+        :required => [:artist]
+      ) do |response|
         response.xml['topalbums']['album']
       end
 
-      regular_method :get_info, [:artist], [] do |response|
+      regular_method(
+        :get_info,
+        :required => [:artist]
+      ) do |response|
         response.xml['artist']
       end
 
-      regular_method :get_events, [:artist], [] do |response|
+      regular_method(
+        :get_events,
+        :required => [:artist]
+      ) do |response|
         response.xml['events']['event']
       end
 
-      regular_method :get_images, [:artist], [] do |response|
+      regular_method(
+        :get_images,
+        :required => [:artist]
+      ) do |response|
         response.xml['images']['image']
       end
 
-      regular_method :get_similar, [:artist], [] do |response|
+      regular_method(:get_similar,
+        :required => [:artist]
+      ) do |response|
         response.xml['similarartists']['artist']
       end
 
-      regular_method :get_tags, [:artist], [[:user, nil], [:mbid, nil], [:autocorrect, nil]] do |response|
+      regular_method(
+        :get_tags,
+        :required => [:artist],
+        :optional => [
+          [:user, nil],
+          [:mbid, nil],
+          [:autocorrect, nil]
+        ]
+      ) do |response|
         response.xml['tags']['tag']
       end
-      
-      regular_method :get_top_fans, [:artist], [] do |response|
+
+      regular_method(
+        :get_top_fans,
+        :required => [:artist]
+      ) do |response|
         response.xml['topfans']['user']
       end
 
-      regular_method :search, [:artist], [[:limit, nil], [:page, nil]]
+      regular_method(
+        :search,
+        :required => [:artist],
+        :optional => [
+          [:limit, nil],
+          [:page, nil]
+        ]
+      )
     end
   end
 end

data/lib/lastfm/method_category/auth.rb

@@ -1,15 +1,21 @@
 class Lastfm
   module MethodCategory
     class Auth < Base
-      method_for_authentication :get_token, [], [] do |response|
+      method_for_authentication :get_token do |response|
         response.xml['token']
       end
 
-      method_for_authentication :get_session, [:token], [] do |response|
+      method_for_authentication(
+        :get_session,
+        :required => [:token]
+      ) do |response|
         response.xml['session']
       end
 
-      method_for_secure_authentication :get_mobile_session, [:username, :password], [] do |response|
+      method_for_secure_authentication(
+        :get_mobile_session,
+        :required => [:username, :password]
+      ) do |response|
         response.xml['session']
       end
     end

data/lib/lastfm/method_category/base.rb

@@ -1,36 +1,58 @@
 class Lastfm
+  class AnyParams
+    attr_reader :candidates
+
+    def initialize(candidates)
+      @candidates = candidates
+    end
+  end
+
   module MethodCategory
     class Base
       class << self
-        def write_method(id, mandatory, optional = [])
-          __define_method(:write_request, id, mandatory, optional) do |response|
+        def any_params(*args)
+          AnyParams.new(args)
+        end
+
+        def write_method(id, params = {})
+          __define_method(:write_request, id, params) do |response|
             response.success?
           end
         end
 
-        def method_with_authentication(id, mandatory, optional = [], &block)
-          __define_method(:request_with_authentication, id, mandatory, optional, &block)
+        def method_with_authentication(id, params = {}, &block)
+          __define_method(:request_with_authentication, id, params, &block)
         end
 
-        def method_for_authentication(id, mandatory, optional = [], &block)
-          __define_method(:request_for_authentication, id, mandatory, optional, &block)
+        def method_for_authentication(id, params = {}, &block)
+          __define_method(:request_for_authentication, id, params, &block)
         end
 
-        def method_for_secure_authentication(id, mandatory, optional = [], &block)
-          __define_method(:request_for_secure_authentication, id, mandatory, optional, &block)
+        def method_for_secure_authentication(id, params = {}, &block)
+          __define_method(:request_for_secure_authentication, id, params, &block)
         end
 
-        def regular_method(id, mandatory, optional = [], &block)
-          __define_method(:request, id, mandatory, optional, &block)
+        def regular_method(id, params = {}, &block)
+          __define_method(:request, id, params, &block)
         end
 
-        def __define_method(method, id, mandatory, optional, &block)
+        def __define_method(method, id, params, &block)
           unless block
             block = Proc.new { |response| response.xml }
           end
 
           define_method(id) do |*args|
-            block.call(send(method, id.to_s.camelize(:lower), Lastfm::Util.build_options(args, mandatory, optional)))
+            block.call(
+              send(
+                method,
+                id.to_s.camelize(:lower),
+                Lastfm::Util.build_options(
+                  args,
+                  params[:required],
+                  params[:optional]
+                )
+              )
+            )
           end
         end
       end

data/lib/lastfm/method_category/chart.rb

@@ -1,27 +1,63 @@
 class Lastfm
   module MethodCategory
     class Chart < Base
-      regular_method :get_hyped_artists, [], [[:page, nil], [:limit, nil]] do |response|
+      regular_method(
+        :get_hyped_artists,
+        :optional => [
+          [:page, nil],
+          [:limit, nil]
+        ]
+      ) do |response|
         response.xml['artists']['artist']
       end
 
-      regular_method :get_hyped_tracks, [], [[:page, nil], [:limit, nil]] do |response|
+      regular_method(
+        :get_hyped_tracks,
+        :optional => [
+          [:page, nil],
+          [:limit, nil]
+        ]
+      ) do |response|
         response.xml['tracks']['track']
       end
 
-      regular_method :get_loved_tracks, [], [[:page, nil], [:limit, nil]] do |response|
+      regular_method(
+        :get_loved_tracks,
+        :optional => [
+          [:page, nil],
+          [:limit, nil]
+        ]
+      ) do |response|
         response.xml['tracks']['track']
       end
 
-      regular_method :get_top_artists, [], [[:page, nil], [:limit, nil]] do |response|
+      regular_method(
+        :get_top_artists,
+        :optional => [
+          [:page, nil],
+          [:limit, nil]
+        ]
+      ) do |response|
         response.xml['artists']['artist']
       end
 
-      regular_method :get_top_tags, [], [[:page, nil], [:limit, nil]] do |response|
+      regular_method(
+        :get_top_tags,
+        :optional => [
+          [:page, nil],
+          [:limit, nil]
+        ]
+      ) do |response|
         response.xml['tags']['tag']
       end
 
-      regular_method :get_top_tracks, [], [[:page, nil], [:limit, nil]] do |response|
+      regular_method(
+        :get_top_tracks,
+        :optional => [
+          [:page, nil],
+          [:limit, nil]
+        ]
+      ) do |response|
         response.xml['tracks']['track']
       end
     end

data/lib/lastfm/method_category/event.rb

@@ -1,7 +1,10 @@
 class Lastfm
   module MethodCategory
     class Event < Base
-      regular_method :get_info, [:event], [] do |response|
+      regular_method(
+        :get_info,
+        :required => [:event]
+      ) do |response|
         response.xml['event'].first
       end
     end

data/lib/lastfm/method_category/geo.rb

@@ -1,7 +1,15 @@
 class Lastfm
   module MethodCategory
     class Geo < Base
-      regular_method :get_events, [], [[:location, nil], [:distance, nil], [:limit, nil], [:page, nil]] do |response|
+      regular_method(
+        :get_events,
+        :optional => [
+          [:location, nil],
+          [:distance, nil],
+          [:limit, nil],
+          [:page, nil]
+        ]
+      ) do |response|
         response.xml['events']['event']
       end
     end

data/lib/lastfm/method_category/library.rb

@@ -1,11 +1,27 @@
 class Lastfm
   module MethodCategory
     class Library < Base
-      regular_method :get_artists, [:user], [[:limit, nil], [:page, nil]] do |response|
+      regular_method(
+        :get_artists,
+        :required => [:user],
+        :optional => [
+          [:limit, nil],
+          [:page, nil]
+        ]
+      ) do |response|
         Util.force_array(response.xml['artists']['artist'])
       end
 
-      regular_method :get_tracks, [:user], [[:artist, nil], [:album, nil], [:page, nil], [:limit, nil]] do |response|
+      regular_method(
+        :get_tracks,
+        :required => [:user],
+        :optional => [
+          [:artist, nil],
+          [:album, nil],
+          [:page, nil],
+          [:limit, nil]
+        ]
+      ) do |response|
         Util.force_array(response.xml['tracks']['track'])
       end
     end

data/lib/lastfm/method_category/radio.rb

@@ -1,8 +1,8 @@
 class Lastfm
   module MethodCategory
     class Radio < Base
-      write_method :tune, [:station]
-      method_with_authentication :get_playlist, [], [] do |response|
+      write_method :tune, :required => [:station]
+      method_with_authentication :get_playlist do |response|
         playlist = response.xml['playlist']
         tracklist = playlist['trackList']['track']
 

data/lib/lastfm/method_category/tag.rb

@@ -1,11 +1,25 @@
 class Lastfm
   module MethodCategory
     class Tag < Base
-      regular_method :get_top_artists, [:tag], [[:limit, nil], [:page, nil]] do |response|
+      regular_method(
+        :get_top_artists,
+        :required => [:tag],
+        :optional => [
+          [:limit, nil],
+          [:page, nil]
+        ]
+      ) do |response|
         response.xml['topartists']['artist']
       end
 
-      regular_method :get_top_tracks, [:tag], [[:limit, nil], [:page, nil]] do |response|
+      regular_method(
+        :get_top_tracks,
+        :required => [:tag],
+        :optional => [
+          [:limit, nil],
+          [:page, nil]
+        ]
+      ) do |response|
         response.xml['toptracks']['track']
       end
     end

data/lib/lastfm/method_category/tasteometer.rb

@@ -1,7 +1,13 @@
 class Lastfm
   module MethodCategory
     class Tasteometer < Base
-      regular_method :compare, [:type1, :type2, :value1, :value2], [[:limit, nil]] do |response|
+      regular_method(
+        :compare,
+        :required => [:type1, :type2, :value1, :value2],
+        :optional => [
+          [:limit, nil]
+        ]
+      ) do |response|
         response.xml['comparison']['result']
       end
     end

data/lib/lastfm/method_category/track.rb

@@ -1,38 +1,98 @@
 class Lastfm
   module MethodCategory
     class Track < Base
-      write_method :add_tags, [:artist, :track, :tags]
-      write_method :remove_tag, [:artist, :track, :tag]
-      write_method :ban, [:artist, :track]
-      write_method :love, [:artist, :track]
-      write_method :share, [:artist, :track, :recipient], [[:message, nil]]
-      write_method :scrobble, [:artist, :track], [[:timestamp, Proc.new { Time.now.utc.to_i }], [:album, nil], [:trackNumber, nil], [:mbid, nil], [:duration, nil], [:albumArtist, nil]]
-      write_method :update_now_playing, [:artist, :track], [[:album, nil], [:trackNumber, nil], [:mbid, nil], [:duration, nil], [:albumArtist, nil]]
-      write_method :unlove, [:artist, :track]
-
-      regular_method :get_info, [:artist, :track], [[:username, nil]] do |response|
+      write_method :add_tags, :required => [:artist, :track, :tags]
+
+      write_method :remove_tag, :required => [:artist, :track, :tag]
+
+      write_method :ban, :required => [:artist, :track]
+
+      write_method :love, :required => [:artist, :track]
+
+      write_method :share, :required => [:artist, :track, :recipient], :optional => [[:message, nil]]
+
+      write_method(
+        :scrobble,
+        :required => [:artist, :track],
+        :optional => [
+          [:timestamp, Proc.new { Time.now.utc.to_i }],
+          [:album, nil],
+          [:trackNumber, nil],
+          [:mbid, nil],
+          [:duration, nil],
+          [:albumArtist, nil]
+        ]
+      )
+
+      write_method(
+        :update_now_playing,
+        :required => [:artist, :track],
+        :optional => [
+          [:album, nil],
+          [:trackNumber, nil],
+          [:mbid, nil],
+          [:duration, nil],
+          [:albumArtist, nil]
+        ]
+      )
+
+      write_method :unlove, :required => [:artist, :track]
+
+      regular_method(
+        :get_info,
+        :required => any_params([:artist, :track], :mbid),
+        :optional => [
+          [:username, nil]
+        ]
+      ) do |response|
         response.xml['track']
       end
 
-      regular_method :get_correction, [:artist, :track], [] do |response|
+      regular_method(
+        :get_correction,
+        :required => [:artist, :track]
+      ) do |response|
         response.xml['corrections']['correction']
       end
 
-      regular_method :get_top_fans, [:artist, :track], [] do |response|
+      regular_method(
+        :get_top_fans,
+        :required => [:artist, :track]
+      ) do |response|
         response.xml['topfans']['user']
       end
-      regular_method :get_top_tags, [:artist, :track], [] do |response|
+
+      regular_method(
+        :get_top_tags,
+        :required => [:artist, :track]
+      ) do |response|
         response.xml['toptags']['tag']
       end
-      regular_method :get_similar, [:artist, :track], [] do |response|
+
+      regular_method(
+        :get_similar,
+        :required => [:artist, :track]
+      ) do |response|
         response.xml['similartracks']['track'][1 .. -1]
       end
-      regular_method :search, [:track], [[:artist, nil], [:limit, nil], [:page, nil]] do |response|
+
+      regular_method(
+        :search,
+        :required => [:track],
+        :optional => [
+          [:artist, nil],
+          [:limit, nil],
+          [:page, nil]
+        ]
+      ) do |response|
         response.xml['results']['trackmatches']['track'] = Util.force_array(response.xml['results']['trackmatches']['track'])
         response.xml
       end
 
-      method_with_authentication :get_tags, [:artist, :track], [] do |response|
+      method_with_authentication(
+        :get_tags,
+        :required => [:artist, :track]
+      ) do |response|
         response.xml['tags']['tag']
       end
     end

data/lib/lastfm/method_category/user.rb

@@ -1,26 +1,65 @@
 class Lastfm
   module MethodCategory
     class User < Base
-      regular_method :get_friends, [:user], [[:recenttracks, nil], [:limit, nil], [:page, nil]] do |response|
+      regular_method(
+        :get_friends,
+        :required => [:user],
+        :optional => [
+          [:recenttracks, nil],
+          [:limit, nil],
+          [:page, nil]
+        ]
+      ) do |response|
         response.xml['friends']['user']
       end
 
-      regular_method :get_info, [:user], [] do |response|
+      def get_info(*args)
+        method = :get_info.to_s.camelize(:lower)
+        response = if args.any?
+          options = Lastfm::Util.build_options(args, [:user], [])
+          request(method, options)
+        else
+          request_with_authentication(method)
+        end
         response.xml['user'][0]
       end
 
-      regular_method :get_loved_tracks, [:user], [[:period, nil], [:limit, nil], [:page, nil]] do |response|
+      regular_method(
+        :get_loved_tracks,
+        :required => [:user],
+        :optional => [
+          [:period, nil],
+          [:limit, nil],
+          [:page, nil]
+        ]
+      ) do |response|
         response.xml['lovedtracks']['track']
       end
 
-      regular_method :get_neighbours, [:user], [[:recenttracks, nil], [:limit, nil], [:page, nil]] do |response|
+      regular_method(
+        :get_neighbours,
+        :required => [:user],
+        :optional => [
+          [:recenttracks, nil],
+          [:limit, nil],
+          [:page, nil]
+        ]
+      ) do |response|
         neighbours = response.xml['neighbours']['user']
         # Ignore first "user" as this is an attribute, not an object.
         neighbours.delete_at(0) if neighbours[0].is_a? String
         neighbours
       end
 
-      regular_method :get_personal_tags, [:user, :tag], [[:taggingtype, 'artist'], [:limit, nil], [:page, nil]] do |response|
+      regular_method(
+        :get_personal_tags,
+        :required => [:user, :tag],
+        :optional => [
+          [:taggingtype, 'artist'],
+          [:limit, nil],
+          [:page, nil]
+        ]
+      ) do |response|
         taggings = response.xml['taggings']
         result = if taggings['artists']
           taggings['artists']['artist']
@@ -33,43 +72,112 @@ class Lastfm
         Lastfm::Util::force_array(result)
       end
 
-      regular_method :get_recent_tracks, [:user], [[:limit, nil], [:page, nil], [:to, nil], [:from, nil]] do |response|
+      regular_method(
+        :get_recent_tracks,
+        :required => [:user],
+        :optional => [
+          [:limit, nil],
+          [:page, nil],
+          [:to, nil],
+          [:from, nil]
+        ]
+      ) do |response|
         response.xml['recenttracks']['track']
       end
 
-      regular_method :get_top_albums, [:user], [[:period, nil], [:limit, nil], [:page, nil]] do |response|
+      regular_method(
+        :get_top_albums,
+        :required => [:user],
+        :optional => [
+          [:period, nil],
+          [:limit, nil],
+          [:page, nil]
+        ]
+      ) do |response|
         response.xml['topalbums']['album']
       end
 
-      regular_method :get_top_artists, [:user], [[:period, nil], [:limit, nil], [:page, nil]] do |response|
+      regular_method(
+        :get_top_artists,
+        :required => [:user],
+        :optional => [
+          [:period, nil],
+          [:limit, nil],
+          [:page, nil]
+        ]
+      ) do |response|
         response.xml['topartists']['artist']
       end
 
-      regular_method :get_top_tags, [:user], [[:limit, nil]] do |response|
+      regular_method(
+        :get_top_tags,
+        :required => [:user],
+        :optional => [[:limit, nil]]
+      ) do |response|
         response.xml['toptags']['tag']
       end
 
-      regular_method :get_top_tracks, [:user], [[:period, nil], [:limit, nil], [:page, nil]] do |response|
+      regular_method(
+        :get_top_tracks,
+        :required => [:user],
+        :optional => [
+          [:period, nil],
+          [:limit, nil],
+          [:page, nil]
+        ]
+      ) do |response|
         response.xml['toptracks']['track']
       end
 
-      regular_method :get_weekly_chart_list, [:user], [[:limit, nil]] do |response|
+      regular_method(
+        :get_weekly_chart_list,
+        :required => [:user],
+        :optional => [
+          [:limit, nil]
+        ]
+      ) do |response|
         response.xml['weeklychartlist']['chart']
       end
 
-      regular_method :get_weekly_artist_chart, [:user], [[:from, nil], [:to, nil], [:limit, nil]] do |response|
+      regular_method(
+        :get_weekly_artist_chart,
+        :required => [:user],
+        :optional => [
+          [:from, nil],
+          [:to, nil],
+          [:limit, nil]
+        ]
+      ) do |response|
         response.xml['weeklyartistchart']['artist']
       end
 
-      regular_method :get_weekly_album_chart, [:user], [[:from, nil], [:to, nil], [:limit, nil]] do |response|
+      regular_method(
+        :get_weekly_album_chart,
+        :required => [:user],
+        :optional => [
+          [:from, nil],
+          [:to, nil],
+          [:limit, nil]
+        ]
+      ) do |response|
         response.xml['weeklyalbumchart']['album']
       end
 
-      regular_method :get_weekly_track_chart, [:user], [[:from, nil], [:to, nil], [:limit, nil]] do |response|
+      regular_method(
+        :get_weekly_track_chart,
+        :required => [:user],
+        :optional => [
+          [:from, nil],
+          [:to, nil],
+          [:limit, nil]
+        ]
+      ) do |response|
         response.xml['weeklytrackchart']['track']
       end
 
-      method_with_authentication :get_recommended_events, [], [] do |response|
+      method_with_authentication(
+        :get_recommended_events
+      ) do |response|
         response.xml['events']['event']
       end
     end

data/lib/lastfm/util.rb

@@ -6,15 +6,26 @@ class Lastfm
 
     def self.build_options(args, mandatory, optional)
       if args.first.is_a?(Hash)
-        build_options_from_hash(args.first, mandatory, optional)
+        build_options_from_hash(args.first, mandatory || [], optional || [])
       else
-        build_options_from_array(args, mandatory, optional)
+        build_options_from_array(args, mandatory || [], optional || [])
       end
     end
 
     def self.build_options_from_hash(options, mandatory, optional)
-      mandatory.each do |name|
-        raise ArgumentError.new("%s is required" % name) unless options[name]
+      candidates = mandatory.kind_of?(AnyParams) ? mandatory.candidates : [mandatory]
+      candidates.each_with_index do |params, index|
+        Array(params).each do |param|
+          if !options.has_key?(param)
+            if params.equal? candidates.last
+              raise ArgumentError.new("%s is required" % param)
+            else
+              next
+            end
+          end
+        end
+
+        break
       end
 
       optional.each do |name, value|

data/spec/method_specs/album_spec.rb

@@ -8,7 +8,7 @@ describe '#album' do
   end
 
   describe '#get_info' do
-    it 'should get info' do
+    it 'should get info by artist and album' do
       @lastfm.should_receive(:request).with('album.getInfo', {
         :artist => 'Cher', :album => 'Believe'
       }).and_return(make_response('album_get_info'))
@@ -26,5 +26,24 @@ describe '#album' do
       album['tracks']['track'][0]['duration'].should == '239'
       album['tracks']['track'][0]['url'].should == 'http://www.last.fm/music/Cher/_/Believe'
     end
+
+    it 'should get info by mbid' do
+      @lastfm.should_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'
+    end
   end
 end

data/spec/method_specs/track_spec.rb

@@ -35,7 +35,7 @@ describe '#track' do
   end
 
   describe '#get_info' do
-    it 'should get info' do
+    it 'should get info by track and artist' do
       @lastfm.should_receive(:request).with('track.getInfo', {
         :artist => 'Cher',
         :track => 'Believe',
@@ -54,6 +54,24 @@ describe '#track' do
       track['toptags']['tag'].first['name'].should == 'pop'
     end
 
+    it 'should get info by mbid' do
+      @lastfm.should_receive(:request).with('track.getInfo', {
+          :mbid => 'xxx',
+          :username => nil
+        }
+      ).and_return(make_response('track_get_info'))
+
+      track = @lastfm.track.get_info(
+        :mbid => 'xxx'
+      )
+      track['name'].should == 'Believe'
+      track['album']['image'].size.should == 4
+      track['album']['image'].first['size'].should == 'small'
+      track['album']['image'].first['content'].should == 'http://userserve-ak.last.fm/serve/64s/8674593.jpg'
+      track['toptags']['tag'].size.should == 5
+      track['toptags']['tag'].first['name'].should == 'pop'
+    end
+
     it 'should get xml with force array option' do
       @lastfm.should_receive(:request).with('track.getInfo', {
         :artist => 'Cher',

data/spec/method_specs/user_spec.rb

@@ -8,10 +8,20 @@ describe '#user' do
   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(:user => 'test')
-      info['id'].should == '1000002'
+    context 'with params' 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(:user => 'test')
+        info['id'].should == '1000002'
+      end
+    end
+
+    context 'without params' do
+      it 'should get current user info' do
+        @lastfm.should_receive(:request).with('user.getInfo', {}, :get, true, true).and_return(make_response('user_get_info'))
+        info = @lastfm.user.get_info
+        info['id'].should == '1000002'
+      end
     end
   end
 
@@ -210,7 +220,7 @@ describe '#user' do
       tracks[1]['artist']['content'].should == 'Kylie Minogue'
       tracks.size.should == 2
     end
-    
+
     it 'should not error when a user\'s recent tracks includes malformed data' do
       @lastfm.should_receive(:request).with('user.getRecentTracks', {
         :user => 'test',

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: lastfm
 version: !ruby/object:Gem::Version
-  version: 1.17.0
+  version: 1.18.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-02-26 00:00:00.000000000 Z
+date: 2013-04-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: xml-simple
@@ -209,7 +209,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3208565068622947004
+      hash: 1101754709663584216
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -218,7 +218,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3208565068622947004
+      hash: 1101754709663584216
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24