lastfm 1.2.0 → 1.3.0

data/Gemfile

@@ -5,7 +5,7 @@ gem 'xml-simple'
 gem 'activesupport', '>= 3.0.3'
 
 group :development do
-  gem 'rspec', '~> 2.3.0'
+  gem 'rspec', '~> 2.8.0'
   gem 'jeweler', '~> 1.6.4'
   gem 'rdoc'
 end

data/Gemfile.lock

@@ -20,14 +20,14 @@ GEM
     rake (0.9.2.2)
     rdoc (3.12)
       json (~> 1.4)
-    rspec (2.3.0)
-      rspec-core (~> 2.3.0)
-      rspec-expectations (~> 2.3.0)
-      rspec-mocks (~> 2.3.0)
-    rspec-core (2.3.1)
-    rspec-expectations (2.3.0)
+    rspec (2.8.0)
+      rspec-core (~> 2.8.0)
+      rspec-expectations (~> 2.8.0)
+      rspec-mocks (~> 2.8.0)
+    rspec-core (2.8.0)
+    rspec-expectations (2.8.0)
       diff-lcs (~> 1.1.2)
-    rspec-mocks (2.3.0)
+    rspec-mocks (2.8.0)
     xml-simple (1.1.1)
 
 PLATFORMS
@@ -38,5 +38,5 @@ DEPENDENCIES
   httparty
   jeweler (~> 1.6.4)
   rdoc
-  rspec (~> 2.3.0)
+  rspec (~> 2.8.0)
   xml-simple

data/README.rdoc

