epp-client-base 0.14.0 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 --- 
-SHA512: 
-  metadata.gz: 77ee35cbe7938f4361e9f66716814012f9c1f30c93f0a514bd1316ee7a33dd82fd266609b7fa6cac31ebe9ab43d9251465f6cee240ca9214800ec9d05e14d8b6
-  data.tar.gz: f619b6f39bd0d9828ea288b9d7b3cd2ca05f9bca0cd7e6883c0471662b612fc750ce56aa03a2b64b84f2c396c0a3e660f6f471d0b717d388843c158fac6aee8e
 SHA1: 
-  metadata.gz: 1c6900dbf010bf125e1b3214cd193abed46fbfb3
-  data.tar.gz: 3006a9a6ac7b05d6fe556cc02d92c93316a81e35
+  metadata.gz: f49097239ee4ebb706ad276429827cf648d8b046
+  data.tar.gz: 2d2827164f086591d6c46d5293313d4f7a11df1e
+SHA512: 
+  metadata.gz: 01e2016614a1fee29f2742aa5dabc964d39aaea655d9ac38bd5ab068c690747ad352d7140be457cb67e04ed67c01a52ccab8834988f241ee96fee3a7c1784aeb
+  data.tar.gz: 020cf0e3e96fa096c1d4ea620b520813f2ab82863bfa4cafdcd0fba774c221ee62144c7c14c88ec0f1a512460cad8eb71e6dd9e1083777935246a39d0ed395dd

data/Rakefile

@@ -2,9 +2,9 @@
 require 'rake'
 require 'rdoc/task'
 require 'rubygems/package_task'
-require "bundler/gem_helper"
+require 'bundler/gem_helper'
 
-MY_GEMS = Dir['*.gemspec'].map {|g| g.sub(/.*-(.*)\.gemspec/, '\1')}
+MY_GEMS = Dir['*.gemspec'].map { |g| g.sub(/.*-(.*)\.gemspec/, '\1') }
 
 MY_GEMS.each do |g|
   namespace g do
@@ -26,10 +26,10 @@ task :build   => 'all:build'
 task :install => 'all:install'
 task :push => 'all:push'
 
-desc "Generate documentation for the Rails framework"
+desc 'Generate documentation for the Rails framework'
 Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_dir = 'doc/rdoc'
-  rdoc.title    = "Documentation"
+  rdoc.title    = 'Documentation'
 
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.options << '--charset' << 'utf-8'
@@ -38,4 +38,3 @@ Rake::RDocTask.new do |rdoc|
   rdoc.rdoc_files.include('ChangeLog')
   rdoc.rdoc_files.include('lib/**/*.rb')
 end
-

data/epp-client-base.gemspec

@@ -8,12 +8,12 @@ Gem::Specification.new do |gem|
   gem.email         = ['m@absolight.fr']
   gem.description   = 'An extensible EPP client library.'
   gem.summary       = 'An extensible EPP client library'
-  gem.homepage       = "https://github.com/Absolight/epp-client"
+  gem.homepage      = 'https://github.com/Absolight/epp-client'
 
   gem.required_ruby_version = '>= 1.8.7'
-  gem.required_rubygems_version = ">= 1.3.6"
+  gem.required_rubygems_version = '>= 1.3.6'
 
