musicbrainz 0.6.0 → 0.7.0

data/Contributors

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

data/README.md

@@ -4,16 +4,21 @@
 ```bash
 gem install musicbrainz
 ```
+or add this line to your Gemfile
+```ruby
+gem "musicbrainz"
+```
+
 ### Usage
 ```ruby
-require 'musicbrainz'
+require "musicbrainz"
 
 # Search for artists
-@suggestions = MusicBrainz::Artist.search('Jet')
+@suggestions = MusicBrainz::Artist.search("Jet")
 
 # Find artist by name or mbid
-@foo_fighters = MusicBrainz::Artist.find_by_name('Foo Fighters')
-@kasabian = MusicBrainz::Artist.find('69b39eab-6577-46a4-a9f5-817839092033')
+@foo_fighters = MusicBrainz::Artist.find_by_name("Foo Fighters")
+@kasabian = MusicBrainz::Artist.find("69b39eab-6577-46a4-a9f5-817839092033")
 
 # Use them like ActiveRecord models
 @empire_tracks = @kasabian.release_groups[8].releases.first.tracks
@@ -71,6 +76,16 @@ MusicBrainz::Track
 @track.length
 ```
 
+### Testing
+```bash
+bundle rake spec
+```
+
+### Debug console
+```bash
+bundle rake console
+```
+
 ### Contributing
 
 * Check out the latest master to make sure the feature hasn't been implemented or the bug hasn't been fixed yet

data/Rakefile

@@ -6,3 +6,8 @@ RSpec::Core::RakeTask.new("spec")
 
 task :default => :spec
 task :test => :spec
+
+desc "Open an irb session preloaded with this library"
+task :console do
+  sh "irb -rubygems -I lib -r musicbrainz.rb"
+end

data/lib/deprecated.rb

@@ -1,12 +1,25 @@
 # -*- encoding: utf-8 -*-
+
 module MusicBrainz
-  def self.query_interval=(sec)
-    MusicBrainz::Tools::Proxy.query_interval = sec
-    puts "WARNING! MusicBrainz.query_interval is deprecated. Use MusicBrainz::Tools::Proxy.query_interval"
-  end
+  class << self
+    def query_interval
+      $stdout.send :puts, "WARNING! MusicBrainz.query_interval is deprecated. Use MusicBrainz::Tools::Proxy.query_interval"
+      MusicBrainz::Tools::Proxy.query_interval
+    end
+
+    def query_interval=(sec)
+      $stdout.send :puts, "WARNING! MusicBrainz.query_interval= is deprecated. Use MusicBrainz::Tools::Proxy.query_interval"
+      MusicBrainz::Tools::Proxy.query_interval = sec
+    end
+
+    def cache_path
+      $stdout.send :puts, "WARNING! MusicBrainz.cache_path is deprecated. Use MusicBrainz::Tools::Cache.cache_path"
+      MusicBrainz::Tools::Cache.cache_path
+    end
 
-  def self.cache_path=(path)
-    MusicBrainz::Tools::Cache.cache_path = path
-    puts "WARNING! MusicBrainz.cache_path is deprecated. Use MusicBrainz::Tools::Cache.cache_path"
+    def cache_path=(path)
+      $stdout.send :puts, "WARNING! MusicBrainz.cache_path= is deprecated. Use MusicBrainz::Tools::Cache.cache_path"
+      MusicBrainz::Tools::Cache.cache_path = path
+    end
   end
 end

data/lib/musicbrainz.rb

@@ -1,20 +1,29 @@
 # -*- encoding: utf-8 -*-
+
 require "open-uri"
 require "socket"
 require "nokogiri"
 require "cgi"
 
+module MusicBrainz
+  module Tools; end
+  module Parsers; end
+end
+
 require "version"
+require "deprecated"
 
-module MusicBrainz
-  autoload :Base, "musicbrainz/base"
-  autoload :Artist, "musicbrainz/artist"
-  autoload :ReleaseGroup, "musicbrainz/release_group"
-  autoload :Release, "musicbrainz/release"
-  autoload :Track, "musicbrainz/track"
+require "musicbrainz/base"
+require "musicbrainz/artist"
+require "musicbrainz/release_group"
+require "musicbrainz/release"
+require "musicbrainz/track"
 
-  module Tools
-    autoload :Cache, "tools/cache"
-    autoload :Proxy, "tools/proxy"
-  end
-end
+require "tools/cache"
+require "tools/proxy"
+
+require "parsers/base"
+require "parsers/artist"
+require "parsers/release_group"
+require "parsers/release"
+require "parsers/track"

data/lib/musicbrainz/artist.rb

@@ -1,81 +1,77 @@
 # -*- encoding: utf-8 -*-
 
 module MusicBrainz
