scrobbler 0.2.1 → 0.2.2

data/History.txt

@@ -1,2 +1,3 @@
+* v 0.2.2: a bunch of changes from titanous, mostly refactoring
 * v 0.2.0: added support for scrobbling tracks and now playing submission (Titanous)
 * v 0.1.0: initial release

data/Manifest

@@ -21,7 +21,7 @@ lib/scrobbler.rb
 Manifest
 MIT-LICENSE
 Rakefile
-README.txt
+README.rdoc
 scrobbler.gemspec
 setup.rb
 test/fixtures/xml/album/info.xml
@@ -59,8 +59,9 @@ test/test_helper.rb
 test/unit/album_test.rb
 test/unit/artist_test.rb
 test/unit/chart_test.rb
+test/unit/playing_test.rb
+test/unit/scrobble_test.rb
+test/unit/simpleauth_test.rb
 test/unit/tag_test.rb
 test/unit/track_test.rb
 test/unit/user_test.rb
-website/css/common.css
-website/index.html

data/Rakefile

@@ -7,13 +7,14 @@ require 'lib/scrobbler/version'
 WEBSITE_PATH = 'jnunemaker@rubyforge.org:/var/www/gforge-projects/scrobbler'
 
 Echoe.new('scrobbler', Scrobbler::Version) do |p|
-  p.description = "wrapper for audioscrobbler (last.fm) web services"
-  p.url         = "http://scrobbler.rubyforge.org"
-  p.author      = "John Nunemaker"
-  p.email       = "nunemaker@gmail.com"
-  p.extra_deps  = [['hpricot', '>=0.4.86'], ['activesupport', '>=1.4.2']]
-  p.need_tar_gz = false
-  p.docs_host   = WEBSITE_PATH
+  p.description     = "wrapper for audioscrobbler (last.fm) web services"
+  p.url             = "http://scrobbler.rubyforge.org"
+  p.author          = ['John Nunemaker', 'Jonathan Rudenberg']
+  p.email           = "nunemaker@gmail.com"
+  p.extra_deps      = [['hpricot', '>=0.4.86'], ['activesupport', '>=1.4.2']]
+  p.need_tar_gz     = false
+  p.docs_host       = WEBSITE_PATH
+  p.ignore_pattern  = /website/
 end
 
 desc 'Upload website files to rubyforge'

data/examples/scrobble.rb

@@ -12,7 +12,7 @@ scrobble = Scrobbler::Scrobble.new(:session_id => auth.session_id,
                                    :submission_url => auth.submission_url,
                                    :artist => 'Coldplay',
                                    :track => 'Viva La Vida',
-                                   :album => "Viva La Vida",
+                                   :album => 'Viva La Vida',
                                    :time => Time.new,
                                    :length => 244,
                                    :track_number => 7)

data/lib/scrobbler/playing.rb

@@ -16,7 +16,7 @@ module Scrobbler
       @track_number = args[:track_number] || '' # track number (optional)
       @mb_track_id = args[:mb_track_id] || '' # MusicBrainz track ID (optional)
 
-      if [@session_id, @now_playing_url, @artist, @track].any?(&:empty?)
+      if [@session_id, @now_playing_url, @artist, @track].any?(&:blank?)
         raise ArgumentError, 'Missing required argument'
       elsif !@length.to_s.empty? && @length.to_i <= 30 # see last.fm/api
         raise ArgumentError, 'Length must be greater than 30 seconds'

data/lib/scrobbler/scrobble.rb

@@ -22,15 +22,15 @@ module Scrobbler
       @track_number = args[:track_number] || '' # track number (optional)
       @mb_track_id = args[:mb_track_id] || '' # MusicBrainz track ID (optional)
 
-      if [@session_id, @submission_url, @artist, @track].any?(&:empty?)
+      if [@session_id, @submission_url, @artist, @track].any?(&:blank?)
         raise ArgumentError, 'Missing required argument'
       elsif @time.class.to_s != 'Time'
         raise ArgumentError, ":time must be a Time object"
       elsif !['P','R','E','U'].include?(@source) # see last.fm/api/submissions#subs
         raise ArgumentError, "Invalid source"
