scrobbler-ng 2.0.1 → 2.0.2

data/lib/scrobbler/user.rb

@@ -1,9 +1,9 @@
 # encoding: utf-8
 
-require File.expand_path('basexml.rb', File.dirname(__FILE__))
+require File.expand_path('basexmlinfo.rb', File.dirname(__FILE__))
 
 module Scrobbler  
-  class User < BaseXml
+  class User < BaseXmlInfo
     # Load Helper modules
     include ImageObjectFuncs
     
@@ -56,10 +56,6 @@ module Scrobbler
     def initialize(data={})
       raise ArgumentError unless data.kind_of?(Hash)
       super(data)
-      data = {:include_info => false}.merge(data)
-      # Load data given as method-parameter
-      load_info() if data.delete(:include_info)
-      populate_data(data)      
       
       raise ArgumentError, "Name is required" if @name.empty?
     end
@@ -68,12 +64,12 @@ module Scrobbler
     #
     # Supports ical, ics or rss as its format  
     def events
-      call('user.getevents', :events, :event, {:user => @name})
+      call('user.getevents', :events, Event, {:user => @name})
     end
 
     # Get a list of the user's friends on Last.fm.    
     def friends(page=1, limit=50)
-      call('user.getfriends', :friends, :user, {:user => @name, :page => page, :limit => limit})
+      call('user.getfriends', :friends, User, {:user => @name, :page => page, :limit => limit})
     end
     
     # Get information about a user profile.
@@ -84,12 +80,12 @@ module Scrobbler
     
     # Get the last 50 tracks loved by a user.
     def loved_tracks
-        call('user.getlovedtracks', :lovedtracks, :track, {:user => @name})
+        call('user.getlovedtracks', :lovedtracks, Track, {:user => @name})
     end
 
     # Get a list of a user's neighbours on Last.fm.
     def neighbours
-      call('user.getneighbours', :neighbours, :user, {:user => @name})
+      call('user.getneighbours', :neighbours, User, {:user => @name})
     end
 
     # Get a paginated list of all events a user has attended in the past. 
@@ -100,7 +96,7 @@ module Scrobbler
     
     # Get a list of a user's playlists on Last.fm. 
     def playlists
-      call('user.getplaylists', :playlists, :playlist, {:user => @name})
+      call('user.getplaylists', :playlists, Playlist, {:user => @name})
     end
     
     # Get a list of the recent tracks listened to by this user. Indicates now 
@@ -110,7 +106,7 @@ module Scrobbler
     #   - limit: An integer used to limit the number of tracks returned.
     def recent_tracks(parameters={})
       parameters.merge!({:user => @name})
-      call('user.getrecenttracks', :recenttracks, :track, parameters)
+      call('user.getrecenttracks', :recenttracks, Track, parameters)
     end
     
     # Get Last.fm artist recommendations for a user
@@ -135,24 +131,24 @@ module Scrobbler
     # Get the top albums listened to by a user. You can stipulate a time period. 
     # Sends the overall chart by default. 
     def top_albums(period=:overall)
-      call('user.gettopalbums', :topalbums, :album, {:user => @name, :period => period})
+      call('user.gettopalbums', :topalbums, Album, {:user => @name, :period => period})
     end
 
     # Get the top artists listened to by a user. You can stipulate a time 
     # period. Sends the overall chart by default. 
     def top_artists(period=:overall)
-      call('user.gettopartists', :topartists, :artist, {:user => @name, :period => period})
+      call('user.gettopartists', :topartists, Artist, {:user => @name, :period => period})
     end
 
     #  Get the top tags used by this user.
     def top_tags
-      call('user.gettoptags', :toptags, :tag, {:user => @name})
+      call('user.gettoptags', :toptags, Tag, {:user => @name})
     end
 
     # Get the top tracks listened to by a user. You can stipulate a time period. 
     # Sends the overall chart by default. 
     def top_tracks(period=:overall)
-      call('user.gettoptracks', :toptracks, :track, {:user => @name, :period => period})
+      call('user.gettoptracks', :toptracks, Track, {:user => @name, :period => period})
     end
 
     # Setup the parameters for a *chart API call

data/lib/scrobbler/venue.rb

@@ -45,8 +45,8 @@ module Scrobbler
         url[url.rindex('/')+1,url.length].to_i
       end
 
-      def search(venue, force=false)
-        get_response('venue.search', :venuematches, 'venuematches', 'venue', {'venue'=>venue}, force)
+      def search(venue)
+        call('venue.search', :venuematches, Venue, {:venue => venue})
       end
     end
 
@@ -56,12 +56,12 @@ module Scrobbler
       populate_data(data)
     end
 