-  gem.files         = [
+  gem.files = [
     'ChangeLog',
     'Gemfile',
     'MIT-LICENSE',
@@ -47,7 +47,7 @@ Gem::Specification.new do |gem|
   gem.test_files    = `git ls-files -- {test,spec,features}/*`.split("\n")
   gem.require_paths = ['lib']
 
-  gem.add_development_dependency "bundler", ">= 1.0.0"
+  gem.add_development_dependency 'bundler', '>= 1.0.0'
   gem.add_dependency('nokogiri', '~> 1.4')
   gem.add_dependency('builder',  '>= 2.1.2')
 end

data/lib/epp-client/base.rb

@@ -3,7 +3,8 @@ require 'socket'
 require 'nokogiri'
 require 'builder'
 require 'date'
-require "epp-client/version"
+require 'English'
+require 'epp-client/version'
 require 'epp-client/xml'
 require 'epp-client/session'
 require 'epp-client/connection'
@@ -14,23 +15,26 @@ require 'epp-client/domain'
 require 'epp-client/contact'
 
 module EPPClient
+  # This is the base class.
+  #
+  # It can be used directly to talk to EPP servers that have no specific
+  # requirements.
   class Base
-
-    SCHEMAS = %w[
+    SCHEMAS = %w(
       epp-1.0
       domain-1.0
       host-1.0
       contact-1.0
-    ]
-    SCHEMAS_EXT_IETF = %w[
+    )
+    SCHEMAS_EXT_IETF = %w(
       rgp-1.0
-    ]
+    )
 
-    EPPClient::SCHEMAS_URL = SCHEMAS.inject({}) do |a,s|
+    EPPClient::SCHEMAS_URL = SCHEMAS.inject({}) do |a, s|
       a[s.sub(/-1\.0$/, '')] = "urn:ietf:params:xml:ns:#{s}" if s =~ /-1\.0$/
       a[s] = "urn:ietf:params:xml:ns:#{s}"
       a
-    end.merge!(SCHEMAS_EXT_IETF.inject({}) do |a,s|
+    end.merge!(SCHEMAS_EXT_IETF.inject({}) do |a, s|
       a[s.sub(/-1\.0$/, '')] = "urn:ietf:params:xml:ns:#{s}" if s =~ /-1\.0$/
       a[s] = "urn:ietf:params:xml:ns:#{s}"
       a
@@ -77,23 +81,23 @@ module EPPClient
     # [<tt>:ssl_key</tt>] The file containing the key of the certificate.
     def initialize(attrs)
       unless attrs.key?(:server) && attrs.key?(:client_id) && attrs.key?(:password)
-	raise ArgumentError, "server, client_id and password are required"
+        fail ArgumentError, 'server, client_id and password are required'
       end
 
-      attrs.each do |k,v|
-	begin
-	  self.send("#{k}=", v)
-	rescue NoMethodError
-	  raise ArgumentError, "there is no #{k} argument"
-	end
+      attrs.each do |k, v|
+        begin
+          send("#{k}=", v)
+        rescue NoMethodError
+          raise ArgumentError, "there is no #{k} argument"
+        end
       end
 
       @port ||= 700
-      @lang ||= "en"
+      @lang ||= 'en'
       @services ||= EPPClient::SCHEMAS_URL.values_at('domain', 'contact', 'host')
       @extensions ||= []
-      @version ||= "1.0"
-      @clTRID ||= "test-#{$$}-#{rand(1000)}"
+      @version ||= '1.0'
+      @clTRID ||= "test-#{$PROCESS_ID}-#{rand(1000)}"
       @clTRID_index = 0
 
       @context ||= OpenSSL::SSL::SSLContext.new

data/lib/epp-client/connection.rb

@@ -1,6 +1,6 @@
 module EPPClient
+  # This handles all the basic I/O for the connection.
   module Connection
-
     attr_reader :sent_frame, :recv_frame, :srv_version, :srv_lang, :srv_ns, :srv_ext
 
     # Establishes the connection to the server, if successful, will return the
@@ -16,63 +16,55 @@ module EPPClient
       @socket.connect
 
       # Get the initial greeting frame
-      greeting_process(get_frame)
+      greeting_process(one_frame)
     end
 
     def greeting_process(xml) #:nodoc:
-      @srv_version = xml.xpath('epp:epp/epp:greeting/epp:svcMenu/epp:version', EPPClient::SCHEMAS_URL).map {|n| n.text}
-      @srv_lang = xml.xpath('epp:epp/epp:greeting/epp:svcMenu/epp:lang', EPPClient::SCHEMAS_URL).map {|n| n.text}
-      @srv_ns = xml.xpath('epp:epp/epp:greeting/epp:svcMenu/epp:objURI', EPPClient::SCHEMAS_URL).map {|n| n.text}
+      @srv_version = xml.xpath('epp:epp/epp:greeting/epp:svcMenu/epp:version', EPPClient::SCHEMAS_URL).map(&:text)
+      @srv_lang = xml.xpath('epp:epp/epp:greeting/epp:svcMenu/epp:lang', EPPClient::SCHEMAS_URL).map(&:text)
+      @srv_ns = xml.xpath('epp:epp/epp:greeting/epp:svcMenu/epp:objURI', EPPClient::SCHEMAS_URL).map(&:text)
       if (ext = xml.xpath('epp:epp/epp:greeting/epp:svcMenu/epp:svcExtension/epp:extURI', EPPClient::SCHEMAS_URL)).size > 0
-	@srv_ext = ext.map {|n| n.text}
+        @srv_ext = ext.map(&:text)
       end
 
-      return xml
+      xml
     end
 
     # Gracefully close the connection
     def close_connection
-      if defined?(@socket) and @socket.is_a?(OpenSSL::SSL::SSLSocket)
-	@socket.close
-	@socket = nil
+      if defined?(@socket) && @socket.is_a?(OpenSSL::SSL::SSLSocket)
+        @socket.close
+        @socket = nil
       end
 
-      if defined?(@tcpserver) and @tcpserver.is_a?(TCPSocket)
-	@tcpserver.close
-	@tcpserver = nil
+      if defined?(@tcpserver) && @tcpserver.is_a?(TCPSocket)
+        @tcpserver.close
+        @tcpserver = nil
       end
 
-      return true if @tcpserver.nil? and @socket.nil?
+      return true if @tcpserver.nil? && @socket.nil?
     end
 
     # Sends a frame and returns the server's answer
     def send_request(xml)
       send_frame(xml)
-      get_frame
+      one_frame
     end
 
     # sends a frame
     def send_frame(xml)
       @sent_frame = xml
-      @socket.write([xml.size + 4].pack("N") + xml)
+      @socket.write([xml.size + 4].pack('N') + xml)
       sent_frame_to_xml
-      return
     end
 
     # gets a frame from the socket and returns the parsed response.
-    def get_frame
+    def one_frame
       size = @socket.read(4)
-      if size.nil?
-	if @socket.eof?
-	  raise SocketError, "Connection closed by remote server"
-	else
-	  raise SocketError, "Error reading frame from remote server"
-	end
-      else
-	size = size.unpack('N')[0]
-	@recv_frame = @socket.read(size - 4)
-	recv_frame_to_xml
-      end
+      fail SocketError, @socket.eof? ? 'Connection closed by remote server' : 'Error reading frame from remote server' if size.nil?
+      size = size.unpack('N')[0]
+      @recv_frame = @socket.read(size - 4)
+      recv_frame_to_xml
     end
   end
 end

data/lib/epp-client/contact.rb

@@ -1,16 +1,19 @@
 module EPPClient
+  # This module handles all the contact interactions.
+  #
+  # See RFC 5733 for more informations.
   module Contact
     EPPClient::Poll::PARSERS['contact:infData'] = :contact_info_process
 
     def contact_check_xml(*contacts) #:nodoc:
       command do |xml|
-	xml.check do
-	  xml.check('xmlns' => EPPClient::SCHEMAS_URL['contact-1.0']) do
-	    contacts.each do |c|
-	      xml.id(c)
-	    end
-	  end
-	end
+        xml.check do
+          xml.check('xmlns' => EPPClient::SCHEMAS_URL['contact-1.0']) do
+            contacts.each do |c|
+              xml.id(c)
+            end
+          end
+        end
       end
     end
 
@@ -34,29 +37,29 @@ module EPPClient
 
     def contact_check_process(xml) #:nodoc:
       xml.xpath('epp:resData/contact:chkData/contact:cd', EPPClient::SCHEMAS_URL).map do |dom|
-	ret = {
-	  :name => dom.xpath('contact:id', EPPClient::SCHEMAS_URL).text,
-	  :avail => dom.xpath('contact:id', EPPClient::SCHEMAS_URL).attr('avail').value == '1',
-	}
-	unless (reason = dom.xpath('contact:reason', EPPClient::SCHEMAS_URL).text).empty?
-	  ret[:reason] = reason
-	end
-	ret
+        ret = {
+          :name => dom.xpath('contact:id', EPPClient::SCHEMAS_URL).text,
+          :avail => dom.xpath('contact:id', EPPClient::SCHEMAS_URL).attr('avail').value == '1',
+        }
+        unless (reason = dom.xpath('contact:reason', EPPClient::SCHEMAS_URL).text).empty?
+          ret[:reason] = reason
+        end
+        ret
       end
     end
 
     def contact_info_xml(args) #:nodoc:
       command do |xml|
-	xml.info do
-	  xml.info('xmlns' => EPPClient::SCHEMAS_URL['contact-1.0']) do
-	    xml.id(args[:id])
-	    if args.key?(:authInfo)
-	      xml.authInfo do
-		xml.pw(args[:authInfo])
-	      end
-	    end
-	  end
-	end
+        xml.info do
+          xml.info('xmlns' => EPPClient::SCHEMAS_URL['contact-1.0']) do
+            xml.id(args[:id])
+            if args.key?(:authInfo)
+              xml.authInfo do
+                xml.pw(args[:authInfo])
+              end
+            end
+          end
+        end
       end
     end
 
@@ -114,13 +117,10 @@ module EPPClient
     # [<tt>:disclose</tt>]
     #   an optional array that identifies elements that require exceptional
     #   server-operator handling to allow or restrict disclosure to third
-    #   parties. See
-    #   section 2.9[http://tools.ietf.org/html/rfc5733#section-2.9] of RFC 5733
-    #   for details.
+    #   parties. See {section 2.9 of RFC
+    #   5733}[http://tools.ietf.org/html/rfc5733#section-2.9] for details.
     def contact_info(args)
-      if String === args
-	args = {:id => args}
-      end
+      args = { :id => args } if args.is_a?(String)
       response = send_request(contact_info_xml(args))
 
       get_result(:xml => response, :callback => :contact_info_process)
@@ -129,107 +129,107 @@ module EPPClient
     def contact_info_process(xml) #:nodoc:
       contact = xml.xpath('epp:resData/contact:infData', EPPClient::SCHEMAS_URL)
       ret = {
-	:id => contact.xpath('contact:id', EPPClient::SCHEMAS_URL).text,
-	:roid => contact.xpath('contact:roid', EPPClient::SCHEMAS_URL).text,
+        :id => contact.xpath('contact:id', EPPClient::SCHEMAS_URL).text,
+        :roid => contact.xpath('contact:roid', EPPClient::SCHEMAS_URL).text,
       }
       if (status = contact.xpath('contact:status', EPPClient::SCHEMAS_URL)).size > 0
-	ret[:status] = status.map {|s| s.attr('s')}
+        ret[:status] = status.map { |s| s.attr('s') }
       end
 
       if (postalInfo = contact.xpath('contact:postalInfo', EPPClient::SCHEMAS_URL)).size > 0
-	ret[:postalInfo] = postalInfo.inject({}) do |acc, p|
-	  type = p.attr('type').to_sym
-	  acc[type] = { :name => p.xpath('contact:name', EPPClient::SCHEMAS_URL).text, :addr => {} }
-	  if (org = p.xpath('contact:org', EPPClient::SCHEMAS_URL)).size > 0
-	    acc[type][:org] = org.text
-	  end
-	  addr = p.xpath('contact:addr', EPPClient::SCHEMAS_URL)
+        ret[:postalInfo] = postalInfo.inject({}) do |acc, p|
+          type = p.attr('type').to_sym
+          acc[type] = { :name => p.xpath('contact:name', EPPClient::SCHEMAS_URL).text, :addr => {} }
+          if (org = p.xpath('contact:org', EPPClient::SCHEMAS_URL)).size > 0
+            acc[type][:org] = org.text
+          end
+          addr = p.xpath('contact:addr', EPPClient::SCHEMAS_URL)
 
-	  acc[type][:addr][:street] = addr.xpath('contact:street', EPPClient::SCHEMAS_URL).map {|s| s.text}
-	  %w(city cc).each do |val|
-	    acc[type][:addr][val.to_sym] = addr.xpath("contact:#{val}", EPPClient::SCHEMAS_URL).text
-	  end
-	  %w(sp pc).each do |val|
-	    if (r = addr.xpath("contact:#{val}", EPPClient::SCHEMAS_URL)).size > 0
-	      acc[type][:addr][val.to_sym] = r.text
-	    end
-	  end
+          acc[type][:addr][:street] = addr.xpath('contact:street', EPPClient::SCHEMAS_URL).map(&:text)
+          %w(city cc).each do |val|
+            acc[type][:addr][val.to_sym] = addr.xpath("contact:#{val}", EPPClient::SCHEMAS_URL).text
+          end
+          %w(sp pc).each do |val|
+            if (r = addr.xpath("contact:#{val}", EPPClient::SCHEMAS_URL)).size > 0
+              acc[type][:addr][val.to_sym] = r.text
+            end
+          end
 
-	  acc
-	end
+          acc
+        end
       end
 
       %w(voice fax email clID crID upID).each do |val|
-	if (value = contact.xpath("contact:#{val}", EPPClient::SCHEMAS_URL)).size > 0
-	  ret[val.to_sym] = value.text
-	end
+        if (value = contact.xpath("contact:#{val}", EPPClient::SCHEMAS_URL)).size > 0
+          ret[val.to_sym] = value.text
+        end
       end
       %w(crDate upDate trDate).each do |val|
-	if (date = contact.xpath("contact:#{val}", EPPClient::SCHEMAS_URL)).size > 0
-	  ret[val.to_sym] = DateTime.parse(date.text)
-	end
+        if (date = contact.xpath("contact:#{val}", EPPClient::SCHEMAS_URL)).size > 0
+          ret[val.to_sym] = DateTime.parse(date.text)
+        end
       end
       if (authInfo = contact.xpath('contact:authInfo', EPPClient::SCHEMAS_URL)).size > 0
-	ret[:authInfo] = authInfo.xpath('contact:pw', EPPClient::SCHEMAS_URL).text
+        ret[:authInfo] = authInfo.xpath('contact:pw', EPPClient::SCHEMAS_URL).text
       end
       if (disclose = contact.xpath('contact:disclose', EPPClient::SCHEMAS_URL)).size > 0
-	ret[:disclose] = { :flag => disclose.attr('flag').value == '1', :elements => [] }
-	disclose.children.each do |c|
-	  r = { :name => c.name }
-	  unless (type = c.attr('type').value).nil?
-	    r[:type] == type
-	  end
-	  ret[:disclose][:elements] << r
-	end
+        ret[:disclose] = { :flag => disclose.attr('flag').value == '1', :elements => [] }
+        disclose.children.each do |c|
+          r = { :name => c.name }
+          unless (type = c.attr('type').value).nil?
+            r[:type] == type
+          end
+          ret[:disclose][:elements] << r
+        end
       end
       ret
     end
 
     def contact_create_xml(contact) #:nodoc:
       command do |xml|
-	xml.create do
-	  xml.create('xmlns' => EPPClient::SCHEMAS_URL['contact-1.0']) do
-	    if contact.key?(:id)
-	      xml.id(contact[:id])
-	    else
-	      xml.id('invalid')
-	    end
-	    contact[:postalInfo].each do |type,infos|
-	      xml.postalInfo :type => type do
-		xml.name(infos[:name])
-		xml.org(infos[:org]) if infos.key?(:org)
-		xml.addr do
-		  infos[:addr][:street].each do |street|
-		    xml.street(street)
-		  end
-		  xml.city(infos[:addr][:city])
-		  [:sp, :pc].each do |val|
-		    xml.__send__(val, infos[:addr][val]) if infos[:addr].key?(val)
-		  end
-		  xml.cc(infos[:addr][:cc])
-		end
-	      end
-	    end
-	    [:voice, :fax].each do |val|
-	      xml.__send__(val, contact[val]) if contact.key?(val)
-	    end
-	    xml.email(contact[:email])
-	    xml.authInfo do
-	      xml.pw(contact[:authInfo])
-	    end
-	    if contact.key?(:disclose)
-	      xml.disclose do
-		contact[:disclose].each do |disc|
-		  if disc.key?(:type)
-		    xml.__send__(disc[:name], :type => disc[:type])
-		  else
-		    xml.__send__(disc[:name])
-		  end
-		end
-	      end
-	    end
-	  end
-	end
+        xml.create do
+          xml.create('xmlns' => EPPClient::SCHEMAS_URL['contact-1.0']) do
+            if contact.key?(:id)
+              xml.id(contact[:id])
+            else
+              xml.id('invalid')
+            end
+            contact[:postalInfo].each do |type, infos|
+              xml.postalInfo :type => type do
+                xml.name(infos[:name])
+                xml.org(infos[:org]) if infos.key?(:org)
+                xml.addr do
+                  infos[:addr][:street].each do |street|
+                    xml.street(street)
+                  end
+                  xml.city(infos[:addr][:city])
+                  [:sp, :pc].each do |val|
+                    xml.__send__(val, infos[:addr][val]) if infos[:addr].key?(val)
+                  end
+                  xml.cc(infos[:addr][:cc])
+                end
+              end
+            end
+            [:voice, :fax].each do |val|
+              xml.__send__(val, contact[val]) if contact.key?(val)
+            end
+            xml.email(contact[:email])
+            xml.authInfo do
+              xml.pw(contact[:authInfo])
+            end
+            if contact.key?(:disclose)
+              xml.disclose do
+                contact[:disclose].each do |disc|
+                  if disc.key?(:type)
+                    xml.__send__(disc[:name], :type => disc[:type])
+                  else
+                    xml.__send__(disc[:name])
+                  end
+                end
+              end
+            end
+          end
+        end
       end
     end
 
@@ -264,9 +264,8 @@ module EPPClient
     # [<tt>:disclose</tt>]
     #   an optional array that identifies elements that require exceptional
     #   server-operator handling to allow or restrict disclosure to third
-    #   parties. See
-    #   section 2.9[http://tools.ietf.org/html/rfc5733#section-2.9] of RFC 5733
-    #   for details.
+    #   parties. See {section 2.9 of RFC
+    #   5733}[http://tools.ietf.org/html/rfc5733#section-2.9] for details.
     #
     # Returns a hash with the following keys :
     #
@@ -281,18 +280,18 @@ module EPPClient
     def contact_create_process(xml) #:nodoc:
       contact = xml.xpath('epp:resData/contact:creData', EPPClient::SCHEMAS_URL)
       {
-	:id => contact.xpath('contact:id', EPPClient::SCHEMAS_URL).text,
-	:crDate => DateTime.parse(contact.xpath('contact:crDate', EPPClient::SCHEMAS_URL).text),
+        :id => contact.xpath('contact:id', EPPClient::SCHEMAS_URL).text,
+        :crDate => DateTime.parse(contact.xpath('contact:crDate', EPPClient::SCHEMAS_URL).text),
       }
     end
 
     def contact_delete_xml(contact) #:nodoc:
       command do |xml|
-	xml.delete do
-	  xml.delete('xmlns' => EPPClient::SCHEMAS_URL['contact-1.0']) do
-	    xml.id(contact)
-	  end
-	end
+        xml.delete do
+          xml.delete('xmlns' => EPPClient::SCHEMAS_URL['contact-1.0']) do
+            xml.id(contact)
+          end
+        end
       end
     end
 
@@ -309,67 +308,67 @@ module EPPClient
 
     def contact_update_xml(args) #:nodoc:
       command do |xml|
-	xml.update do
-	  xml.update('xmlns' => EPPClient::SCHEMAS_URL['contact-1.0']) do
-	    xml.id args[:id]
-	    if args.key?(:add) && args[:add].key?(:status)
-	      xml.add do
-		args[:add][:status].each do |s|
-		  xml.status :s => s
-		end
-	      end
-	    end
-	    if args.key?(:rem) && args[:rem].key?(:status)
-	      xml.rem do
-		args[:rem][:status].each do |s|
-		  xml.status :s => s
-		end
-	      end
-	    end
-	    if args.key?(:chg)
-	      contact = args[:chg]
-	      xml.chg do
-		if contact.key?(:postalInfo)
-		  contact[:postalInfo].each do |type,infos|
-		    xml.postalInfo :type => type do
-		      xml.name(infos[:name])
-		      xml.org(infos[:org]) if infos.key?(:org)
-		      xml.addr do
-			infos[:addr][:street].each do |street|
-			  xml.street(street)
-			end
-			xml.city(infos[:addr][:city])
-			[:sp, :pc].each do |val|
-			  xml.__send__(val, infos[:addr][val]) if infos[:addr].key?(val)
-			end
-			xml.cc(infos[:addr][:cc])
-		      end
-		    end
-		  end
-		end
-		[:voice, :fax, :email].each do |val|
-		  xml.__send__(val, contact[val]) if contact.key?(val)
-		end
-		if contact.key?(:authInfo)
-		  xml.authInfo do
-		    xml.pw(contact[:authInfo])
-		  end
-		end
-		if contact.key?(:disclose)
-		  xml.disclose do
-		    contact[:disclose].each do |disc|
-		      if disc.key?(:type)
-			xml.__send__(disc[:name], :type => disc[:type])
-		      else
-			xml.__send__(disc[:name])
-		      end
-		    end
-		  end
-		end
-	      end
-	    end
-	  end
-	end
+        xml.update do
+          xml.update('xmlns' => EPPClient::SCHEMAS_URL['contact-1.0']) do
+            xml.id args[:id]
+            if args.key?(:add) && args[:add].key?(:status)
+              xml.add do
+                args[:add][:status].each do |s|
+                  xml.status :s => s
+                end
+              end
+            end
+            if args.key?(:rem) && args[:rem].key?(:status)
+              xml.rem do
+                args[:rem][:status].each do |s|
+                  xml.status :s => s
+                end
+              end
+            end
+            if args.key?(:chg)
+              contact = args[:chg]
+              xml.chg do
+                if contact.key?(:postalInfo)
+                  contact[:postalInfo].each do |type, infos|
+                    xml.postalInfo :type => type do
+                      xml.name(infos[:name])
+                      xml.org(infos[:org]) if infos.key?(:org)
+                      xml.addr do
+                        infos[:addr][:street].each do |street|
+                          xml.street(street)
+                        end
+                        xml.city(infos[:addr][:city])
+                        [:sp, :pc].each do |val|
+                          xml.__send__(val, infos[:addr][val]) if infos[:addr].key?(val)
+                        end
+                        xml.cc(infos[:addr][:cc])
+                      end
+                    end
+                  end
+                end
+                [:voice, :fax, :email].each do |val|
+                  xml.__send__(val, contact[val]) if contact.key?(val)
+                end
+                if contact.key?(:authInfo)
+                  xml.authInfo do
+                    xml.pw(contact[:authInfo])
+                  end
+                end
+                if contact.key?(:disclose)
+                  xml.disclose do
+                    contact[:disclose].each do |disc|
+                      if disc.key?(:type)
+                        xml.__send__(disc[:name], :type => disc[:type])
+                      else
+                        xml.__send__(disc[:name])
+                      end
+                    end
+                  end
+                end
+              end
+            end
+          end
+        end
       end
     end