lib/models/music_brainz/track.rb in musicbrainz-0.4.10 vs lib/models/music_brainz/track.rb in musicbrainz-0.5.0

@@ -1,20 +1,20 @@
 module MusicBrainz
-  class Track
+  class Track < MusicBrainz::Base
     attr_accessor :position, :recording_id, :title, :length
   
     def self.find mbid
-      xml = Nokogiri::XML(MusicBrainz.load('http://musicbrainz.org/ws/2/recording/' + mbid + '?limit=100'))
+      xml = Nokogiri::XML(MusicBrainz.load(:recording, :id => mbid))
       self.parse_xml(xml) unless xml.nil?
     end
   
     def self.parse_xml xml
       @track = MusicBrainz::Track.new
-      @track.position = xml.css('position').text.to_i unless xml.css('position').empty?
-      @track.recording_id = xml.css('recording').attr('id').value unless xml.css('recording').empty?
-      @track.title = xml.css('recording > title').text unless xml.css('recording > title').empty?
-      @track.length = xml.css('length').first.text.to_i unless xml.css('length').empty?
-      @track.length = xml.css('recording > length').first.text.to_i unless xml.css('recording > length').empty?
+      @track.position = self.safe_get_value(xml, 'position').to_i
+      @track.recording_id = self.safe_get_attr(xml, 'recording', 'id')
+      @track.title = self.safe_get_value(xml, 'recording > title')
+      @track.length = self.safe_get_value(xml, 'length').to_i
+      @track.length = self.safe_get_value(xml, 'recording > length').to_i
       @track
     end
   end
 end