-    def events(force=false)
-      get_response('venue.getevents', :events, 'events', 'event', {'venue'=>@id}, force)
+    def events
+      call('venue.getevents', :events, Event, {:venue => @id})
     end
 
-    def past_events(force=false)
-      get_response('venue.getpastevents', :events, 'events', 'event', {'venue'=>@id}, force)
+    def past_events
+      call('venue.getpastevents', :events, Event, {:venue => @id})
     end
   end
 end

data/tasks/jeweler.rake

@@ -5,16 +5,15 @@ begin
     s.summary = "A ruby library for accessing the last.fm v2 webservices"
     s.email = "uwelk@xhochy.org"
     s.homepage = "http://github.com/xhochy/scrobbler"
-    s.description = "A ruby library for accessing the last.fm v2 webservices"
+    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.authors = ['John Nunemaker', 'Jonathan Rudenberg', 'Uwe L. Korn']
     s.add_development_dependency "rspec", ">= 1.2.9"
     s.add_development_dependency "yard", ">= 0"
     s.add_development_dependency "fakeweb", ">= 0"
-    #if RUBY_PLATFORM =~ /\bjava\b/
-    #  s.add_dependency 'libxml-jruby'
-    #else
-    #  s.add_dependency 'libxml-ruby'
-    #end
+    s.add_dependency 'nokogiri'
+
+    s.files.exclude 'test/**/*'
   end
   Jeweler::GemcutterTasks.new
 rescue LoadError

data/tasks/tests.rake

@@ -1,5 +1,13 @@
 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
+
+Spec::Rake::SpecTask.new('test:rcov') do |t|
   begin
     require 'rcov'
     t.rcov = true
@@ -13,9 +21,3 @@ Spec::Rake::SpecTask.new('test:unit') do |t|
   t.spec_files = FileList['test/unit/*_spec.rb']
 end
 
-Spec::Rake::SpecTask.new(:rcov) do |spec|
-  spec.libs << 'lib' << 'spec'
-  spec.pattern = 'test/unit/*_spec.rb'
-  spec.rcov = true
-end
-

data/test/mocks/rest.rb

@@ -2,7 +2,7 @@
 
 require 'rubygems'
 require 'fakeweb'
-require File.expand_path('/../../lib/scrobbler/rest', File.dirname(__FILE__))
+require File.expand_path('../../lib/scrobbler/rest', File.dirname(__FILE__))
 
 FIXTURES_BASE = File.join([File.dirname(__FILE__), '..', 'fixtures', 'xml'])
 WEB_BASE = 'http://ws.audioscrobbler.com:80/2.0/?'

data/test/unit/tag_spec.rb

@@ -5,7 +5,7 @@ require File.dirname(__FILE__) + '/../spec_helper.rb'
 describe Scrobbler::Tag do
 
   before(:all) do 
-    @tag = Scrobbler::Tag.new('rock')
+    @tag = Scrobbler::Tag.new(:name => 'rock')
   end
   
   it 'should know its name' do

data/test/unit/venue_spec.rb

@@ -2,8 +2,9 @@ require File.dirname(__FILE__) + '/../spec_helper.rb'
 
 describe Scrobbler::Venue do
   before do
-    xml =  LibXML::XML::Document.file(File.dirname(__FILE__) + '/../fixtures/xml/venue/venue.xml')
-    @venue = Scrobbler::Venue.new_from_xml(xml.root)
+    f = File.read(File.dirname(__FILE__) + '/../fixtures/xml/venue/venue.xml')
+    doc = Nokogiri::XML(f)
+    @venue = Scrobbler::Venue.new_from_xml(doc.root)
     @event_ids = [875740, 950267, 1082373, 1059277]
     @event_titles =  ["Kilians", "Convention of the Universe - International Depeche Mode Fan Event", "The Get Up Kids", "Philipp Poisel"]
   end

metadata

@@ -1,12 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scrobbler-ng
 version: !ruby/object:Gem::Version 
+  hash: 11
   prerelease: false
   segments: 
   - 2
   - 0
-  - 1
-  version: 2.0.1
+  - 2
+  version: 2.0.2
 platform: ruby
 authors: 
 - John Nunemaker
@@ -16,16 +17,18 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-02 00:00:00 +02:00
+date: 2010-05-22 00:00:00 +02: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: 13
         segments: 
         - 1
         - 2
@@ -37,9 +40,11 @@ dependencies:
   name: yard
   prerelease: false
   requirement: &id002 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
@@ -49,15 +54,31 @@ dependencies:
   name: fakeweb
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
+    none: false
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
+        hash: 3
         segments: 
         - 0
         version: "0"
   type: :development
   version_requirements: *id003
