lib/core_extensions.rb @@ -13,7 +13,7 @@ Echoe.new(ProjectName, HTTParty::Version) do |p| p.url = "http://#{ProjectName}.rubyforge.org" p.author = "John Nunemaker" p.email = "nunemaker@gmail.com" - p.extra_deps = [['activesupport', '>= 2.1']] + p.extra_deps = [['json', '~> 1.1']] p.need_tar_gz = false p.docs_host = WebsitePath end Rakefile @@ -5,8 +5,8 @@ require 'net/https' require 'rubygems' gem 'json', '>= 1.1.3' require 'json' -require 'active_support' require 'module_level_inheritable_attributes' +require 'core_extensions' module HTTParty AllowedFormats = {:xml => 'text/xml', :json => 'application/json', :html => 'text/html'} @@ -18,7 +18,7 @@ module HTTParty base.instance_variable_set("@default_options", {}) end - module ClassMethods + module ClassMethods def default_options @default_options end lib/httparty.rb @@ -5,8 +5,11 @@ module HTTParty # Makes it so uri is sure to parse stuff like google.com without the http def self.normalize_base_uri(url) #:nodoc: use_ssl = (url =~ /^https/) || url.include?(':443') - url.chop! if url.ends_with?('/') + ends_with_slash = url =~ /\/$/ + + url.chop! if ends_with_slash url.gsub!(/^https?:\/\//i, '') + "http#{'s' if use_ssl}://#{url}" end lib/httparty/request.rb @@ -84,7 +84,7 @@ describe HTTParty::Request do def setup_ok_response @ok = Net::HTTPOK.new("1.1", 200, "Content for you") - @ok.stub!(:body).and_return({"foo" => "bar"}.to_xml) + @ok.stub!(:body).and_return('<hash><foo>bar</foo></hash>') @http.should_receive(:request).and_return(@redirect, @ok) @request.options[:format] = :xml end spec/httparty/request_spec.rb @@ -7,9 +7,9 @@ def file_fixture(filename) open(File.join(File.dirname(__FILE__), 'fixtures', "#{filename.to_s}")).read end -def stub_http_response_with(fixture_name) - format = fixture_name.split('.').last.intern - data = file_fixture(fixture_name) +def stub_http_response_with(filename) + format = filename.split('.').last.intern + data = file_fixture(filename) http = Net::HTTP.new('localhost', 80) response = Net::HTTPOK.new("1.1", 200, "Content for you") spec/spec_helper.rb c0ad5dece3d15f8549f5292ad678c7b18a939ccb John Nunemaker nunemaker@gmail.com http://github.com/jnunemaker/httparty/commit/8a70a8ef40531def06c950bfb4902abc774b5b31 8a70a8ef40531def06c950bfb4902abc774b5b31 2008-12-06T19:47:39-08:00 2008-12-06T19:47:01-08:00 Removed active support. Added json. Added some core extensions. 6582b0e9f859367edefabd93c2aaa7f1ff7f55cc John Nunemaker nunemaker@gmail.com