Merge pull request #12 from Applicat/release_group_search2

Implementation of release group search

README.md

@@ -80,6 +80,9 @@ MusicBrainz::ReleaseGroup
 ```ruby
 # Class Methods
 MusicBrainz::ReleaseGroup.find(id)
+MusicBrainz::ReleaseGroup.find_by_artist_and_title(artist_name, title, type: 'Album')
+MusicBrainz::ReleaseGroup.search(artist_name, title)
+MusicBrainz::ReleaseGroup.search(artist_name, title, type: 'Album')
 
 # Instance Methods
 @release_group.releases

lib/musicbrainz.rb

@@ -24,6 +24,7 @@ require "musicbrainz/bindings/artist"
 require "musicbrainz/bindings/artist_search"
 require "musicbrainz/bindings/artist_release_groups"
 require "musicbrainz/bindings/release_group"
+require "musicbrainz/bindings/release_group_search"
 require "musicbrainz/bindings/release_group_releases"
 require "musicbrainz/bindings/release"
 require "musicbrainz/bindings/release_tracks"

lib/musicbrainz/bindings/release_group_search.rb

@@ -0,0 +1,20 @@
+# encoding: UTF-8
+module MusicBrainz
+  module Bindings
+    module ReleaseGroupSearch
+      def parse(xml)
+        xml.xpath('./release-group-list/release-group').map do |xml|
+          {
+            id: (xml.attribute('id').value rescue nil),
+            mbid: (xml.attribute('id').value rescue nil), # Old shit
+            title: (xml.xpath('./title').text.gsub(/[`’]/, "'") rescue nil),
+            type: (xml.attribute('type').value rescue nil),
+            score: (xml.attribute('score').value.to_i rescue nil)
+          } rescue nil
+        end.delete_if{ |item| item.nil? }
+      end
+
+      extend self
+    end
+  end
+end

lib/musicbrainz/models/release_group.rb

@@ -23,6 +23,23 @@ module MusicBrainz
           create_model: :release_group
         })
       end
+      
+      def search(artist_name, title, options = {})
+        artist_name = CGI.escape(artist_name).gsub(/\!/, '\!')
+        title = CGI.escape(title).gsub(/\!/, '\!')
+        query = ["artist:\"#{artist_name}\"", "releasegroup:\"#{title}\""]
+        query << "type: #{options[:type]}" if options[:type]
+
+        client.load(
+          :release_group, { query: query.join(' AND '), limit: 10 }, 
+          { binding: :release_group_search }
+        )
+      end
+      
+      def find_by_artist_and_title(artist_name, title, options = {})
+        matches = search(artist_name, title, options)
+        matches.empty? ? nil : find(matches.first[:id])
+      end
     end
   end
 end

spec/bindings/release_group_search_spec.rb

@@ -0,0 +1,17 @@
+# -*- encoding: utf-8 -*-
+
+require "spec_helper"
+
+describe MusicBrainz::Bindings::ReleaseGroupSearch do
+  describe '.parse' do
+    it "gets correct release group data" do
+      response = '<release-group-list><release-group id="246bc928-2dc8-35ba-80ee-7a0079de1632" type="Single" ext:score="100"><title>Empire</title></release-group>'
+      described_class.parse(Nokogiri::XML.parse(response)).should == [
+        {
+          id: '246bc928-2dc8-35ba-80ee-7a0079de1632', mbid: '246bc928-2dc8-35ba-80ee-7a0079de1632', 
+          title: 'Empire', type: 'Single', score: 100
+        }
+      ]
+    end
+  end
+end

spec/models/release_group_spec.rb

@@ -3,32 +3,63 @@
 require "spec_helper"
 
 describe MusicBrainz::ReleaseGroup do
