scrobbler-ng 2.0.10 → 2.0.11

data/Rakefile

@@ -3,9 +3,7 @@
 require 'rubygems'
 require 'rake'
 require 'rake/testtask'
-require 'rake/rdoctask'
-require 'spec/rake/spectask'
- 
+
 Dir['tasks/**/*.rake'].each { |rake| load rake }
  
 task :default => 'test:unit'

data/VERSION.yml

@@ -1,5 +1,5 @@
---- 
+---
 :major: 2
 :minor: 0
-:patch: 10
+:patch: 11
 :build: 

data/lib/scrobbler/artist.rb

@@ -59,7 +59,7 @@ module Scrobbler
               @listeners = childL2.content.to_i if childL2.name == 'listeners'
               @playcount = childL2.content.to_i if childL2.name == 'playcount'
               @playcount = childL2.content.to_i if childL2.name == 'plays'
-            end
+            end if not child.children.nil?
           when 'similar'
             # Ignore them for the moment, they are not stored.
           when 'bio'
@@ -141,11 +141,16 @@ module Scrobbler
     #
     # @return [nil]
     def load_info
-      doc = request('artist.getinfo', {:artist => @name})
+     if @mbid.nil?
+        req_args = {:artist => @name}
+      else
+        req_args = {:mbid => @mbid}
+      end
+      doc = request('artist.getinfo', req_args)
       doc.root.children.each do |childL1|
         next unless childL1.name == 'artist'
         load_from_xml(childL1)
-      end
+      end if (not doc.root.nil?) && (not doc.root.children.nil?)
       @info_loaded = true
     end # load_info
 

data/lib/scrobbler/base.rb

@@ -13,6 +13,8 @@ end
 module Scrobbler
  
   API_URL  = 'http://ws.audioscrobbler.com/' unless defined? API_URL
+
+  class ApiError < StandardError; end
   
   class Base
     
@@ -185,12 +187,25 @@ module Scrobbler
       xml = fetch_http(request_method, paramlist) if xml.nil?
       # Process it
       doc = Nokogiri::XML(xml) { |config| config.noent.noblanks.nonet }
+      # Validate it
+      validate_response_document doc
       # Write to cache
       save_to_cache(xml, parameters) if check_cache
       
       # Return the parsed result      
       doc
     end
+
+    # Check response status, raise ApiError if request failed.
+    #
+    # @param [Nokogiri::XML::Document] document Response XML document.
+    # @return [void]
+    def Base.validate_response_document(document)
+      unless document.root and document.root['status'] == 'ok'
+        error_message = (document.content if document.root.child.name == 'error') rescue nil
+        raise ApiError, error_message
+      end
+    end
     
     # Load information into instance variables.
     #
@@ -228,7 +243,7 @@ module Scrobbler
         doc.root.children.each do |child|
           next unless child.name == parent.to_s
           root = child
-        end
+        end unless doc.nil? || doc.root.nil?
         if root.nil? then
           # Sometimes Last.fm returns an empty file if we query for sth not known
           return []

data/lib/scrobbler/helper/image.rb

@@ -66,7 +66,7 @@ module Scrobbler
       raise ArgumentError unless ['small', 'medium', 'large', 'extralarge',
         'mega'].include?(which)      
       img_url = instance_variable_get("@image_#{which}")
-      if img_url.nil? && responds_to?(:load_info) 
+      if img_url.nil? && respond_to?(:load_info) 
         load_info 
         img_url = instance_variable_get("@image_#{which}")
       end

data/lib/scrobbler/user.rb

@@ -8,6 +8,7 @@ module Scrobbler
     include ImageObjectFuncs
     
     attr_reader :url, :weight, :match, :realname, :name
+    attr_reader :id, :country, :age, :gender, :subscriber, :playcount, :playlistcount, :registered
     
     # Alias for User.new(:xml => xml)
     #
@@ -43,6 +44,28 @@ module Scrobbler
             @realname = child.content
           when 'image'
             check_image_node(child)
+          when 'id'
+            @id = child.content.to_i
+          when 'country'
+            @country = child.content
+          when 'age'
+            @age = child.content.to_i
+          when 'gender'
+            @gender = child.content
+          when 'subscriber'
+            @subscriber = child.content == '1'
+          when 'playcount'
+            @playcount = child.content.to_i
+          when 'playlists'
+            @playlistcount = child.content.to_i
+          when 'registered'
+            @registered = Time.parse child.content
+          when 'id'
+            @id = child.content.to_i
+          when 'type'
+            @type = child.content.to_i
+          when 'bootstrap'
+            # TODO Guess meaning of 'bootstrap' field
           when 'text'
             # ignore, these are only blanks
           when '#text'
