@@ -26,9 +26,9 @@ project = { ], :dependencies => { 'json_pure' => '>= 1.1.2', - 'rack' => '= 0.3.0', - 'extlib' => '>= 0.9.4', - 'merb-core' => '= 0.9.4', + 'rack' => '>= 0.4.0', + 'extlib' => '>= 0.9.5', + 'merb-core' => '>= 0.9.5', 'rubigen' => '>= 1.2.4' }, :requirements => 'install the json gem to get faster JSON parsing', Rakefile @@ -15,7 +15,7 @@ $:.unshift File.dirname(__FILE__) # module Halcyon - VERSION = [0,5,3] unless defined?(Halcyon::VERSION) + VERSION = [0,5,2] unless defined?(Halcyon::VERSION) autoload :Application, 'halcyon/application' autoload :Client, 'halcyon/client' lib/halcyon.rb @@ -193,28 +193,8 @@ module Halcyon # format according to Net::HTTP for sending through as a Hash. def format_body(data) data = {:body => data} unless data.is_a? Hash - data.to_mash - # Hash.to_params (from extlib) doesn't escape keys/values Rack::Utils.build_query(data) end - # Ported over from Rack::Utils.build_query which has not been released yet - # as of Halcyon 0.5.2's release. - # - # The key difference from this and extlib's Hash.to_params is - # that the keys and values are escaped (which cause many problems). - # - # TODO: Remove when Rack is released with Rack::Utils.build_query included. - # - def build_query(params) - params.map { |k, v| - if v.class == Array - build_query(v.map { |x| [k, x] }) - else - Rack::Utils.escape(k) + "=" + Rack::Utils.escape(v) - end - }.join("&") - end - end end lib/halcyon/client.rb e8e3e758827e6488892b0e9a8270ef2fae16c481 Matt Todd chiology@gmail.com http://github.com/mtodd/halcyon/commit/1d151b8627adcad2638a5ca8780a748b4722c5b6 1d151b8627adcad2638a5ca8780a748b4722c5b6 2008-08-26T16:39:16-07:00 2008-08-26T16:39:16-07:00 Reverted and removed any oddities with Gem dependencies et al. 021cce3f9194ce48a9a5cd298673c5b6c65385fd Matt Todd chiology@gmail.com