-  class Artist < MusicBrainz::Base
-    attr_accessor :id, :type, :name, :country, :date_begin, :date_end, :urls
-    @release_groups
+  class Artist < Base
+
+    field :id, String
+    field :type, String
+    field :name, String
+    field :country, String
+    field :date_begin, Time
+    field :date_end, Time
+    field :urls, Hash
 
     def release_groups
-      if @release_groups.nil? and not self.id.nil?
-        @release_groups = []
-        Nokogiri::XML(self.class.load(:release_group, :artist => self.id)).css('release-group').each do |rg|
-          @release_groups << MusicBrainz::ReleaseGroup.parse_xml(rg)
-        end
+      @release_groups ||= nil
+      if @release_groups.nil? and !id.nil?
+        @release_groups = self.class.load({
+          :parser => :artist_release_groups,
+          :create_models => MusicBrainz::ReleaseGroup
+        }, {
+          :resource => :release_group,
+          :artist => id
+        })
+        @release_groups.sort!{ |a, b| a.first_release_date <=> b.first_release_date }
       end
-      @release_groups.sort{ |a, b| a.first_release_date <=> b.first_release_date }
-    end
-
-    def self.find mbid
-      res = self.load :artist, :id => mbid, :inc => [:url_rels]
-      return nil if res.nil?
-      @artist = self.parse_xml(Nokogiri::XML(res))
+      @release_groups
     end
 
