scrobbler 0.1.1 → 0.2.0

data/History.txt

@@ -1 +1,2 @@
+* v 0.2.0: added support for scrobbling tracks and now playing submission (Titanous)
 * v 0.1.0: initial release

data/MIT-LICENSE

@@ -0,0 +1,19 @@
+Copyright (c) 2007 John Nunemaker
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in
+all copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+THE SOFTWARE.

data/{Manifest.txt → Manifest}

@@ -1,24 +1,28 @@
-History.txt
-Manifest.txt
-README.txt
-Rakefile
-setup.rb
 examples/album.rb
 examples/artist.rb
+examples/scrobble.rb
 examples/tag.rb
 examples/track.rb
 examples/user.rb
-lib/scrobbler.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
-test/test_helper.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
@@ -50,9 +54,12 @@ 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
+test/unit/user_test.rb
+website/css/common.css
+website/index.html

data/README.txt

@@ -68,4 +68,40 @@ Below is just a sampling of how easy this lib is to use.
 	track = Scrobbler::Track.new('Carrie Underwood', 'Before He Cheats')
 	puts 'Fans'
 	puts "=" * 4
-	track.fans.each { |u| puts "(#{u.weight}) #{u.username}" }
+	track.fans.each { |u| puts "(#{u.weight}) #{u.username}" }
+	
+== Simple Authentication (for Scrobbling)
+
+    auth = Scrobbler::SimpleAuth.new(:user => 'chunky', :password => 'bacon')
+    auth.handshake!
+
+    puts "Auth Status: #{auth.status}"
+    puts "Session ID: #{auth.session_id}"
+    puts "Now Playing URL: #{auth.now_playing_url}"
+    puts "Submission URL: #{auth.submission_url}"
+
+== Scrobbling
+
+    scrobble = Scrobbler::Scrobble.new(:session_id => auth.session_id,
+                                       :submission_url => auth.submission_url,
+                                       :artist => 'Coldplay',
+                                       :track => 'Viva La Vida',
+                                       :album => "Viva La Vida",
+                                       :time => Time.new,
+                                       :length => 244,
+                                       :track_number => 7)
+    scrobble.submit!
+    puts "Scrobbler Submission Status: #{scrobble.status}"
+
+== Now Playing Submission
+
+    playing = Scrobbler::Playing.new(:session_id => auth.session_id,
+                                     :now_playing_url => auth.now_playing_url,
+                                     :artist => 'Anberlin',
+                                     :track => 'Readyfuels',
+                                     :album => 'Blueprints For the Black Market',
+                                     :length => 218,
+                                     :track_number => 1)
+
+    playing.submit!         
+    puts "Playing Submission Status: #{playing.status}"

data/Rakefile

@@ -1,56 +1,15 @@
+# Rakefile
 require 'rubygems'
 require 'rake'
-require 'rake/clean'
-require 'rake/testtask'
-require 'rake/packagetask'
-require 'rake/gempackagetask'
-require 'rake/rdoctask'
-require 'rake/contrib/rubyforgepublisher'
-require 'fileutils'
-require 'hoe'
-include FileUtils
-require File.join(File.dirname(__FILE__), 'lib', 'scrobbler', 'version')
+require 'echoe'
 
