firstfm 0.6.0 → 0.7.0

data/VERSION.yml

@@ -1,5 +1,5 @@
 ---
 :major: 0
-:minor: 6
+:minor: 7
 :patch: 0
 :build: 

data/firstfm.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = "firstfm"
-  s.version = "0.6.0"
+  s.version = "0.7.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Aleksandr Lossenko"]
-  s.date = "2013-01-27"
+  s.date = "2013-07-14"
   s.description = "Firstfm is a ruby wrapper for the Last.fm APIs ( http://www.last.fm/api ). My main focus is to import events from Last.FM, but with time I will try to add support for all API methods."
   s.email = "aleksandr.lossenko@gmail.com"
   s.extra_rdoc_files = [
@@ -33,6 +33,7 @@ Gem::Specification.new do |s|
     "lib/firstfm/image.rb",
     "lib/firstfm/location.rb",
     "lib/firstfm/track.rb",
+    "lib/firstfm/user.rb",
     "lib/firstfm/venue.rb",
     "test/fixtures/artist.xml",
     "test/fixtures/artists.xml",
@@ -46,18 +47,20 @@ Gem::Specification.new do |s|
     "test/fixtures/get_images.xml",
     "test/fixtures/top_tracks.xml",
     "test/fixtures/tracks.xml",
+    "test/fixtures/user_artists.xml",
     "test/fixtures/venue.xml",
     "test/fixtures/venues.xml",
     "test/helper.rb",
     "test/test_artist.rb",
     "test/test_geo.rb",
     "test/test_track.rb",
+    "test/test_user.rb",
     "test/test_venue.rb"
   ]
   s.homepage = "http://github.com/egze/firstfm"
   s.licenses = ["MIT"]
   s.require_paths = ["lib"]
-  s.rubygems_version = "1.8.24"
+  s.rubygems_version = "1.8.25"
   s.summary = "A ruby wrapper for the Last.fm APIs"
 
   if s.respond_to? :specification_version then

data/lib/firstfm/artist.rb

@@ -2,7 +2,7 @@ module Firstfm
   
   class Artist
     
-    attr_accessor :name, :mbid, :url, :listeners, :streamable, :images
+    attr_accessor :name, :mbid, :url, :listeners, :streamable, :images, :playcount
    
     include HTTParty
     base_uri 'ws.audioscrobbler.com'
@@ -88,6 +88,7 @@ module Firstfm
         artist.listeners = hash["listeners"].to_i
         artist.streamable = hash["streamable"] == "1"
         artist.images = hash["image"]
+        artist.playcount = hash["playcount"].to_i
       end
     end
     

data/lib/firstfm/user.rb

@@ -0,0 +1,21 @@
+module Firstfm
+  
+  class User
+    
+    include HTTParty
+    base_uri 'ws.audioscrobbler.com'
+    format :xml
+    
+    def self.get_top_artists(user, period = "overall", page = 1, limit = 50)
+      response = get("/2.0/", {query: {method: 'user.getTopArtists', user: user, period: period, page: page, limit: limit, api_key: Firstfm.config.api_key}})
+      artists_array = (response and response["lfm"] and response["lfm"]["topartists"] and response["lfm"]["topartists"]["artist"]) || []
+      artists = Artist.init_from_array(artists_array)
+      WillPaginate::Collection.create(page, limit) do |pager|
+        pager.replace artists
+        pager.total_entries = response['lfm']['topartists']['total'].to_i rescue 0
+      end
+    end
+    
+  end
+  
+end

data/lib/firstfm.rb

@@ -11,6 +11,7 @@ require 'firstfm/event'
 require 'firstfm/location'
 require 'firstfm/venue'
 require 'firstfm/geo'
+require 'firstfm/user'
 
 module Firstfm
   

data/test/fixtures/user_artists.xml

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<lfm status="ok">
+  <topartists user="RJ" type="overall" page="1" perPage="50" totalPages="115" total="5702">
+    <artist rank="1">
+      <name>Dream Theater</name>
+      <playcount>1797</playcount>
+      <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/34/5623420.jpg</image>
+      <image size="medium">http://userserve-ak.last.fm/serve/64/5623420.jpg</image>
+      <image size="large">http://userserve-ak.last.fm/serve/126/5623420.jpg</image>
+      <image size="extralarge">http://userserve-ak.last.fm/serve/252/5623420.jpg</image>
+      <image size="mega">http://userserve-ak.last.fm/serve/500/5623420/Dream+Theater+dt.jpg</image>
+    </artist>
+    <artist rank="2">
+      <name>Dire Straits</name>
+      <playcount>1498</playcount>
+      <mbid>614e3804-7d34-41ba-857f-811bad7c2b7a</mbid>
+      <url>http://www.last.fm/music/Dire+Straits</url>
+      <streamable>1</streamable>
+      <image size="small">http://userserve-ak.last.fm/serve/34/12048127.jpg</image>
+      <image size="medium">http://userserve-ak.last.fm/serve/64/12048127.jpg</image>
+      <image size="large">http://userserve-ak.last.fm/serve/126/12048127.jpg</image>
+      <image size="extralarge">http://userserve-ak.last.fm/serve/252/12048127.jpg</image>
+      <image size="mega">http://userserve-ak.last.fm/serve/500/12048127/Dire+Straits+expresso+love.jpg</image>
+    </artist>
+  </topartists>
+</lfm>

data/test/test_user.rb

@@ -0,0 +1,19 @@
+require 'helper'
+ 
+class TestUser < Test::Unit::TestCase
+  
+  def test_should_get_top_artists
+    FakeWeb.register_uri(:get, %r|http://ws.audioscrobbler.com/|, :body => File.read(File.dirname(__FILE__) + "/fixtures/user_artists.xml"))
+    artists = Firstfm::User.get_top_artists("RJ")
+    assert_equal 2, artists.size
+    assert_equal 5702, artists.total_entries
+    artist = artists.first
+    assert_equal "Dream Theater", artist.name
+    assert_equal 1797, artist.playcount
+    assert_equal "http://www.last.fm/music/Dream+Theater", artist.url
+    assert_equal "28503ab7-8bf2-4666-a7bd-2644bfc7cb1d", artist.mbid
+    assert artist.streamable
+    assert_equal 5, artist.images.size
+  end
+  
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: firstfm
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-27 00:00:00.000000000 Z
+date: 2013-07-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
@@ -165,6 +165,7 @@ files:
 - lib/firstfm/image.rb
 - lib/firstfm/location.rb
 - lib/firstfm/track.rb
+- lib/firstfm/user.rb
 - lib/firstfm/venue.rb
 - test/fixtures/artist.xml
 - test/fixtures/artists.xml
@@ -178,12 +179,14 @@ files:
 - test/fixtures/get_images.xml
 - test/fixtures/top_tracks.xml
 - test/fixtures/tracks.xml
+- test/fixtures/user_artists.xml
 - test/fixtures/venue.xml
 - test/fixtures/venues.xml
 - test/helper.rb
 - test/test_artist.rb
 - test/test_geo.rb
 - test/test_track.rb
+- test/test_user.rb
 - test/test_venue.rb
 homepage: http://github.com/egze/firstfm
 licenses:
@@ -200,7 +203,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3155602274475506363
+      hash: -964110322330808442
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -209,7 +212,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.24
+rubygems_version: 1.8.25
 signing_key: 
 specification_version: 3
 summary: A ruby wrapper for the Last.fm APIs