-    def self.parse_xml xml
-      @artist = MusicBrainz::Artist.new
-      @artist.id = self.safe_get_attr(xml, 'artist', 'id')
-      @artist.type = self.safe_get_attr(xml, 'artist', 'type')
-      @artist.name = self.safe_get_value(xml, 'artist > name').gsub(/[`’]/, "'")
-      @artist.country = self.safe_get_value(xml, 'artist > country')
-      @artist.date_begin = self.safe_get_value(xml, 'artist > life-span > begin')
-      @artist.date_end = self.safe_get_value(xml, 'artist > life-span > end')
-      @artist.urls = {}
-      xml.css('relation-list[target-type="url"] > relation').each do |rel|
-        @artist.urls[rel.attr('type').downcase.split(' ').join('_').to_sym] = rel.css('target').text
+    class << self
+      def find(mbid)
+        load({
+          :parser => :artist_model,
+          :create_model => MusicBrainz::Artist
+        }, {
+          :resource => :artist,
+          :id => mbid,
+          :inc => [:url_rels]
+        })
       end
-      @artist
-    end
 
-    def self.discography mbid
-      artist = self.find(mbid)
-      artist.release_groups.each {|rg| rg.releases.each {|r| r.tracks } }
-      artist
-    end
+      def search(name)
+        artists = load({
+          :parser => :artist_search
+        }, {
+          :resource => :artist,
+          :query => CGI.escape(name).gsub(/\!/, '\!') + '~',
+          :limit => 50
+        })
+        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 self.find_by_name name
-      matches = self.search name
-      matches.length.zero? ? nil : self.find(matches.first[:mbid])
-    end
+      def discography(mbid)
+        artist = find(mbid)
+        artist.release_groups.each { |rg| rg.releases.each { |r| r.tracks } }
+        artist
+      end
 
-    def self.search name
-      artists = []
-      xml = Nokogiri::XML(self.load(:artist, :query => CGI.escape(name).gsub(/\!/, '\!') + '~', :limit => 50))
-      xml.css('artist-list > artist').each do |a|
-        artist = {
-          :name => a.first_element_child.text.gsub(/[`’]/, "'"),
-          :sort_name => self.safe_get_value(a, 'sort-name').gsub(/[`’]/, "'"),
-          :weight => 0,
-          :desc => self.safe_get_value(a, 'disambiguation'),
-          :type => self.safe_get_attr(a, nil, 'type'),
-          :mbid => self.safe_get_attr(a, nil, 'id')
-        }
-        aliases = a.css('alias-list > alias').map{ |item| item.text }
-        if artist[:name] == name
-          artist[:weight] += 100
-        elsif artist[:name].downcase == name.downcase
-          artist[:weight] += 50
-        elsif artist[:name].downcase.gsub(/\s/, '') == name.downcase.gsub(/\s/, '')
-          artist[:weight] += 25
-        elsif 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
+      def find_by_name(name)
+        matches = search(name)
+        matches.length.zero? ? nil : find(matches.first[:mbid])
       end
-      artists.sort{ |a, b| b[:weight] <=> a[:weight] }.take(10)
     end
   end
 end

data/lib/musicbrainz/base.rb

@@ -1,17 +1,71 @@
 # -*- encoding: utf-8 -*-
+
 module MusicBrainz
   class Base
-    def self.safe_get_attr(xml, path, name)
-      node = path.nil? ? xml : (xml.css(path).first unless xml.css(path).empty?)
-      node.attr(name) unless node.nil? or node.attr(name).nil?
+    class << self
+      def field(name, type)
+        @fields ||= {}
+        @fields[name] = type
+
+        define_method(name) {
+          instance_variable_get("@#{name}")
+        }
+        define_method("#{name}=") { |val|
+          instance_variable_set("@#{name}", validate_type(val, type))
+        }
+      end
+
+      def load(params, query)
+        parser = MusicBrainz::Parsers.get_by_name(params[:parser])
+        xml = MusicBrainz::Tools::Proxy.query(query)
+        result = parser[:const].send(parser[:method], Nokogiri::XML(xml))
+        if params[:create_model]
+          result_model = params[:create_model].new
+          result.each { |field, value|
+            result_model.send("#{field}=".to_sym, value)
+          }
+          result_model
+        elsif params[:create_models]
+          result_models = []
+          result.each { |item|
+            result_model = params[:create_models].new
+            item.each { |field, value|
+              result_model.send("#{field}=".to_sym, value)
+            }
+            result_models << result_model
+          }
+          result_models
+        else
+          result
+        end
+      end
     end
 
-    def self.safe_get_value(xml, path)
-      xml.css(path).first.text unless xml.css(path).empty?
+    def initialize
+      self.class.instance_variable_get("@fields").each { |name, type|
+        instance_variable_set("@#{name}", nil)
+      }
     end
 
-    def self.load(*args)
-      MusicBrainz::Tools::Proxy.load(*args)
+    def validate_type(val, type)
+      if type == Integer
+        val.to_i
+      elsif type == Float
+        val.to_f
+      elsif type == String
+        val.to_s
+      elsif type == Time
+        if val.nil? or val == ""
+          val = "2030-12-31"
+        elsif val.split("-").length == 1
+          val << "-12-31"
+        elsif val.split("-").length == 2
+          val << "-31"
+        end
+        Time.utc(*val.split("-"))
+      else
+        val
+      end
     end
   end
 end

data/lib/musicbrainz/release.rb

@@ -1,42 +1,43 @@
 # -*- encoding: utf-8 -*-
+
 module MusicBrainz
-  class Release < MusicBrainz::Base
-    attr_accessor :id, :title, :status, :format, :date, :country
-    @tracks
+  class Release < Base
+
+    field :id, String
+    field :title, String
+    field :status, String
+    field :format, String
+    field :date, Time
+    field :country, String
 
     def tracks
-      if @tracks.nil? and not self.id.nil?
-        @tracks = []
-        Nokogiri::XML(self.class.load(:release, :id => self.id, :inc => [:recordings, :media], :limit => 100)).css('medium-list > medium > track-list > track').each do |r|
-          @tracks << MusicBrainz::Track.parse_xml(r)
-        end
+      @tracks ||= nil
+      if @tracks.nil? and !id.nil?
+        @tracks = self.class.load({
+          :parser => :release_tracks,
+          :create_models => MusicBrainz::Track
+        }, {
+          :resource => :release,
+          :id => id,
+          :inc => [:recordings, :media],
+          :limit => 100
+        })
+        @tracks.sort{ |a, b| a.position <=> b.position }
       end
-      @tracks.sort{ |a, b| a.position <=> b.position }
-    end
-
-    def self.find mbid
-      xml = Nokogiri::XML(self.load(:release, :id => mbid, :inc => [:media])).css('release').first
-      self.parse_xml(xml) unless xml.nil?
+      @tracks
     end
 
-    def self.parse_xml xml
-      @release = MusicBrainz::Release.new
-      @release.id = self.safe_get_attr(xml, nil, 'id')
-      @release.title = self.safe_get_value(xml, 'title')
-      @release.status = self.safe_get_value(xml, 'status')
-      @release.format = self.safe_get_value(xml, 'medium-list > medium > format')
-      date = xml.css('date').empty? ? '2030-12-31' : xml.css('date').text
-      if date.length == 0
-        date = '2030-12-31'
-      elsif date.length == 4
-        date += '-12-31'
-      elsif date.length == 7
-        date += '-31'
+    class << self
+      def find(mbid)
+        load({
+          :parser => :release_model,
+          :create_model => MusicBrainz::Release
+        }, {
+          :resource => :release,
+          :id => mbid,
+          :inc => [:media]
+        })
       end
-      date = date.split('-')
-      @release.date = Time.utc(date[0], date[1], date[2])
-      @release.country = self.safe_get_value(xml, 'country')
-      @release
     end
   end
 end

data/lib/musicbrainz/release_group.rb

@@ -1,41 +1,41 @@
 # -*- encoding: utf-8 -*-
+
 module MusicBrainz
-  class ReleaseGroup < MusicBrainz::Base
-    attr_accessor :id, :type, :title, :disambiguation, :first_release_date
-    @releases
+  class ReleaseGroup < Base
+
+    field :id, String
+    field :type, String
+    field :title, String
+    field :disambiguation, String
+    field :first_release_date, Time
 
     def releases
-      if @releases.nil? and not self.id.nil?
-        @releases = []
-        Nokogiri::XML(self.class.load(:release, :release_group => self.id, :inc => [:media], :limit => 100)).css('release').each do |r|
-          @releases << MusicBrainz::Release.parse_xml(r)
-        end
+      @releases ||= nil
+      if @releases.nil? and !id.nil?
+        @releases = self.class.load({
+          :parser => :release_group_releases,
+          :create_models => MusicBrainz::Release
+        }, {
+          :resource => :release,
+          :release_group => self.id,
+          :inc => [:media],
+          :limit => 100
+        })
+        @releases.sort!{ |a, b| a.date <=> b.date }
       end
-      @releases.sort{ |a, b| a.date <=> b.date }
-    end
-
-    def self.find mbid
-      xml = Nokogiri::XML(self.load(:release_group, :id => mbid)).css('release-group').first
-      self.parse_xml(xml) unless xml.nil?
+      @releases
     end
 
-    def self.parse_xml xml
-      @release_group = MusicBrainz::ReleaseGroup.new
-      @release_group.id = self.safe_get_attr(xml, nil, 'id')
-      @release_group.type = self.safe_get_attr(xml, nil, 'type')
-      @release_group.title = self.safe_get_value(xml, 'title')
-      @release_group.disambiguation = self.safe_get_value(xml, 'disambiguation')
-      date = xml.css('first-release-date').empty? ? '2030-12-31' : xml.css('first-release-date').text
-      if date.length == 0
-        date = '2030-12-31'
-      elsif date.length == 4
-        date += '-12-31'
-      elsif date.length == 7
-        date += '-31'
+    class << self
+      def find(mbid)
+        load({
+          :parser => :release_group_model,
+          :create_model => MusicBrainz::ReleaseGroup
+        }, {
+          :resource => :release_group,
+          :id => mbid
+        })
       end
-      date = date.split('-')
-      @release_group.first_release_date = Time.utc(date[0], date[1], date[2])
-      @release_group
     end
   end
 end

data/lib/musicbrainz/track.rb

@@ -1,21 +1,23 @@
 # -*- encoding: utf-8 -*-
+
 module MusicBrainz
-  class Track < MusicBrainz::Base
-    attr_accessor :position, :recording_id, :title, :length
+  class Track < Base
 
-    def self.find mbid
-      xml = Nokogiri::XML(self.load(:recording, :id => mbid))
-      self.parse_xml(xml) unless xml.nil?
-    end
+    field :position, Integer
+    field :recording_id, String
+    field :title, String
+    field :length, Integer
 
-    def self.parse_xml xml
-      @track = MusicBrainz::Track.new
-      @track.position = self.safe_get_value(xml, 'position').to_i
-      @track.recording_id = self.safe_get_attr(xml, 'recording', 'id')
-      @track.title = self.safe_get_value(xml, 'recording > title')
-      @track.length = self.safe_get_value(xml, 'length').to_i
-      @track.length = self.safe_get_value(xml, 'recording > length').to_i
-      @track
+    class << self
+      def find(mbid)
+        load({
+          :parser => :track_model,
+          :create_model => MusicBrainz::Track
+        }, {
+          :resource => :recording,
+          :id => mbid
+        })
+      end
     end
   end
 end

data/lib/parsers/artist.rb

@@ -0,0 +1,49 @@
+# -*- encoding: utf-8 -*-
+
+module MusicBrainz
+  module Parsers
+    class Artist < Base
+      class << self
+        def model(xml)
+          res = {
+            :id => safe_get_attr(xml, "artist", "id"),
+            :type => safe_get_attr(xml, "artist", "type"),
+            :name => safe_get_value(xml, "artist > name").gsub(/[`’]/, "'"),
+            :country => safe_get_value(xml, "artist > country"),
+            :date_begin => safe_get_value(xml, "artist > life-span > begin"),
+            :date_end => safe_get_value(xml, "artist > life-span > end"),
+            :urls => {}
+          }
+          xml.css("relation-list[target-type='url'] > relation").each { |rel|
+            res[:urls][rel.attr("type").downcase.split(" ").join("_").to_sym] = rel.css("target").text
+          }
+          res
+        end
+
+        def search(xml)
+          artists = []
+          xml.css("artist-list > artist").each do |a|
+            artists << {
+              :name => a.first_element_child.text.gsub(/[`’]/, "'"),
+              :sort_name => safe_get_value(a, "sort-name").gsub(/[`’]/, "'"),
+              :weight => 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)
+          release_groups = []
+          xml.css("release-group").each do |rg|
+            release_groups << MusicBrainz::Parsers::ReleaseGroup.model(rg)
+          end
+          release_groups
+        end
+      end
+    end
+  end
+end