@@ -55,12 +55,14 @@ It supports methods which require {authentication}[http://www.last.fm/api/authen
 
 === User
 
-* {user.getInfo}[http://www.lastfm.jp/api/show?service=344]
 * {user.getFriends}[http://www.lastfm.jp/api/show?service=263]
-* {user.getRecentTracks}[http://www.lastfm.jp/api/show?service=278]
+* {user.getInfo}[http://www.lastfm.jp/api/show?service=344]
+* {user.getLovedTracks}[http://www.lastfm.jp/api/show/user.getLovedTracks]
 * {user.getNeighbours}[http://www.lastfm.jp/api/show?service=264]
 * {user.getTopArtists}[http://www.lastfm.jp/api/show/user.getTopArtists]
 * {user.getTopAlbuns}[http://www.lastfm.jp/api/show/user.getTopAlbums]
+* {user.getTopTracks}[http://www.lastfm.jp/api/show/user.getTopTracks]
+* {user.getRecentTracks}[http://www.lastfm.jp/api/show?service=278]
 
 === Geo
 
@@ -88,16 +90,17 @@ It supports methods which require {authentication}[http://www.last.fm/api/authen
 
 == Comitters
 
-* {mattfawcett}[https://github.com/mattfawcett]
-* {peplin}[https://github.com/peplin]
-* {liff}[https://github.com/liff]
+* {Matthew Fawcett}[https://github.com/mattfawcett]
+* {Christopher Peplin}[https://github.com/peplin]
+* {Olli Helenius}[https://github.com/liff]
 * {pipedreambomb}[https://github.com/pipedreambomb]
-* {dbolson}[https://github.com/dbolson]
+* {Danny Olson}[https://github.com/dbolson]
 * {webs}[https://github.com/webs]
-* {magnolia-fan}[https://github.com/magnolia-fan]
-* {garyadamshannon}[https://github.com/garyadamshannon]
-* {Garthex}[https://github.com/Garthex]
-* {lfzawacki}[https://github.com/lfzawacki]
+* {Gregory Eremin}[https://github.com/magnolia-fan]
+* {Gary Shannon}[https://github.com/garyadamshannon]
+* {Kyle Fleming}[https://github.com/Garthex]
+* {Lucas}[https://github.com/lfzawacki]
+* {Johan Oskarsson}[https://github.com/johanoskarsson]
 
 == Note on Patches/Pull Requests
 

data/VERSION

@@ -1 +1 @@
-1.2.0
+1.3.0

data/lib/lastfm/method_category/user.rb

@@ -13,6 +13,14 @@ class Lastfm
         response.xml['topartists']['artist']
       end
 
+      regular_method :get_top_tracks, [:user], [[:period, nil], [:limit, nil], [:page, nil]] do |response|
+        response.xml['toptracks']['track']
+      end
+
+      regular_method :get_loved_tracks, [:user], [[:period, nil], [:limit, nil], [:page, nil]] do |response|
+        response.xml['lovedtracks']['track']
+      end
+
       regular_method :get_friends, [:user], [[:recenttracks, nil], [:limit, nil], [:page, nil]] do |response|
         response.xml['friends']['user']
       end

data/spec/fixtures/user_get_loved_tracks.xml

@@ -0,0 +1,28 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lfm status="ok">
+<lovedtracks user="skr" page="1" perPage="50" totalPages="4" total="180">
+    <track>
+        <name>I Spy</name>
+        <mbid></mbid>
+                        <url>http://www.last.fm/music/Mikhael+Paskalev/_/I+Spy</url>
+                <date uts="1329859504">21 Feb 2012, 21:25</date>
+                <artist> 
+            <name>Mikhael Paskalev</name>
+            <mbid></mbid>
+                        <url>http://www.last.fm/music/Mikhael+Paskalev</url>
+        </artist>
+                        <streamable fulltrack="0">0</streamable>
+    </track>
+    <track>
+        <name>Working Titles</name>
+        <mbid></mbid>
+                        <url>http://www.last.fm/music/Damien+Jurado/_/Working+Titles</url>
+                <date uts="1329857253">21 Feb 2012, 20:47</date>
+                <artist> 
+            <name>Damien Jurado</name>
+            <mbid>f4805b9d-68f8-438e-8f13-ec7bcb4c8581</mbid>
+                        <url>http://www.last.fm/music/Damien+Jurado</url>
+        </artist>
+                        <streamable fulltrack="0">0</streamable>
+    </track>
+</lovedtracks></lfm>

data/spec/fixtures/user_get_top_tracks.xml

@@ -0,0 +1,30 @@
+<?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>
+        <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>
+        <name>Oupa &amp; Tony Crow</name>
+        <mbid></mbid>
+        <url>http://www.last.fm/music/Oupa%2B%2526%2BTony%2BCrow</url>
+    </artist>
+                </track>                        
+                </toptracks></lfm>

data/spec/lastfm_spec.rb

@@ -513,6 +513,52 @@ XML
         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

metadata

@@ -1,117 +1,90 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: lastfm
-version: !ruby/object:Gem::Version 
-  prerelease: false
-  segments: 
-  - 1
-  - 2
-  - 0
-  segments_generated: true
-  version: 1.2.0
+version: !ruby/object:Gem::Version
+  version: 1.3.0
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - youpy
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2012-01-27 00:00:00 +09:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id001 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id001
+date: 2012-02-26 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: httparty
-  prerelease: false
+  requirement: &70299718961480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id002 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id002
-  name: xml-simple
   prerelease: false
+  version_requirements: *70299718961480
+- !ruby/object:Gem::Dependency
+  name: xml-simple
+  requirement: &70299718960660 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id003 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 3
-        - 0
-        - 3
-        segments_generated: true
-        version: 3.0.3
-  requirement: *id003
-  name: activesupport
   prerelease: false
+  version_requirements: *70299718960660
+- !ruby/object:Gem::Dependency
+  name: activesupport
+  requirement: &70299718959900 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: 3.0.3
   type: :runtime
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id004 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 2
-        - 3
-        - 0
-        segments_generated: true
-        version: 2.3.0
-  requirement: *id004
-  name: rspec
   prerelease: false
+  version_requirements: *70299718959900
+- !ruby/object:Gem::Dependency
+  name: rspec
+  requirement: &70299718975280 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 2.8.0
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id005 !ruby/object:Gem::Requirement 
-    requirements: 
+  prerelease: false
+  version_requirements: *70299718975280
+- !ruby/object:Gem::Dependency
+  name: jeweler
+  requirement: &70299718974480 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
     - - ~>
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 1
-        - 6
-        - 4
-        segments_generated: true
+      - !ruby/object:Gem::Version
         version: 1.6.4
-  requirement: *id005
-  name: jeweler
-  prerelease: false
   type: :development
-- !ruby/object:Gem::Dependency 
-  version_requirements: &id006 !ruby/object:Gem::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        segments: 
-        - 0
-        segments_generated: true
-        version: "0"
-  requirement: *id006
-  name: rdoc
   prerelease: false
+  version_requirements: *70299718974480
+- !ruby/object:Gem::Dependency
+  name: rdoc
+  requirement: &70299718973600 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
+  prerelease: false
+  version_requirements: *70299718973600
 description: A ruby interface for Last.fm web services version 2.0
 email: youpy@buycheapviagraonlinenow.com
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - LICENSE
 - README.rdoc
-files: 
+files:
 - .document
 - .rspec
 - Gemfile
@@ -150,46 +123,42 @@ files:
 - spec/fixtures/track_search.xml
 - spec/fixtures/user_get_friends.xml
 - spec/fixtures/user_get_info.xml
+- spec/fixtures/user_get_loved_tracks.xml
 - spec/fixtures/user_get_neighbours.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_tracks.xml
 - spec/lastfm_spec.rb
 - spec/method_category_spec.rb
 - spec/response_spec.rb
 - spec/spec_helper.rb
 - spec/util_spec.rb
-has_rdoc: true
 homepage: http://github.com/youpy/ruby-lastfm
 licenses: []
-
 post_install_message: 
 rdoc_options: []
-
-require_paths: 
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
-      - 0
-      segments_generated: true
-      version: "0"
-required_rubygems_version: !ruby/object:Gem::Requirement 
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      segments: 
+required_ruby_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+      segments:
       - 0
-      segments_generated: true
-      version: "0"
+      hash: 791443162221732736
+required_rubygems_version: !ruby/object:Gem::Requirement
+  none: false
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.6
+rubygems_version: 1.8.10
 signing_key: 
 specification_version: 3
 summary: A Ruby interface for Last.fm Web Services
 test_files: []
-