-  it "gets no exception while loading release group info" do
-    lambda {
-      MusicBrainz::ReleaseGroup.find("6f33e0f0-cde2-38f9-9aee-2c60af8d1a61")
-    }.should_not raise_error(Exception)
+  describe '.find' do
+    it "gets no exception while loading release group info" do
+      lambda {
+        MusicBrainz::ReleaseGroup.find("6f33e0f0-cde2-38f9-9aee-2c60af8d1a61")
+      }.should_not raise_error(Exception)
+    end
+  
+    it "gets correct instance" do
+      release_group = MusicBrainz::ReleaseGroup.find("6f33e0f0-cde2-38f9-9aee-2c60af8d1a61")
+      release_group.should be_an_instance_of(MusicBrainz::ReleaseGroup)
+    end
+  
+    it "gets correct release group data" do
+      release_group = MusicBrainz::ReleaseGroup.find("6f33e0f0-cde2-38f9-9aee-2c60af8d1a61")
+      release_group.id.should == "6f33e0f0-cde2-38f9-9aee-2c60af8d1a61"
+      release_group.type.should == "Album"
+      release_group.title.should == "Empire"
+      release_group.first_release_date.should == Date.new(2006, 8, 28)
+    end
   end
-
-  it "gets correct instance" do
-    release_group = MusicBrainz::ReleaseGroup.find("6f33e0f0-cde2-38f9-9aee-2c60af8d1a61")
-    release_group.should be_an_instance_of(MusicBrainz::ReleaseGroup)
+  
+  describe '.search' do
+    context 'without type filter' do
+      it "searches release group by artist name and title" do
+        matches = MusicBrainz::ReleaseGroup.search('Kasabian', 'Empire')
+        matches.length.should be > 0
+        matches.first[:title].should == 'Empire'
+        matches.first[:type].should == 'Single'
+      end
+    end
+    
+    context 'with type filter' do
+      it "searches release group by artist name and title" do
+        matches = MusicBrainz::ReleaseGroup.search('Kasabian', 'Empire', type: 'Album')
+        matches.length.should be > 0
+        matches.first[:title].should == 'Empire'
+        matches.first[:type].should == 'Album'
+      end
+    end
   end
-
-  it "gets correct release group data" do
-    release_group = MusicBrainz::ReleaseGroup.find("6f33e0f0-cde2-38f9-9aee-2c60af8d1a61")
-    release_group.id.should == "6f33e0f0-cde2-38f9-9aee-2c60af8d1a61"
-    release_group.type.should == "Album"
-    release_group.title.should == "Empire"
-    release_group.first_release_date.should == Date.new(2006, 8, 28)
+  
+  describe '.find_by_artist_and_title' do
+    it "gets first release group by artist name and title" do
+      release_group = MusicBrainz::ReleaseGroup.find_by_artist_and_title('Kasabian', 'Empire')
+      release_group.id.should == '246bc928-2dc8-35ba-80ee-7a0079de1632'
+    end
   end
-
-  it "gets correct release group's releases" do
-    releases = MusicBrainz::ReleaseGroup.find("6f33e0f0-cde2-38f9-9aee-2c60af8d1a61").releases
-    releases.length.should be >= 5
-    releases.first.id.should == "2225dd4c-ae9a-403b-8ea0-9e05014c778f"
-    releases.first.status.should == "Official"
-    releases.first.title.should == "Empire"
-    releases.first.date.should == Date.new(2006, 8, 28)
-    releases.first.country.should == "GB"
+  
+  describe '#releases' do
+    it "gets correct release group's releases" do
+      releases = MusicBrainz::ReleaseGroup.find("6f33e0f0-cde2-38f9-9aee-2c60af8d1a61").releases
+      releases.length.should be >= 5
+      releases.first.id.should == "2225dd4c-ae9a-403b-8ea0-9e05014c778f"
+      releases.first.status.should == "Official"
+      releases.first.title.should == "Empire"
+      releases.first.date.should == Date.new(2006, 8, 28)
+      releases.first.country.should == "GB"
+    end
   end
 end