data/lib/parsers/base.rb

@@ -0,0 +1,41 @@
+# -*- encoding: utf-8 -*-
+
+module MusicBrainz
+  module Parsers
+    class << self
+      def get_by_name(name)
+        case name
+        when :artist_model
+          { :const => MusicBrainz::Parsers::Artist, :method => :model }
+        when :artist_search
+          { :const => MusicBrainz::Parsers::Artist, :method => :search }
+        when :artist_release_groups
+          { :const => MusicBrainz::Parsers::Artist, :method => :release_groups }
+        when :release_group_model
+          { :const => MusicBrainz::Parsers::ReleaseGroup, :method => :model }
+        when :release_group_releases
+          { :const => MusicBrainz::Parsers::ReleaseGroup, :method => :releases }
+        when :release_model
+          { :const => MusicBrainz::Parsers::Release, :method => :model }
+        when :release_tracks
+          { :const => MusicBrainz::Parsers::Release, :method => :tracks }
+        when :track_model
+          { :const => MusicBrainz::Parsers::Track, :method => :model }
+        end
+      end
+    end
+
+    class Base
+      class << self
+        def safe_get_attr(xml, path, name)
+          node = path.nil? ? xml : (xml.css(path).first unless xml.css(path).empty?)
+          node.attr(name) unless node.nil? or node.attr(name).nil?
+        end
+
+        def safe_get_value(xml, path)
+          xml.css(path).first.text unless xml.css(path).empty?
+        end
+      end
+    end
+  end
+end