-AUTHOR = 'nunemaker'  # can also be an array of Authors
-EMAIL = "nunemaker@gmail.com"
-DESCRIPTION = "wrapper for audioscrobbler (last.fm) web services"
-GEM_NAME = 'scrobbler' # what ppl will type to install your gem
-RUBYFORGE_PROJECT = 'scrobbler' # The unix name for your project
-HOMEPATH = "http://#{RUBYFORGE_PROJECT}.rubyforge.org"
-DOWNLOAD_PATH = "http://rubyforge.org/projects/#{RUBYFORGE_PROJECT}"
-
-NAME = "scrobbler"
-REV = nil # UNCOMMENT IF REQUIRED: File.read(".svn/entries")[/committed-rev="(d+)"/, 1] rescue nil
-VERS = Scrobbler::VERSION::STRING + (REV ? ".#{REV}" : "")
-CLEAN.include ['**/.*.sw?', '*.gem', '.config', '**/.DS_Store']
-RDOC_OPTS = ['--quiet', '--title', 'scrobbler documentation',
-    "--opname", "index.html",
-    "--line-numbers", 
-    "--main", "README",
-    "--inline-source"]
-
-class Hoe
-  def extra_deps 
-    @extra_deps.reject { |x| Array(x).first == 'hoe' } 
-  end 
-end
-
-# Generate all the Rake tasks
-# Run 'rake -T' to see list of generated tasks (from gem root directory)
-hoe = Hoe.new(GEM_NAME, VERS) do |p|
-  p.author = AUTHOR 
-  p.description = DESCRIPTION
-  p.email = EMAIL
-  p.summary = DESCRIPTION
-  p.url = HOMEPATH
-  p.rubyforge_name = RUBYFORGE_PROJECT if RUBYFORGE_PROJECT
-  p.test_globs = ["test/**/test_*.rb"]
-  p.clean_globs = CLEAN  #An array of file patterns to delete on clean.
-  
-  # == Optional
-  p.changes = p.paragraphs_of("History.txt", 0..1).join("\n\n")
-  p.extra_deps = [['hpricot', '>=0.4.86'], ['activesupport', '>=1.4.2']]     # An array of rubygem dependencies [name, version], e.g. [ ['active_support', '>= 1.3.1'] ]
-  #p.spec_extras = {}    # A hash of extra values to set in the gemspec.
+Echoe.new('scrobbler', '0.2.0') 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
 end
 
 desc 'Upload website files to rubyforge'
@@ -63,16 +22,9 @@ task :website do
   sh %{rsync -av #{local_dir}/ #{host}:#{remote_dir}}
 end
 
-desc 'Release the website and new gem version'
-task :deploy => [:check_version, :website, :release]
-
-task :check_version do
-  unless ENV['VERSION']
-    puts 'Must pass a VERSION=x.y.z release version'
-    exit
-  end
-  unless ENV['VERSION'] == VERS
-    puts "Please update your version.rb to match the release version, currently #{VERS}"
-    exit
+desc 'Preps the gem for a new release'
+task :prepare do
+  %w[manifest build_gemspec].each do |task|
+    Rake::Task[task].invoke
   end
 end

data/examples/scrobble.rb

@@ -0,0 +1,32 @@
+require 'rubygems'
+require 'scrobbler'
+
+auth = Scrobbler::SimpleAuth.new(:user => 'chunky', :password => 'bacon')
+auth.handshake!
+
+puts "Auth Status: #{auth.status}"
+puts "Session ID: #{auth.session_id}"
+puts "Now Playing URL: #{auth.now_playing_url}"
+puts "Submission URL: #{auth.submission_url}"
+
+scrobble = Scrobbler::Scrobble.new(:session_id => auth.session_id,
+                                   :submission_url => auth.submission_url,
+                                   :artist => 'Coldplay',
+                                   :track => 'Viva La Vida',
+                                   :album => "Viva La Vida",
+                                   :time => Time.new,
+                                   :length => 244,
+                                   :track_number => 7)
+scrobble.submit!
+puts "Scrobbler Submission Status: #{scrobble.status}"
+
+playing = Scrobbler::Playing.new(:session_id => auth.session_id,
+                                 :now_playing_url => auth.now_playing_url,
+                                 :artist => 'Anberlin',
+                                 :track => 'A Day Late',
+                                 :album => 'Never Take Friendship Personal',
+                                 :length => 214,
+                                 :track_number => 5)
+                                 
+playing.submit!         
+puts "Playing Submission Status: #{playing.status}"      

data/lib/scrobbler.rb

@@ -1,5 +1,7 @@
 %w{cgi rubygems hpricot active_support}.each { |x| require x }
 
+$: << File.expand_path(File.dirname(__FILE__))
+
 require 'scrobbler/base'
 
 require 'scrobbler/album'
@@ -9,5 +11,8 @@ require 'scrobbler/user'
 require 'scrobbler/tag'
 require 'scrobbler/track'
 
+require 'scrobbler/simpleauth'
+require 'scrobbler/scrobble'
+require 'scrobbler/playing'
+
 require 'scrobbler/rest'
-require 'scrobbler/version'

data/lib/scrobbler/playing.rb

@@ -0,0 +1,49 @@
+module Scrobbler
+  class Playing
+    # you should read last.fm/api/submissions#np first!
+
+    attr_accessor :session_id, :now_playing_url, :artist, :track,
+                  :album, :length, :track_number, :mb_track_id
+    attr_reader :status
+
+    def initialize(args = {})
+      @session_id = args[:session_id] # from Scrobbler::SimpleAuth
+      @now_playing_url = args[:now_playing_url] # from Scrobbler::SimpleAuth (can change)
+      @artist = args[:artist] # track artist
+      @track = args[:track] # track name
+      @album = args[:album] || '' # track album (optional)
+      @length = args[:length] || '' # track length in seconds (optional)
+      @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?)
+        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'
+      end 
+
+      @connection = REST::Connection.new(@now_playing_url)
+    end
+
+    def submit!
+      query = { :s => @session_id,
+                :a => @artist,
+                :t => @track,
+                :b => @album,
+                :l => @length,
+                :n => @track_number,
+                :m => @mb_track_id }
+
+      @status = @connection.post('', query)
+
+      case @status
+      when /OK/
+
+      when /BADSESSION/
+        raise BadSessionError # rerun Scrobbler::SimpleAuth#handshake!
+      else
+        raise RequestFailedError
+      end
+    end
+  end
+end

