lib/musicbrainz/artist.rb in musicbrainz-0.6.0 vs lib/musicbrainz/artist.rb in musicbrainz-0.7.0

@@ -1,81 +1,77 @@
 # -*- encoding: utf-8 -*-
 
 module MusicBrainz
-  class Artist < MusicBrainz::Base
-    attr_accessor :id, :type, :name, :country, :date_begin, :date_end, :urls
-    @release_groups
+  class Artist < Base
 
+    field :id, String
+    field :type, String
+    field :name, String
+    field :country, String
+    field :date_begin, Time
+    field :date_end, Time
+    field :urls, Hash
+
     def release_groups
-      if @release_groups.nil? and not self.id.nil?
-        @release_groups = []
-        Nokogiri::XML(self.class.load(:release_group, :artist => self.id)).css('release-group').each do |rg|
-          @release_groups << MusicBrainz::ReleaseGroup.parse_xml(rg)
-        end
+      @release_groups ||= nil
+      if @release_groups.nil? and !id.nil?
+        @release_groups = self.class.load({
+          :parser => :artist_release_groups,
+          :create_models => MusicBrainz::ReleaseGroup
+        }, {
+          :resource => :release_group,
+          :artist => id
+        })
+        @release_groups.sort!{ |a, b| a.first_release_date <=> b.first_release_date }
       end
-      @release_groups.sort{ |a, b| a.first_release_date <=> b.first_release_date }
+      @release_groups
     end
 
-    def self.find mbid
-      res = self.load :artist, :id => mbid, :inc => [:url_rels]
-      return nil if res.nil?
-      @artist = self.parse_xml(Nokogiri::XML(res))
-    end
+    class << self
+      def find(mbid)
+        load({
+          :parser => :artist_model,
+          :create_model => MusicBrainz::Artist
+        }, {
+          :resource => :artist,
+          :id => mbid,
+          :inc => [:url_rels]
+        })
+      end
 
-    def self.parse_xml xml
-      @artist = MusicBrainz::Artist.new
-      @artist.id = self.safe_get_attr(xml, 'artist', 'id')
-      @artist.type = self.safe_get_attr(xml, 'artist', 'type')
-      @artist.name = self.safe_get_value(xml, 'artist > name').gsub(/[`’]/, "'")
-      @artist.country = self.safe_get_value(xml, 'artist > country')
-      @artist.date_begin = self.safe_get_value(xml, 'artist > life-span > begin')
-      @artist.date_end = self.safe_get_value(xml, 'artist > life-span > end')
-      @artist.urls = {}
-      xml.css('relation-list[target-type="url"] > relation').each do |rel|
-        @artist.urls[rel.attr('type').downcase.split(' ').join('_').to_sym] = rel.css('target').text
+      def search(name)
+        artists = load({
+          :parser => :artist_search
+        }, {
+          :resource => :artist,
+          :query => CGI.escape(name).gsub(/\!/, '\!') + '~',
+          :limit => 50
+        })
+        artists.each { |artist|
+          if artist[:name].downcase == name.downcase
+            artist[:weight] += 80
+          elsif artist[:name].downcase.gsub(/\s/, "") == name.downcase.gsub(/\s/, "")
+            artist[:weight] += 25
+          elsif artist[:aliases].include? name
+            artist[:weight] += 20
+          elsif artist[:aliases].map { |item| item.downcase }.include?(name.downcase)
+            artist[:weight] += 10
+          elsif artist[:aliases].map { |item| item.downcase.gsub(/\s/, "") }.include?(name.downcase.gsub(/\s/, ""))
+            artist[:weight] += 5
+          end
+        }
+        artists.sort{ |a, b| b[:weight] <=> a[:weight] }.take(10)
       end
-      @artist
-    end
 
-    def self.discography mbid
-      artist = self.find(mbid)
-      artist.release_groups.each {|rg| rg.releases.each {|r| r.tracks } }
-      artist
-    end
+      def discography(mbid)
+        artist = find(mbid)
+        artist.release_groups.each { |rg| rg.releases.each { |r| r.tracks } }
+        artist
+      end
 
-    def self.find_by_name name
-      matches = self.search name
-      matches.length.zero? ? nil : self.find(matches.first[:mbid])
-    end
-
-    def self.search name
-      artists = []
-      xml = Nokogiri::XML(self.load(:artist, :query => CGI.escape(name).gsub(/\!/, '\!') + '~', :limit => 50))
-      xml.css('artist-list > artist').each do |a|
-        artist = {
-          :name => a.first_element_child.text.gsub(/[`’]/, "'"),
-          :sort_name => self.safe_get_value(a, 'sort-name').gsub(/[`’]/, "'"),
-          :weight => 0,
-          :desc => self.safe_get_value(a, 'disambiguation'),
-          :type => self.safe_get_attr(a, nil, 'type'),
-          :mbid => self.safe_get_attr(a, nil, 'id')
-        }
-        aliases = a.css('alias-list > alias').map{ |item| item.text }
-        if artist[:name] == name
-          artist[:weight] += 100
-        elsif artist[:name].downcase == name.downcase
-          artist[:weight] += 50
-        elsif artist[:name].downcase.gsub(/\s/, '') == name.downcase.gsub(/\s/, '')
-          artist[:weight] += 25
-        elsif aliases.include? name
-          artist[:weight] += 20
-        elsif aliases.map{ |item| item.downcase }.include? name.downcase
-          artist[:weight] += 10
-        elsif aliases.map{ |item| item.downcase.gsub(/\s/, '') }.include? name.downcase.gsub(/\s/, '')
-          artist[:weight] += 5
-        end
-        artists << artist
+      def find_by_name(name)
+        matches = search(name)
+        matches.length.zero? ? nil : find(matches.first[:mbid])
       end
-      artists.sort{ |a, b| b[:weight] <=> a[:weight] }.take(10)
     end
   end
 end