lastfm 0.2.1 → 0.3.0

data/README.rdoc

@@ -46,6 +46,12 @@ It supports methods which require {authentication}[http://www.last.fm/api/authen
 
 * artist.getEvents
 
+=== User
+
+* user.getInfo
+* user.getFriends
+* user.getRecentTracks
+
 == Installation
 
 === Archive Installation
@@ -61,6 +67,12 @@ It supports methods which require {authentication}[http://www.last.fm/api/authen
 
 == Features/Problems
 
+== Commiters
+
+* mattfawcett <https://github.com/mattfawcett>
+* peplin <https://github.com/peplin>
+* liff <https://github.com/liff>
+
 == Note on Patches/Pull Requests
  
 * Fork the project.

data/VERSION

@@ -1 +1 @@
-0.2.1
+0.3.0

data/lib/lastfm.rb

@@ -9,6 +9,7 @@ require 'lastfm/method_category/base'
 require 'lastfm/method_category/auth'
 require 'lastfm/method_category/track'
 require 'lastfm/method_category/artist'
+require 'lastfm/method_category/user'
 
 class Lastfm
   API_ROOT = 'http://ws.audioscrobbler.com/2.0'
@@ -38,6 +39,10 @@ class Lastfm
     MethodCategory::Artist.new(self)
   end
 
+  def user
+    MethodCategory::User.new(self)
+  end
+
   def request(method, params = {}, http_method = :get, with_signature = false, with_session = false)
     params[:method] = method
     params[:api_key] = @api_key

data/lib/lastfm/method_category/user.rb

@@ -0,0 +1,17 @@
+class Lastfm
+  module MethodCategory
+    class User < Base
+      regular_method :get_info, [:user], [] do |response|
+        response.xml['user'][0]
+      end
+
+      regular_method :get_friends, [:user], [[:recenttracks, nil], [:limit, nil], [:page, nil]] do |response|
+        response.xml['friends']['user']
+      end
+
+      regular_method :get_recent_tracks, [:user], [[:limit, nil], [:page, nil], [:to, nil], [:from, nil]] do |response|
+        response.xml['recenttracks']['track']
+      end
+    end
+  end
+end

data/spec/fixtures/user_get_friends.xml

@@ -0,0 +1,11 @@
+<lfm status="ok" total="1" page="1" perPage="50" totalPages="1">
+  <friends for="joanofarctan">
+    <user>
+      <name>polaroide</name>
+      <image size="small">...</image>
+      <image size="medium">...</image>
+      <image size="large">...</image>
+      <url>http://www.last.fm/user/polaroide/</url>
+    </user>
+  </friends>
+</lfm>

data/spec/fixtures/user_get_info.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lfm status="ok">
+  <user>
+    <id>1000002</id>
+    <name>RJ</name>
+    <realname>Richard Jones </realname>
+    <url>http://www.last.fm/user/RJ</url>
+    <image>http://userserve-ak.last.fm/serve/126/8270359.jpg</image>
+    <country>UK</country>
+    <age>27</age>
+    <gender>m</gender>
+    <subscriber>1</subscriber>
+    <playcount>54189</playcount>
+    <playlists>4</playlists>
+    <bootstrap>0</bootstrap>
+    <registered unixtime="1037793040">2002-11-20 11:50</registered>
+  </user>
+</lfm>

data/spec/fixtures/user_get_recent_tracks.xml

@@ -0,0 +1,23 @@
+<lfm status="ok">
+  <recenttracks user="RJ" page="1" perPage="10" totalPages="3019">
+    <track nowplaying="true">
+      <artist mbid="2f9ecbed-27be-40e6-abca-6de49d50299e">Aretha Franklin</artist>
+      <name>Sisters Are Doing It For Themselves</name>
+      <mbid/>
+      <album mbid=""/>
+      <url>www.last.fm/music/Aretha+Franklin/_/Sisters+Are+Doing+It+For+Themselves</url>
+      <date uts="1213031819">9 Jun 2008, 17:16</date>
+      <streamable>1</streamable>
+    </track>
+    <track>
+      <name>I Believe in You</name>
+      <artist mbid="">Kylie Minogue</artist>
+      <url>http://www.last.fm/music/Kylie+Minogue/_/I+Believe+in+You</url>
+      <streamable fulltrack="0">0</streamable>
+      <image size="small">http://userserve-ak.last.fm/serve/34s/8822309.jpg</image>
+      <image size="medium">http://userserve-ak.last.fm/serve/64s/8822309.jpg</image>
+      <image size="large">http://userserve-ak.last.fm/serve/126/8822309.jpg</image>
+      <image size="extralarge">http://userserve-ak.last.fm/serve/300x300/8822309.jpg</image>
+    </track>
+  </recenttracks>
+</lfm>

data/spec/lastfm_spec.rb

@@ -344,4 +344,47 @@ XML
       events[0]['tags']['tag'].should == ["pop", "dance", "female vocalists", "80s", "cher"]
     end
   end
+
+  describe '#user' do
+    it 'should return and 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_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_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
 end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lastfm
 version: !ruby/object:Gem::Version 
-  prerelease: false
+  hash: 19
+  prerelease: 
   segments: 
   - 0
-  - 2
-  - 1
-  version: 0.2.1
+  - 3
+  - 0
+  version: 0.3.0
 platform: ruby
 authors: 
 - youpy
@@ -14,16 +15,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-01-06 00:00:00 +09:00
+date: 2011-03-13 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: rspec
   prerelease: false
   requirement: &id001 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 15
         segments: 
         - 2
         - 0
@@ -35,9 +38,11 @@ dependencies:
   name: httparty
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -47,9 +52,11 @@ dependencies:
   name: xml-simple
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -59,9 +66,11 @@ dependencies:
   name: activesupport
   prerelease: false
   requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 1
         segments: 
         - 3
         - 0
@@ -91,6 +100,7 @@ files:
 - lib/lastfm/method_category/auth.rb
 - lib/lastfm/method_category/base.rb
 - lib/lastfm/method_category/track.rb
+- lib/lastfm/method_category/user.rb
 - lib/lastfm/response.rb
 - lib/lastfm/util.rb
 - spec/fixtures/artist_get_events.xml
@@ -103,6 +113,9 @@ files:
 - spec/fixtures/track_get_top_fans.xml
 - spec/fixtures/track_get_top_tags.xml
 - spec/fixtures/track_search.xml
+- spec/fixtures/user_get_friends.xml
+- spec/fixtures/user_get_info.xml
+- spec/fixtures/user_get_recent_tracks.xml
 - spec/lastfm_spec.rb
 - spec/method_category_spec.rb
 - spec/response_spec.rb
@@ -117,23 +130,27 @@ rdoc_options: []
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 required_rubygems_version: !ruby/object:Gem::Requirement 
+  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
+      hash: 3
       segments: 
       - 0
       version: "0"
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.5.0
 signing_key: 
 specification_version: 3
 summary: A Ruby interface for Last.fm Web Services