data/lib/parsers/release.rb

@@ -0,0 +1,28 @@
+# -*- encoding: utf-8 -*-
+
+module MusicBrainz
+  module Parsers
+    class Release < Base
+      class << self
+        def model(xml)
+          {
+            :id => safe_get_attr(xml, nil, "id") || safe_get_attr(xml, "release", "id"),
+            :title => safe_get_value(xml, "title"),
+            :status => safe_get_value(xml, "status"),
+            :country => safe_get_value(xml, "country"),
+            :format => safe_get_value(xml, "medium-list > medium > format"),
+            :date => safe_get_value(xml, "date")
+          }
+        end
+
+        def tracks(xml)
+          tracks = []
+          xml.css("medium-list > medium > track-list > track").each do |r|
+            tracks << MusicBrainz::Parsers::Track.model(r)
+          end
+          tracks
+        end
+      end
+    end
+  end
+end

data/lib/parsers/release_group.rb

@@ -0,0 +1,27 @@
+# -*- encoding: utf-8 -*-
+
+module MusicBrainz
+  module Parsers
+    class ReleaseGroup < Base
+      class << self
+        def model(xml)
+          {
+            :id => safe_get_attr(xml, nil, "id") || safe_get_attr(xml, "release-group", "id"),
+            :type => safe_get_attr(xml, nil, "type") || safe_get_attr(xml, "release-group", "type"),
+            :title => safe_get_value(xml, "title"),
+            :disambiguation => safe_get_value(xml, "disambiguation"),
+            :first_release_date => safe_get_value(xml, "first-release-date")
+          }
+        end
+
+        def releases(xml)
+          releases = []
+          xml.css("release").each do |r|
+            releases << MusicBrainz::Parsers::Release.model(r)
+          end
+          releases
+        end
+      end
+    end
+  end
+end

data/lib/parsers/track.rb

@@ -0,0 +1,18 @@
+# -*- encoding: utf-8 -*-
+
+module MusicBrainz
+  module Parsers
+    class Track < Base
+      class << self
+        def model(xml)
+          {
+            :position => safe_get_value(xml, "position"),
+            :recording_id => safe_get_attr(xml, "recording", "id"),
+            :title => safe_get_value(xml, "recording > title"),
+            :length => safe_get_value(xml, "length") || safe_get_value(xml, "recording > length")
+          }
+        end
+      end
+    end
+  end
+end

data/lib/tools/cache.rb

@@ -1,44 +1,47 @@
 # -*- encoding: utf-8 -*-
+
 module MusicBrainz
   module Tools
     class Cache
-      @@cache_path = nil
+      class << self
+        @@cache_path = nil
 
-      def self.cache_path=(path)
-        @@cache_path = path
-      end
+        def cache_path=(path)
+          @@cache_path = path
+        end
 
-      def self.cache_path
-        @@cache_path
-      end
+        def cache_path
+          @@cache_path
+        end
 
-      def self.clear_cache
-        FileUtils.rm_r(@@cache_path) if @@cache_path && File.exist?(@@cache_path)
-      end
+        def clear_cache
+          FileUtils.rm_r(@@cache_path) if @@cache_path && File.exist?(@@cache_path)
+        end
+
+        def cache_contents(url)
+          response = nil
+          url_parts = url.split('/')
+          file_name = url_parts.pop
+          directory = url_parts.pop
+          file_path = @@cache_path ? "#{@@cache_path}/#{directory}/#{file_name}" : nil
+
+          if file_path && File.exist?(file_path)
+            response = File.open(file_path).gets
+          else
+            response = yield
 
