scrobbler-ng 2.0.2 → 2.0.3

data/.gitignore

@@ -12,3 +12,4 @@ catalog.xml
 scrobbler-ng.gemspec
 tmp
 .project
+.loadpath

data/VERSION.yml

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

data/lib/scrobbler.rb

@@ -24,12 +24,9 @@ require 'scrobbler/session'
 require 'scrobbler/tag'
 require 'scrobbler/track'
 
-require 'scrobbler/auth'
 require 'scrobbler/library'
 require 'scrobbler/playlist'
 require 'scrobbler/radio'
 
-require 'scrobbler/simpleauth'
-require 'scrobbler/playing'
-
 require 'scrobbler/rest'
+require 'scrobbler/authentication'

data/lib/scrobbler/album.rb

@@ -3,7 +3,8 @@
 require File.expand_path('basexmlinfo.rb', File.dirname(__FILE__))
 
 module Scrobbler
-  # @todo Add missing functions that require authentication
+  # Class for handling album.* requests to the Last.fm API and reading Album data
+  # provided in return.
   class Album < BaseXmlInfo
     include Scrobbler::ImageObjectFuncs
     
@@ -116,10 +117,13 @@ module Scrobbler
       end
     end
     
-    # Tag an album using a list of user supplied tags. 
-    def add_tags(tags)
-        # This function require authentication, but SimpleAuth is not yet 2.0
-        raise NotImplementedError
+    # Tag an album using a list of user supplied tags.
+    #
+    # @param [Scrobbler::Session] session A valid session to authenticate access
+    # @param [Array<String>] tags Tags to add to this album
+    # @return [nil] 
+    def add_tags(session, tags)
+      Base.post_request('album.addTags', {:sk => session.key, :signed => true, :tags => tags.join(',')})
     end
 
     # Get the tags applied by an individual user to an album on Last.fm.
@@ -133,5 +137,15 @@ module Scrobbler
         # This function require authentication, but SimpleAuth is not yet 2.0
         raise NotImplementedError
     end
+    
+    # Get the links to buy this album
+    def buylinks()
+      raise NotImplementedError
+    end
+    
+    # Share this album with a friend
+    def share()
+      raise NotImplementedError
+    end
   end
 end

data/lib/scrobbler/authentication.rb

@@ -0,0 +1,63 @@
+require 'cgi'
+require 'digest/md5'
+
+module Scrobbler
+  class Authentication < Base
+
+    def initialize(data = {})
+      populate_data(data)
+      super()
+      
+      @digest = Digest::MD5.new
+      
+      # Check if the input parameters are valid
+      if @username.nil? || @username.empty?
+        raise ArgumentError, 'Username is required'
+      end
+    end
+
+    def auth_token(password)
+      @digest.hexdigest(@username + @digest.hexdigest(password))
+    end
+      
+    def mobile_session(password)
+      xml = Base.request('auth.getMobileSession', {:username => @username, :signed => true, :authToken => auth_token(password)})
+      load_session_out_of_session_request(xml)
+    end
+    
+    def session(tokenStr)
+      xml = Base.request('auth.getSession', {:signed => true, :token => tokenStr})
+      load_session_out_of_session_request(xml)
+    end
+    
+    def load_session_out_of_session_request(xml)
+      # Find the session node
+      xml.root.children.each do |child|
+          next unless child.name == 'session'
+          return Session.new(:xml => child)
+      end
+    end
+    
+    def token
+      xml = Base.request('auth.getToken', {:signed => true})
+      # Grep the token
+      xml.root.children.each do |child|
+          next unless child.name == 'token'
+          return child.content
+      end
+    end
+    
+    def webservice_session_url(callback=nil)
+      if not callback.nil? then
+        cb = "&cb=" + CGI::escape(callback)
+      else
+        cb = ''
+      end
+      'http://www.last.fm/api/auth/?api_key=' + @@api_key + cb 
+    end
+    
+    def desktop_session_url(tokenStr)
+      webservice_session_url + '&token=' + tokenStr 
+    end
+  end
+end

data/lib/scrobbler/event.rb

