musicbrainz 0.7.3 → 0.7.4

data/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
@@ -105,11 +108,15 @@ MusicBrainz::Release.find(id)
 # Fields
 {
   :id      => String,
+  :type    => String,
   :title   => String,
   :status  => String,
   :format  => String,
   :date    => Date,
-  :country => String
+  :country => String,
+  :asin    => String,
+  :barcode => String,
+  :quality => String
 }
 ```
 

data/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"

data/lib/musicbrainz/bindings/release.rb

@@ -6,10 +6,14 @@ module MusicBrainz
         
         hash = {
           id: (xml.attribute('id').value rescue nil),
+          type: (xml.xpath('./release-group').attribute('type').value rescue nil),
           title: (xml.xpath('./title').text rescue nil),
           status: (xml.xpath('./status').text rescue nil),
           country: (xml.xpath('./country').text rescue nil),
-          date: (xml.xpath('./date').text rescue nil)
+          date: (xml.xpath('./date').text rescue nil),
+          asin: (xml.xpath('./asin').text rescue nil),
+          barcode: (xml.xpath('./barcode').text rescue nil),
+          quality: (xml.xpath('./quality').text rescue nil)
         }
         
         formats = (xml.xpath('./medium-list/medium/format') rescue []).map(&:text)

data/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

data/lib/musicbrainz/models/base_model.rb

@@ -46,14 +46,18 @@ module MusicBrainz
         elsif type == String
           val.to_s
         elsif type == Date
-          if val.nil? or val == ""
-            val = "2030-12-31"
+          val = if val.nil? or val == ""
+            [2030, 12, 31]
           elsif val.split("-").length == 1
-            val << "-12-31"
+            [val.split("-").first.to_i, 12, 31]
           elsif val.split("-").length == 2
-            val << "-31"
+            val = val.split("-").map(&:to_i)
+            [val.first, val.last, -1]
+          else
+            val.split("-").map(&:to_i)
           end
-          Date.new(*val.split(?-).map(&:to_i))
+          
+          Date.new(*val)
         else
           val
         end

data/lib/musicbrainz/models/release.rb

@@ -1,12 +1,16 @@
 module MusicBrainz
   class Release < BaseModel
     field :id, String
+    field :type, String
     field :title, String
     field :status, String
     field :format, String
     field :date, Date
     field :country, String
-
+    field :asin, String
+    field :barcode, String
+    field :quality, String
+    
     def tracks
       @tracks ||= client.load(:release, { id: id, inc: [:recordings, :media], limit: 100 }, {
         binding: :release_tracks,
@@ -17,7 +21,7 @@ module MusicBrainz
 
     class << self
       def find(id)
-        client.load(:release, { id: id, inc: [:media] }, {
+        client.load(:release, { id: id, inc: [:media, :release_groups] }, {
           binding: :release,
           create_model: :release
         })

data/lib/musicbrainz/models/release_group.rb

@@ -9,7 +9,7 @@ module MusicBrainz
     alias_method :disambiguation, :desc
 
     def releases
-      @releases ||= client.load(:release, { release_group: id, inc: [:media], limit: 100 }, {
+      @releases ||= client.load(:release, { release_group: id, inc: [:media, :release_groups], limit: 100 }, {
         binding: :release_group_releases,
         create_models: :release,
         sort: :date
@@ -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

data/lib/musicbrainz/version.rb

@@ -1,3 +1,3 @@
 module MusicBrainz
-  VERSION = "0.7.3"
+  VERSION = "0.7.4"
 end

data/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

data/spec/models/base_model_spec.rb

@@ -0,0 +1,45 @@
+# -*- encoding: utf-8 -*-
+
+require "spec_helper"
+
+describe MusicBrainz::BaseModel do
+  describe '#validate_type' do
+    describe 'Date' do
+      context 'nil value' do
+        it 'returns 2030-12-31' do
+          response = '<release-group><first-release-date></first-release-date></release-group>'
+          xml = Nokogiri::XML.parse(response)
+          release_group = MusicBrainz::ReleaseGroup.new MusicBrainz::Bindings::ReleaseGroup.parse(xml)
+          release_group.first_release_date.should == Date.new(2030, 12, 31)
+        end
+      end
+      
+      context 'year only' do
+        it 'returns 1995-12-31' do
+          response = '<release-group><first-release-date>1995</first-release-date></release-group>'
+          xml = Nokogiri::XML.parse(response)
+          release_group = MusicBrainz::ReleaseGroup.new MusicBrainz::Bindings::ReleaseGroup.parse(xml)
+          release_group.first_release_date.should == Date.new(1995, 12, 31)
+        end
+      end
+      
+      context 'year and month only' do
+        it 'returns 1995-04-30' do
+          response = '<release-group><first-release-date>1995-04</first-release-date></release-group>'
+          xml = Nokogiri::XML.parse(response)
+          release_group = MusicBrainz::ReleaseGroup.new MusicBrainz::Bindings::ReleaseGroup.parse(xml)
+          release_group.first_release_date.should == Date.new(1995, 4, 30)
+        end
+      end
+      
+      context 'year, month and day' do
+        it 'returns 1995-04-30' do
+          response = '<release-group><first-release-date>1995-04-30</first-release-date></release-group>'
+          xml = Nokogiri::XML.parse(response)
+          release_group = MusicBrainz::ReleaseGroup.new MusicBrainz::Bindings::ReleaseGroup.parse(xml)
+          release_group.first_release_date.should == Date.new(1995, 4, 30)
+        end
+      end
+    end
+  end
+end

data/spec/models/release_group_spec.rb

@@ -3,32 +3,64 @@
 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"
+      releases.first.type.should == "Album"
+    end
   end
 end

data/spec/models/release_spec.rb

@@ -15,12 +15,16 @@ describe MusicBrainz::Release do
   end
 
   it "gets correct release data" do
-    release = MusicBrainz::Release.find("2225dd4c-ae9a-403b-8ea0-9e05014c778f")
-    release.id.should == "2225dd4c-ae9a-403b-8ea0-9e05014c778f"
-    release.title.should == "Empire"
+    release = MusicBrainz::Release.find("b94cb547-cf7a-4357-894c-53c3bf33b093")
+    release.id.should == "b94cb547-cf7a-4357-894c-53c3bf33b093"
+    release.title.should == "Humanoid"
     release.status.should == "Official"
-    release.date.should == Date.new(2006, 8, 28)
-    release.country.should == "GB"
+    release.date.should == Date.new(2009, 10, 6)
+    release.country.should == "US"
+    release.asin.should == 'B002NOYX6I'
+    release.barcode.should == '602527197692'
+    release.quality.should == 'normal'
+    release.type.should == 'Album'
   end
 
   it "gets correct release tracks" do

metadata

@@ -2,14 +2,14 @@
 name: musicbrainz
 version: !ruby/object:Gem::Version
   prerelease: 
-  version: 0.7.3
+  version: 0.7.4
 platform: ruby
 authors:
 - Gregory Eremin
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-01-20 00:00:00.000000000 Z
+date: 2013-01-30 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   version_requirements: !ruby/object:Gem::Requirement
@@ -97,6 +97,7 @@ files:
 - lib/musicbrainz/bindings/release.rb
 - lib/musicbrainz/bindings/release_group.rb
 - lib/musicbrainz/bindings/release_group_releases.rb
+- lib/musicbrainz/bindings/release_group_search.rb
 - lib/musicbrainz/bindings/release_tracks.rb
 - lib/musicbrainz/bindings/track.rb
 - lib/musicbrainz/client.rb
@@ -113,12 +114,14 @@ files:
 - lib/musicbrainz/models/track.rb
 - lib/musicbrainz/version.rb
 - musicbrainz.gemspec
+- spec/bindings/release_group_search_spec.rb
 - spec/bindings/release_spec.rb
 - spec/client_modules/cache_spec.rb
 - spec/deprecated/cache_config_spec.rb
 - spec/deprecated/proxy_config_spec.rb
 - spec/fixtures/kasabian.xml
 - spec/models/artist_spec.rb
+- spec/models/base_model_spec.rb
 - spec/models/release_group_spec.rb
 - spec/models/release_spec.rb
 - spec/models/track_spec.rb
@@ -149,12 +152,14 @@ signing_key:
 specification_version: 3
 summary: MusicBrainz Web Service wrapper with ActiveRecord-style models
 test_files:
+- spec/bindings/release_group_search_spec.rb
 - spec/bindings/release_spec.rb
 - spec/client_modules/cache_spec.rb
 - spec/deprecated/cache_config_spec.rb
 - spec/deprecated/proxy_config_spec.rb
 - spec/fixtures/kasabian.xml
 - spec/models/artist_spec.rb
+- spec/models/base_model_spec.rb
 - spec/models/release_group_spec.rb
 - spec/models/release_spec.rb
 - spec/models/track_spec.rb