musicbrainz 0.3.1 → 0.4.0

data/README.rdoc

@@ -1,4 +1,4 @@
-= MusicBrainz Web Service wrapper
+= MusicBrainz Web Service wrapper {<img src="https://secure.travis-ci.org/magnolia-fan/musicbrainz.png"/>}[http://travis-ci.org/magnolia-fan/musicbrainz]
 
 === Installation
 

data/VERSION

@@ -1 +1 @@
-0.3.1
+0.4.0

data/lib/models/music_brainz.rb

@@ -15,12 +15,12 @@ module MusicBrainz
     5.times do
       begin
         response = open(url, "User-Agent" => "gem musicbrainz (https://github.com/magnolia-fan/musicbrainz) @ " + Socket.gethostname)
+        self.last_query_time = Time.now.to_f
       rescue => e
         p "MusicBrainz: 503"
       end
       break unless response.nil?
     end
-    self.last_query_time = Time.now.to_f
     response
   end
   

data/lib/models/music_brainz/artist.rb

@@ -6,7 +6,9 @@ module MusicBrainz
     def release_groups
       if @release_groups.nil? and not self.id.nil?
         @release_groups = []
-        Nokogiri::XML(MusicBrainz.load('http://musicbrainz.org/ws/2/release-group/?artist=' + self.id)).css('release-group').each do |rg|
+        Nokogiri::XML(MusicBrainz.load(
+          'http://musicbrainz.org/ws/2/release-group/?artist=' + self.id
+        )).css('release-group').each do |rg|
           @release_groups << MusicBrainz::ReleaseGroup.parse_xml(rg)
         end
       end
@@ -27,5 +29,36 @@ module MusicBrainz
       @artist.date_end = xml.css('artist > life-span > end').text unless xml.css('artist > life-span > end').empty?
       @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(MusicBrainz.load(
+        'http://musicbrainz.org/ws/2/artist/?query='+ URI.escape(name).gsub(/\&/, '%26').gsub(/\?/, '%3F') +'~&limit=50'
+      ))
+      xml.css('artist-list > artist').each do |a|
+        artist = {
+          :name => a.first_element_child.text,
+          :weight => 0,
+          :desc => (a.css('disambiguation').text unless a.css('disambiguation').empty?),
+          :type => a.attr('type'),
+          :mbid => a.attr('id')
+        }
+        aliases = a.css('alias-list > alias').map{ |item| item.text }
+        if 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
+      end
+      artists.sort{ |a, b| b[:weight] <=> a[:weight] }.take(10)
+    end
   end
 end

data/lib/models/music_brainz/release.rb

@@ -6,7 +6,7 @@ module MusicBrainz
     def tracks
       if @tracks.nil? and not self.id.nil?
         @tracks = []
-        Nokogiri::XML(MusicBrainz.load('http://musicbrainz.org/ws/2/release/' + self.id + '?inc=recordings')).css('medium-list > medium > track-list > track').each do |r|
+        Nokogiri::XML(MusicBrainz.load('http://musicbrainz.org/ws/2/release/' + self.id + '?inc=recordings&limit=100')).css('medium-list > medium > track-list > track').each do |r|
           @tracks << MusicBrainz::Track.parse_xml(r)
         end
       end

data/lib/models/music_brainz/release_group.rb

@@ -6,7 +6,7 @@ module MusicBrainz
     def releases
       if @releases.nil? and not self.id.nil?
         @releases = []
-        Nokogiri::XML(MusicBrainz.load('http://musicbrainz.org/ws/2/release/?release-group=' + self.id)).css('release').each do |r|
+        Nokogiri::XML(MusicBrainz.load('http://musicbrainz.org/ws/2/release/?release-group=' + self.id + '&limit=100')).css('release').each do |r|
           @releases << MusicBrainz::Release.parse_xml(r)
         end
       end

data/lib/models/music_brainz/track.rb

@@ -3,7 +3,7 @@ module MusicBrainz
     attr_accessor :position, :recording_id, :title, :length
   
     def self.find mbid
-      xml = Nokogiri::XML(MusicBrainz.load('http://musicbrainz.org/ws/2/recording/' + mbid))
+      xml = Nokogiri::XML(MusicBrainz.load('http://musicbrainz.org/ws/2/recording/' + mbid + '?limit=100'))
       self.parse_xml(xml) unless xml.nil?
     end
   

data/musicbrainz.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{musicbrainz}
-  s.version = "0.3.1"
+  s.version = "0.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = [%q{Gregory Eremin}]
-  s.date = %q{2011-09-13}
+  s.date = %q{2011-09-14}
   s.description = %q{MusicBrainz Web Service wrapper with ActiveRecord-style models}
   s.email = %q{magnolia_fan@me.com}
   s.extra_rdoc_files = [

data/test/test_musicbrainz.rb

@@ -8,6 +8,17 @@ class TestMusicbrainz < Test::Unit::TestCase
       end
     end
     
+    should "search for artists by name" do
+      matches = MusicBrainz::Artist.search('Kasabian')
+      assert_operator(0, :<, matches.length)
+      assert_equal("Kasabian", matches.first[:name])
+    end
+    
+    should "get correct artist by name" do
+      @artist = MusicBrainz::Artist.find_by_name('Kasabian')
+      assert_equal("69b39eab-6577-46a4-a9f5-817839092033", @artist.id)
+    end
+    
     setup do
       @artist = MusicBrainz::Artist.find('69b39eab-6577-46a4-a9f5-817839092033')
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musicbrainz
 version: !ruby/object:Gem::Version
-  version: 0.3.1
+  version: 0.4.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-09-13 00:00:00.000000000Z
+date: 2011-09-14 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &2152915760 !ruby/object:Gem::Requirement
+  requirement: &2153490500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,10 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *2152915760
+  version_requirements: *2153490500
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &2152914720 !ruby/object:Gem::Requirement
+  requirement: &2153489260 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152914720
+  version_requirements: *2153489260
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &2152913500 !ruby/object:Gem::Requirement
+  requirement: &2153467600 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,10 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *2152913500
+  version_requirements: *2153467600
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &2152912280 !ruby/object:Gem::Requirement
+  requirement: &2153466800 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +54,10 @@ dependencies:
         version: 1.6.4
   type: :development
   prerelease: false
-  version_requirements: *2152912280
+  version_requirements: *2153466800
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &2152911400 !ruby/object:Gem::Requirement
+  requirement: &2153465500 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +65,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152911400
+  version_requirements: *2153465500
 - !ruby/object:Gem::Dependency
   name: rdoc
-  requirement: &2152910500 !ruby/object:Gem::Requirement
+  requirement: &2153464900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +76,7 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *2152910500
+  version_requirements: *2153464900
 description: MusicBrainz Web Service wrapper with ActiveRecord-style models
 email: magnolia_fan@me.com
 executables: []
@@ -116,7 +116,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: -2577539182600304667
+      hash: -2702220955620971085
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements: