musicbrainz 0.7.0 → 0.7.1

data/Contributors

@@ -2,3 +2,4 @@ Huge thanks to that people for making this gem better!
 
 Applicat (https://github.com/Applicat)
 Jens Fahnenbruck (https://github.com/jigfox)
+Sander Nieuwenhuizen (https://github.com/munkius)

data/lib/musicbrainz/artist.rb

@@ -39,27 +39,13 @@ module MusicBrainz
       end
 
       def search(name)
-        artists = load({
+        load({
           :parser => :artist_search
         }, {
           :resource => :artist,
-          :query => CGI.escape(name).gsub(/\!/, '\!') + '~',
-          :limit => 50
+          :query => "artist:" << CGI.escape(name).gsub(/\!/, '\!'),
+          :limit => 10
         })
-        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
 
       def discography(mbid)

data/lib/parsers/artist.rb

@@ -21,19 +21,17 @@ module MusicBrainz
         end
 
         def search(xml)
-          artists = []
-          xml.css("artist-list > artist").each do |a|
-            artists << {
+          xml.css("artist-list > artist").map do |a|
+            {
               :name => a.first_element_child.text.gsub(/[`’]/, "'"),
               :sort_name => safe_get_value(a, "sort-name").gsub(/[`’]/, "'"),
-              :weight => 0,
+              :score => (safe_get_attr(a, nil, "score").to_i rescue 0),
               :desc => safe_get_value(a, "disambiguation"),
               :type => safe_get_attr(a, nil, "type"),
               :mbid => safe_get_attr(a, nil, "id"),
               :aliases => a.css("alias-list > alias").map { |item| item.text }
             }
           end
-          artists
         end
 
         def release_groups(xml)

data/lib/version.rb

@@ -1,5 +1,5 @@
 # -*- encoding: utf-8 -*-
 
 module MusicBrainz
-  VERSION = "0.7.0"
+  VERSION = "0.7.1"
 end

data/spec/requests/artist_spec.rb

@@ -20,10 +20,25 @@ describe MusicBrainz::Artist do
     matches.first[:name].should == "Kasabian"
   end
 
+  it "should return search results in the right order and pass back the correct score" do
+    matches = MusicBrainz::Artist.search('Chris Martin')
+
+    matches[0][:score].should == 100
+    matches[0][:mbid].should == "98d1ec5a-dd97-4c0b-9c83-7928aac89bca"
+    matches[1][:score].should == 100
+    matches[1][:mbid].should == "af2ab893-3212-4226-9e73-73a1660b6952"
+    matches[2][:score].should == 95
+    matches[2][:mbid].should == "444d1b63-534b-4ea6-89f0-0af6ab2e20c3"
+    matches[3][:score].should == 95
+    matches[3][:mbid].should == "b732a912-af95-472c-be52-b14610734c64"
+    matches[4][:score].should == 95
+    matches[4][:mbid].should == "90fff570-a4ef-4cd4-ba21-e00c7261b05a"
+  end
+
   it "finds name first than alias" do
     matches = MusicBrainz::Artist.search('Chris Martin')
     matches.length.should be > 0
-    matches.first[:mbid].should == "af2ab893-3212-4226-9e73-73a1660b6952"
+    matches.first[:mbid].should == "98d1ec5a-dd97-4c0b-9c83-7928aac89bca"
   end
 
   it "gets correct result by name" do

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musicbrainz
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-08 00:00:00.000000000 Z
+date: 2012-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
@@ -127,12 +127,18 @@ required_ruby_version: !ruby/object:Gem::Requirement
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4552071205810046641
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
   - - ! '>='
     - !ruby/object:Gem::Version
       version: '0'
+      segments:
+      - 0
+      hash: 4552071205810046641
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23