Merge branch 'master' of github.com:magnolia-fan/musicbrainz
This commit is contained in:
commit
4bb437b2aa
|
@ -50,7 +50,7 @@ module MusicBrainz
|
||||||
def self.search name
|
def self.search name
|
||||||
artists = []
|
artists = []
|
||||||
xml = Nokogiri::XML(MusicBrainz.load(
|
xml = Nokogiri::XML(MusicBrainz.load(
|
||||||
'http://musicbrainz.org/ws/2/artist/?query='+ URI.escape(name).gsub(/\&/, '%26').gsub(/\?/, '%3F') +'~&limit=50'
|
'http://musicbrainz.org/ws/2/artist/?query='+ CGI.escape(name).gsub(/\!/, '') +'~&limit=50'
|
||||||
))
|
))
|
||||||
xml.css('artist-list > artist').each do |a|
|
xml.css('artist-list > artist').each do |a|
|
||||||
artist = {
|
artist = {
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
require "open-uri"
|
require "open-uri"
|
||||||
require "socket"
|
require "socket"
|
||||||
require "nokogiri"
|
require "nokogiri"
|
||||||
|
require "cgi"
|
||||||
|
|
||||||
require "models/music_brainz"
|
require "models/music_brainz"
|
||||||
require "models/music_brainz/artist"
|
require "models/music_brainz/artist"
|
||||||
|
|
|
@ -5,10 +5,10 @@
|
||||||
|
|
||||||
Gem::Specification.new do |s|
|
Gem::Specification.new do |s|
|
||||||
s.name = %q{musicbrainz}
|
s.name = %q{musicbrainz}
|
||||||
s.version = "0.4.7"
|
s.version = "0.4.8"
|
||||||
|
|
||||||
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
|
||||||
s.authors = ["Gregory Eremin"]
|
s.authors = [%q{Gregory Eremin}]
|
||||||
s.date = %q{2011-09-19}
|
s.date = %q{2011-09-19}
|
||||||
s.description = %q{MusicBrainz Web Service wrapper with ActiveRecord-style models}
|
s.description = %q{MusicBrainz Web Service wrapper with ActiveRecord-style models}
|
||||||
s.email = %q{magnolia_fan@me.com}
|
s.email = %q{magnolia_fan@me.com}
|
||||||
|
@ -36,9 +36,9 @@ Gem::Specification.new do |s|
|
||||||
"test/test_musicbrainz.rb"
|
"test/test_musicbrainz.rb"
|
||||||
]
|
]
|
||||||
s.homepage = %q{http://github.com/magnolia-fan/musicbrainz}
|
s.homepage = %q{http://github.com/magnolia-fan/musicbrainz}
|
||||||
s.licenses = ["MIT"]
|
s.licenses = [%q{MIT}]
|
||||||
s.require_paths = ["lib"]
|
s.require_paths = [%q{lib}]
|
||||||
s.rubygems_version = %q{1.6.2}
|
s.rubygems_version = %q{1.8.8}
|
||||||
s.summary = %q{MusicBrainz Web Service wrapper}
|
s.summary = %q{MusicBrainz Web Service wrapper}
|
||||||
|
|
||||||
if s.respond_to? :specification_version then
|
if s.respond_to? :specification_version then
|
||||||
|
|
Loading…
Reference in New Issue