-      def self.cache_contents(url)
-        response = nil
-        url_parts = url.split('/')
-        file_name = url_parts.pop
-        directory = url_parts.pop
-        file_path = @@cache_path ? "#{@@cache_path}/#{directory}/#{file_name}" : nil
-
-        if file_path && File.exist?(file_path)
-          response = File.open(file_path).gets
-        else
-          response = yield
-
-          unless response.nil? or file_path.nil?
-            FileUtils.mkdir_p file_path.split('/')[0..-2].join('/')
-            file = File.new(file_path, 'w')
-            file.puts(response.gets) # .force_encoding('UTF-8')
-            file.chmod(0755)
-            file.close
-            response.rewind
+            unless response.nil? or file_path.nil?
+              FileUtils.mkdir_p file_path.split('/')[0..-2].join('/')
+              file = File.new(file_path, 'w')
+              file.puts(response.gets) # .force_encoding('UTF-8')
+              file.chmod(0755)
+              file.close
+              response.rewind
+            end
           end
-        end
 
-        response
+          response
+        end
       end
     end
   end

data/lib/tools/proxy.rb

@@ -1,53 +1,61 @@
 # -*- encoding: utf-8 -*-
+
 module MusicBrainz
   module Tools
     class Proxy
-      @@last_query_time = 0
-      @@query_interval = 1.5 # Min: 1.0 Safe: 1.5
-      @@tries_limit = 5
-
-      WEB_SERVICE_URL = 'http://musicbrainz.org/ws/2/'
-      USER_AGENT = "gem musicbrainz (https://github.com/magnolia-fan/musicbrainz) @ " + Socket.gethostname
-
-      def self.query_interval=(sec)
-        @@query_interval = sec.to_f
-      end
-
-      def self.tries_limit=(num)
-        @@tries_limit = num.to_i
-      end
-
-      def self.load(resourse, params = {})
-        url = WEB_SERVICE_URL + resourse.to_s.gsub('_', '-') + '/' + (params[:id].to_s || '')
-        params.delete(:id) unless params[:id].nil?
-        url << '?' + params.map{ |k, v|
-          k = k.to_s.gsub('_', '-')
-          v = (v.is_a?(Array) ? v.map{ |_| _.to_s.gsub('_', '-') }.join('+') : v.to_s)
-          k + '=' + v
-        }.join('&') unless params.empty?
-        MusicBrainz::Tools::Cache.cache_contents(url) {
-          self.get_contents url
-        }
-      end
-
-      def self.get_contents(url)
-        response = nil
-
-        @@tries_limit.times {
-          time_passed = Time.now.to_f - @@last_query_time
-          sleep(@@query_interval - time_passed) if time_passed < @@query_interval
-
-          begin
-            response = open(url, "User-Agent" => USER_AGENT)
-            @@last_query_time = Time.now.to_f
-          rescue => e
-            response = nil if e.io.status[0].to_i == 404
-          end
-
-          break unless response.nil?
-        }
-
-        response
+      class << self
+        @@last_query_time = 0
+        @@query_interval = 1.5 # Min: 1.0 Safe: 1.5
+        @@tries_limit = 5
+
+        WEB_SERVICE_URL = 'http://musicbrainz.org/ws/2/'
+        USER_AGENT = "gem musicbrainz (https://github.com/magnolia-fan/musicbrainz) @ " + Socket.gethostname
+
+        def query_interval=(sec)
+          @@query_interval = sec.to_f
+        end
+
+        def query_interval
+          @@query_interval
+        end
+
+        def tries_limit=(num)
+          @@tries_limit = num.to_i
+        end
+
+        def query(params = {})
+          url = WEB_SERVICE_URL + params[:resource].to_s.gsub('_', '-') + '/' + (params[:id].to_s || '')
+          params.delete(:resource)
+          params.delete(:id) unless params[:id].nil?
+          url << '?' + params.map{ |k, v|
+            k = k.to_s.gsub('_', '-')
+            v = (v.is_a?(Array) ? v.map{ |_| _.to_s.gsub('_', '-') }.join('+') : v.to_s)
+            k + '=' + v
+          }.join('&') unless params.empty?
+          MusicBrainz::Tools::Cache.cache_contents(url) {
+            get_contents url
+          }
+        end
+
+        def get_contents(url)
+          response = nil
+
+          @@tries_limit.times {
+            time_passed = Time.now.to_f - @@last_query_time
+            sleep(@@query_interval - time_passed) if time_passed < @@query_interval
+
+            begin
+              response = open(url, "User-Agent" => USER_AGENT)
+              @@last_query_time = Time.now.to_f
+            rescue => e
+              response = nil if e.io.status[0].to_i == 404
+            end
+
+            break unless response.nil?
+          }
+
+          response
+        end
       end
     end
   end

data/lib/version.rb

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

data/musicbrainz.gemspec

@@ -1,4 +1,5 @@
 # -*- encoding: utf-8 -*-
+
 require File.expand_path('../lib/version', __FILE__)
 
 Gem::Specification.new do |gem|