-description: A ruby library for accessing the last.fm v2 webservices
+- !ruby/object:Gem::Dependency 
+  name: nokogiri
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  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.
 email: uwelk@xhochy.org
 executables: []
 
@@ -83,6 +104,7 @@ files:
 - lib/scrobbler/auth.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
@@ -92,7 +114,6 @@ files:
 - lib/scrobbler/playlist.rb
 - lib/scrobbler/radio.rb
 - lib/scrobbler/rest.rb
-- lib/scrobbler/scrobble.rb
 - lib/scrobbler/session.rb
 - lib/scrobbler/shout.rb
 - lib/scrobbler/simpleauth.rb
@@ -107,125 +128,24 @@ files:
 - tasks/roodi.rake
 - tasks/tests.rake
 - tasks/yardoc.rake
-- test/fixtures/xml/album/info.xml
-- test/fixtures/xml/artist/fans.xml
-- test/fixtures/xml/artist/info.xml
-- test/fixtures/xml/artist/similar.xml
-- test/fixtures/xml/artist/topalbums.xml
-- test/fixtures/xml/artist/toptags.xml
-- test/fixtures/xml/artist/toptracks.xml
-- test/fixtures/xml/auth/session.xml
-- test/fixtures/xml/auth/token.xml
-- test/fixtures/xml/event/attend.xml
-- test/fixtures/xml/event/attendees.xml
-- test/fixtures/xml/event/event.xml
-- test/fixtures/xml/event/shouts.xml
-- test/fixtures/xml/geo/events-distance-p1.xml
-- test/fixtures/xml/geo/events-lat-long.xml
-- test/fixtures/xml/geo/events-p1.xml
-- test/fixtures/xml/geo/events-p2.xml
-- test/fixtures/xml/geo/events-p3.xml
-- test/fixtures/xml/geo/top_artists-p1.xml
-- test/fixtures/xml/geo/top_tracks-p1.xml
-- test/fixtures/xml/library/albums-f30.xml
-- test/fixtures/xml/library/albums-p1.xml
-- test/fixtures/xml/library/albums-p2.xml
-- test/fixtures/xml/library/albums-p3.xml
-- test/fixtures/xml/library/albums-p4.xml
-- test/fixtures/xml/library/albums-p5.xml
-- test/fixtures/xml/library/albums-p6.xml
-- test/fixtures/xml/library/albums-p7.xml
-- test/fixtures/xml/library/albums-p8.xml
-- test/fixtures/xml/library/artists-f30.xml
-- test/fixtures/xml/library/artists-p1.xml
-- test/fixtures/xml/library/artists-p2.xml
-- test/fixtures/xml/library/artists-p3.xml
-- test/fixtures/xml/library/artists-p4.xml
-- test/fixtures/xml/library/artists-p5.xml
-- test/fixtures/xml/library/artists-p6.xml
-- test/fixtures/xml/library/artists-p7.xml
-- test/fixtures/xml/library/tracks-f30.xml
-- test/fixtures/xml/library/tracks-p1.xml
-- test/fixtures/xml/library/tracks-p10.xml
-- test/fixtures/xml/library/tracks-p11.xml
-- test/fixtures/xml/library/tracks-p12.xml
-- test/fixtures/xml/library/tracks-p13.xml
-- test/fixtures/xml/library/tracks-p14.xml
-- test/fixtures/xml/library/tracks-p15.xml
-- test/fixtures/xml/library/tracks-p16.xml
-- test/fixtures/xml/library/tracks-p17.xml
-- test/fixtures/xml/library/tracks-p18.xml
-- test/fixtures/xml/library/tracks-p19.xml
-- test/fixtures/xml/library/tracks-p2.xml
-- test/fixtures/xml/library/tracks-p20.xml
-- test/fixtures/xml/library/tracks-p21.xml
-- test/fixtures/xml/library/tracks-p22.xml
-- test/fixtures/xml/library/tracks-p23.xml
-- test/fixtures/xml/library/tracks-p24.xml
-- test/fixtures/xml/library/tracks-p25.xml
-- test/fixtures/xml/library/tracks-p26.xml
-- test/fixtures/xml/library/tracks-p27.xml
-- test/fixtures/xml/library/tracks-p28.xml
-- test/fixtures/xml/library/tracks-p29.xml
-- test/fixtures/xml/library/tracks-p3.xml
-- test/fixtures/xml/library/tracks-p30.xml
-- test/fixtures/xml/library/tracks-p31.xml
-- test/fixtures/xml/library/tracks-p32.xml
-- test/fixtures/xml/library/tracks-p33.xml
-- test/fixtures/xml/library/tracks-p34.xml
-- test/fixtures/xml/library/tracks-p4.xml
-- test/fixtures/xml/library/tracks-p5.xml
-- test/fixtures/xml/library/tracks-p6.xml
-- test/fixtures/xml/library/tracks-p7.xml
-- test/fixtures/xml/library/tracks-p8.xml
-- test/fixtures/xml/library/tracks-p9.xml
-- test/fixtures/xml/tag/similar.xml
-- test/fixtures/xml/tag/topalbums.xml
-- test/fixtures/xml/tag/topartists.xml
-- test/fixtures/xml/tag/toptags.xml
-- test/fixtures/xml/tag/toptracks.xml
-- test/fixtures/xml/track/fans.xml
-- test/fixtures/xml/track/info.xml
-- test/fixtures/xml/track/toptags.xml
-- test/fixtures/xml/user/events.xml
-- test/fixtures/xml/user/friends.xml
-- test/fixtures/xml/user/lovedtracks.xml
-- test/fixtures/xml/user/neighbours.xml
-- test/fixtures/xml/user/playlists.xml
-- test/fixtures/xml/user/profile.xml
-- test/fixtures/xml/user/recentbannedtracks.xml
-- test/fixtures/xml/user/recentlovedtracks.xml
-- test/fixtures/xml/user/recenttracks.xml
-- test/fixtures/xml/user/systemrecs.xml
-- test/fixtures/xml/user/topalbums.xml
-- test/fixtures/xml/user/topartists.xml
-- test/fixtures/xml/user/toptags.xml
-- test/fixtures/xml/user/toptracks.xml
-- test/fixtures/xml/user/weeklyalbumchart.xml
-- test/fixtures/xml/user/weeklyartistchart.xml
-- test/fixtures/xml/user/weeklytrackchart.xml
-- test/fixtures/xml/venue/events.xml
-- test/fixtures/xml/venue/venue.xml
-- test/mocks/library.rb
-- test/mocks/rest.rb
 - test/spec_helper.rb