@@ -78,10 +101,18 @@ module Scrobbler
       call_pageable('user.getfriends', :friends, User, {:user => @name}.merge(opts))
     end
     
+    # Indicates if the info was already loaded
+    @info_loaded = false
+
     # Get information about a user profile.
     def load_info
-        # This function requires authentication, but SimpleAuth is not yet 2.0
-        raise NotImplementedError
+      unless @info_loaded
+        xml = Base.request 'user.getinfo', :user => @name
+        if xml.root['status'] == 'ok' and xml.root.children.first.name == 'user'
+          load_from_xml xml.root.children.first
+          @info_loaded = true
+        end
+      end
     end
     
     # Get the last 50 tracks loved by a user.

data/scrobbler-ng.gemspec

@@ -1,91 +1,63 @@
 # Generated by jeweler
 # DO NOT EDIT THIS FILE DIRECTLY
-# Instead, edit Jeweler::Tasks in Rakefile, and run the gemspec command
+# Instead, edit Jeweler::Tasks in Rakefile, and run 'rake gemspec'
 # -*- encoding: utf-8 -*-
 
 Gem::Specification.new do |s|
-  s.name = %q{scrobbler-ng}
-  s.version = "2.0.10"
+  s.name = "scrobbler-ng"
+  s.version = "2.0.11"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["John Nunemaker", "Jonathan Rudenberg", "Uwe L. Korn"]
-  s.date = %q{2010-09-25}
-  s.description = %q{A ruby library for accessing the Last.fm 2.0 API. It is higly optimized so that it uses less memory and parses XML (through Nokogiri) than other implementations.}
-  s.email = %q{uwelk@xhochy.org}
+  s.date = "2012-01-11"
+  s.description = "A ruby library for accessing the Last.fm 2.0 API. It is higly optimized so that it uses less memory and parses XML (through Nokogiri) than other implementations."
+  s.email = "uwelk@xhochy.org"
   s.extra_rdoc_files = [
     "README.rdoc"
   ]
   s.files = [
     "MIT-LICENSE",
-     "README.rdoc",
-     "Rakefile",
-     "VERSION.yml",
-     "examples/album.rb",
-     "examples/artist.rb",
-     "examples/scrobble.rb",
-     "examples/tag.rb",
-     "examples/track.rb",
-     "examples/user.rb",
-     "lib/scrobbler.rb",
-     "lib/scrobbler/album.rb",
-     "lib/scrobbler/artist.rb",
-     "lib/scrobbler/authentication.rb",
-     "lib/scrobbler/base.rb",
-     "lib/scrobbler/basexml.rb",
-     "lib/scrobbler/basexmlinfo.rb",
-     "lib/scrobbler/event.rb",
-     "lib/scrobbler/geo.rb",
-     "lib/scrobbler/helper/image.rb",
-     "lib/scrobbler/helper/streamable.rb",
-     "lib/scrobbler/library.rb",
-     "lib/scrobbler/playlist.rb",
-     "lib/scrobbler/radio.rb",
-     "lib/scrobbler/session.rb",
-     "lib/scrobbler/shout.rb",
-     "lib/scrobbler/tag.rb",
-     "lib/scrobbler/track.rb",
-     "lib/scrobbler/user.rb",
-     "lib/scrobbler/venue.rb",
-     "scrobbler-ng.gemspec",
-     "tasks/jeweler.rake",
-     "tasks/rdoc.rake",
-     "tasks/tests.rake",
-     "tasks/yardoc.rake"
+    "README.rdoc",
+    "Rakefile",
+    "VERSION.yml",
+    "examples/album.rb",
+    "examples/artist.rb",
+    "examples/scrobble.rb",
+    "examples/tag.rb",
+    "examples/track.rb",
+    "examples/user.rb",
+    "lib/scrobbler.rb",
+    "lib/scrobbler/album.rb",
+    "lib/scrobbler/artist.rb",
+    "lib/scrobbler/authentication.rb",
+    "lib/scrobbler/base.rb",
+    "lib/scrobbler/basexml.rb",
+    "lib/scrobbler/basexmlinfo.rb",
+    "lib/scrobbler/event.rb",
+    "lib/scrobbler/geo.rb",
+    "lib/scrobbler/helper/image.rb",
+    "lib/scrobbler/helper/streamable.rb",
+    "lib/scrobbler/library.rb",
+    "lib/scrobbler/playlist.rb",
+    "lib/scrobbler/radio.rb",
+    "lib/scrobbler/session.rb",
+    "lib/scrobbler/shout.rb",
+    "lib/scrobbler/tag.rb",
+    "lib/scrobbler/track.rb",
+    "lib/scrobbler/user.rb",
+    "lib/scrobbler/venue.rb",
+    "scrobbler-ng.gemspec",
+    "tasks/jeweler.rake",
+    "tasks/rdoc.rake",
+    "tasks/tests.rake",
+    "tasks/yardoc.rake"
   ]
