daapclient 0.1.0 → 0.2.0

data/lib/net/daap/playlist.rb

@@ -6,11 +6,10 @@ module Net
       attr_reader :itemcount, :persistentid, :name, :id
 
       def initialize(args)
-        info = args[:pl_info]
-        @itemcount      = info['dmap.itemcount']
-        @persistentid   = info['dmap.persistentid']
-        @name           = info['dmap.itemname']
-        @id             = info['dmap.itemid']
+        @itemcount      = args['dmap.itemcount']
+        @persistentid   = args['dmap.persistentid']
+        @name           = args['dmap.itemname']
+        @id             = args['dmap.itemid']
         @daap           = args[:daap]
         @db             = args[:db]
       end

data/lib/net/daap/song.rb

@@ -4,15 +4,17 @@ module Net
     class Song
       attr_reader :size, :album, :name, :artist, :format, :persistentid, :id
 
+      alias :to_s :name
+
       def initialize(args)
-        info = args[:song_info]
-        @size           = info['daap.songsize']
-        @album          = info['daap.songalbum']
-        @name           = info['dmap.itemname']
-        @artist         = info['daap.songartist']
-        @format         = info['daap.songformat']
-        @persistentid   = info['dmap.persistentid']
-        @id             = info['dmap.itemid']
+        @size           = args['daap.songsize']
+        @album          = args[:album]
+        @name           = args['dmap.itemname']
+        #@artist         = args['daap.songartist']
+        @artist         = args[:artist]
+        @format         = args['daap.songformat']
+        @persistentid   = args['dmap.persistentid']
+        @id             = args['dmap.itemid']
         @daap           = args[:daap]
         @db             = args[:db]
       end

data/test/data/song_structure.txt

