Using Track objects when importing a playlist.

ymendel · Oct 8, 2008 · 6dcf18d · 6dcf18d
1 parent 14a68c7
commit 6dcf18d
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/lib/pj.rb b/lib/pj.rb
@@ -2,7 +2,6 @@
   $:.include?(File.dirname(__FILE__)) || $:.include?(File.expand_path(File.dirname(__FILE__)))
 
 require 'pj/playlist'
-require 'pj/track'
 
 module PJ
 end
diff --git a/lib/pj/playlist.rb b/lib/pj/playlist.rb
@@ -1,5 +1,6 @@
 require 'rubygems'
 require 'plist'
+require 'pj/track'
 
 module PJ
   class Playlist
@@ -19,7 +20,7 @@ def import(filename)
         parsed_playlist = parsed['Playlists'].first
         playlist = new
         playlist.name   = parsed_playlist['Name']
-        playlist.tracks = parsed_playlist['Playlist Items'].collect { |item|  item['Track ID'] }
+        playlist.tracks = parsed_playlist['Playlist Items'].collect { |item|  track = Track.new; track.track_id = item['Track ID']; track }
         playlist
       end
     end

diff --git a/lib/pj/track.rb b/lib/pj/track.rb
@@ -1,5 +1,5 @@
 module PJ
   class Track
-    attr_reader :track_id
+    attr_accessor :track_id
   end
 end
diff --git a/spec/playlist_spec.rb b/spec/playlist_spec.rb
@@ -91,8 +91,12 @@
         PJ::Playlist.import(@filename).name.should == @name
       end
 
-      it 'should set the playlist tracks' do
-        PJ::Playlist.import(@filename).tracks.should == @track_ids
+      it 'should set the playlist tracks to track objects' do
+        PJ::Playlist.import(@filename).tracks.all? { |t|  t.is_a?(PJ::Track) }.should == true
+      end
+
+      it 'should put the track objects in the order from the file' do
+        PJ::Playlist.import(@filename).tracks.collect { |t|  t.track_id }.should == @track_ids
       end
     end
   end