@@ -1,3 +1,4 @@ +* v 0.2.3: changed the way things get escaped in hopes that it would fix some problems some were having * v 0.2.2: a bunch of changes from titanous, mostly refactoring * v 0.2.0: added support for scrobbling tracks and now playing submission (Titanous) * v 0.1.0: initial release \ No newline at end of file History.txt @@ -1,6 +1,10 @@ require File.expand_path(File.join(File.dirname(__FILE__), '..', 'lib', 'scrobbler')) +require 'pp' track = Scrobbler::Track.new('Carrie Underwood', 'Before He Cheats') puts 'Fans' puts "=" * 4 -track.fans.each { |u| puts "(#{u.weight}) #{u.username}" } \ No newline at end of file +track.fans.each { |u| puts "(#{u.weight}) #{u.username}" } + +track = Scrobbler::Track.new('U2 & Green Day', 'The Saints Are Coming') +pp track.tags \ No newline at end of file examples/track.rb @@ -21,8 +21,7 @@ module Scrobbler url = URI.join(@base_url, resource) if args - # TODO: What about keys without value? - url.query = args.map { |k,v| "%s=%s" % [URI.encode(k.to_s), URI.encode(v.to_s)] }.join("&") + url.query = args.map { |k,v| "%s=%s" % [escape(k.to_s), escape(v.to_s)] }.join("&") end case method @@ -42,6 +41,11 @@ module Scrobbler res = http.start() { |conn| conn.request(req) } res.body end + + private + def escape(str) + URI.escape(str, Regexp.new("[^#{URI::PATTERN::UNRESERVED}]")) + end end end end \ No newline at end of file lib/scrobbler/rest.rb 4da3c34ba956ae34891d14abf85333d8c135d464 John Nunemaker nunemaker@gmail.com http://github.com/jnunemaker/scrobbler/commit/ff6dca2878e4572c3d5ef523fdba96074a6c4585 ff6dca2878e4572c3d5ef523fdba96074a6c4585 2009-04-13T06:26:59-07:00 2009-04-13T06:26:59-07:00 Changed the way query string information gets encoded in hopes that it fixes some problems for some people. 594821ec0f496bf5e46d10b4ea8c635cfdb8df71 John Nunemaker nunemaker@gmail.com