-      elsif @source == 'P' && @length.empty? # length is not optional if source is P
+      elsif @source == 'P' && @length.blank? # length is not optional if source is P
         raise ArgumentError, 'Length must be set'
-      elsif !@length.empty? && @length.to_i <= 30 # see last.fm/api/submissions#subs
+      elsif !@length.blank? && @length.to_i <= 30 # see last.fm/api/submissions#subs
         raise ArgumentError, 'Length must be greater than 30 seconds'
       end
 
@@ -43,7 +43,7 @@ module Scrobbler
                 't[0]' => @track,
                 'i[0]' => @time.utc.to_i,
                 'o[0]' => @source,
-                'r[0]' => @rating,
+                'r[0]' => '',
                 'l[0]' => @length,
                 'b[0]' => @album,
                 'n[0]' => @track_number,

data/lib/scrobbler/simpleauth.rb

@@ -40,7 +40,7 @@ module Scrobbler
       result = @connection.get('/', query)
 
       @status = result.split(/\n/)[0]
-      case @status 
+      case @status
       when /OK/
         @session_id, @now_playing_url, @submission_url = result.split(/\n/)[1,3]
       when /BANNED/

data/lib/scrobbler/version.rb

@@ -1,3 +1,3 @@
 module Scrobbler
-  Version = '0.2.1'
+  Version = '0.2.2'
 end

data/scrobbler.gemspec

@@ -2,23 +2,23 @@
 
 Gem::Specification.new do |s|
   s.name = %q{scrobbler}
-  s.version = "0.2.1"
+  s.version = "0.2.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 1.2") if s.respond_to? :required_rubygems_version=
-  s.authors = ["John Nunemaker"]
-  s.date = %q{2008-12-03}
+  s.authors = ["John Nunemaker, Jonathan Rudenberg"]
+  s.date = %q{2008-12-23}
   s.description = %q{wrapper for audioscrobbler (last.fm) web services}
   s.email = %q{nunemaker@gmail.com}
