http_request.rb 1.1.2 → 1.1.4

data/Changelog

@@ -1,3 +1,9 @@
+v1.1.4
+   * always use "get" method for redirection
+
+v1.1.3
+   * fixed a bug of the number of redirection checking
+
 v1.1.2
    * fixed a bug of redirection
 

data/README.rdoc

@@ -227,7 +227,7 @@ download multiple files from a directory
   bug fixing, testing and testing...
 
 == LATEST VERSION
-  1.1.2
+  1.1.4
 
 == Author
    

data/lib/http_request.rb

@@ -11,9 +11,9 @@
 #
 # == Version
 # 
-#   v1.1.2
+#   v1.1.4
 #
-#   Last Change: 15 Oct, 2009
+#   Last Change: 16 Feb, 2010
 #
 # == Author
 #
@@ -32,7 +32,7 @@ class HttpRequest
 	include Singleton
 	class << self
 		# version
-		VERSION = '1.1.2'.freeze
+		VERSION = '1.1.4'.freeze
 		def version;VERSION;end
 
 		# avaiabled http methods
@@ -97,6 +97,7 @@ class HttpRequest
 
 	# catch all available http requests
 	def self.method_missing(method_name, options, &block)
+        @@redirect_times = 0
 		# we need to retrieve the cookies from last http response before reset cookies if it's a Net::HTTPResponse
 		options[:cookies] = options[:cookies].cookies	if options[:cookies].is_a? Net::HTTPResponse
 		@@__cookies = {}
@@ -276,8 +277,6 @@ class HttpRequest
 			end
 			@headers['Cookie'] = cookies unless cookies.empty?
 		end
-
-		@redirect_times = 0 if @options[:redirect]
 	end
 
 	# parse parameters for the options[:parameters] and @uri.query
@@ -387,6 +386,7 @@ class HttpRequest
 		case response
 		when Net::HTTPRedirection
 			url = "#{@uri.scheme}://#{@uri.host}#{':' + @uri.port.to_s if @uri.port != 80}"
+            last_url = @options[:url]
 			@options[:url] = case response['location']
 											 when /^https?:\/\//i
 												 response['location']
@@ -403,13 +403,16 @@ class HttpRequest
 											 else
 												 url + File.dirname(@uri.path) + '/' + response['location']
 											 end
-			@redirect_times = @redirect_times.succ
-			raise 'too many redirects...' if @redirect_times > @options[:redirect_limits]
+            return data(response, &block) if @@redirect_times > 2 and @options[:url].eql? last_url
+			@@redirect_times += 1 
+			raise 'too many redirects...' if @@redirect_times > @options[:redirect_limits]
 			if @options[:cookies].nil?
 				@options[:cookies] = self.class.cookies
 			else
 				@options[:cookies] = @options[:cookies].update self.class.cookies
 			end
+            @options.delete :parameters
+            @options.delete :method
 			request('get', @options, &block)
 		else
 			data(response, &block)

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: http_request.rb
 version: !ruby/object:Gem::Version 
-  version: 1.1.2
+  version: 1.1.4
 platform: ruby
 authors: 
 - xianhua.zhou
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-26 00:00:00 +08:00
+date: 2010-02-16 00:00:00 +08:00
 default_executable: 
 dependencies: []