-  s.homepage = %q{http://github.com/xhochy/scrobbler}
-  s.rdoc_options = ["--charset=UTF-8"]
+  s.homepage = "http://github.com/xhochy/scrobbler"
   s.require_paths = ["lib"]
-  s.rubygems_version = %q{1.3.7}
-  s.summary = %q{A ruby library for accessing the last.fm v2 webservices}
-  s.test_files = [
-    "test/unit/tag_spec.rb",
-     "test/unit/playlist_spec.rb",
-     "test/unit/album_spec.rb",
-     "test/unit/radio_spec.rb",
-     "test/unit/event_spec.rb",
-     "test/unit/venue_spec.rb",
-     "test/unit/user_spec.rb",
-     "test/unit/artist_spec.rb",
-     "test/unit/playing_test.rb",
-     "test/unit/simpleauth_test.rb",
-     "test/unit/geo_spec.rb",
-     "test/unit/library_spec.rb",
-     "test/unit/track_spec.rb",
-     "test/unit/authentication_spec.rb",
-     "test/spec_helper.rb",
-     "test/test_helper.rb",
-     "test/mocks/library.rb",
-     "test/mocks/rest.rb",
-     "examples/tag.rb",
-     "examples/track.rb",
-     "examples/user.rb",
-     "examples/artist.rb",
-     "examples/scrobble.rb",
-     "examples/album.rb"
-  ]
+  s.rubygems_version = "1.8.13"
+  s.summary = "A ruby library for accessing the last.fm v2 webservices"
 
   if s.respond_to? :specification_version then
-    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
     s.specification_version = 3
 
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then

data/tasks/rdoc.rake

@@ -1,4 +1,5 @@
-Rake::RDocTask.new do |rdoc|
+require 'rdoc/task'
+RDoc::Task.new do |rdoc|
   rdoc.rdoc_dir = 'rdoc'
   rdoc.title = 'scrobbler-ng'
   rdoc.options << '--line-numbers' << '--inline-source'

data/tasks/tests.rake

@@ -1,23 +1,5 @@
-desc "Run all tests"
-Spec::Rake::SpecTask.new('test:unit') do |t|
-  t.rcov = false
-  t.spec_opts << '--format' << 'html:spec.html'
-  t.spec_opts << '--format' << 'progress'
-  t.spec_opts << '-b'
-  t.spec_files = FileList['test/unit/*_spec.rb']
-end
+require 'rspec/core/rake_task'
 
-Spec::Rake::SpecTask.new('test:rcov') do |t|
-  begin
-    require 'rcov'
-    t.rcov = true
-    t.rcov_opts = ['--exclude', '/var/lib/gems']
-  rescue LoadError
-    t.rcov = false
-  end
-  t.spec_opts << '--format' << 'html:spec.html'
-  t.spec_opts << '--format' << 'progress'
-  t.spec_opts << '-b'
-  t.spec_files = FileList['test/unit/*_spec.rb']
+RSpec::Core::RakeTask.new(:spec) do |t|
+  t.pattern = 'test/unit/*_spec.rb'
 end
-

metadata

@@ -1,94 +1,70 @@
---- !ruby/object:Gem::Specification 
+--- !ruby/object:Gem::Specification
 name: scrobbler-ng
-version: !ruby/object:Gem::Version 
-  hash: 27
-  prerelease: false
-  segments: 
-  - 2
-  - 0
-  - 10
-  version: 2.0.10
+version: !ruby/object:Gem::Version
+  version: 2.0.11
+  prerelease: 
 platform: ruby
-authors: 
+authors:
 - John Nunemaker
 - Jonathan Rudenberg
 - Uwe L. Korn
 autorequire: 
 bindir: bin
 cert_chain: []
-
-date: 2010-09-25 00:00:00 +02:00
-default_executable: 
-dependencies: 
-- !ruby/object:Gem::Dependency 
+date: 2012-01-11 00:00:00.000000000 Z
+dependencies:
+- !ruby/object:Gem::Dependency
   name: rspec
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+  requirement: &10958280 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 13
-        segments: 
-        - 1
-        - 2
-        - 9
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.2.9
   type: :development
-  version_requirements: *id001
-- !ruby/object:Gem::Dependency 
-  name: yard
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+  version_requirements: *10958280
+- !ruby/object:Gem::Dependency
+  name: yard
+  requirement: &11344040 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
-  name: fakeweb
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+  version_requirements: *11344040
+- !ruby/object:Gem::Dependency
+  name: fakeweb
+  requirement: &11342900 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
-        version: "0"
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: nokogiri
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+  version_requirements: *11342900
+- !ruby/object:Gem::Dependency
+  name: nokogiri
+  requirement: &11341500 !ruby/object:Gem::Requirement
     none: false
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 1
-        - 4
-        - 2
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
         version: 1.4.2
   type: :runtime
-  version_requirements: *id004
-description: A ruby library for accessing the Last.fm 2.0 API. It is higly optimized so that it uses less memory and parses XML (through Nokogiri) than other implementations.
+  prerelease: false
+  version_requirements: *11341500
+description: A ruby library for accessing the Last.fm 2.0 API. It is higly optimized
+  so that it uses less memory and parses XML (through Nokogiri) than other implementations.
 email: uwelk@xhochy.org
 executables: []
-
 extensions: []
-
-extra_rdoc_files: 
+extra_rdoc_files:
 - README.rdoc
-files: 
+files:
 - MIT-LICENSE
 - README.rdoc
 - Rakefile
@@ -124,80 +100,28 @@ files:
 - tasks/rdoc.rake
 - tasks/tests.rake
 - tasks/yardoc.rake
-- test/unit/tag_spec.rb
-- test/unit/playlist_spec.rb
-- test/unit/album_spec.rb
-- test/unit/radio_spec.rb
-- test/unit/event_spec.rb
-- test/unit/venue_spec.rb
-- test/unit/user_spec.rb
-- test/unit/artist_spec.rb
-- test/unit/playing_test.rb
-- test/unit/simpleauth_test.rb
-- test/unit/geo_spec.rb
-- test/unit/library_spec.rb
-- test/unit/track_spec.rb
-- test/unit/authentication_spec.rb
-- test/spec_helper.rb
-- test/test_helper.rb
-- test/mocks/library.rb
-- test/mocks/rest.rb
-has_rdoc: true
 homepage: http://github.com/xhochy/scrobbler
 licenses: []
-
 post_install_message: 
-rdoc_options: 
-- --charset=UTF-8
-require_paths: 
+rdoc_options: []
+require_paths:
 - lib
-required_ruby_version: !ruby/object:Gem::Requirement 
+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 
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
+required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
-  requirements: 
-  - - ">="
-    - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
-      version: "0"
+  requirements:
+  - - ! '>='
+    - !ruby/object:Gem::Version
+      version: '0'
 requirements: []
-
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.8.13
 signing_key: 
 specification_version: 3
 summary: A ruby library for accessing the last.fm v2 webservices
-test_files: 
-- test/unit/tag_spec.rb
-- test/unit/playlist_spec.rb
-- test/unit/album_spec.rb
-- test/unit/radio_spec.rb
-- test/unit/event_spec.rb
-- test/unit/venue_spec.rb
-- test/unit/user_spec.rb
-- test/unit/artist_spec.rb
-- test/unit/playing_test.rb
-- test/unit/simpleauth_test.rb
-- test/unit/geo_spec.rb
-- test/unit/library_spec.rb
-- test/unit/track_spec.rb
-- test/unit/authentication_spec.rb
-- test/spec_helper.rb
-- test/test_helper.rb
-- test/mocks/library.rb
-- test/mocks/rest.rb
-- examples/tag.rb
-- examples/track.rb
-- examples/user.rb
-- examples/artist.rb
-- examples/scrobble.rb
-- examples/album.rb
+test_files: []