-  s.extra_rdoc_files = ["lib/scrobbler/album.rb", "lib/scrobbler/artist.rb", "lib/scrobbler/base.rb", "lib/scrobbler/chart.rb", "lib/scrobbler/playing.rb", "lib/scrobbler/rest.rb", "lib/scrobbler/scrobble.rb", "lib/scrobbler/simpleauth.rb", "lib/scrobbler/tag.rb", "lib/scrobbler/track.rb", "lib/scrobbler/user.rb", "lib/scrobbler/version.rb", "lib/scrobbler.rb", "README.txt"]
-  s.files = ["examples/album.rb", "examples/artist.rb", "examples/scrobble.rb", "examples/tag.rb", "examples/track.rb", "examples/user.rb", "History.txt", "lib/scrobbler/album.rb", "lib/scrobbler/artist.rb", "lib/scrobbler/base.rb", "lib/scrobbler/chart.rb", "lib/scrobbler/playing.rb", "lib/scrobbler/rest.rb", "lib/scrobbler/scrobble.rb", "lib/scrobbler/simpleauth.rb", "lib/scrobbler/tag.rb", "lib/scrobbler/track.rb", "lib/scrobbler/user.rb", "lib/scrobbler/version.rb", "lib/scrobbler.rb", "Manifest", "MIT-LICENSE", "Rakefile", "README.txt", "scrobbler.gemspec", "setup.rb", "test/fixtures/xml/album/info.xml", "test/fixtures/xml/artist/fans.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/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/toptags.xml", "test/fixtures/xml/user/friends.xml", "test/fixtures/xml/user/neighbours.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/weeklyalbumchart_from_1138536002_to_1139140802.xml", "test/fixtures/xml/user/weeklyartistchart.xml", "test/fixtures/xml/user/weeklyartistchart_from_1138536002_to_1139140802.xml", "test/fixtures/xml/user/weeklychartlist.xml", "test/fixtures/xml/user/weeklytrackchart.xml", "test/fixtures/xml/user/weeklytrackchart_from_1138536002_to_1139140802.xml", "test/mocks/rest.rb", "test/test_helper.rb", "test/unit/album_test.rb", "test/unit/artist_test.rb", "test/unit/chart_test.rb", "test/unit/tag_test.rb", "test/unit/track_test.rb", "test/unit/user_test.rb", "website/css/common.css", "website/index.html"]
+  s.extra_rdoc_files = ["lib/scrobbler/album.rb", "lib/scrobbler/artist.rb", "lib/scrobbler/base.rb", "lib/scrobbler/chart.rb", "lib/scrobbler/playing.rb", "lib/scrobbler/rest.rb", "lib/scrobbler/scrobble.rb", "lib/scrobbler/simpleauth.rb", "lib/scrobbler/tag.rb", "lib/scrobbler/track.rb", "lib/scrobbler/user.rb", "lib/scrobbler/version.rb", "lib/scrobbler.rb", "README.rdoc"]
+  s.files = ["examples/album.rb", "examples/artist.rb", "examples/scrobble.rb", "examples/tag.rb", "examples/track.rb", "examples/user.rb", "History.txt", "lib/scrobbler/album.rb", "lib/scrobbler/artist.rb", "lib/scrobbler/base.rb", "lib/scrobbler/chart.rb", "lib/scrobbler/playing.rb", "lib/scrobbler/rest.rb", "lib/scrobbler/scrobble.rb", "lib/scrobbler/simpleauth.rb", "lib/scrobbler/tag.rb", "lib/scrobbler/track.rb", "lib/scrobbler/user.rb", "lib/scrobbler/version.rb", "lib/scrobbler.rb", "Manifest", "MIT-LICENSE", "Rakefile", "README.rdoc", "scrobbler.gemspec", "setup.rb", "test/fixtures/xml/album/info.xml", "test/fixtures/xml/artist/fans.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/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/toptags.xml", "test/fixtures/xml/user/friends.xml", "test/fixtures/xml/user/neighbours.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/weeklyalbumchart_from_1138536002_to_1139140802.xml", "test/fixtures/xml/user/weeklyartistchart.xml", "test/fixtures/xml/user/weeklyartistchart_from_1138536002_to_1139140802.xml", "test/fixtures/xml/user/weeklychartlist.xml", "test/fixtures/xml/user/weeklytrackchart.xml", "test/fixtures/xml/user/weeklytrackchart_from_1138536002_to_1139140802.xml", "test/mocks/rest.rb", "test/test_helper.rb", "test/unit/album_test.rb", "test/unit/artist_test.rb", "test/unit/chart_test.rb", "test/unit/playing_test.rb", "test/unit/scrobble_test.rb", "test/unit/simpleauth_test.rb", "test/unit/tag_test.rb", "test/unit/track_test.rb", "test/unit/user_test.rb"]
   s.has_rdoc = true
   s.homepage = %q{http://scrobbler.rubyforge.org}
-  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Scrobbler", "--main", "README.txt"]
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Scrobbler", "--main", "README.rdoc"]
   s.require_paths = ["lib"]
   s.rubyforge_project = %q{scrobbler}
   s.rubygems_version = %q{1.3.1}
   s.summary = %q{wrapper for audioscrobbler (last.fm) web services}
-  s.test_files = ["test/test_helper.rb", "test/unit/album_test.rb", "test/unit/artist_test.rb", "test/unit/chart_test.rb", "test/unit/tag_test.rb", "test/unit/track_test.rb", "test/unit/user_test.rb"]
+  s.test_files = ["test/test_helper.rb", "test/unit/album_test.rb", "test/unit/artist_test.rb", "test/unit/chart_test.rb", "test/unit/playing_test.rb", "test/unit/scrobble_test.rb", "test/unit/simpleauth_test.rb", "test/unit/tag_test.rb", "test/unit/track_test.rb", "test/unit/user_test.rb"]
 
   if s.respond_to? :specification_version then
     current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION

data/test/mocks/rest.rb

@@ -1,25 +1,49 @@
 require File.dirname(__FILE__) + '/../../lib/scrobbler/rest'
+require 'digest/md5'
 
 module Scrobbler
   module REST
   	class Connection
   	  # reads xml fixture file instead of hitting up the internets
   	  def request(resource, method = "get", args = nil)
-  	    pieces = resource.split('/')
-  	    pieces.shift
-  	    pieces.shift
-  	    folder = pieces.shift
-  	    file   = pieces.last[0, pieces.last.index('.xml')]
-  	    base_pieces = pieces.last.split('?')
+  	    @now_playing_url = 'http://62.216.251.203:80/nowplaying'
+  	    @submission_url = 'http://62.216.251.205:80/protocol_1.2'
+  	    @session_id = '17E61E13454CDD8B68E8D7DEEEDF6170'
   	    
-  	    file = if base_pieces.size > 1
-  	      # if query string params are in resource they are underscore separated for filenames
-  	      base_pieces.last.split('&').inject("#{file}_") { |str, pair| str << pair.split('=').join('_') + '_'; str }.chop!
-	      else
-	        file
-        end
+  	    if @base_url == Scrobbler::API_URL
+    	    pieces = resource.split('/')
+    	    pieces.shift
+    	    pieces.shift
+    	    folder = pieces.shift
+    	    file   = pieces.last[0, pieces.last.index('.xml')]
+    	    base_pieces = pieces.last.split('?')
   	    
-  	    File.read(File.dirname(__FILE__) + "/../fixtures/xml/#{folder}/#{file}.xml")
+    	    file = if base_pieces.size > 1
+    	      # if query string params are in resource they are underscore separated for filenames
+    	      base_pieces.last.split('&').inject("#{file}_") { |str, pair| str << pair.split('=').join('_') + '_'; str }.chop!
+  	      else
+  	        file
+          end
+  	    
+    	    File.read(File.dirname(__FILE__) + "/../fixtures/xml/#{folder}/#{file}.xml")
+  	    elsif @base_url == Scrobbler::AUTH_URL
+          if args[:hs] == "true" && args[:p] == Scrobbler::AUTH_VER.to_s && args[:c] == 'rbs' &&
+             args[:v] == Scrobbler::Version.to_s && args[:u] == 'chunky' && !args[:t].blank? &&
+             args[:a] == Digest::MD5.hexdigest('7813258ef8c6b632dde8cc80f6bda62f' + args[:t])
+            
+            "OK\n#{@session_id}\n#{@now_playing_url}\n#{@submission_url}"
+          end
+        elsif @base_url == @now_playing_url
+          if args[:s] == @session_id && ![args[:a], args[:t], args[:b], args[:n]].any?(&:blank?)
+             'OK'
+          end           
+        elsif @base_url == @submission_url
+          if args[:s] == @session_id && 
+             ![args['a[0]'], args['t[0]'], args['i[0]'], args['o[0]'], args['l[0]'], args['b[0]']].any?(&:blank?)
+            'OK'
+          end
+	      end
+	      
 	    end
 	  end
   end

data/test/unit/playing_test.rb

@@ -0,0 +1,53 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+
+class TestPlaying < Test::Unit::TestCase
+  
+  def setup
+    @session_id = '17E61E13454CDD8B68E8D7DEEEDF6170'
+    @now_playing_url = 'http://62.216.251.203:80/nowplaying'
+    @artist = 'Anberlin'
+    @track = 'A Day Late'
+    @album = 'Never Take Friendship Personal'
+    
+    @playing = Scrobbler::Playing.new(:session_id => @session_id, :now_playing_url => @now_playing_url,
+                                      :artist => @artist, :track => @track, :album => @album, :length => 214,
+                                      :track_number => 5)
+  end
+  
+  test 'should require a session id' do
+    assert_raises(ArgumentError) { Scrobbler::Playing.new(
+                                      :now_playing_url => @now_playing_url, :artist => @artist, :track => @track,
+                                      :album => @album, :length => 214, :track_number => 5) }
+  end
+  
+  test 'should require a now playing url' do
+    assert_raises(ArgumentError) { Scrobbler::Playing.new(
+                                      :session_id => @session_id, :artist => @artist, :track => @track,
+                                      :album => @album, :length => 214, :track_number => 5) }
+  end
+  
+  test 'should require an artist' do
+    assert_raises(ArgumentError) { Scrobbler::Playing.new(
+                                      :session_id => @session_id, :now_playing_url => @now_playing_url,
+                                      :track => @track, :album => @album, :length => 214, :track_number => 5) }
+  end
+  
+  test 'should require a track' do
+    assert_raises(ArgumentError) { Scrobbler::Playing.new(
+                                      :session_id => @session_id, :now_playing_url => @now_playing_url,
+                                      :artist => @artist, :album => @album, :length => 214, :track_number => 5) }
+  end
+  
+  test 'should require a length greater than 30 seconds' do
+    assert_raises(ArgumentError) { Scrobbler::Playing.new(
+                                      :session_id => @session_id, :now_playing_url => @now_playing_url,
+                                      :artist => @artist, :track => @track, :album => @album, :length => 29,
+                                      :track_number => 5) }
+  end
+  
+  test 'should submit successfully' do
+    @playing.submit!
+    assert_equal('OK', @playing.status)
+  end
+  
+end

data/test/unit/scrobble_test.rb

@@ -0,0 +1,69 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+
+class TestScrobble < Test::Unit::TestCase
+  
+  def setup
+    @session_id = '17E61E13454CDD8B68E8D7DEEEDF6170'
+    @submission_url = 'http://62.216.251.205:80/protocol_1.2'
+    @artist = 'Coldplay'
+    @name = 'Viva La Vida'
+    
+    @scrobble = Scrobbler::Scrobble.new(:session_id => @session_id, :submission_url => @submission_url,
+                                        :artist => @artist, :track => @name, :album => @name, :time => Time.new,
+                                        :length => 244, :track_number => 7)
+  end
+  
+  test 'should require a session id' do
+    assert_raises(ArgumentError) { Scrobbler::Scrobble.new(:submission_url => @submission_url,
+                                        :artist => @artist, :track => @name, :album => @name, :time => Time.new,
+                                        :length => 244, :track_number => 7) }
+  end
+  
+  test 'should require a submission url' do
+    assert_raises(ArgumentError) { Scrobbler::Scrobble.new(:session_id => @session_id,
+                                        :artist => @artist, :track => @name, :album => @name, :time => Time.new,
+                                        :length => 244, :track_number => 7) }
+  end
+  
+  test 'should require an artist' do
+    assert_raises(ArgumentError) { Scrobbler::Scrobble.new(:session_id => @session_id, :submission_url => @submission_url,
+                                        :track => @name, :album => @name, :time => Time.new,
+                                        :length => 244, :track_number => 7) }
+  end
+  
+  test 'should require a track' do
+    assert_raises(ArgumentError) { Scrobbler::Scrobble.new(:session_id => @session_id, :submission_url => @submission_url,
+                                        :artist => @artist, :album => @name, :time => Time.new,
+                                        :length => 244, :track_number => 7) }
+  end
+  
+  test 'should require a Time object' do
+    assert_raises(ArgumentError) { Scrobbler::Scrobble.new(:session_id => @session_id, :submission_url => @submission_url,
+                                        :artist => @artist, :track => @name, :album => @name, :time => 'chunky_bacon',
+                                        :length => 244, :track_number => 7) }
+  end
+  
+  test 'should require a valid source' do
+    assert_raises(ArgumentError) { Scrobbler::Scrobble.new(:session_id => @session_id, :submission_url => @submission_url,
+                                        :artist => @artist, :track => @name, :album => @name, :time => Time.new,
+                                        :length => 244, :track_number => 7, :source => 'Z') }
+  end
+  
+  test 'should require a length if source is set to P' do
+    assert_raises(ArgumentError) { Scrobbler::Scrobble.new(:session_id => @session_id, :submission_url => @submission_url,
+                                        :artist => @artist, :track => @name, :album => @name, :time => Time.new,
+                                        :track_number => 7, :source => 'P') }
+  end
+  
+  test 'should require a length greater than 30 if source is set to P' do
+    assert_raises(ArgumentError) { Scrobbler::Scrobble.new(:session_id => @session_id, :submission_url => @submission_url,
+                                        :artist => @artist, :track => @name, :album => @name, :time => Time.new,
+                                        :length => 29, :track_number => 7, :source => 'P') }
+  end
+  
+  test 'should submit successfully' do
+    @scrobble.submit!
+    assert_equal('OK', @scrobble.status)
+  end
+  
+end

data/test/unit/simpleauth_test.rb

@@ -0,0 +1,45 @@
+require File.dirname(__FILE__) + '/../test_helper.rb'
+
+class TestSimpleAuth < Test::Unit::TestCase
+  
+  def setup
+    @auth = Scrobbler::SimpleAuth.new(:user => 'chunky', :password => 'bacon')
+  end
+  
+  test 'should require a user' do
+    assert_raises(ArgumentError) { Scrobbler::SimpleAuth.new(:password => 'bacon') }
+  end
+  
+  test 'should require a password' do
+    assert_raises(ArgumentError) { Scrobbler::SimpleAuth.new(:user => 'chunky') }
+  end
+  
+  test 'should have the right client id' do
+    assert_equal('rbs', @auth.client_id)
+  end
+  
+  test 'should have the right version' do
+    assert_equal(Scrobbler::Version, @auth.client_ver)
+  end
+  
+  test 'should handshake successfully' do
+    @auth.handshake!
+    assert_equal('OK', @auth.status)
+  end
+  
+  test 'should get a session id' do
+    @auth.handshake!
+    assert_equal('17E61E13454CDD8B68E8D7DEEEDF6170', @auth.session_id)
+  end
+  
+  test 'should get a now playing url' do
+    @auth.handshake!
+    assert_equal('http://62.216.251.203:80/nowplaying', @auth.now_playing_url)
+  end
+  
+  test 'should get a submission url' do
+    @auth.handshake!
+    assert_equal('http://62.216.251.205:80/protocol_1.2', @auth.submission_url)
+  end
+  
+end

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification 
 name: scrobbler
 version: !ruby/object:Gem::Version 
-  version: 0.2.1
+  version: 0.2.2
 platform: ruby
 authors: 
-- John Nunemaker
+- John Nunemaker, Jonathan Rudenberg
 autorequire: 
 bindir: bin
 cert_chain: []
 
-date: 2008-12-03 00:00:00 -05:00
+date: 2008-12-23 00:00:00 -05:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -62,7 +62,7 @@ extra_rdoc_files:
 - lib/scrobbler/user.rb
 - lib/scrobbler/version.rb
 - lib/scrobbler.rb
-- README.txt
+- README.rdoc
 files: 
 - examples/album.rb
 - examples/artist.rb
@@ -87,7 +87,7 @@ files:
 - Manifest
 - MIT-LICENSE
 - Rakefile
-- README.txt
+- README.rdoc
 - scrobbler.gemspec
 - setup.rb
 - test/fixtures/xml/album/info.xml
@@ -125,11 +125,12 @@ files:
 - test/unit/album_test.rb
 - test/unit/artist_test.rb
 - test/unit/chart_test.rb
+- test/unit/playing_test.rb
+- test/unit/scrobble_test.rb
+- test/unit/simpleauth_test.rb
 - test/unit/tag_test.rb
 - test/unit/track_test.rb
 - test/unit/user_test.rb
-- website/css/common.css
-- website/index.html
 has_rdoc: true
 homepage: http://scrobbler.rubyforge.org
 post_install_message: 
@@ -139,7 +140,7 @@ rdoc_options:
 - --title
 - Scrobbler
 - --main
-- README.txt
+- README.rdoc
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
@@ -166,6 +167,9 @@ test_files:
 - test/unit/album_test.rb
 - test/unit/artist_test.rb
 - test/unit/chart_test.rb
+- test/unit/playing_test.rb
+- test/unit/scrobble_test.rb
+- test/unit/simpleauth_test.rb
 - test/unit/tag_test.rb
 - test/unit/track_test.rb
 - test/unit/user_test.rb

data/website/css/common.css

@@ -1,47 +0,0 @@
-@media screen, projection {
-	/*
-	Copyright (c) 2007, Yahoo! Inc. All rights reserved.
-	Code licensed under the BSD License:
-	http://developer.yahoo.net/yui/license.txt
-	version: 2.2.0
-	*/
-	body {font:13px arial,helvetica,clean,sans-serif;*font-size:small;*font:x-small;}table {font-size:inherit;font:100%;}select, input, textarea {font:99% arial,helvetica,clean,sans-serif;}pre, code {font:115% monospace;*font-size:100%;}body * {line-height:1.22em;}
-	body,div,dl,dt,dd,ul,ol,li,h1,h2,h3,h4,h5,h6,pre,form,fieldset,input,textarea,p,blockquote,th,td{margin:0;padding:0;}table{border-collapse:collapse;border-spacing:0;}fieldset,img{border:0;}address,caption,cite,code,dfn,em,strong,th,var{font-style:normal;font-weight:normal;}/*ol,ul {list-style:none;}*/caption,th {text-align:left;}h1,h2,h3,h4,h5,h6{font-size:100%;font-weight:normal;}q:before,q:after{content:'';}abbr,acronym {border:0;}
-	/* end of yahoo reset and fonts */
-	
-	body 										{color:#333; background:#4b1a1a; line-height:1.3;}
-	p												{margin:0 0 20px;}
-	a												{color:#4b1a1a;}
-	a:hover									{text-decoration:none;}
-	strong									{font-weight:bold;}
-	em											{font-style:italics;}
-	h1,h2,h3,h4,h5,h6				{font-weight:bold;}
-	h1											{font-size:197%; margin:30px 0; color:#4b1a1a;}
-	h2											{font-size:174%; margin:20px 0; color:#b8111a;}
-	h3											{font-size:152%; margin:10px 0;}
-	h4											{font-size:129%; margin:10px 0;}
-	pre 										{background:#eee; padding:20px; border:1px solid #ccc; font-size:100%; overflow:auto;}
-	code										{font-size:100%; margin:0; padding:0;}
-	ul, ol									{margin:10px 0 10px 25px;}
-	ol li										{margin:0 0 10px;}
-
-
-
-
-
-	div#wrapper 							{background:#fff; width:560px; margin:0 auto; padding:20px; border:10px solid #bc8c46; border-width:0 10px;}
-	div#header								{position:relative; border-bottom:1px dotted; margin:0 0 10px; padding:0 0 10px;}
-	div#header p							{margin:0; padding:0;}
-	div#header h1							{margin:0; padding:0;}
-	ul#nav										{position:absolute; top:0; right:0; list-style:none; margin:0; padding:0;}
-	ul#nav li									{display:inline; padding:0 0 0 5px;}
-	ul#nav li a								{}
-	div#content								{}
-	div#footer								{margin:40px 0 0; border-top:1px dotted; padding:10px 0 0;}
-
-
-
-
-
-
-}

data/website/index.html

@@ -1,113 +0,0 @@
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-	<meta http-equiv="Content-Type" content="text/html; charset=utf-8"/>
-	<title>Scrobbler by John Nunemaker</title>
-	<link rel="stylesheet" href="css/common.css" type="text/css" />
-</head>
-<body>
-
-<div id="wrapper">
-	<div id="header">
-		<h1>Scrobbler</h1>
-		<p>Get your music on.</p>
-		
-		<ul id="nav">
-			<li><a href="docs/">Docs</a></li>
-			<li><a href="http://rubyforge.org/projects/scrobbler/">Rubyforge Page</a></li>
-		</ul>
-	</div>
-	
-	<div id="content">
-		<p>Scrobbler is a wrapper for the <a href="http://www.audioscrobbler.net/data/webservices/">audioscrobbler (last.fm) web services</a>.</p>
-		
-		<h2>Installation</h2>
-		
-		<pre><code>$ sudo gem install scrobbler</code></pre>
-		
-		<h2>Usage</h2>
-		
-		<p>Below is just a sampling of how easy this lib is to use.</p>
-
-		<h3>Users</h3>
-
-			<pre><code class="ruby">user = Scrobbler::User.new('jnunemaker')
-
-puts "#{user.username}'s Recent Tracks"
-puts "=" * (user.username.length + 16)
-user.recent_tracks.each { |t| puts t.name }
-
-puts
-puts
-
-puts "#{user.username}'s Top Tracks"
-puts "=" * (user.username.length + 13)
-user.top_tracks.each { |t| puts "(#{t.playcount}) #{t.name}" }</code></pre>
-
-		<h3>Albums</h3>
-
-			<pre><code class="ruby">album = Scrobbler::Album.new('Carrie Underwood', 'Some Hearts', :include_info => true)
-
-puts "Album: #{album.name}"
-puts "Artist: #{album.artist}"
-puts "Reach: #{album.reach}"
-puts "URL: #{album.url}"
-puts "Release Date: #{album.release_date.strftime('%m/%d/%Y')}"
-
-puts
-puts
-
-puts "Tracks"
-longest_track_name = album.tracks.collect(&:name).sort { |x, y| y.length <=> x.length }.first.length
-puts "=" * longest_track_name
-album.tracks.each { |t| puts t.name }</code></pre>
-
-		<h3>Artists</h3>
-
-			<pre><code class="ruby">artist = Scrobbler::Artist.new('Carrie Underwood')
-
-puts 'Top Tracks'
-puts "=" * 10
-artist.top_tracks.each { |t| puts "(#{t.reach}) #{t.name}" }
-
-puts
-
-puts 'Similar Artists'
-puts "=" * 15
-artist.similar.each { |a| puts "(#{a.match}%) #{a.name}" }</code></pre>
-
-		<h3>Tags</h3>
-
-			<pre><code class="ruby">tag = Scrobbler::Tag.new('country')
-
-puts 'Top Albums'
-tag.top_albums.each { |a| puts "(#{a.count}) #{a.name} by #{a.artist}" }
-
-puts
-
-puts 'Top Tracks'
-tag.top_tracks.each { |t| puts "(#{t.count}) #{t.name} by #{t.artist}" }</code></pre>
-
-		<h3>Tracks</h3>
-
-			<pre><code class="ruby">track = Scrobbler::Track.new('Carrie Underwood', 'Before He Cheats')
-puts 'Fans'
-puts "=" * 4
-track.fans.each { |u| puts "(#{u.weight}) #{u.username}" }</code></pre>
-	</div>
-
-	<div id="footer">
-		<p>Created by <a href="http://addictedtonew.com/about/">John Nunemaker</a></p>
-	</div>
-
-</div>
-
-<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"></script>
-<script type="text/javascript">_uacct = "UA-85301-11"; urchinTracker();</script>
-
-<!-- 103bees.com 'bee' code v1.11 - please do not make any changes! -->
-<script type="text/javascript" src="http://103bees.com/bees/?bee=3672&amp;fid=6687"></script>
-<!-- 103bees.com 'bee' code -->
-
-</body>
-</html>