-- test/test_helper.rb
+- test/unit/library_spec.rb
 - test/unit/album_spec.rb
-- test/unit/artist_spec.rb
-- test/unit/auth_spec.rb
-- test/unit/event_spec.rb
 - test/unit/geo_spec.rb
-- test/unit/library_spec.rb
-- test/unit/playing_test.rb
-- test/unit/playlist_spec.rb
-- test/unit/radio_spec.rb
-- test/unit/scrobble_spec.rb
-- test/unit/scrobble_test.rb
+- test/unit/track_spec.rb
 - test/unit/simpleauth_test.rb
+- test/unit/auth_spec.rb
 - test/unit/tag_spec.rb
-- test/unit/track_spec.rb
 - test/unit/user_spec.rb
+- test/unit/event_spec.rb
+- test/unit/radio_spec.rb
 - test/unit/venue_spec.rb
+- test/unit/playlist_spec.rb
+- test/unit/artist_spec.rb
+- test/unit/playing_test.rb
+- test/mocks/library.rb
+- test/mocks/rest.rb
+- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/xhochy/scrobbler
 licenses: []
@@ -236,50 +156,52 @@ 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.3.7
 signing_key: 
 specification_version: 3
 summary: A ruby library for accessing the last.fm v2 webservices
 test_files: 
+- test/spec_helper.rb
+- test/unit/library_spec.rb
+- test/unit/album_spec.rb
 - test/unit/geo_spec.rb
-- test/unit/playing_test.rb
-- test/unit/radio_spec.rb
-- test/unit/scrobble_test.rb
 - test/unit/track_spec.rb
-- test/unit/event_spec.rb
-- test/unit/album_spec.rb
-- test/unit/scrobble_spec.rb
-- test/unit/library_spec.rb
 - test/unit/simpleauth_test.rb
-- test/unit/user_spec.rb
+- test/unit/auth_spec.rb
 - test/unit/tag_spec.rb
+- test/unit/user_spec.rb
+- test/unit/event_spec.rb
+- test/unit/radio_spec.rb
 - test/unit/venue_spec.rb
-- test/unit/auth_spec.rb
-- test/unit/artist_spec.rb
 - test/unit/playlist_spec.rb
-- test/test_helper.rb
-- test/spec_helper.rb
-- test/mocks/rest.rb
+- test/unit/artist_spec.rb
+- test/unit/playing_test.rb
 - test/mocks/library.rb
-- examples/track.rb
+- test/mocks/rest.rb
+- test/test_helper.rb
 - examples/artist.rb
-- examples/scrobble.rb
+- examples/tag.rb
 - examples/user.rb
+- examples/track.rb
+- examples/scrobble.rb
 - examples/album.rb
-- examples/tag.rb