data/spec/fixtures/kasabian.xml

@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><metadata xmlns="http://musicbrainz.org/ns/mmd-2.0#"><artist type="Group" id="69b39eab-6577-46a4-a9f5-817839092033"><name>Kasabian</name><sort-name>Kasabian</sort-name><country>GB</country><life-span><begin>1999</begin></life-span><relation-list target-type="url"><relation type="allmusic"><target>http://allmusic.com/artist/p678134</target></relation><relation type="wikipedia"><target>http://en.wikipedia.org/wiki/Kasabian</target></relation><relation type="microblog"><target>http://twitter.com/kasabianhq</target></relation><relation type="BBC Music page"><target>http://www.bbc.co.uk/music/artists/69b39eab-6577-46a4-a9f5-817839092033</target></relation><relation type="discogs"><target>http://www.discogs.com/artist/Kasabian</target></relation><relation type="social network"><target>http://www.facebook.com/kasabian</target></relation><relation type="IMDb"><target>http://www.imdb.com/name/nm1868442/</target></relation><relation type="official homepage"><target>http://www.kasabian.co.uk/</target></relation><relation type="myspace"><target>http://www.myspace.com/kasabian</target></relation><relation type="youtube"><target>http://www.youtube.com/kasabianvevo</target></relation><relation type="youtube"><target>http://www.youtube.com/user/KasabianTour</target></relation></relation-list></artist></metadata>

data/spec/misc/deprecated_spec.rb

@@ -0,0 +1,38 @@
+# -*- encoding: utf-8 -*-
+
+require "spec_helper"
+
+describe MusicBrainz do
+  before(:all) {
+    @old_cache_path = MusicBrainz::Tools::Cache.cache_path
+  }
+
+  before(:each) {
+    $stdout.stub!(:puts)
+    MusicBrainz::Tools::Cache.cache_path = nil
+  }
+
+  after(:all) {
+    MusicBrainz::Tools::Cache.cache_path = @old_cache_path
+  }
+
+  it "allows deprecated use of cache_path" do
+    MusicBrainz::Tools::Cache.cache_path = "some/path"
+    MusicBrainz::cache_path.should == "some/path"
+  end
+
+  it "allows deprecated use of cache_path=" do
+    MusicBrainz.cache_path = "some/path"
+    MusicBrainz::Tools::Cache.cache_path.should == "some/path"
+  end
+
+  it "allows deprecated use of query_interval" do
+    MusicBrainz::Tools::Proxy.query_interval = 2
+    MusicBrainz::query_interval.should == 2
+  end
+
+  it "allows deprecated use of query_interval=" do
+    MusicBrainz.query_interval = 2
+    MusicBrainz::Tools::Proxy.query_interval.should == 2
+  end
+end

data/spec/requests/artist_spec.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require "spec_helper"
 
 describe MusicBrainz::Artist do
@@ -21,7 +23,7 @@ describe MusicBrainz::Artist do
   it "finds name first than alias" do
     matches = MusicBrainz::Artist.search('Chris Martin')
     matches.length.should be > 0
-    matches.first[:name].should == "Chris Martin"
+    matches.first[:mbid].should == "af2ab893-3212-4226-9e73-73a1660b6952"
   end
 
   it "gets correct result by name" do
@@ -35,7 +37,7 @@ describe MusicBrainz::Artist do
     artist.type.should == "Group"
     artist.name.should == "Kasabian"
     artist.country.should == "GB"
-    artist.date_begin.should == "1999"
+    artist.date_begin.year.should == 1999
   end
 
   it "gets correct artist's release groups" do

data/spec/requests/release_group_spec.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require "spec_helper"
 
 describe MusicBrainz::ReleaseGroup do

data/spec/requests/release_spec.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require "spec_helper"
 
 describe MusicBrainz::Release do

data/spec/requests/track_spec.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require "spec_helper"
 
 describe MusicBrainz::Track do

data/spec/spec_helper.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require "rubygems"
 require "bundler/setup"
 require "ap"

data/spec/tools/cache_spec.rb

@@ -1,3 +1,5 @@
+# -*- encoding: utf-8 -*-
+
 require "spec_helper"
 
 describe MusicBrainz::Tools::Cache do
@@ -11,32 +13,17 @@ describe MusicBrainz::Tools::Cache do
   end
 
   before(:each) do