@@ -0,0 +1,209 @@
+--- 
+27328526: 
+  :album: Warnings / Promises
+  :size: 5916800
+  :artist: Idlewild
+  :persistentid: 27328526
+  :format: mp3
+  :name: I Want A Warning
+  :itemid: 27328526
+27328537: 
+  :album: "Who Will Cut Our Hair When We're Gone?"
+  :size: 5741662
+  :artist: The Unicorns
+  :persistentid: 27328537
+  :format: mp3
+  :name: Tuff Luff
+  :itemid: 27328537
+27328521: 
+  :album: Warnings / Promises
+  :size: 5617792
+  :artist: Idlewild
+  :persistentid: 27328521
+  :format: mp3
+  :name: "As If I Hadn't Slept"
+  :itemid: 27328521
+27328543: 
+  :album: "Who Will Cut Our Hair When We're Gone?"
+  :size: 4681321
+  :artist: The Unicorns
+  :persistentid: 27328543
+  :format: mp3
+  :name: Ghost Mountain
+  :itemid: 27328543
+27328538: 
+  :album: "Who Will Cut Our Hair When We're Gone?"
+  :size: 5805288
+  :artist: The Unicorns
+  :persistentid: 27328538
+  :format: mp3
+  :name: Sea Ghost
+  :itemid: 27328538
+27328527: 
+  :album: Warnings / Promises
+  :size: 4224
+  :artist: Idlewild
+  :persistentid: 27328527
+  :format: mp3
+  :name: Hidden Track 2
+  :itemid: 27328527
+27328544: 
+  :album: "Who Will Cut Our Hair When We're Gone?"
+  :size: 2535811
+  :artist: The Unicorns
+  :persistentid: 27328544
+  :format: mp3
+  :name: The Clap
+  :itemid: 27328544
+27328522: 
+  :album: Warnings / Promises
+  :size: 6875264
+  :artist: Idlewild
+  :persistentid: 27328522
+  :format: mp3
+  :name: The Space Between All Things
+  :itemid: 27328522
+27328528: 
+  :album: Warnings / Promises
+  :size: 5306496
+  :artist: Idlewild
+  :persistentid: 27328528
+  :format: mp3
+  :name: Too Long Awake
+  :itemid: 27328528
+27328523: 
+  :album: Warnings / Promises
+  :size: 4825216
+  :artist: Idlewild
+  :persistentid: 27328523
+  :format: mp3
+  :name: Welcome Home
+  :itemid: 27328523
+27328534: 
+  :album: "Who Will Cut Our Hair When We're Gone?"
+  :size: 2774011
+  :artist: The Unicorns
+  :persistentid: 27328534
+  :format: mp3
+  :name: Ready to Die
+  :itemid: 27328534
+27328545: 
+  :album: "Who Will Cut Our Hair When We're Gone?"
+  :size: 7631889
+  :artist: The Unicorns
+  :persistentid: 27328545
+  :format: mp3
+  :name: Child Star
+  :itemid: 27328545
+27328540: 
+  :album: "Who Will Cut Our Hair When We're Gone?"
+  :size: 4764396
+  :artist: The Unicorns
+  :persistentid: 27328540
+  :format: mp3
+  :name: Tuff Ghost
+  :itemid: 27328540
+27328529: 
+  :album: Warnings / Promises
+  :size: 4864128
+  :artist: Idlewild
+  :persistentid: 27328529
+  :format: mp3
+  :name: Love Steals Us From Loneliness
+  :itemid: 27328529
+27328546: 
+  :album: "Who Will Cut Our Hair When We're Gone?"
+  :size: 7356555
+  :artist: The Unicorns
+  :persistentid: 27328546
+  :format: mp3
+  :name: Inoculate the Innocuous
+  :itemid: 27328546
+27328524: 
+  :album: Warnings / Promises
+  :size: 5765248
+  :artist: Idlewild
+  :persistentid: 27328524
+  :format: mp3
+  :name: Not Just Sometimes But Always
+  :itemid: 27328524
+27328535: 
+  :album: "Who Will Cut Our Hair When We're Gone?"
+  :size: 2975312
+  :artist: The Unicorns
+  :persistentid: 27328535
+  :format: mp3
+  :name: "Let's Get Known"
+  :itemid: 27328535
+27328530: 
+  :album: Warnings / Promises
+  :size: 5744768
+  :artist: Idlewild
+  :persistentid: 27328530
+  :format: mp3
+  :name: Disconnected
+  :itemid: 27328530
+27328541: 
+  :album: "Who Will Cut Our Hair When We're Gone?"
+  :size: 4032487
+  :artist: The Unicorns
+  :persistentid: 27328541
+  :format: mp3
+  :name: Jellybones
+  :itemid: 27328541
+27328519: 
+  :album: Warnings / Promises
+  :size: 5253248
+  :artist: Idlewild
+  :persistentid: 27328519
+  :format: mp3
+  :name: I Understand It
+  :itemid: 27328519
+27328547: 
+  :album: "Who Will Cut Our Hair When We're Gone?"
+  :size: 4855761
+  :artist: The Unicorns
+  :persistentid: 27328547
+  :format: mp3
+  :name: I Was Born (A Unicorn)
+  :itemid: 27328547
+27328525: 
+  :album: Warnings / Promises
+  :size: 5597312
+  :artist: Idlewild
+  :persistentid: 27328525
+  :format: mp3
+  :name: Blame It On Obvious Ways
+  :itemid: 27328525
+27328536: 
+  :album: "Who Will Cut Our Hair When We're Gone?"
+  :size: 5871881
+  :artist: The Unicorns
+  :persistentid: 27328536
+  :format: mp3
+  :name: Les OS
+  :itemid: 27328536
+27328542: 
+  :album: "Who Will Cut Our Hair When We're Gone?"
+  :size: 3216155
+  :artist: The Unicorns
+  :persistentid: 27328542
+  :format: mp3
+  :name: "I Don't Wanna Die"
+  :itemid: 27328542
+27328520: 
+  :album: Warnings / Promises
+  :size: 5849216
+  :artist: Idlewild
+  :persistentid: 27328520
+  :format: mp3
+  :name: El Capitan
+  :itemid: 27328520
+27328531: 
+  :album: Warnings / Promises
+  :size: 8157312
+  :artist: Idlewild
+  :persistentid: 27328531
+  :format: mp3
+  :name: Goodnight
+  :itemid: 27328531

data/test/mock_server.rb

