audioscrobbler 0.0.2 → 0.1.0

data/audioscrobbler.gemspec

@@ -1,7 +1,7 @@
 require 'rubygems'
 SPEC = Gem::Specification.new do |s|
   s.name          = "audioscrobbler"
-  s.version       = "0.0.2"
+  s.version       = "0.1.0"
   s.author        = "Daniel Erat"
   s.email         = "dan-ruby@erat.org"
   s.homepage      = "http://www.erat.org/ruby/"

data/lib/audioscrobbler.rb

@@ -6,10 +6,11 @@
 # == Description
 # This file contains an implementation of the Audioscrobbler plugin
 # protocol, used to submit playlist history to Last.fm.  The protocol
-# description is located at http://www.audioscrobbler.net/wiki/Protocol1.1 .
+# description is located at
+# http://www.audioscrobbler.net/development/protocol/ .
 #
 # == Version
-# 0.0.2
+# 0.1.0
 #
 # == Author
 # Daniel Erat <dan-ruby@erat.org>
@@ -29,6 +30,8 @@
 #        - track numbers can be submitted
 #        Also added a race condition that I haven't bothered fixing (I
 #        think I'm the only person using this library?).
+# 0.1.0  Catch an exception when the server gives us a bogus now-playing
+#        URL, as happened to me yesterday. :-P
 
 require "cgi"
 require "md5"
@@ -336,21 +339,27 @@ class Audioscrobbler
     body = args.collect {|k, v| "#{k}=" + CGI.escape(v.to_s) }.join('&')
 
     success = false
-    url = URI.parse(@now_playing_url)
-    headers = { 'Content-Type' => 'application/x-www-form-urlencoded' }
     begin
-      data = Net::HTTP.start(url.host, url.port) do |http|
-        http.post(url.path, body, headers).body
-      end
+      url = URI.parse(@now_playing_url)
     rescue Exception
-      vlog("Submission failed -- couldn't read #@now_playing_url: #{$!}")
+      vlog("Submission failed -- couldn't parse now-playing " +
+           "URL \"#@now_playing_url\"")
     else
-      data.chomp!
-      if data == "OK"
-        vlog("Now-playing report was successful")
-        success = true
+      headers = { 'Content-Type' => 'application/x-www-form-urlencoded' }
+      begin
+        data = Net::HTTP.start(url.host, url.port) do |http|
+          http.post(url.path, body, headers).body
+        end
+      rescue Exception
+        vlog("Submission failed -- couldn't read #@now_playing_url: #{$!}")
       else
-        vlog("Now-playing report failed -- got \"#{data}\"")
+        data.chomp!
+        if data == "OK"
+          vlog("Now-playing report was successful")
+          success = true
+        else
+          vlog("Now-playing report failed -- got \"#{data}\"")
+        end
       end
     end
     success

data/test/test_audioscrobbler.rb

@@ -359,4 +359,39 @@ class TestAudioscrobbler < Test::Unit::TestCase
     assert_equal(tracks, @submit_status.tracks)
     assert_equal(now_playing, @now_playing_status.tracks)
   end  # test_audioscrobbler
+
+  # Test that we don't crash when the handshake returns an unparseable
+  # now-playing URL.
+  def test_broken_url
+    @handshake_status = AudioscrobblerHandshakeStatus.new
+    @submit_status = AudioscrobblerSubmitStatus.new
+    @now_playing_status = AudioscrobblerSubmitStatus.new
+    # FIXME(derat): Quite mortifying that I'm just using a different port
+    # from the previous tests instead of killing off the old server.
+    @http_port = 16350
+
+    @server_thread = Thread.new do
+      s = WEBrick::HTTPServer.new(:BindAddress => "127.0.0.1",
+                                  :Port => @http_port,
+                                  :Logger => WEBrick::Log.new(
+                                      nil, WEBrick::BasicLog::WARN),
+                                  :AccessLog => [])
+      # Use garbage for the submit and now-playing URLs.
+      s.mount("/handshake", AudioscrobblerHandshakeServlet, @handshake_status,
+              "username", "password", "sessionid",
+              "hch094h09h9 htnhstn",  # submit
+              "gcrlhc g g890")  # now-playing
+      trap("INT") { s.shutdown }
+      s.start
+    end
+
+    a = Audioscrobbler.new("username", "password")
+    a.client = "tst"
+    a.version = "1.1"
+    a.handshake_url = "http://127.0.0.1:#@http_port/handshake"
+    a.verbose = false
+    a.start_submitter_thread
+
+    assert(!a.report_now_playing('artist', 'title', 100, 'album', 'mbid', 1))
+  end  # test_broken_url
 end  # TestAudioscrobbler

metadata

@@ -3,8 +3,8 @@ rubygems_version: 0.9.3
 specification_version: 1
 name: audioscrobbler
 version: !ruby/object:Gem::Version 
-  version: 0.0.2
-date: 2007-08-26 00:00:00 -07:00
+  version: 0.1.0
+date: 2007-10-11 00:00:00 -07:00
 summary: Library to submit music playlists to Last.fm
 require_paths: 
 - lib