data/lib/scrobbler/rest.rb

@@ -22,7 +22,7 @@ module Scrobbler
 
   			if args
   				# TODO: What about keys without value?
-  				url.query = args.map { |k,v| "%s=%s" % [URI.encode(k), URI.encode(v)] }.join("&")
+  				url.query = args.map { |k,v| "%s=%s" % [URI.encode(k.to_s), URI.encode(v.to_s)] }.join("&")
   			end
 
   			case method

data/lib/scrobbler/scrobble.rb

@@ -0,0 +1,66 @@
+# exception definitions
+class BadSessionError < StandardError; end
+class RequestFailedError < StandardError; end
+
+module Scrobbler
+  class Scrobble
+    # you need to read last.fm/api/submissions#subs first!
+
+    attr_accessor :session_id, :submission_url, :artist, :track, :time,
+                  :source, :length, :album, :track_number, :mb_track_id
+    attr_reader :status
+
+    def initialize(args = {})
+      @session_id = args[:session_id] # from Scrobbler::SimpleAuth
+      @submission_url = args[:submission_url] # from Scrobbler::SimpleAuth (can change)
+      @artist = args[:artist] # track artist
+      @track = args[:track] # track name
+      @time = args[:time] # a Time object set to the time the track started playing
+      @source = args[:source] || 'P' # track source, see last.fm/api/submissions#subs
+      @length = args[:length].to_s || '' # track length in seconds
+      @album = args[:album] || '' # track album name (optional)
+      @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?)
+        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
+        raise ArgumentError, 'Length must be set'
+      elsif !@length.empty? && @length.to_i <= 30 # see last.fm/api/submissions#subs
+        raise ArgumentError, 'Length must be greater than 30 seconds'
+      end
+
+      @connection = REST::Connection.new(@submission_url)
+    end
+
+    def submit!
+      query = { :s => @session_id,
+                'a[0]' => @artist,
+                't[0]' => @track,
+                'i[0]' => @time.utc.to_i,
+                'o[0]' => @source,
+                'r[0]' => @rating,
+                'l[0]' => @length,
+                'b[0]' => @album,
+                'n[0]' => @track_number,
+                'm[0]' => @mb_track_id }
+                
+      @status = @connection.post('', query)
+
+      case @status
+      when /OK/
+
+      when /BADSESSION/
+        raise BadSessionError # rerun Scrobbler::SimpleAuth#handshake!
+      when /FAILED/
+        raise RequestFailedError, @status
+      else
+        raise RequestFailedError
+      end
+    end
+  end
+end

