xcapclient 1.2 → 1.2.1

data/README.rdoc

@@ -1,4 +1,4 @@
-= XCAPClient (version 1.2)
+= XCAPClient (version 1.2.1)
 
 * http://dev.sipdoc.net/projects/ruby-xcapclient/wiki/
 * http://rubyforge.org/projects/xcapclient/

data/lib/xcapclient.rb

@@ -1,6 +1,6 @@
 module XCAPClient
 	
-	VERSION = "1.2"
+	VERSION = "1.2.1"
 	
 	RUBY_VERSION_CORE = case RUBY_VERSION
 		when /^1\.9\./

data/lib/xcapclient/client.rb

@@ -128,7 +128,7 @@ module XCAPClient
 			
 			@identity_header = conf[:identity_header].freeze
 			@identity_user = ( conf[:identity_user].freeze || @user )  if @identity_header
-			COMMON_HEADERS[@identity_header] = @identity_user  if @identity_header
+			COMMON_HEADERS[@identity_header] = '"' + @identity_user + '"'  if @identity_header
 			
 			# Initialize the HTTP client.
 			@http_client = HTTPClient.new
@@ -429,7 +429,8 @@ module XCAPClient
 		# the document stored in the server. This methods allows the client
 		# to fetch these namespaces and prefixes.
 		#
-		# Related documentation: {RFC 4825 section 7.10}[http://tools.ietf.org/html/rfc4825#section-7.10], {RFC 4825 section 10}[http://tools.ietf.org/html/rfc4825#section-10]
+		# Related documentation: {RFC 4825 section 7.10}[http://tools.ietf.org/html/rfc4825#section-7.10],
+		# {RFC 4825 section 10}[http://tools.ietf.org/html/rfc4825#section-10]
 		#
 		# Example:
 		#
@@ -471,15 +472,16 @@ module XCAPClient
 		#
 		# Related documentation: {RFC 4825 section 12}[http://tools.ietf.org/html/rfc4825#section-12]
 		#
-		# If Nokogiri[http://wiki.github.com/tenderlove/nokogiri] is available the method returns an Array containing the auids. If not, the response body is returned as a String.
+		# If Nokogiri[http://wiki.github.com/tenderlove/nokogiri] is available the method returns an 
+		# Array containing the auids. If not, the response body is returned as a String.
 		#
 		def get_xcap_auids
 		
-			body = get_node("xcap-caps", nil, '/xcap-caps/auids')
+			body = get_node("xcap-caps", nil, 'xcap-caps/auids')
 			
 			return case NOKOGIRI_INSTALLED
 				when true
-					parse(body).xpath("/auids/auid", {"xmlns" => XCAP_CAPS_XMLNS}).map {|auid| auid.content}
+					parse(body).xpath("auids/auid", {"xmlns" => XCAP_CAPS_XMLNS}).map {|auid| auid.content}
 				when false
 					body
 				end
@@ -493,11 +495,11 @@ module XCAPClient
 		#
 		def get_xcap_extensions
 		
-			body = get_node("xcap-caps", nil, '/xcap-caps/extensions')
+			body = get_node("xcap-caps", nil, 'xcap-caps/extensions')
 			
 			return case NOKOGIRI_INSTALLED
 				when true
-					parse(body).xpath("/extensions/extension", {"xmlns" => XCAP_CAPS_XMLNS}).map {|extension| extension.content}
+					parse(body).xpath("extensions/extension", {"xmlns" => XCAP_CAPS_XMLNS}).map {|extension| extension.content}
 				when false
 					body
 				end
@@ -511,11 +513,11 @@ module XCAPClient
 		#
 		def get_xcap_namespaces
 		
-			body = get_node("xcap-caps", nil, '/xcap-caps/namespaces')
+			body = get_node("xcap-caps", nil, 'xcap-caps/namespaces')
 			
 			return case NOKOGIRI_INSTALLED
 				when true
-					parse(body).xpath("/namespaces/namespace", {"xmlns" => XCAP_CAPS_XMLNS}).map {|namespace| namespace.content}
+					parse(body).xpath("namespaces/namespace", {"xmlns" => XCAP_CAPS_XMLNS}).map {|namespace| namespace.content}
 				when false
 					body
 				end
@@ -651,12 +653,18 @@ module XCAPClient
 		end  # def send_request
 		
 		
+		# http://tools.ietf.org/html/rfc3986#section-3.3
+		# I add "/" and "@" as they must not be escaped.
+		# I remove "&", "?" so they must be escaped now.
+		ESCAPE_CHARS = "[^a-zA-Z0-9\\-._~!$&'()*+,=:;/@]"
+		
 		def percent_encode(str)
+			### NOTE: I've removed "&", "?" so they must be escaped now.
 			return case RUBY_VERSION_CORE
 			when :RUBY_1_9
-				str.dup.force_encoding('ASCII-8BIT').gsub(/[^a-zA-Z0-9\.,:;\-_?!@$&=+*\/~'()]/) { '%%%02x' % $&.ord }
+				str.dup.force_encoding('ASCII-8BIT').gsub(/#{ESCAPE_CHARS}/) { '%%%02x' % $&.ord }
 			when :RUBY_1_8
-				str.gsub(/[^a-zA-Z0-9\.,:;\-_?!@$&=+*\/~'()]/n) {|s| sprintf('%%%02x', s[0]) }
+				str.gsub(/#{ESCAPE_CHARS}/n) {|s| sprintf('%%%02x', s[0]) }
 			end
 		end
 		

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: xcapclient
 version: !ruby/object:Gem::Version 
-  version: "1.2"
+  version: 1.2.1
 platform: ruby
 authors: 
 - "I\xC3\xB1aki Baz Castillo"
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-11-23 00:00:00 +01:00
+date: 2009-11-30 00:00:00 +01:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency