Gem is rewrapped with Bundler instead of Jeweler. All tests are using RSpec. Reorganized lib structure. Tests are fixed.
This commit is contained in:
@@ -0,0 +1,12 @@
|
||||
# -*- 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
|
||||
|
||||
def self.cache_path=(path)
|
||||
MusicBrainz::Tools::Cache.cache_path = path
|
||||
puts "WARNING! MusicBrainz.cache_path is deprecated. Use MusicBrainz::Tools::Cache.cache_path"
|
||||
end
|
||||
end
|
||||
@@ -1,78 +0,0 @@
|
||||
module MusicBrainz
|
||||
@@last_query_time = 0
|
||||
@@query_interval = 1.5 # Min: 1.0 Safe: 1.5
|
||||
@@cache_path = nil
|
||||
|
||||
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.cache_path= path
|
||||
@@cache_path = path
|
||||
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.to_s.gsub('_', '-') + '=' + (v.is_a?(Array) ? v.map{ |_| _.to_s.gsub('_', '-') }.join('+') : v.to_s)
|
||||
}.join('&') unless params.empty?
|
||||
self.cache_contents(url) do
|
||||
self.get_contents url
|
||||
end
|
||||
end
|
||||
|
||||
def self.clear_cache
|
||||
FileUtils.rm_r(@@cache_path) if @@cache_path && File.exist?(@@cache_path)
|
||||
end
|
||||
|
||||
private
|
||||
|
||||
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? || 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
|
||||
|
||||
response
|
||||
end
|
||||
|
||||
def self.get_contents url
|
||||
response = nil
|
||||
|
||||
5.times do
|
||||
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?
|
||||
end
|
||||
|
||||
response
|
||||
end
|
||||
end
|
||||
+15
-6
@@ -1,11 +1,20 @@
|
||||
# -*- encoding: utf-8 -*-
|
||||
require "open-uri"
|
||||
require "socket"
|
||||
require "nokogiri"
|
||||
require "cgi"
|
||||
|
||||
require "models/music_brainz"
|
||||
require "models/music_brainz/base"
|
||||
require "models/music_brainz/artist"
|
||||
require "models/music_brainz/release_group"
|
||||
require "models/music_brainz/release"
|
||||
require "models/music_brainz/track"
|
||||
require "version"
|
||||
|
||||
module MusicBrainz
|
||||
autoload :Base, "musicbrainz/base"
|
||||
autoload :Artist, "musicbrainz/artist"
|
||||
autoload :ReleaseGroup, "musicbrainz/release_group"
|
||||
autoload :Release, "musicbrainz/release"
|
||||
autoload :Track, "musicbrainz/track"
|
||||
|
||||
module Tools
|
||||
autoload :Cache, "tools/cache"
|
||||
autoload :Proxy, "tools/proxy"
|
||||
end
|
||||
end
|
||||
|
||||
@@ -1,26 +1,26 @@
|
||||
# encoding: UTF-8
|
||||
# -*- encoding: utf-8 -*-
|
||||
|
||||
module MusicBrainz
|
||||
class Artist < MusicBrainz::Base
|
||||
attr_accessor :id, :type, :name, :country, :date_begin, :date_end, :urls
|
||||
@release_groups
|
||||
|
||||
|
||||
def release_groups
|
||||
if @release_groups.nil? and not self.id.nil?
|
||||
@release_groups = []
|
||||
Nokogiri::XML(MusicBrainz.load(:release_group, :artist => self.id)).css('release-group').each do |rg|
|
||||
Nokogiri::XML(self.class.load(:release_group, :artist => self.id)).css('release-group').each do |rg|
|
||||
@release_groups << MusicBrainz::ReleaseGroup.parse_xml(rg)
|
||||
end
|
||||
end
|
||||
@release_groups.sort{ |a, b| a.first_release_date <=> b.first_release_date }
|
||||
end
|
||||
|
||||
|
||||
def self.find mbid
|
||||
res = MusicBrainz.load :artist, :id => mbid, :inc => [:url_rels]
|
||||
res = self.load :artist, :id => mbid, :inc => [:url_rels]
|
||||
return nil if res.nil?
|
||||
@artist = self.parse_xml(Nokogiri::XML(res))
|
||||
end
|
||||
|
||||
|
||||
def self.parse_xml xml
|
||||
@artist = MusicBrainz::Artist.new
|
||||
@artist.id = self.safe_get_attr(xml, 'artist', 'id')
|
||||
@@ -35,21 +35,21 @@ module MusicBrainz
|
||||
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 self.find_by_name name
|
||||
matches = self.search name
|
||||
matches.length.zero? ? nil : self.find(matches.first[:mbid])
|
||||
end
|
||||
|
||||
|
||||
def self.search name
|
||||
artists = []
|
||||
xml = Nokogiri::XML(MusicBrainz.load(:artist, :query => CGI.escape(name).gsub(/\!/, '\!') + '~', :limit => 50))
|
||||
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(/[`’]/, "'"),
|
||||
@@ -1,12 +1,17 @@
|
||||
# -*- encoding: utf-8 -*-
|
||||
module MusicBrainz
|
||||
class Base
|
||||
def self.safe_get_attr xml, path, name
|
||||
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?
|
||||
end
|
||||
|
||||
def self.safe_get_value xml, path
|
||||
|
||||
def self.safe_get_value(xml, path)
|
||||
xml.css(path).first.text unless xml.css(path).empty?
|
||||
end
|
||||
|
||||
def self.load(*args)
|
||||
MusicBrainz::Tools::Proxy.load(*args)
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -1,23 +1,24 @@
|
||||
# -*- encoding: utf-8 -*-
|
||||
module MusicBrainz
|
||||
class Release < MusicBrainz::Base
|
||||
attr_accessor :id, :title, :status, :format, :date, :country
|
||||
@tracks
|
||||
|
||||
|
||||
def tracks
|
||||
if @tracks.nil? and not self.id.nil?
|
||||
@tracks = []
|
||||
Nokogiri::XML(MusicBrainz.load(:release, :id => self.id, :inc => [:recordings, :media], :limit => 100)).css('medium-list > medium > track-list > track').each do |r|
|
||||
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
|
||||
end
|
||||
@tracks.sort{ |a, b| a.position <=> b.position }
|
||||
end
|
||||
|
||||
|
||||
def self.find mbid
|
||||
xml = Nokogiri::XML(MusicBrainz.load(:release, :id => mbid, :inc => [:media])).css('release').first
|
||||
xml = Nokogiri::XML(self.load(:release, :id => mbid, :inc => [:media])).css('release').first
|
||||
self.parse_xml(xml) unless xml.nil?
|
||||
end
|
||||
|
||||
|
||||
def self.parse_xml xml
|
||||
@release = MusicBrainz::Release.new
|
||||
@release.id = self.safe_get_attr(xml, nil, 'id')
|
||||
@@ -1,23 +1,24 @@
|
||||
# -*- encoding: utf-8 -*-
|
||||
module MusicBrainz
|
||||
class ReleaseGroup < MusicBrainz::Base
|
||||
attr_accessor :id, :type, :title, :disambiguation, :first_release_date
|
||||
@releases
|
||||
|
||||
|
||||
def releases
|
||||
if @releases.nil? and not self.id.nil?
|
||||
@releases = []
|
||||
Nokogiri::XML(MusicBrainz.load(:release, :release_group => self.id, :inc => [:media], :limit => 100)).css('release').each do |r|
|
||||
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
|
||||
end
|
||||
@releases.sort{ |a, b| a.date <=> b.date }
|
||||
end
|
||||
|
||||
|
||||
def self.find mbid
|
||||
xml = Nokogiri::XML(MusicBrainz.load(:release_group, :id => mbid)).css('release-group').first
|
||||
xml = Nokogiri::XML(self.load(:release_group, :id => mbid)).css('release-group').first
|
||||
self.parse_xml(xml) unless xml.nil?
|
||||
end
|
||||
|
||||
|
||||
def self.parse_xml xml
|
||||
@release_group = MusicBrainz::ReleaseGroup.new
|
||||
@release_group.id = self.safe_get_attr(xml, nil, 'id')
|
||||
@@ -1,12 +1,13 @@
|
||||
# -*- encoding: utf-8 -*-
|
||||
module MusicBrainz
|
||||
class Track < MusicBrainz::Base
|
||||
attr_accessor :position, :recording_id, :title, :length
|
||||
|
||||
|
||||
def self.find mbid
|
||||
xml = Nokogiri::XML(MusicBrainz.load(:recording, :id => mbid))
|
||||
xml = Nokogiri::XML(self.load(:recording, :id => mbid))
|
||||
self.parse_xml(xml) unless xml.nil?
|
||||
end
|
||||
|
||||
|
||||
def self.parse_xml xml
|
||||
@track = MusicBrainz::Track.new
|
||||
@track.position = self.safe_get_value(xml, 'position').to_i
|
||||
@@ -0,0 +1,45 @@
|
||||
# -*- encoding: utf-8 -*-
|
||||
module MusicBrainz
|
||||
module Tools
|
||||
class Cache
|
||||
@@cache_path = nil
|
||||
|
||||
def self.cache_path=(path)
|
||||
@@cache_path = path
|
||||
end
|
||||
|
||||
def self.cache_path
|
||||
@@cache_path
|
||||
end
|
||||
|
||||
def self.clear_cache
|
||||
FileUtils.rm_r(@@cache_path) if @@cache_path && File.exist?(@@cache_path)
|
||||
end
|
||||
|
||||
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
|
||||
end
|
||||
end
|
||||
|
||||
response
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,54 @@
|
||||
# -*- 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
|
||||
end
|
||||
end
|
||||
end
|
||||
end
|
||||
@@ -0,0 +1,4 @@
|
||||
# -*- encoding: utf-8 -*-
|
||||
module MusicBrainz
|
||||
VERSION = "0.6.0-rc1"
|
||||
end
|
||||
Reference in New Issue
Block a user