data/lib/scrobbler/simpleauth.rb

@@ -0,0 +1,59 @@
+require 'digest/md5'
+
+# exception definitions
+class BadAuthError < StandardError; end
+class BannedError < StandardError; end
+class BadTimeError < StandardError; end
+module Scrobbler
+  AUTH_URL = 'http://post.audioscrobbler.com'
+  AUTH_VER = '1.2.1'
+  
+  class SimpleAuth
+    # you should read last.fm/api/submissions#handshake
+
+    attr_accessor :user, :password, :client_id, :client_ver
+    attr_reader :status, :session_id, :now_playing_url, :submission_url
+
+    def initialize(args = {})
+      @user = args[:user] # last.fm username
+      @password = args[:password] # last.fm password
+      @client_id = 'rbs' # Client ID assigned by last.fm; Don't change this!
+      @client_ver = Scrobbler::VERSION::STRING
+
+      raise ArgumentError, 'Missing required argument' if @user.blank? || @password.blank?
+
+      @connection = REST::Connection.new(AUTH_URL)
+    end
+
+    def handshake!
+      password_hash = Digest::MD5.hexdigest(@password)
+      timestamp = Time.now.to_i.to_s
+      token = Digest::MD5.hexdigest(password_hash + timestamp)
+
+      query = { :hs => 'true',
+                :p => AUTH_VER,
+                :c => @client_id,
+                :v => @client_ver,
+                :u => @user,
+                :t => timestamp,
+                :a => token }
+      result = @connection.get('/', query)
+
+      @status = result.split(/\n/)[0]
+      case @status 
+      when /OK/
+        @session_id, @now_playing_url, @submission_url = result.split(/\n/)[1,3]
+      when /BANNED/
+        raise BannedError # something is wrong with the gem, check for an update
+      when /BADAUTH/
+        raise BadAuthError # invalid user/password
+      when /FAILED/
+        raise RequestFailedError, @status
+      when /BADTIME/
+        raise BadTimeError # system time is way off
+      else
+        raise RequestFailedError
+      end  
+    end
+  end
+end

data/scrobbler.gemspec