-    @test_response = ::StringIO.new('<?xml version="1.0" encoding="UTF-8"?>'+
-      '<metadata xmlns="http://musicbrainz.org/ns/mmd-2.0#">'+
-      '<artist type="Group" id="69b39eab-6577-46a4-a9f5-817839092033">'+
-      '<name>Kasabian</name><sort-name>Kasabian</sort-name><country>GB</country>'+
-      '<life-span><begin>1999</begin></life-span><relation-list target-type="url">'+
-      '<relation type="allmusic"><target>http://allmusic.com/artist/p678134</target>'+
-      '</relation><relation type="wikipedia"><target>http://en.wikipedia.org/wiki/Kasabian</target>'+
-      '</relation><relation type="microblog"><target>http://twitter.com/kasabianhq</target>'+
-      '</relation><relation type="BBC Music page"><target>'+
-      'http://www.bbc.co.uk/music/artists/69b39eab-6577-46a4-a9f5-817839092033</target></relation>'+
-      '<relation type="discogs"><target>http://www.discogs.com/artist/Kasabian</target></relation>'+
-      '<relation type="social network"><target>http://www.facebook.com/kasabian</target></relation>'+
-      '<relation type="IMDb"><target>http://www.imdb.com/name/nm1868442/</target></relation>'+
-      '<relation type="official homepage"><target>http://www.kasabian.co.uk/</target></relation>'+
-      '<relation type="myspace"><target>http://www.myspace.com/kasabian</target></relation>'+
-      '<relation type="youtube"><target>http://www.youtube.com/kasabianvevo</target></relation>'+
-      '<relation type="youtube"><target>http://www.youtube.com/user/KasabianTour</target></relation>'+
-      '</relation-list></artist></metadata>')
+    file_path = File.join(File.dirname(__FILE__), "../fixtures/kasabian.xml")
+    @test_response = ::StringIO.new(File.open(file_path).gets)
   end
 
   context "with cache enabled" do
     it "calls get contents only once when requesting the resource twice" do
       MusicBrainz::Tools::Cache.cache_path = @tmp_cache_path
+      mbid = "69b39eab-6577-46a4-a9f5-817839092033"
+
       MusicBrainz::Tools::Proxy.stub(:get_contents).and_return(@test_response)
       MusicBrainz::Tools::Proxy.should_receive(:get_contents).once
-      mbid = "69b39eab-6577-46a4-a9f5-817839092033"
 
       File.exist?("#{@tmp_cache_path}/artist/#{mbid}?inc=url-rels").should be_false
       artist = MusicBrainz::Artist.find(mbid)
@@ -53,9 +40,10 @@ describe MusicBrainz::Tools::Cache do
   context "with cache disabled" do
     it "calls get contents twice when requesting the resource twice" do
       MusicBrainz::Tools::Cache.cache_path = nil
+      mbid = "69b39eab-6577-46a4-a9f5-817839092033"
+
       MusicBrainz::Tools::Proxy.stub(:get_contents).and_return(@test_response)
       MusicBrainz::Tools::Proxy.should_receive(:get_contents).twice
-      mbid = "69b39eab-6577-46a4-a9f5-817839092033"
 
       File.exist?("#{@tmp_cache_path}/artist/#{mbid}?inc=url-rels").should be_false
       artist = MusicBrainz::Artist.find(mbid)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: musicbrainz
 version: !ruby/object:Gem::Version
-  version: 0.6.0
+  version: 0.7.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-07-04 00:00:00.000000000Z
+date: 2012-07-08 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri
-  requirement: &70115651814840 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,10 +21,15 @@ dependencies:
         version: '0'
   type: :runtime
   prerelease: false
-  version_requirements: *70115651814840
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rake
-  requirement: &70115651805120 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +37,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115651805120
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: awesome_print
-  requirement: &70115651804200 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,10 +53,15 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115651804200
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
-  requirement: &70115651803420 !ruby/object:Gem::Requirement
+  requirement: !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -54,7 +69,12 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *70115651803420
+  version_requirements: !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ! '>='
+      - !ruby/object:Gem::Version
+        version: '0'
 description: 
 email:
 - magnolia_fan@me.com
@@ -65,6 +85,7 @@ files:
 - .gitignore
 - .rspec
 - .travis.yml
+- Contributors
 - Gemfile
 - LICENSE
 - README.md
@@ -76,10 +97,17 @@ files:
 - lib/musicbrainz/release.rb
 - lib/musicbrainz/release_group.rb
 - lib/musicbrainz/track.rb
+- lib/parsers/artist.rb
+- lib/parsers/base.rb
+- lib/parsers/release.rb
+- lib/parsers/release_group.rb
+- lib/parsers/track.rb
 - lib/tools/cache.rb
 - lib/tools/proxy.rb
 - lib/version.rb
 - musicbrainz.gemspec
+- spec/fixtures/kasabian.xml
+- spec/misc/deprecated_spec.rb
 - spec/requests/artist_spec.rb
 - spec/requests/release_group_spec.rb
 - spec/requests/release_spec.rb
@@ -107,11 +135,13 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.10
+rubygems_version: 1.8.23
 signing_key: 
 specification_version: 3
 summary: MusicBrainz Web Service wrapper with ActiveRecord-style models
 test_files:
+- spec/fixtures/kasabian.xml
+- spec/misc/deprecated_spec.rb
 - spec/requests/artist_spec.rb
 - spec/requests/release_group_spec.rb
 - spec/requests/release_spec.rb