From 1792125912cc8d8024649d7a83ebedd5fa9257ff Mon Sep 17 00:00:00 2001 From: Gregory Eremin Date: Mon, 19 Sep 2011 19:19:58 +0400 Subject: [PATCH 1/2] Artist search encode fix --- VERSION | 2 +- lib/models/music_brainz/artist.rb | 2 +- lib/musicbrainz.rb | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 70d5b25..c650d5a 100644 --- a/VERSION +++ b/VERSION @@ -1 +1 @@ -0.4.3 \ No newline at end of file +0.4.8 \ No newline at end of file diff --git a/lib/models/music_brainz/artist.rb b/lib/models/music_brainz/artist.rb index ba04265..18a33b8 100644 --- a/lib/models/music_brainz/artist.rb +++ b/lib/models/music_brainz/artist.rb @@ -44,7 +44,7 @@ module MusicBrainz def self.search name artists = [] 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| artist = { diff --git a/lib/musicbrainz.rb b/lib/musicbrainz.rb index f256070..5314f1c 100644 --- a/lib/musicbrainz.rb +++ b/lib/musicbrainz.rb @@ -1,6 +1,7 @@ require "open-uri" require "socket" require "nokogiri" +require "cgi" require "models/music_brainz" require "models/music_brainz/artist" From 612e90ef4cc1a7f7d1000d400ac1943c7e27d88e Mon Sep 17 00:00:00 2001 From: Gregory Eremin Date: Mon, 19 Sep 2011 19:22:08 +0400 Subject: [PATCH 2/2] Regenerate gemspec for version 0.4.8 --- musicbrainz.gemspec | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/musicbrainz.gemspec b/musicbrainz.gemspec index 62ef5ba..ad5abb3 100644 --- a/musicbrainz.gemspec +++ b/musicbrainz.gemspec @@ -5,10 +5,10 @@ Gem::Specification.new do |s| 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.authors = ["Gregory Eremin"] + s.authors = [%q{Gregory Eremin}] s.date = %q{2011-09-19} s.description = %q{MusicBrainz Web Service wrapper with ActiveRecord-style models} s.email = %q{magnolia_fan@me.com} @@ -36,9 +36,9 @@ Gem::Specification.new do |s| "test/test_musicbrainz.rb" ] s.homepage = %q{http://github.com/magnolia-fan/musicbrainz} - s.licenses = ["MIT"] - s.require_paths = ["lib"] - s.rubygems_version = %q{1.6.2} + s.licenses = [%q{MIT}] + s.require_paths = [%q{lib}] + s.rubygems_version = %q{1.8.8} s.summary = %q{MusicBrainz Web Service wrapper} if s.respond_to? :specification_version then