@@ -0,0 +1,56 @@
+require 'digest/md5'
+require 'yaml'
+
+file_dir = nil
+if FileTest.exists?('test/data')
+  file_dir = 'test/data'
+else
+  file_dir = 'data'
+end
+FILE_DIR = file_dir
+
+File.open("#{FILE_DIR}/song_structure.txt", 'r') {|f| HASH = YAML.load(f.read) }
+File.open("#{FILE_DIR}/song_data.txt", 'r') { |f| FILE_DATA = f.read }
+SERVER = 'localhost'
+
+module Net
+  class Container
+    attr_reader :header, :body
+
+    def initialize(args)
+      @header = args[:header]
+      @body   = args[:body]
+    end
+  end
+
+  class HTTP
+    def self.new
+      allocate
+    end
+
+    def initialize
+    end
+
+    def self.start(*args)
+      Net::HTTP.new
+    end
+
+    def get(*args, &block)
+      md5 = Digest::MD5.new(args[0])
+      contents = nil
+      dir = nil
+      if FileTest.exists?('test/data')
+        dir = 'test/data/mt-daapd/'
+      else
+        dir = 'data/mt-daapd/'
+      end
+      File::open(dir + md5.to_s + ".txt" , "r") do |file|
+        contents = file.read
+      end
+      Container.new(:body => contents, :header => {
+                                                    'content-type' => 'dmap',
+                                                    'daap-server'  => 'mock'
+                                                  })
+    end
+  end
+end

data/test/server_saver.rb

@@ -0,0 +1,31 @@
+module Net
+  module DAAP
+    class Client
+      def do_get(request, &block)
+        @log.debug("do_get called")
+        url = String.new('/' + request)
+        if @session_id
+          url += url =~ /\?/ ?  "&" : "?"
+          url += "session-id=20"
+        end
+
+        @log.debug("Fetching url: #{url}")
+
+        res = nil
+        md5 = Digest::MD5.new(url)
+        File.open(md5.to_s + ".txt", "w") do |file|
+        res = @http_client.get(url, request_headers(url), nil, &block)
+        file.write res.body
+        end
+        @log.debug("Done Fetching url: #{url}")
+
+        content_type = res.header['content-type']
+        if request !~ /(?:\/items\/\d+\.|logout)/ && content_type !~ /dmap/
+          raise "Broken response"
+        end
+
+        res.body
+      end
+    end
+  end
+end

data/test/tc_artists.rb

@@ -0,0 +1,33 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+$:.unshift File.join(File.dirname(__FILE__), "..", "test")
+
+require 'test/unit'
+require 'net/daap'
+require 'mock_server'
+
+class DAAPCLientArtistTest < Test::Unit::TestCase
+  def setup
+    @daap = Net::DAAP::Client.new(SERVER)
+    @daap.connect
+  end
+
+  def teardown
+    @daap.disconnect
+  end
+
+  def test_artists
+    db = @daap.databases.first
+
+    album_songs = 0
+    db.albums.each { |a|
+      album_songs += a.songs.length
+    }
+    assert_equal(db.songs.length, album_songs)
+
+    artist_songs = 0
+    db.artists.each { |a|
+      artist_songs += a.songs.length
+    }
+    assert_equal(db.songs.length, artist_songs)
+  end
+end

data/test/tc_client.rb

@@ -1,119 +1,65 @@
+$:.unshift File.join(File.dirname(__FILE__), "..", "lib")
+$:.unshift File.join(File.dirname(__FILE__), "..", "test")
+
 require 'test/unit'
 require 'net/daap'
-require 'digest/md5'
+require 'mock_server'
 
-class MyTest < Net::DAAP::Client
-  def connect
-    @dmap = Net::DAAP::DMAP.new(:daap => self)
-    load_server_info
-    @connected = 1
-    @dsn
+class DAAPClient_Test < Test::Unit::TestCase
+  def setup
+    @daap = Net::DAAP::Client.new(SERVER)
+    @daap.connect
   end
 
-  def find_validator
+  def teardown
+    @daap.disconnect
   end
 
