musicbrainz 0.7.5 → 0.7.6

data/.gitignore

@@ -4,3 +4,4 @@ tmp
 Gemfile.lock
 .gem
 *.swp
+pkg/*

data/CHANGELOG.md

@@ -1,5 +1,9 @@
 ## musicbrainz (unreleased) ##
 
+# 0.7.6 (June 14, 2013) ##
+
+*   Improves urls attribute to return an array if there are multiple urls for a relation type. [#19]
+
 # 0.7.5 (May 6, 2013) ##
 
 *   Created new track_search binding to allow searching for tracks. [#18]

data/lib/musicbrainz.rb

@@ -24,6 +24,7 @@ require "musicbrainz/models/track"
 require "musicbrainz/bindings/artist"
 require "musicbrainz/bindings/artist_search"
 require "musicbrainz/bindings/artist_release_groups"
+require "musicbrainz/bindings/relations"
 require "musicbrainz/bindings/release_group"
 require "musicbrainz/bindings/release_group_search"
 require "musicbrainz/bindings/release_group_releases"

data/lib/musicbrainz/bindings/artist.rb

@@ -3,18 +3,18 @@ module MusicBrainz
   module Bindings
     module Artist
       def parse(xml)
-        xml = xml.xpath('./artist') unless xml.xpath('./artist').empty?
+        xml = xml.xpath('./artist') 
+
+        return {} if xml.empty?
+        
         {
           id: (xml.attribute('id').value rescue nil),
           type: (xml.attribute('type').value rescue nil),
           name: (xml.xpath('./name').text.gsub(/[`’]/, "'") rescue nil),
           country: (xml.xpath('./country').text rescue nil),
           date_begin: (xml.xpath('./life-span/begin').text rescue nil),
-          date_end: (xml.xpath('./life-span/end').text rescue nil),
-          urls: (Hash[xml.xpath('./relation-list[@target-type="url"]/relation').map{ |xml|
-            [xml.attribute('type').value.downcase.split(" ").join("_").to_sym, xml.xpath('./target').text]
-          }] rescue {})
-        }
+          date_end: (xml.xpath('./life-span/end').text rescue nil)
+        }.merge(Relations.parse(xml))
       end
 
       extend self

data/lib/musicbrainz/bindings/relations.rb

@@ -0,0 +1,26 @@
+# encoding: UTF-8
+module MusicBrainz
+  module Bindings
+    module Relations
+      def parse(xml)
+        hash = { urls: {} }
+        
+        xml.xpath('./relation-list[@target-type="url"]/relation').map do |xml|
+          next unless type = xml.attribute('type')
+          
+          type = type.value.downcase.split(" ").join("_").to_sym       
+          target = xml.xpath('./target').text   
+          
+          if hash[:urls][type].nil? then hash[:urls][type] = target
+          elsif hash[:urls][type].is_a?(Array) then hash[:urls][type] << target
+          else hash[:urls][type] = [hash[:urls][type]]; hash[:urls][type] << target
+          end
+        end
+        
+        hash
+      end
+      
+      extend self
+    end
+  end
+end

data/lib/musicbrainz/bindings/release_group.rb

@@ -8,11 +8,8 @@ module MusicBrainz
           type: (xml.attribute('type').value rescue nil),
           title: (xml.xpath('./title').text rescue nil),
           desc: (xml.xpath('./disambiguation').text rescue nil),
-          first_release_date: (xml.xpath('./first-release-date').text rescue nil),
-          urls: (Hash[xml.xpath('./relation-list[@target-type="url"]/relation').map{ |xml|
-            [xml.attribute('type').value.downcase.split(" ").join("_").to_sym, xml.xpath('./target').text]
-          }] rescue {})
-        }
+          first_release_date: (xml.xpath('./first-release-date').text rescue nil)
+        }.merge(Relations.parse(xml))
       end
 
       extend self

data/lib/musicbrainz/version.rb

@@ -1,3 +1,3 @@
 module MusicBrainz
-  VERSION = "0.7.5"
+  VERSION = "0.7.6"
 end

data/spec/bindings/relations_spec.rb

@@ -0,0 +1,44 @@
+# -*- encoding: utf-8 -*-
+
+require "spec_helper"
+
+describe MusicBrainz::Bindings::Relations do
+  describe '.parse' do
+    describe 'attributes' do
+      describe 'urls' do
+        context '1 url for relation type' do
+          it 'returns a string' do
+            xml = Nokogiri::XML.parse(
+              %Q{<artist><relation-list target-type="url">
+                <relation type-id="99429741-f3f6-484b-84f8-23af51991770" type="social network">
+                  <target id="4f4068cb-7001-47a3-a2fe-9146eb6b5d16">https://plus.google.com/+Madonna</target>
+                </relation>
+              </relation-list></artist>}
+            )
+            
+            described_class.parse(xml.xpath('./artist'))[:urls][:social_network].should == 'https://plus.google.com/+Madonna'
+          end
+        end
+        
+        context 'multiple urls for relation types' do
+          it 'returns an array' do
+            xml = Nokogiri::XML.parse(
+              %Q{<artist><relation-list target-type="url">
+                <relation type-id="99429741-f3f6-484b-84f8-23af51991770" type="social network">
+                  <target id="4f4068cb-7001-47a3-a2fe-9146eb6b5d16">https://plus.google.com/+Madonna</target>
+                </relation>
+                <relation type-id="99429741-f3f6-484b-84f8-23af51991770" type="social network">
+                  <target id="1dc9e14d-ebfb-448c-a005-e3481d320595">https://www.facebook.com/madonna</target>
+                </relation>
+              </relation-list></artist>}
+            )
+
+            described_class.parse(xml.xpath('./artist'))[:urls][:social_network].should == [
+              'https://plus.google.com/+Madonna', 'https://www.facebook.com/madonna'
+            ]
+          end
+        end
+      end
+    end
+  end
+end

data/spec/fixtures/artist/search.xml

@@ -0,0 +1,67 @@
+<?xml version="1.0" standalone="yes"?>
+<metadata created="2013-06-11T14:02:53.104Z" xmlns="http://musicbrainz.org/ns/mmd-2.0#" xmlns:ext="http://musicbrainz.org/ns/ext#-2.0">
+  <artist-list count="5" offset="0">
+    <artist id="90fff570-a4ef-4cd4-ba21-e00c7261b05a" type="Person" ext:score="100">
+      <name>Chris Martin</name>
+      <sort-name>Martin, Chris</sort-name>
+      <disambiguation>Reggae / Dancehall singer Christopher Martin</disambiguation>
+      <life-span>
+        <ended>false</ended>
+      </life-span>
+    </artist>
+    <artist id="b732a912-af95-472c-be52-b14610734c64" type="Person" ext:score="100">
+      <name>Chris Martin</name>
+      <sort-name>Martin, Chris</sort-name>
+      <disambiguation>Illustrator</disambiguation>
+      <life-span>
+        <ended>false</ended>
+      </life-span>
+    </artist>
+    <artist id="98d1ec5a-dd97-4c0b-9c83-7928aac89bca" type="Person" ext:score="100">
+      <name>Chris Martin</name>
+      <sort-name>Martin, Chris</sort-name>
+      <gender>male</gender>
+      <country>GB</country>
+      <area id="8a754a16-0027-3a29-b6d7-2b40ea0481ed">
+        <name>United Kingdom</name>
+        <sort-name>United Kingdom</sort-name>
+      </area>
+      <disambiguation>lead singer of Coldplay</disambiguation>
+      <ipi-list>
+        <ipi>00280536565</ipi>
+      </ipi-list>
+      <life-span>
+        <begin>1977-03-02</begin>
+        <ended>false</ended>
+      </life-span>
+      <alias-list>
+        <alias sort-name="Martin, Christopher Anthony John" type="Legal name">Christopher Anthony John Martin</alias>
+      </alias-list>
+      <tag-list>
+        <tag count="1">
+          <name>pop/rock</name>
+        </tag>
+      </tag-list>
+    </artist>
+    <artist id="af2ab893-3212-4226-9e73-73a1660b6952" type="Person" ext:score="100">
+      <name>Chris Martin</name>
+      <sort-name>Martin, Chris</sort-name>
+      <disambiguation>hip hop producer DJ Premier, DJ Primo</disambiguation>
+      <life-span>
+        <begin>1965-05-05</begin>
+        <ended>false</ended>
+      </life-span>
+      <alias-list>
+        <alias sort-name="Christopher Edward Martin">Christopher Edward Martin</alias>
+      </alias-list>
+    </artist>
+    <artist id="444d1b63-534b-4ea6-89f0-0af6ab2e20c3" type="Person" ext:score="100">
+      <name>Chris Martin</name>
+      <sort-name>Martin, Chris</sort-name>
+      <disambiguation>Disney songwriter/composer</disambiguation>
+      <life-span>
+        <ended>false</ended>
+      </life-span>
+    </artist>
+  </artist-list>
+</metadata>

data/spec/models/artist_spec.rb

@@ -21,18 +21,16 @@ describe MusicBrainz::Artist do
   end
 
   it "should return search results in the right order and pass back the correct score" do
+    response = File.open(File.join(File.dirname(__FILE__), "../fixtures/artist/search.xml")).read
+    MusicBrainz::Client.any_instance.stub(:get_contents).with('http://musicbrainz.org/ws/2/artist?query=artist:"Chris+Martin"&limit=10').
+    and_return({ status: 200, body: response})
+        
     matches = MusicBrainz::Artist.search('Chris Martin')
 
     matches[0][:score].should == 100
-    matches[0][:id].should == "98d1ec5a-dd97-4c0b-9c83-7928aac89bca"
+    matches[0][:id].should == "90fff570-a4ef-4cd4-ba21-e00c7261b05a"
     matches[1][:score].should == 100
-    matches[1][:id].should == "af2ab893-3212-4226-9e73-73a1660b6952"
-  end
-
-  it "finds name first than alias" do
-    matches = MusicBrainz::Artist.search('Chris Martin')
-    matches.length.should be > 0
-    matches.first[:mbid].should == "98d1ec5a-dd97-4c0b-9c83-7928aac89bca"
+    matches[1][:id].should == "b732a912-af95-472c-be52-b14610734c64"
   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.5
+  version: 0.7.6
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-05-06 00:00:00.000000000 Z
+date: 2013-06-14 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: faraday
@@ -96,6 +96,7 @@ files:
 - lib/musicbrainz/bindings/artist.rb
 - lib/musicbrainz/bindings/artist_release_groups.rb
 - lib/musicbrainz/bindings/artist_search.rb
+- lib/musicbrainz/bindings/relations.rb
 - lib/musicbrainz/bindings/release.rb
 - lib/musicbrainz/bindings/release_group.rb
 - lib/musicbrainz/bindings/release_group_releases.rb
@@ -117,12 +118,14 @@ files:
 - lib/musicbrainz/models/track.rb
 - lib/musicbrainz/version.rb
 - musicbrainz.gemspec
+- spec/bindings/relations_spec.rb
 - spec/bindings/release_group_search_spec.rb
 - spec/bindings/release_spec.rb
 - spec/bindings/track_search_spec.rb
 - spec/client_modules/cache_spec.rb
 - spec/deprecated/cache_config_spec.rb
 - spec/deprecated/proxy_config_spec.rb
+- spec/fixtures/artist/search.xml
 - spec/fixtures/kasabian.xml
 - spec/fixtures/release_group/entity.xml
 - spec/fixtures/release_group/search.xml
@@ -147,7 +150,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3461617473548305683
+      hash: 85383648681558491
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -156,7 +159,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3461617473548305683
+      hash: 85383648681558491
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.24
@@ -164,12 +167,14 @@ signing_key:
 specification_version: 3
 summary: MusicBrainz Web Service wrapper with ActiveRecord-style models
 test_files:
+- spec/bindings/relations_spec.rb
 - spec/bindings/release_group_search_spec.rb
 - spec/bindings/release_spec.rb
 - spec/bindings/track_search_spec.rb
 - spec/client_modules/cache_spec.rb
 - spec/deprecated/cache_config_spec.rb
 - spec/deprecated/proxy_config_spec.rb
+- spec/fixtures/artist/search.xml
 - spec/fixtures/kasabian.xml
 - spec/fixtures/release_group/entity.xml
 - spec/fixtures/release_group/search.xml