@@ -123,8 +123,9 @@ module Scrobbler
       raise NotImplementedError
     end
 
-    def attend(session, attendance_status)
-      Base.post_request('event.attend',{:event => @id, :signed => true, :status => attendance_status, :sk => session.key})
+    def attend
+      # This function require authentication, but SimpleAuth is not yet 2.0
+      raise NotImplementedError
     end
 
     def share

data/lib/scrobbler/session.rb

@@ -1,9 +1,42 @@
+# encoding: utf-8
+
+require File.expand_path('basexml.rb', File.dirname(__FILE__))
+
 module Scrobbler
-  class Session < Base
+  class Session < BaseXml
     attr_reader :key, :name, :subscriber
     
     def initialize(data={})
-      populate_data(data)
+      raise ArgumentError unless data.kind_of?(Hash)
+      super(data)
     end
+    
+    # Load the data for this object out of a XML-Node
+    #
+    # @param [LibXML::XML::Node] node The XML node containing the information
+    # @return [nil]
+    def load_from_xml(node)
+      # Get all information from the root's children nodes
+      node.children.each do |child|
+        case child.name
+          when 'name'
+            @name = child.content
+          when 'key' 
+            @key = child.content
+          when 'subscriber'
+            if child.content == '1' then
+              @subscriber = true
+            else
+              @subscriber = false
+            end
+          when 'text'
+            # ignore, these are only blanks
+          when '#text'
+            # libxml-jruby version of blanks
+          else
+            raise NotImplementedError, "Field '#{child.name}' not known (#{child.content})"
+        end #^ case
+      end #^ do |child|
+    end #^ load_from_xml
   end
 end

data/lib/scrobbler/track.rb

@@ -1,5 +1,7 @@
 # encoding: utf-8
 
+require File.expand_path('basexmlinfo.rb', File.dirname(__FILE__))
+
 module Scrobbler
   class Track < Base
     # Load Helper modules
@@ -10,6 +12,10 @@ module Scrobbler
     attr_reader :streamable, :album, :date, :now_playing, :tagcount
     attr_reader :duration, :listeners
     
+    def self.fingerprint_metadata(fpid)
+      Base.get('track.getFingerprintMetadata', :tracks, Track, {:fingerprintid => fpid})
+    end
+    
     def self.new_from_libxml(xml)
       data = {}
       xml.children.each do |child|
@@ -32,7 +38,7 @@ module Scrobbler
       end
       
       
-      data[:rank] = xml['rank'].to_i if xml['rank']
+      data[:rank] = xml['rank'].to_f if xml['rank']
       data[:now_playing] = true if xml['nowplaying'] && xml['nowplaying'] == 'true'
       
       data[:now_playing] = false if data[:now_playing].nil?

data/test/mocks/rest.rb

@@ -71,6 +71,8 @@ register_fw('artist=Cher&track=Before%20He%20Cheats&api_key=foo123&method=track.
   'track', 'fans.xml')
 register_fw('artist=Cher&track=Before%20He%20Cheats&api_key=foo123&method=track.gettoptags',
   'track', 'toptags.xml')
+register_fw('fingerprintid=1234&api_key=foo123&method=track.getFingerprintMetadata',
+  'track', 'fingerprintmetadata.xml')
 
 ## Geo
 FakeWeb.register_uri(:get, WEB_BASE + 'location=Manchester&api_key=foo123&method=geo.getevents', :body => File.join([FIXTURES_BASE, 'geo', 'events-p1.xml']))
