http_request.rb 1.1 → 1.1.1

data/Changelog

@@ -1,8 +1,11 @@
+v1.1.1
+   * using String#each_line instead of String#each, because ruby 1.9 doesn't have the method String#each
+
 v1.1
    * added some testing with test/spec
-	 * fixed some bugs such as uploading files, combine parameters and query string etc.
-	 * supported the HTTP Digest Authentication
-	 * refactoring code...
+   * fixed some bugs such as uploading files, combine parameters and query string etc.
+   * supported the HTTP Digest Authentication
+   * refactoring code...
 
 v1.0.7
    * bug fixing for the ':ajax' and ':xhr' directive
@@ -15,16 +18,16 @@ v1.0.5
 
 v1.0.4
     * support gzipped content only if the zlib library is loaded
-		* post xml data via the POST method
+	* post xml data via the POST method
 
 v1.0.3
     * add some dynamic methods such as code_1xx?, code_200?, code_403? etc. for check the http status 
     * decompressing gzipped body automatically, the 'Accept-Encoding: gzip,deflate' has been added into the header for sending request automatically.
-		* fixed retrieve cookies problem which is if a cookie name is a keyword of the cookie's info such as path, expire etc. then it doesn't work.
+	* fixed retrieve cookies problem which is if a cookie name is a keyword of the cookie's info such as path, expire etc. then it doesn't work.
 
 v1.0.2
     * Proc.call (block) style supported and some small changes
-		* improve ftp protocol and add a new method get_as_string for the ftp calls
+	* improve ftp protocol and add a new method get_as_string for the ftp calls
 
 v1.0.1
     * new feature: upload or download files by ftp

data/README.rdoc

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

data/lib/http_request.rb

@@ -11,9 +11,9 @@
 #
 # == Version
 # 
-#   v1.1
+#   v1.1.1
 #
-#   Last Change: 04 Oct, 2009
+#   Last Change: 15 Oct, 2009
 #
 # == Author
 #
@@ -32,7 +32,7 @@ class HttpRequest
 	include Singleton
 	class << self
 		# version
-		VERSION = '1.1'.freeze
+		VERSION = '1.1.1'.freeze
 		def version;VERSION;end
 
 		# avaiabled http methods
@@ -49,7 +49,7 @@ class HttpRequest
 		# update cookies
 		def update_cookies(response)
 			return unless response.header['set-cookie']
-			response.header['set-cookie'].each {|k|
+			response.header['set-cookie'].each_line {|k|
 				k, v = k.split(';')[0].split('=')
 				@@__cookies[k] = v
 			}
@@ -78,10 +78,10 @@ class HttpRequest
 	end
 
 	# send request by some given parameters
-	def request(method, opt, &block)
+	def request(method, options, &block)
 
 		# parse the @options
-		parse_options(method, opt)
+		parse_options(method, options)
 
 		# parse and merge for the options[:parameters]
 		parse_parameters
@@ -96,11 +96,13 @@ class HttpRequest
 	end
 
 	# catch all available http requests
-	def self.method_missing(method_name, args, &block)
+	def self.method_missing(method_name, options, &block)
+		# 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 = {}
 		method_name = method_name.to_s.downcase
 		raise NoHttpMethodException, "No such http method can be called: #{method_name}" unless self.http_methods.include?(method_name)
-		self.instance.request(method_name, args, &block)
+		self.instance.request(method_name, options, &block)
 	end
 
 	# for ftp, no plan to add new features to this method except bug fixing
@@ -250,7 +252,7 @@ class HttpRequest
 
 		# support gzip
 		begin; require 'zlib'; rescue LoadError; end
-		@headers['Accept-Encoding'] = 'gzip,deflate' if defined? Zlib
+		@headers['Accept-Encoding'] = 'gzip,deflate' if defined? ::Zlib
 
 		# ajax calls?
 		@headers['X_REQUESTED_WITH'] = 'XMLHttpRequest' if @options[:ajax] or @options[:xhr]
@@ -428,7 +430,7 @@ module Net
 		def body
 			bd = read_body()
 			return bd unless bd
-			if (self['content-encoding'] == 'gzip') and defined?(Zlib)
+			if (self['content-encoding'] == 'gzip') and defined?(::Zlib)
 				::Zlib::GzipReader.new(StringIO.new(bd)).read
 			else
 				bd

data/test/test_http_request.rb

@@ -223,6 +223,12 @@ context 'Session && Cookie' do
 		h1 = hr.get(:url => URL + "/session", :cookies => h1.cookies)
 		h1.body.should.equal "2"
 
+		h2 = hr.get(URL + "/session")
+		h2.body.should.equal "1"
+
+		h2 = hr.get(:url => URL + "/session", :cookies => h2)
+		h2.body.should.equal "2"
+
 		h = hr.get(URL + "/session/1")
 		h.body.should.equal "/session/1:/session/2"
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: http_request.rb
 version: !ruby/object:Gem::Version 
-  version: "1.1"
+  version: 1.1.1
 platform: ruby
 authors: 
 - xianhua.zhou
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-10-04 00:00:00 +08:00
+date: 2009-10-15 00:00:00 +08:00
 default_executable: 
 dependencies: []