-  def do_get(request)
-    contents = nil
-    md5 = Digest::MD5.new(request)
-    File::open("data/mt-daapd/" + md5.to_s + ".txt", "r") do |file|
-      contents = file.read
-    end
-    contents
+  def test_connect
+    daap = Net::DAAP::Client.new(SERVER)
+    dsn = daap.connect
+    assert_equal("Aaron's Music", dsn)
   end
-end
 
-class DAAPClient_Test < Test::Unit::TestCase
-  def setup
-    @daap = MyTest.new('localhost')
-    @daap.connect
+  def test_connect_with_block
+    daap = Net::DAAP::Client.new(SERVER)
+    daap.connect do |dsn|
+      assert_equal("Aaron's Music", dsn)
+    end
   end
 
-  def test_connect
-    daap = MyTest.new('localhost')
-    dsn = daap.connect
-    assert_equal("apatterson", dsn)
+  def test_db_error
+    daap = Net::DAAP::Client.new(SERVER)
+    begin
+      daap.databases
+    rescue
+      assert(true, true)
+    end
   end
 
   def test_songs
     songs = @daap.databases[0].songs
     songs_hash = Hash.new
     songs.each do |song|
-      songs_hash[song.id] = { :size => song.size, :album => song.album,
-        :name => song.name, :artist => song.artist, :format => song.format,
+      songs_hash[song.id] = { :size => song.size, :album => song.album.to_s,
+        :name => song.name, :artist => song.artist.to_s, :format => song.format,
         :persistentid => song.persistentid, :itemid => song.id }
     end
 
-    hash = 
-{2327300=>{:itemid=>2327300, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>4654199, :name=>"Myxomatosis (Judge, Jury & Executioner)", :persistentid=>2327300},
- 2327243=>{:itemid=>2327243, :album=>"Hail To The Theif", :format=>"mp3", :artist=>"Radiohead", :size=>3723264, :name=>"Myxomatosis", :persistentid=>2327243},
- 2327281=>{:itemid=>2327281, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>5950405, :name=>"A Punch Up At A Wedding (No No No No No No No No)", :persistentid=>2327281},
- 2327234=>{:itemid=>2327234, :album=>"Hail To The Theif", :format=>"mp3", :artist=>"Radiohead", :size=>4759552, :name=>"A Punch-Up At The Wedding", :persistentid=>2327234},
- 2327272=>{:itemid=>2327272, :album=>"OK Computer", :format=>"mp3", :artist=>"Radiohead", :size=>7673398, :name=>"Paranoid Android", :persistentid=>2327272},
- 2327253=>{:itemid=>2327253, :album=>"Radiohead - HTTT Era B-Sides", :format=>"m4a", :artist=>"Radiohead", :size=>3284376, :name=>"I will (Los Angeles version)", :persistentid=>2327253},
- 2327225=>{:itemid=>2327225, :album=>"Hail To The Theif", :format=>"mp3", :artist=>"Radiohead", :size=>3190784, :name=>"2+2=5", :persistentid=>2327225},
- 2327301=>{:itemid=>2327301, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>6455593, :name=>"Backdrifts (Honeymoon Is Over)", :persistentid=>2327301},
- 2327282=>{:itemid=>2327282, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>4037702, :name=>"Scatterbrain (As Dead As Leaves)", :persistentid=>2327282},
- 2327273=>{:itemid=>2327273, :album=>"OK Computer", :format=>"mp3", :artist=>"Radiohead", :size=>5236170, :name=>"Karma Police", :persistentid=>2327273},
- 2327311=>{:itemid=>2327311, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>4030394, :name=>"A Wolf At The Door (It Girl. Rag Doll)", :persistentid=>2327311},
- 2327254=>{:itemid=>2327254, :album=>"Radiohead - HTTT Era B-Sides", :format=>"m4a", :artist=>"Radiohead", :size=>6443033, :name=>"Skttrbrain (Four Tet remix)", :persistentid=>2327254},
- 2327302=>{:itemid=>2327302, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>2393022, :name=>"I Will (No Man's Land)", :persistentid=>2327302},
- 2327245=>{:itemid=>2327245, :album=>"Radiohead - HTTT Era B-Sides", :format=>"m4a", :artist=>"Radiohead", :size=>5212004, :name=>"Gagging Order", :persistentid=>2327245},
- 2327283=>{:itemid=>2327283, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>4833826, :name=>"A Wolf At The Door", :persistentid=>2327283},
- 2327226=>{:itemid=>2327226, :album=>"Hail To The Theif", :format=>"mp3", :artist=>"Radiohead", :size=>4134912, :name=>"Sail To The Moon", :persistentid=>2327226},
- 2327264=>{:itemid=>2327264, :album=>"OK Computer", :format=>"mp3", :artist=>"Radiohead", :size=>2350164, :name=>"Fitter Happier", :persistentid=>2327264},
- 2327312=>{:itemid=>2327312, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>2868372, :name=>"I Will", :persistentid=>2327312},
- 2327246=>{:itemid=>2327246, :album=>"Radiohead - HTTT Era B-Sides", :format=>"m4a", :artist=>"Radiohead", :size=>5130084, :name=>"I am Citizen Insane", :persistentid=>2327246},
- 2327284=>{:itemid=>2327284, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>4785551, :name=>"2 + 2 = 5", :persistentid=>2327284},
- 2327322=>{:itemid=>2327322, :album=>"I Might Be Wrong: Live Recordings", :format=>"mp3", :artist=>"Radiohead", :size=>5953983, :name=>"The National Anthem", :persistentid=>2327322},
- 2327227=>{:itemid=>2327227, :album=>"Hail To The Theif", :format=>"mp3", :artist=>"Radiohead", :size=>3223552, :name=>"A Wolf At The Door", :persistentid=>2327227},
- 2327265=>{:itemid=>2327265, :album=>"OK Computer", :format=>"mp3", :artist=>"Radiohead", :size=>4616547, :name=>"Electioneering", :persistentid=>2327265},
- 2327303=>{:itemid=>2327303, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>6475455, :name=>"There There (The Boney King Of Nowhere)", :persistentid=>2327303},
- 2327294=>{:itemid=>2327294, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>7122152, :name=>"We Suck Young Blood", :persistentid=>2327294},
- 2327237=>{:itemid=>2327237, :album=>"Hail To The Theif", :format=>"mp3", :artist=>"Radiohead", :size=>3229696, :name=>"Scatterbrain", :persistentid=>2327237},
- 2327247=>{:itemid=>2327247, :album=>"Radiohead - HTTT Era B-Sides", :format=>"m4a", :artist=>"Radiohead", :size=>3349578, :name=>"Fog. (Again) - Live", :persistentid=>2327247},
- 2327285=>{:itemid=>2327285, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>5170908, :name=>"Sail To The Moon (Brush The Cobwebs Of The Sky)", :persistentid=>2327285},
- 2327323=>{:itemid=>2327323, :album=>"I Might Be Wrong: Live Recordings", :format=>"mp3", :artist=>"Radiohead", :size=>6263793, :name=>"Dollars And Cents", :persistentid=>2327323},
- 2327228=>{:itemid=>2327228, :album=>"Hail To The Theif", :format=>"mp3", :artist=>"Radiohead", :size=>3225600, :name=>"Go To Sleep", :persistentid=>2327228},
- 2327266=>{:itemid=>2327266, :album=>"OK Computer", :format=>"mp3", :artist=>"Radiohead", :size=>5691739, :name=>"Airbag", :persistentid=>2327266},
- 2327295=>{:itemid=>2327295, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>6240049, :name=>"Sit Down. Stand Up", :persistentid=>2327295},
- 2327314=>{:itemid=>2327314, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>6463866, :name=>"Where I End And You Begin", :persistentid=>2327314},
- 2327324=>{:itemid=>2327324, :album=>"I Might Be Wrong: Live Recordings", :format=>"mp3", :artist=>"Radiohead", :size=>5300405, :name=>"Idioteque", :persistentid=>2327324},
- 2327229=>{:itemid=>2327229, :album=>"Hail To The Theif", :format=>"mp3", :artist=>"Radiohead", :size=>5179392, :name=>"There There", :persistentid=>2327229},
- 2327267=>{:itemid=>2327267, :album=>"OK Computer", :format=>"mp3", :artist=>"Radiohead", :size=>5707428, :name=>"Climbing Up The Walls", :persistentid=>2327267},
- 2327305=>{:itemid=>2327305, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>4840722, :name=>"Scatterbrain", :persistentid=>2327305},
- 2327248=>{:itemid=>2327248, :album=>"Radiohead - HTTT Era B-Sides", :format=>"m4a", :artist=>"Radiohead", :size=>4547728, :name=>"I Am A Wicked Child", :persistentid=>2327248},
- 2327286=>{:itemid=>2327286, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>4836960, :name=>"Go To Sleep", :persistentid=>2327286},
- 2327258=>{:itemid=>2327258, :album=>"2+2=5 CD's", :format=>"mp3", :artist=>"Radiohead", :size=>4930333, :name=>"Remyxomatosis", :persistentid=>2327258},
- 2327315=>{:itemid=>2327315, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>3990668, :name=>"2+2=5 (The Lukewarm)", :persistentid=>2327315},
- 2327230=>{:itemid=>2327230, :album=>"Hail To The Theif", :format=>"mp3", :artist=>"Radiohead", :size=>5163008, :name=>"Backdrifts", :persistentid=>2327230},
- 2327268=>{:itemid=>2327268, :album=>"OK Computer", :format=>"mp3", :artist=>"Radiohead", :size=>5299397, :name=>"Exit Music (For A Film)", :persistentid=>2327268},
- 2327249=>{:itemid=>2327249, :album=>"Radiohead - HTTT Era B-Sides", :format=>"m4a", :artist=>"Radiohead", :size=>7450123, :name=>"Remyxomatosis (Cristian Vogel RMX)", :persistentid=>2327249},
- 2327287=>{:itemid=>2327287, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>7767272, :name=>"There There", :persistentid=>2327287},
- 2327325=>{:itemid=>2327325, :album=>"I Might Be Wrong: Live Recordings", :format=>"mp3", :artist=>"Radiohead", :size=>4552253, :name=>"Like Spinning Plates", :persistentid=>2327325},
- 2327240=>{:itemid=>2327240, :album=>"Hail To The Theif", :format=>"mp3", :artist=>"Radiohead", :size=>1912832, :name=>"I Will", :persistentid=>2327240},
- 2327316=>{:itemid=>2327316, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>5581763, :name=>"Myxomatosis", :persistentid=>2327316},
- 2327221=>{:itemid=>2327221, :album=>"There there", :format=>"mp3", :artist=>"Radiohead", :size=>5777028, :name=>"Where bluebirds fly.", :persistentid=>2327221},
- 2327259=>{:itemid=>2327259, :album=>"2+2=5 CD's", :format=>"mp3", :artist=>"Radiohead", :size=>7425967, :name=>"There There (demo)", :persistentid=>2327259},
- 2327297=>{:itemid=>2327297, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>5389293, :name=>"Where I End And You Begin (The Sky Is Falling In)", :persistentid=>2327297},
- 2327269=>{:itemid=>2327269, :album=>"OK Computer", :format=>"mp3", :artist=>"Radiohead", :size=>5195935, :name=>"Lucky", :persistentid=>2327269},
- 2327307=>{:itemid=>2327307, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>7137199, :name=>"A Punchup At A Wedding", :persistentid=>2327307},
- 2327250=>{:itemid=>2327250, :album=>"Radiohead - HTTT Era B-Sides", :format=>"m4a", :artist=>"Radiohead", :size=>11222064, :name=>"There there (First demo)", :persistentid=>2327250},
- 2327231=>{:itemid=>2327231, :album=>"Hail To The Theif", :format=>"mp3", :artist=>"Radiohead", :size=>4749312, :name=>"We Suck Young Blood", :persistentid=>2327231},
- 2327260=>{:itemid=>2327260, :album=>"2+2=5 CD's", :format=>"mp3", :artist=>"Radiohead", :size=>4263688, :name=>"Skttrbrain (Four Tet RMX)", :persistentid=>2327260},
- 2327298=>{:itemid=>2327298, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>5937853, :name=>"We Suck Young Blood (Your Time Is Up)", :persistentid=>2327298},
- 2327251=>{:itemid=>2327251, :album=>"Radiohead - HTTT Era B-Sides", :format=>"m4a", :artist=>"Radiohead", :size=>5786001, :name=>"Paperbag Writer", :persistentid=>2327251},
- 2327232=>{:itemid=>2327232, :album=>"Hail To The Theif", :format=>"mp3", :artist=>"Radiohead", :size=>3393536, :name=>"The Gloaming", :persistentid=>2327232},
- 2327270=>{:itemid=>2327270, :album=>"OK Computer", :format=>"mp3", :artist=>"Radiohead", :size=>6494227, :name=>"The Tourist", :persistentid=>2327270},
- 2327280=>{:itemid=>2327280, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>6201806, :name=>"Sail To The Moon", :persistentid=>2327280},
- 2327261=>{:itemid=>2327261, :album=>"2+2=5 CD's", :format=>"mp3", :artist=>"Radiohead", :size=>2158009, :name=>"I will (LA version)", :persistentid=>2327261},
- 2327299=>{:itemid=>2327299, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>5089617, :name=>"The Gloaming", :persistentid=>2327299},
- 2327242=>{:itemid=>2327242, :album=>"Hail To The Theif", :format=>"mp3", :artist=>"Radiohead", :size=>4311040, :name=>"Where I End And You Begin", :persistentid=>2327242},
- 2327271=>{:itemid=>2327271, :album=>"OK Computer", :format=>"mp3", :artist=>"Radiohead", :size=>5989015, :name=>"Let Down", :persistentid=>2327271},
- 2327233=>{:itemid=>2327233, :album=>"Hail To The Theif", :format=>"mp3", :artist=>"Radiohead", :size=>4161536, :name=>"Sit Down, Stand Up", :persistentid=>2327233},
- 2327252=>{:itemid=>2327252, :album=>"Radiohead - HTTT Era B-Sides", :format=>"m4a", :artist=>"Radiohead", :size=>6588253, :name=>"Where Bluebirds Fly", :persistentid=>2327252},
- 2327290=>{:itemid=>2327290, :album=>"Hail To The Thief", :format=>"mp3", :artist=>"Radiohead", :size=>7743448, :name=>"Backdrifts", :persistentid=>2327290}}
-    assert_equal(hash, songs_hash)
+    assert_equal(HASH, songs_hash)
+  end
+
+  def test_songs_with_block
+    @daap.databases do |db|
+      songs_hash = Hash.new
+      db.songs do |song|
+        songs_hash[song.id] = { :size => song.size, :album => song.album.to_s,
+          :name => song.name, :artist => song.artist.to_s, :format => song.format,
+          :persistentid => song.persistentid, :itemid => song.id }
+      end
+
+      assert_equal(HASH, songs_hash)
+    end
   end
 
   def test_databases
@@ -121,28 +67,13 @@ class DAAPClient_Test < Test::Unit::TestCase
     assert(true, @daap.databases.length == 1)
     db = @daap.databases[0]
     assert_equal(1, db.persistentid)
-    assert_equal('apatterson', db.name)
-    assert_equal(4, db.containercount)
+    assert_equal('Aaron\'s Music', db.name)
+    assert_equal(3, db.containercount)
     assert_equal(1, db.id)
-    assert_equal(68, db.itemcount)
-    assert_equal(68, db.songs.length)
+    assert_equal(26, db.itemcount)
+    assert_equal(26, db.songs.length)
     assert(true, db.songs.length == db.itemcount)
-    assert_equal(4, db.playlists.length)
+    assert_equal(3, db.playlists.length)
     assert(true, db.playlists.length == db.containercount)
-
-      #@daap.databases.each do |db|
-      #  puts "All songs in the database"
-      #  db.songs.each do |song|
-      #    #puts "#{song.artist} - #{song.name}"
-      #  end
-      #
-      #  puts "Songs for each playlist"
-      #  db.playlists.each do |pl|
-      #    puts "Playlist name: #{pl.name}"
-      #    pl.songs.each do |song|
-      #      #puts "#{song.artist} - #{song.name}"
-      #    end
-      #  end
-      #end
   end
 end