@@ -112,3 +114,13 @@ register_fw('user=jnunemaker&api_key=foo123&method=user.getlovedtracks',
 # Album
 register_fw('artist=Carrie%20Underwood&album=Some%20Hearts&api_key=foo123&method=album.getinfo',
   'album', 'info.xml')
+FakeWeb.register_uri(:post, WEB_BASE + 'api_key=foo123&method=album.addTags&sk=d580d57f32848f5dcf574d1ce18d78b2&tags=tag1%2Ctag2&api_sig=ab00d1e2baf1c820f889f604ca86535d',
+  :body => File.join([FIXTURES_BASE, 'album', 'addtags.xml']))
+
+# Authentication
+register_fw('api_key=foo123&authToken=3cf8871e1ce17fbfad72d49007ec2aad&method=auth.getMobileSession&username=john&api_sig=6b9c4b9732a6bb0339bcbbc9ecbcd4dd', 
+  'auth', 'mobile.xml')
+register_fw('api_key=foo123&method=auth.getToken&api_sig=1cc6b6f01a027f166a21ca8fe0c693b3',
+  'auth', 'token.xml')
+register_fw('api_key=foo123&method=auth.getSession&token=0e6af5cd2fff6b314994af5b0c58ecc1&api_sig=2f8e52b15b36e8ca1356e7337364b84b',
+  'auth', 'session.xml')

data/test/unit/album_spec.rb

@@ -4,6 +4,7 @@ describe Scrobbler::Album do
 
   before(:each) do 
     @album = Scrobbler::Album.new(:name => 'Some Hearts', :artist => 'Carrie Underwood')
+    @session = Scrobbler::Session.new(:name => 'john', :subscriber => false, :key => 'd580d57f32848f5dcf574d1ce18d78b2')
   end
   
   it 'should know the artist' do
@@ -16,13 +17,18 @@ describe Scrobbler::Album do
   
   it "should implement all methods from the Last.fm 2.0 API" do
      @album.should respond_to(:add_tags)
+     @album.should respond_to(:buylinks)
      @album.should respond_to(:load_info)
      @album.should respond_to(:tags)
+     @album.should respond_to(:top_tags)
      @album.should respond_to(:remove_tag)
      @album.should respond_to(:search)
+     @album.should respond_to(:share)
   end
   
-  it 'should be able to add tags'
+  it 'should be able to add tags' do
+    @album.add_tags(@session, ['tag1', 'tag2'])
+  end
   
   it 'should be able to load album info' do
     @album.load_info
@@ -48,4 +54,8 @@ describe Scrobbler::Album do
   it 'should be able to remove tags'
   
   it 'should be able to search for albums'
+  
+  it 'should be able to get the links to buy this album'
+  
+  it 'should be able to share a album with a friend'
 end

data/test/unit/artist_spec.rb

@@ -109,7 +109,7 @@ describe Scrobbler::Artist do
     @artist.top_tracks.should be_kind_of(Array)
     @artist.top_tracks.should have(4).items
     @artist.top_tracks.first.should be_kind_of(Scrobbler::Track)
-    @artist.top_tracks.first.rank.should eql(1)
+    @artist.top_tracks.first.rank.should eql(1.0)
     @artist.top_tracks.first.name.should eql('Nothing Else Matters')
     @artist.top_tracks.first.playcount.should eql(537704)
     @artist.top_tracks.first.mbid.should eql('')

data/test/unit/authentication_spec.rb

@@ -0,0 +1,51 @@
+require File.dirname(__FILE__) + '/../spec_helper.rb'
+
+describe Scrobbler::Authentication do
+  
+  before(:each) do
+    @auth = Scrobbler::Authentication.new(:username => 'john') 
+  end
+
+  it 'should implement' do
+    @auth.should respond_to(:session)
+    @auth.should respond_to(:mobile_session)
+    @auth.should respond_to(:token)
+  end
+
+  it 'should be able to authorize a mobile session' do
+    @session = @auth.mobile_session('doe')
+    @session.key.should eql('d580d57f32848f5dcf574d1ce18d78b2')
+    @session.subscriber.should be_false
+    @session.name.should eql('john')
+  end
+
+  it 'should be able to authorize a web session' do
+    # Check URL generation
+    session_url = @auth.webservice_session_url
+    session_url.should match /http\:\/\/www.last.fm\/api\/auth\/\?api_key=[^&?]*/
+    session_url_cb = @auth.webservice_session_url("http://www.example.com/callback")
+    session_url_cb.should match /http\:\/\/www.last.fm\/api\/auth\/\?api_key=[^&?]*&cb=[^&?]*/
+    # Handle callback -- mocking this --
+    token = @auth.token
+    # Check session generation
+    @session = @auth.session(token)
+    @session.key.should eql('d580d57f32848f5dcf574d1ce18d78b2')
+    @session.subscriber.should be_false
+    @session.name.should eql('john')
+  end
+
+  it 'should be able to authroize a desktop session' do
+    # Check URL generation
+    token = @auth.token
+    session_url = @auth.desktop_session_url(token)
+    session_url.should match /http\:\/\/www.last.fm\/api\/auth\/\?api_key=[^&?]*&token=[^&?]*/
+    # -- Intemediate step needed in production to let the user grant this application access
+    # Check session generation
+    @session = @auth.session(token)
+    @session.key.should eql('d580d57f32848f5dcf574d1ce18d78b2')
+    @session.subscriber.should be_false
+    @session.name.should eql('john')
+  end
+
+end
+

data/test/unit/event_spec.rb

@@ -3,8 +3,6 @@ require File.dirname(__FILE__) + '/../spec_helper.rb'
 describe Scrobbler::Event do
 
   before(:all) do
-    @auth = Scrobbler::Auth.new('user')
-    @session = @auth.session('test123token')
     @event = Scrobbler::Event.new(:id => 328799)
   end
   
@@ -20,9 +18,7 @@ describe Scrobbler::Event do
     end
   end
   
-  it 'should set user\'s status for attendace' do
-    @event.attend(@session,1)
-  end
+  it 'should set user\'s status for attendance'
 
   describe 'events attendees' do
     before do

data/test/unit/tag_spec.rb

@@ -78,7 +78,7 @@ describe Scrobbler::Tag do
     @tag.top_tracks.should be_kind_of(Array)
     @tag.top_tracks.should have(50).items
     @tag.top_tracks.first.should be_kind_of(Scrobbler::Track)
-    @tag.top_tracks.first.rank.should eql(1)
+    @tag.top_tracks.first.rank.should eql(1.0)
     @tag.top_tracks.first.name.should eql('Stayin\' Alive')
     @tag.top_tracks.first.tagcount.should eql(422)
     @tag.top_tracks.first.mbid.should eql('')

data/test/unit/track_spec.rb

@@ -27,6 +27,7 @@ describe Scrobbler::Track do
     @track.should respond_to(:remove_tag)
     @track.should respond_to(:search)
     @track.should respond_to(:share)
+    Scrobbler::Track.should respond_to(:fingerprint_metadata)
   end
   
   it 'should be able to add tags'
@@ -91,5 +92,14 @@ describe Scrobbler::Track do
   
   it 'should be able to share a track'
   
+  it 'should be able to fetch the metadata that matches a certain finderprint' do
+    @metadata = Scrobbler::Track.fingerprint_metadata('1234')
+    @metadata.should have(5).items
+    @track = @metadata[0]
+    @track.rank.should eql 1.0
+    @track.name.should eql 'Merlin\'s Will'
+    @track.artist.name.should eql 'Ayreon'
+  end
+  
 end
 

data/test/unit/user_spec.rb

@@ -206,7 +206,7 @@ describe Scrobbler::User do
     first.name.should eql 'Learning to Live'
     first.mbid.should eql ''
     first.playcount.should eql 51
-    first.rank.should eql 1
+    first.rank.should eql 1.0
     first.url.should eql 'http://www.last.fm/music/Dream+Theater/_/Learning+to+Live'
     first.image(:small).should eql 'http://userserve-ak.last.fm/serve/34s/12620339.jpg'
     first.image(:medium).should eql 'http://userserve-ak.last.fm/serve/64s/12620339.jpg'
@@ -255,7 +255,7 @@ describe Scrobbler::User do
     first.artist.mbid.should eql 'bc641be9-ca36-4c61-9394-5230433f6646'
     first.mbid.should eql ''
     first.playcount.should eql 5
-    first.rank.should eql 1
+    first.rank.should eql 1.0
     first.url.should eql 'www.last.fm/music/Liquid+Tension+Experiment/_/Three+Minute+Warning'
   end
   

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: scrobbler-ng
 version: !ruby/object:Gem::Version 
-  hash: 11
+  hash: 9
   prerelease: false
   segments: 
   - 2
   - 0
-  - 2
-  version: 2.0.2
+  - 3
+  version: 2.0.3
 platform: ruby
 authors: 
 - John Nunemaker
@@ -17,7 +17,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-05-22 00:00:00 +02:00
+date: 2010-07-20 00:00:00 +02:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -101,7 +101,7 @@ files:
 - lib/scrobbler.rb
 - lib/scrobbler/album.rb
 - lib/scrobbler/artist.rb
-- lib/scrobbler/auth.rb
+- lib/scrobbler/authentication.rb
 - lib/scrobbler/base.rb
 - lib/scrobbler/basexml.rb
 - lib/scrobbler/basexmlinfo.rb
@@ -110,42 +110,37 @@ files:
 - lib/scrobbler/helper/image.rb
 - lib/scrobbler/helper/streamable.rb
 - lib/scrobbler/library.rb
-- lib/scrobbler/playing.rb
 - lib/scrobbler/playlist.rb
 - lib/scrobbler/radio.rb
 - lib/scrobbler/rest.rb
 - lib/scrobbler/session.rb
 - lib/scrobbler/shout.rb
-- lib/scrobbler/simpleauth.rb
 - lib/scrobbler/tag.rb
 - lib/scrobbler/track.rb
 - lib/scrobbler/user.rb
 - lib/scrobbler/venue.rb
 - tasks/jeweler.rake
-- tasks/metric_fu.rake
 - tasks/rdoc.rake
-- tasks/reek.rake
-- tasks/roodi.rake
 - tasks/tests.rake
 - tasks/yardoc.rake
-- test/spec_helper.rb
-- test/unit/library_spec.rb
-- test/unit/album_spec.rb
-- test/unit/geo_spec.rb
-- test/unit/track_spec.rb
-- test/unit/simpleauth_test.rb
-- test/unit/auth_spec.rb
 - test/unit/tag_spec.rb
-- test/unit/user_spec.rb
-- test/unit/event_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/playlist_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
-- test/test_helper.rb
 has_rdoc: true
 homepage: http://github.com/xhochy/scrobbler
 licenses: []
@@ -181,27 +176,27 @@ 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/track_spec.rb
-- test/unit/simpleauth_test.rb
-- test/unit/auth_spec.rb
 - test/unit/tag_spec.rb
-- test/unit/user_spec.rb
-- test/unit/event_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/playlist_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
-- test/test_helper.rb
-- examples/artist.rb
 - examples/tag.rb
-- examples/user.rb
 - examples/track.rb
+- examples/user.rb
+- examples/artist.rb
 - examples/scrobble.rb
 - examples/album.rb

data/lib/scrobbler/auth.rb

@@ -1,59 +0,0 @@
-module Scrobbler
-  # @todo everything
-  class Auth < Base
-  
-    def initialize(username)
-      super()
-      @username = username
-    end
-    
-    def session(token)
-      doc = Base.request('auth.getsession', :signed => true, :token => token)
-      asession = {}
-      doc.root.children.each do |child1|
-        next unless child1.name == 'session'
-        child1.children.each do |child2|
-          if child2.name == 'name'
-            asession[:name] = child2.content
-          elsif child2.name == 'key'
-            asession[:key] = child2.content
-          elsif child2.name == 'subscriber'
-            asession[:subscriber] = true if child2.content == '1'
-            asession[:subscriber] = false unless child2.content == '1'
-          end   
-        end
-      end
-      Scrobbler::Session.new(asession)
-    end
-    
-    def token
-      doc = Base.request('auth.gettoken', :signed => true)
-      stoken = ''
-      doc.root.children.each do |child|
-        next unless child.name == 'token'
-        stoken = child.content
-      end
-      stoken
-    end
-    
-    def url(options={})
-      options[:token] = token if options[:token].nil?
-      options[:api_key] = @@api_key
-      "http://www.last.fm/api/auth/?api_key=#{options[:api_key]}&token=#{options[:token]}"
-    end
-
-    def mobile_session
-      # This function require authentication, but SimpleAuth is not yet 2.0
-      raise NotImplementedError
-    end
-    
-    def websession
-      # This function require authentication, but SimpleAuth is not yet 2.0
-      raise NotImplementedError
-    end
-
-
-    
-  end
-end
-

data/lib/scrobbler/playing.rb

@@ -1,49 +0,0 @@
-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/simpleauth.rb

@@ -1,60 +0,0 @@
-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'
-  
-  # @todo This is not 2.0!!
-  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 = '0.2.13'
-
-      raise ArgumentError, 'Missing required argument' if @user.empty? || @password.empty?
-
-      @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/tasks/metric_fu.rake

@@ -1,27 +0,0 @@
-begin
-  require 'metric_fu'
-  MetricFu::Configuration.run do |config|
-    # Deactivated: saikuro, stats, rcov
-    config.metrics  = [:churn, :flog, :flay, :reek, :roodi]
-    config.graphs   = [:flog, :flay, :reek, :roodi, :rcov]
-    config.flay     = { :dirs_to_flay => ['lib'],
-                        :minimum_score => 100  } 
-    config.flog     = { :dirs_to_flog => ['lib']  }
-    config.reek     = { :dirs_to_reek => ['lib']  }
-    config.roodi    = { :dirs_to_roodi => ['lib'] }
-    config.churn    = { :start_date => "1 year ago", :minimum_churn_count => 10}
-    config.rcov     = { :environment => 'test',
-                        :test_files => ['test/**/*_test.rb', 
-                                        'spec/**/*_spec.rb'],
-                        :rcov_opts => ["--sort coverage", 
-                                       "--no-html", 
-                                       "--text-coverage",
-                                       "--no-color",
-                                       "--profile",
-                                       "--rails",
-                                       "--exclude /gems/,/Library/,spec"]}
-    config.graph_engine = :bluff
-  end
-rescue LoadError
-  puts "metric_fu not available. Install it with: gem install metric_fu"
-end

data/tasks/reek.rake

@@ -1,13 +0,0 @@
-begin
-  require 'reek/rake/task'
-  Reek::Rake::Task.new do |t|
-    t.fail_on_error = true
-    t.verbose = false
-    t.source_files = 'lib/**/*.rb'
-  end
-rescue LoadError
-  task :reek do
-    abort "Reek is not available. In order to run reek, you must: sudo gem install reek"
-  end
-end
-

data/tasks/roodi.rake

@@ -1,13 +0,0 @@
-begin
-  require 'roodi'
-  require 'roodi_task'
-  RoodiTask.new do |t|
-    t.verbose = false
-  end
-rescue LoadError
-  task :roodi do
-    abort "Roodi is not available. In order to run roodi, you must: sudo gem install roodi"
-  end
-end
-
-

data/test/unit/auth_spec.rb

@@ -1,36 +0,0 @@
-require File.dirname(__FILE__) + '/../spec_helper.rb'
-
-describe Scrobbler::Auth do
-
-  before(:all) do 
-    @auth = Scrobbler::Auth.new('user')
-  end
-  
-  it 'should implement all methods from the Last.fm 2.0 API' do
-    @auth.should respond_to(:mobile_session)
-    @auth.should respond_to(:session)
-    @auth.should respond_to(:token)
-    @auth.should respond_to(:websession)
-  end
-  
-  it 'should be able to start a mobile session'
-  
-  it 'should be able to fetch a session key' do
-    session = @auth.session('test123token')
-    session.should be_kind_of(Scrobbler::Session)
-    session.name.should eql('MyLastFMUsername')
-    session.key.should eql('d580d57f32848f5dcf574d1ce18d78b2')
-    session.subscriber.should be_false
-  end
-  
-  it 'should be able to fetch a request token' do
-    @auth.token.should eql('0e6af5cd2fff6b314994af5b0c58ecc1')
-  end
-  
-  it 'should be able to start a web session'
-  
-  it 'should be able to get a url for authenticate this service' do
-    @auth.url.should eql('http://www.last.fm/api/auth/?api_key=foo123&token=0e6af5cd2fff6b314994af5b0c58ecc1')
-  end
-
-end