Refactored Release and Track models, fixed tests

lib/deprecated.rb

@@ -1,12 +1,25 @@
 # -*- encoding: utf-8 -*-
-module MusicBrainz
-  def self.query_interval=(sec)
-    MusicBrainz::Tools::Proxy.query_interval = sec
-    STDOUT.send :puts, "WARNING! MusicBrainz.query_interval is deprecated. Use MusicBrainz::Tools::Proxy.query_interval"
-  end
 
-  def self.cache_path=(path)
-    MusicBrainz::Tools::Cache.cache_path = path
-    $stdout.send :puts, "WARNING! MusicBrainz.cache_path is deprecated. Use MusicBrainz::Tools::Cache.cache_path"
+module MusicBrainz
+  class << self
+    def query_interval
+      $stdout.send :puts, "WARNING! MusicBrainz.query_interval is deprecated. Use MusicBrainz::Tools::Proxy.query_interval"
+      MusicBrainz::Tools::Proxy.query_interval
+    end
+
+    def query_interval=(sec)
+      $stdout.send :puts, "WARNING! MusicBrainz.query_interval= is deprecated. Use MusicBrainz::Tools::Proxy.query_interval"
+      MusicBrainz::Tools::Proxy.query_interval = sec
+    end
+
+    def cache_path
+      $stdout.send :puts, "WARNING! MusicBrainz.cache_path is deprecated. Use MusicBrainz::Tools::Cache.cache_path"
+      MusicBrainz::Tools::Cache.cache_path
+    end
+
+    def cache_path=(path)
+      $stdout.send :puts, "WARNING! MusicBrainz.cache_path= is deprecated. Use MusicBrainz::Tools::Cache.cache_path"
+      MusicBrainz::Tools::Cache.cache_path = path
+    end
   end
 end

lib/musicbrainz.rb

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 require "open-uri"
 require "socket"
 require "nokogiri"

lib/musicbrainz/release.rb

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
+
 module MusicBrainz
-  class Release < MusicBrainz::Base
+  class Release < Base
 
     field :id, String
     field :title, String
@@ -10,19 +11,32 @@ module MusicBrainz
     field :country, String
 
     def tracks
-      if @tracks.nil? and not self.id.nil?
-        @tracks = []
-        Nokogiri::XML(self.class.load(:release, :id => self.id, :inc => [:recordings, :media], :limit => 100)).css('medium-list > medium > track-list > track').each do |r|
-          @tracks << MusicBrainz::Track.parse_xml(r)
-        end
+      @tracks ||= nil
+      if @tracks.nil? and !id.nil?
+        @tracks = self.class.load({
+          :parser => :release_tracks,
+          :create_models => MusicBrainz::Track
+        }, {
+          :resource => :release,
+          :id => id,
+          :inc => [:recordings, :media],
+          :limit => 100
+        })
+        @tracks.sort{ |a, b| a.position <=> b.position }
       end
-      @tracks.sort{ |a, b| a.position <=> b.position }
+      @tracks
     end
 
     class << self
       def find(mbid)
-        xml = Nokogiri::XML(self.load(:release, :id => mbid, :inc => [:media])).css('release').first
-        self.parse_xml(xml) unless xml.nil?
+        load({
+          :parser => :release_model,
+          :create_model => MusicBrainz::Release
+        }, {
+          :resource => :release,
+          :id => mbid,
+          :inc => [:media]
+        })
       end
     end
   end

lib/musicbrainz/release_group.rb

@@ -1,6 +1,7 @@
 # -*- encoding: utf-8 -*-
+
 module MusicBrainz
-  class ReleaseGroup < MusicBrainz::Base
+  class ReleaseGroup < Base
 
     field :id, String
     field :type, String
@@ -20,8 +21,9 @@ module MusicBrainz
           :inc => [:media],
           :limit => 100
         })
+        @releases.sort!{ |a, b| a.date <=> b.date }
       end
-      @releases.sort{ |a, b| a.date <=> b.date }
+      @releases
     end
 
     class << self

lib/musicbrainz/track.rb

@@ -1,21 +1,23 @@
 # -*- encoding: utf-8 -*-
+
 module MusicBrainz
-  class Track < MusicBrainz::Base
-    attr_accessor :position, :recording_id, :title, :length
+  class Track < Base
 
-    def self.find mbid
-      xml = Nokogiri::XML(self.load(:recording, :id => mbid))
-      self.parse_xml(xml) unless xml.nil?
-    end
+    field :position, Integer
+    field :recording_id, String
+    field :title, String
+    field :length, Integer
 
-    def self.parse_xml xml
-      @track = MusicBrainz::Track.new
-      @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
+    class << self
+      def find(mbid)
+        load({
+          :parser => :track_model,
+          :create_model => MusicBrainz::Track
+        }, {
+          :resource => :recording,
+          :id => mbid
+        })
+      end
     end
   end
 end

lib/parsers/release.rb

@@ -6,7 +6,7 @@ module MusicBrainz
       class << self
         def model(xml)
           {
-            :id => safe_get_attr(xml, nil, "id") || safe_get_attr(xml, "release-group", "id"),
+            :id => safe_get_attr(xml, nil, "id") || safe_get_attr(xml, "release", "id"),
             :title => safe_get_value(xml, "title"),
             :status => safe_get_value(xml, "status"),
             :country => safe_get_value(xml, "country"),
@@ -14,6 +14,14 @@ module MusicBrainz
             :date => safe_get_value(xml, "date")
           }
         end
+
+        def tracks(xml)
+          tracks = []
+          xml.css("medium-list > medium > track-list > track").each do |r|
+            tracks << MusicBrainz::Parsers::Track.model(r)
+          end
+          tracks
+        end
       end
     end
   end

lib/parsers/track.rb

@@ -4,7 +4,14 @@ module MusicBrainz
   module Parsers
     class Track < Base
       class << self
-
+        def model(xml)
+          {
+            :position => safe_get_value(xml, "position"),
+            :recording_id => safe_get_attr(xml, "recording", "id"),
+            :title => safe_get_value(xml, "recording > title"),
+            :length => safe_get_value(xml, "length") || safe_get_value(xml, "recording > length")
+          }
+        end
       end
     end
   end

lib/tools/proxy.rb

@@ -23,6 +23,7 @@ module MusicBrainz
 
       def self.load(params = {})
         url = WEB_SERVICE_URL + params[:resource].to_s.gsub('_', '-') + '/' + (params[:id].to_s || '')
+        params.delete(:resource)
         params.delete(:id) unless params[:id].nil?
         url << '?' + params.map{ |k, v|
           k = k.to_s.gsub('_', '-')