@@ -0,0 +1,41 @@
+# -*- encoding: utf-8 -*-
+
+Gem::Specification.new do |s|
+  s.name = %q{scrobbler}
+  s.version = "0.2.0"
+
+  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.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.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.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.has_rdoc = true
+  s.homepage = %q{http://scrobbler.rubyforge.org}
+  s.rdoc_options = ["--line-numbers", "--inline-source", "--title", "Scrobbler", "--main", "README.txt"]
+  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"]
+
+  if s.respond_to? :specification_version then
+    current_version = Gem::Specification::CURRENT_SPECIFICATION_VERSION
+    s.specification_version = 2
+
+    if Gem::Version.new(Gem::RubyGemsVersion) >= Gem::Version.new('1.2.0') then
+      s.add_runtime_dependency(%q<hpricot>, [">= 0.4.86"])
+      s.add_runtime_dependency(%q<activesupport>, [">= 1.4.2"])
+      s.add_development_dependency(%q<echoe>, [">= 0"])
+    else
+      s.add_dependency(%q<hpricot>, [">= 0.4.86"])
+      s.add_dependency(%q<activesupport>, [">= 1.4.2"])
+      s.add_dependency(%q<echoe>, [">= 0"])
+    end
+  else
+    s.add_dependency(%q<hpricot>, [">= 0.4.86"])
+    s.add_dependency(%q<activesupport>, [">= 1.4.2"])
+    s.add_dependency(%q<echoe>, [">= 0"])
+  end
+end

data/website/css/common.css

@@ -0,0 +1,47 @@
+@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

@@ -0,0 +1,113 @@
+<!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="scrobbler/">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>

metadata

@@ -1,55 +1,93 @@
 --- !ruby/object:Gem::Specification 
-rubygems_version: 0.9.4
-specification_version: 1
 name: scrobbler
 version: !ruby/object:Gem::Version 
-  version: 0.1.1
-date: 2007-10-23 00:00:00 -04:00
-summary: wrapper for audioscrobbler (last.fm) web services
-require_paths: 
-- lib
-email: nunemaker@gmail.com
-homepage: http://scrobbler.rubyforge.org
-rubyforge_project: scrobbler
-description: wrapper for audioscrobbler (last.fm) web services
-autorequire: 
-default_executable: 
-bindir: bin
-has_rdoc: true
-required_ruby_version: !ruby/object:Gem::Version::Requirement 
-  requirements: 
-  - - ">"
-    - !ruby/object:Gem::Version 
-      version: 0.0.0
-  version: 
+  version: 0.2.0
 platform: ruby
-signing_key: 
-cert_chain: 
-post_install_message: 
 authors: 
-- nunemaker
-files: 
-- History.txt
-- Manifest.txt
+- John Nunemaker
+autorequire: 
+bindir: bin
+cert_chain: []
+
+date: 2008-12-03 00:00:00 -05:00
+default_executable: 
+dependencies: 
+- !ruby/object:Gem::Dependency 
+  name: hpricot
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 0.4.86
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: activesupport
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: 1.4.2
+    version: 
+- !ruby/object:Gem::Dependency 
+  name: echoe
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        version: "0"
+    version: 
+description: wrapper for audioscrobbler (last.fm) web services
+email: nunemaker@gmail.com
+executables: []
+
+extensions: []
+
+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.rb
 - README.txt
-- Rakefile
-- setup.rb
+files: 
 - examples/album.rb
 - examples/artist.rb
+- examples/scrobble.rb
 - examples/tag.rb
 - examples/track.rb
 - examples/user.rb
-- lib/scrobbler.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
-- test/test_helper.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
@@ -81,43 +119,51 @@ files:
 - 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
-test_files: 
-- test/test_helper.rb
+- website/css/common.css
+- website/index.html
+has_rdoc: true
+homepage: http://scrobbler.rubyforge.org
+post_install_message: 
 rdoc_options: 
+- --line-numbers
+- --inline-source
+- --title
+- Scrobbler
 - --main
 - README.txt
-extra_rdoc_files: 
-- History.txt
-- Manifest.txt
-- README.txt
-executables: []
-
-extensions: []
-
+require_paths: 
+- lib
+required_ruby_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "0"
+  version: 
+required_rubygems_version: !ruby/object:Gem::Requirement 
+  requirements: 
+  - - ">="
+    - !ruby/object:Gem::Version 
+      version: "1.2"
+  version: 
 requirements: []
 
-dependencies: 
-- !ruby/object:Gem::Dependency 
-  name: hpricot
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 0.4.86
-    version: 
-- !ruby/object:Gem::Dependency 
-  name: activesupport
-  version_requirement: 
-  version_requirements: !ruby/object:Gem::Version::Requirement 
-    requirements: 
-    - - ">="
-      - !ruby/object:Gem::Version 
-        version: 1.4.2
-    version: 
+rubyforge_project: scrobbler
+rubygems_version: 1.3.1
+signing_key: 
+specification_version: 2
+summary: wrapper for audioscrobbler (last.fm) web services
+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

data/lib/scrobbler/version.rb

@@ -1,9 +0,0 @@
-module Scrobbler #:nodoc:
-  module VERSION #:nodoc:
-    MAJOR = 0
-    MINOR = 1
-    TINY  = 1
-
-    STRING = [MAJOR, MINOR, TINY].join('.')
-  end
-end