@@ -1,14 +1,10 @@ +$:.unshift(File.dirname(__FILE__)) + require 'net/http' require 'net/https' -require 'uri' require 'rubygems' require 'active_support' - -dir = File.dirname(__FILE__) -$:.unshift(dir) unless $:.include?(dir) || $:.include?(File.expand_path(dir)) - require 'module_level_inheritable_attributes' -require 'httparty/request' module HTTParty class UnsupportedFormat < StandardError; end @@ -101,3 +97,5 @@ module HTTParty Basement.delete(*args) end end + +require 'httparty/request' \ No newline at end of file lib/httparty.rb @@ -1,3 +1,5 @@ +require 'uri' + module HTTParty class Request # Makes it so uri is sure to parse stuff like google.com without the http lib/httparty/request.rb @@ -1,11 +1,6 @@ -begin - require 'spec' -rescue LoadError - require 'rubygems' - gem 'rspec' - require 'spec' -end - +require 'rubygems' +gem 'rspec' +require 'spec' require File.join(File.dirname(__FILE__), '..', 'lib', 'httparty') def file_fixture(filename) spec/spec_helper.rb 5ba768e29ab19edebd2122b4bd0c39de536b97d6 John Nunemaker nunemaker@gmail.com http://github.com/jnunemaker/httparty/commit/80aa3595d504dccb175e35797db6bfada427ee93 80aa3595d504dccb175e35797db6bfada427ee93 2008-12-06T19:01:42-08:00 2008-12-06T19:01:42-08:00 Tweaked requires and such. 02b9906307471c207350b295302e1e1d67d7b530 John Nunemaker nunemaker@gmail.com