lastfm 0.4.0 → 0.5.0

data/README.rdoc

@@ -53,6 +53,14 @@ It supports methods which require {authentication}[http://www.last.fm/api/authen
 * user.getRecentTracks
 * user.getNeighbours
 
+=== Geo
+
+* geo.getEvents
+
+=== Library
+
+* library.getArtists
+
 == Installation
 
 === Archive Installation

data/VERSION

@@ -1 +1 @@
-0.4.0
+0.5.0

data/lastfm.gemspec

@@ -29,6 +29,7 @@ Gem::Specification.new do |s|
      "lib/lastfm/method_category/artist.rb",
      "lib/lastfm/method_category/auth.rb",
      "lib/lastfm/method_category/base.rb",
+     "lib/lastfm/method_category/geo.rb",
      "lib/lastfm/method_category/track.rb",
      "lib/lastfm/response.rb",
      "lib/lastfm/util.rb",

data/lib/lastfm/method_category/geo.rb

@@ -0,0 +1,9 @@
+class Lastfm
+  module MethodCategory
+    class Geo < Base
+      regular_method :get_events, [], [[:location, nil], [:distance, nil], [:limit, nil], [:page, nil]] do |response|
+        response.xml['events']['event']
+      end
+    end
+  end
+end

data/lib/lastfm/method_category/library.rb

@@ -0,0 +1,9 @@
+class Lastfm
+  module MethodCategory
+    class Library < Base
+      regular_method :get_artists, [:user], [[:limit, nil], [:page, nil]] do |response|
+        response.xml['artists']['artist']
+      end
+    end
+  end
+end

data/lib/lastfm.rb

@@ -10,6 +10,8 @@ require 'lastfm/method_category/auth'
 require 'lastfm/method_category/track'
 require 'lastfm/method_category/artist'
 require 'lastfm/method_category/user'
+require 'lastfm/method_category/geo'
+require 'lastfm/method_category/library'
 
 class Lastfm
   API_ROOT = 'http://ws.audioscrobbler.com/2.0'
@@ -43,6 +45,14 @@ class Lastfm
     MethodCategory::User.new(self)
   end
 
+  def geo
+    MethodCategory::Geo.new(self)
+  end
+
+  def library
+    MethodCategory::Library.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/spec/fixtures/geo_get_events.xml

@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lfm status="ok">
+  <events xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" location="Boulder, Denver CO, United States" page="1" perPage="1" totalPages="1" total="1">
+    <event xmlns:geo="http://www.w3.org/2003/01/geo/wgs84_pos#" >
+      <id>1958795</id>
+      <title>Transistor Festival</title>
+      <artists>
+        <artist>Not Breathing</artist>
+        <artist>Iuengliss</artist>
+        <artist>kuxaan-sum</artist>
+        <artist>Entropic Advance</artist>
+        <artist>Page 27</artist>
+        <artist>Brocken Spectre</artist>
+        <artist>And Many More...</artist>
+        <artist>The 47th Star</artist>
+        <artist>c.db.sn.</artist>
+        <artist>Kontrolled Demolition</artist>
+        <headliner>Not Breathing</headliner>
+      </artists>
+      <venue>
+        <id>8898699</id>
+        <name>The Walnut Room</name>
+        <location>
+          <city>Denver, CO</city>
+          <country>United States</country>
+          <street>3131 Walnut Street</street>
+          <postalcode>80205</postalcode>
+          <geo:point>
+            <geo:lat>39.764316</geo:lat>
+            <geo:long>-104.979679</geo:long>
+          </geo:point>
+        </location>
+        <url>http://www.last.fm/venue/8898699+The+Walnut+Room</url>
+        <website>www.thewalnutroom.com</website>
+        <phonenumber>(303) 292-1700</phonenumber>
+        <image size="small">http://userserve-ak.last.fm/serve/34/18629169.png</image>
+        <image size="medium">http://userserve-ak.last.fm/serve/64/18629169.png</image>
+        <image size="large">http://userserve-ak.last.fm/serve/126/18629169.png</image>
+        <image size="extralarge">http://userserve-ak.last.fm/serve/252/18629169.png</image>
+        <image size="mega">http://userserve-ak.last.fm/serve/_/18629169/The+Walnut+Room+twrlogo.png</image>
+      </venue>
+      <startDate>Fri, 10 Jun 2011 01:58:01</startDate>
+      <endDate>Sun, 12 Jun 2011 01:58:01</endDate>
+      <description></description>
+      <image size="small">http://userserve-ak.last.fm/serve/34/166214.jpg</image>
+      <image size="medium">http://userserve-ak.last.fm/serve/64/166214.jpg</image>
+      <image size="large">http://userserve-ak.last.fm/serve/126/166214.jpg</image>
+      <image size="extralarge">http://userserve-ak.last.fm/serve/252/166214.jpg</image>
+      <attendance>1</attendance>
+      <reviews>0</reviews>
+      <tag>lastfm:event=1958795</tag>    
+      <url>http://www.last.fm/festival/1958795+Transistor+Festival</url>
+      <website>http://www.thewalnutroom.com/posts/detail/2570</website>
+      <tickets></tickets>
+      <cancelled>0</cancelled>
+    </event>
+  </events>
+</lfm>

data/spec/fixtures/library_get_artists.xml

@@ -0,0 +1,26 @@
+<lfm status="ok">
+  <artists user="RJ" page="1" perPage="50" totalPages="20">
+    <artist rank="1">
+      <name>Dream Theater</name>
+      <playcount>1346</playcount>
+      <tagcount>0</tagcount>
+      <mbid>28503ab7-8bf2-4666-a7bd-2644bfc7cb1d</mbid>
+      <url>http://www.last.fm/music/Dream+Theater</url>
+      <streamable>1</streamable>
+      <image size="small">http://userserve-ak.last.fm/serve/50/95853.jpg</image>
+      <image size="medium">http://userserve-ak.last.fm/serve/85/95853.jpg</image>
+      <image size="large">http://userserve-ak.last.fm/serve/160/95853.jpg</image>
+    </artist>
+    <artist rank="2">
+      <name>Dark Castle</name>
+      <playcount>1201</playcount>
+      <tagcount>0</tagcount>
+      <mbid>38503ab7-8bf2-4666-a7bd-2644bfc7cb1d</mbid>
+      <url>http://www.last.fm/music/Dark+Castle</url>
+      <streamable>1</streamable>
+      <image size="small">http://userserve-ak.last.fm/serve/50/95855.jpg</image>
+      <image size="medium">http://userserve-ak.last.fm/serve/85/95855.jpg</image>
+      <image size="large">http://userserve-ak.last.fm/serve/160/95855.jpg</image>
+    </artist>
+  </artists>
+</lfm>

data/spec/lastfm_spec.rb

@@ -345,8 +345,36 @@ XML
     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 and instance of Lastfm::User' do
+    it 'should return an instance of Lastfm::User' do
       @lastfm.user.should be_an_instance_of(Lastfm::MethodCategory::User)
     end
 
@@ -401,4 +429,23 @@ XML
       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_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
+    end
+  end
 end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: lastfm
 version: !ruby/object:Gem::Version 
-  hash: 15
+  hash: 11
   prerelease: 
   segments: 
   - 0
-  - 4
+  - 5
   - 0
-  version: 0.4.0
+  version: 0.5.0
 platform: ruby
 authors: 
 - youpy
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-05-06 00:00:00 +09:00
+date: 2011-06-13 00:00:00 +09:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -99,11 +99,15 @@ files:
 - lib/lastfm/method_category/artist.rb
 - lib/lastfm/method_category/auth.rb
 - lib/lastfm/method_category/base.rb
+- lib/lastfm/method_category/geo.rb
+- lib/lastfm/method_category/library.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
+- spec/fixtures/geo_get_events.xml
+- spec/fixtures/library_get_artists.xml
 - spec/fixtures/ng.xml
 - spec/fixtures/ok.xml
 - spec/fixtures/track_get_info.xml