meta-spotify 0.3.0 → 0.3.1

data/lib/meta-spotify.rb

@@ -1,6 +1,7 @@
 $:.unshift File.dirname(__FILE__)
 
 require 'httparty'
+require 'uri'
 
 module MetaSpotify
 
@@ -20,7 +21,10 @@ module MetaSpotify
       item_name = self.name.downcase.gsub(/^.*::/,'')
       query = {:q => string}
       query[:page] = opts[:page].to_s if opts.has_key? :page
-      result = get("/search/#{API_VERSION}/#{item_name}", :query => query, :format => :xml)
+      result = get("/search/#{API_VERSION}/#{item_name}",
+        :query => query,
+        :format => :xml,
+        :query_string_normalizer => self.method(:normalize))
       raise_errors(result)
       result = result[item_name+'s']
       items = []
@@ -87,11 +91,21 @@ module MetaSpotify
         raise BadRequestError.new('406 - The requested format isn\'t available')
       when 500
         raise ServerError.new('500 - The server encountered an unexpected problem')
+      when 502
+        raise ServerError.new('502 - The API internally received a bad response')
       when 503
         raise ServerError.new('503 - The API is temporarily unavailable')
       end
     end
 
+    def self.normalize(query)
+      stack = []
+      query.each do |key, value|
+        stack.push "#{key}=#{URI.encode_www_form_component value}"
+      end
+      stack.join("&")
+    end
+
   end
 
   class MetaSpotifyError < StandardError

data/lib/meta-spotify/version.rb

@@ -1,3 +1,3 @@
 module MetaSpotify
-  VERSION = "0.3.0"
+  VERSION = "0.3.1"
 end

data/test/test_artist.rb

@@ -31,7 +31,7 @@ class TestArtist < Test::Unit::TestCase
     context "a single result" do
       setup do
         FakeWeb.register_uri(:get,
-                             "http://ws.spotify.com/search/1/artist?q=1200%20Micrograms",
+                             "http://ws.spotify.com/search/1/artist?q=1200+Micrograms",
                              :body => fixture_file("artist_search_one_result.xml"))
         @results = MetaSpotify::Artist.search('1200 Micrograms')
       end
@@ -56,7 +56,7 @@ class TestArtist < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "looking up an artist" do
     setup do
       FakeWeb.register_uri(:get,
@@ -75,7 +75,7 @@ class TestArtist < Test::Unit::TestCase
       end
     end
   end
-  
+
   context "looking up an artist with detailed album information" do
     setup do
       FakeWeb.register_uri(:get,

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: meta-spotify
 version: !ruby/object:Gem::Version
-  version: 0.3.0
+  version: 0.3.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-09 00:00:00.000000000 Z
+date: 2013-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty
-  requirement: &70213547995960 !ruby/object:Gem::Requirement
+  requirement: &70318309136740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>'
@@ -21,10 +21,10 @@ dependencies:
         version: '0.8'
   type: :runtime
   prerelease: false
-  version_requirements: *70213547995960
+  version_requirements: *70318309136740
 - !ruby/object:Gem::Dependency
   name: shoulda
-  requirement: &70213547995140 !ruby/object:Gem::Requirement
+  requirement: &70318309132920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -32,10 +32,10 @@ dependencies:
         version: 2.10.2
   type: :development
   prerelease: false
-  version_requirements: *70213547995140
+  version_requirements: *70318309132920
 - !ruby/object:Gem::Dependency
   name: fakeweb
-  requirement: &70213547994460 !ruby/object:Gem::Requirement
+  requirement: &70318309142920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -43,7 +43,7 @@ dependencies:
         version: 1.2.4
   type: :development
   prerelease: false
-  version_requirements: *70213547994460
+  version_requirements: *70318309142920
 description: ! "A ruby wrapper for the Spotify Metadata API.\n                         See
   https://developer.spotify.com/technologies/web-api/\n                         for
   API documentation."