epp-client-hostmaster 0.2.0 → 0.2.1

data/lib/epp-client/hostmaster-connection.rb

@@ -2,7 +2,8 @@ module EPPClient
   module HostmasterConnection
     def send_frame(xml)
       @sent_frame = xml
-      @socket.write([xml.bytesize + 4].pack("N") + xml)
+      @socket.write [xml.bytesize + 4].pack("N")
+      @socket.write xml
       sent_frame_to_xml
     end
   end

data/lib/epp-client/hostmaster-contact.rb

@@ -25,6 +25,21 @@ module EPPClient
       end
     end
 
+    def contact_disclose_xml(xml, disclose)
+      [:show, :hide].each do |operation|
+        next unless disclose.key? operation
+        xml.contact :disclose, flag: operation == :show ? '1' : '0' do
+          disclose[operation].each do |element|
+            if element.key? :type
+              xml.contact element[:name].to_sym, type: element[:type]
+            else
+              xml.contact element[:name].to_sym
+            end
+          end
+        end
+      end
+    end
+
     def contact_create_xml(contact)
       command do |xml|
         xml.create do
@@ -39,8 +54,10 @@ module EPPClient
                 xml.contact :name, infos[:name]
                 xml.contact :org, infos[:org] if infos.key?(:org)
                 xml.contact :addr do
-                  infos[:addr][:street].each do |street|
-                    xml.contact :street, street
+                  if infos[:addr].key? :street
+                    infos[:addr][:street].each do |street|
+                      xml.contact :street, street
+                    end
                   end
                   xml.contact :city, infos[:addr][:city]
                   xml.contact :sp, infos[:addr][:sp] if infos[:addr].key? :sp
@@ -55,17 +72,7 @@ module EPPClient
             xml.contact :authInfo do
               xml.contact :pw, contact[:authInfo]
             end
-            if contact.key?(:disclose)
-              xml.contact :disclose, flag: '1' do # TODO: parameter for flag need
-                contact[:disclose].each do |disc|
-                  if disc.key?(:type)
-                    xml.contact disc[:name], type: disc[:type]
-                  else
-                    xml.contact disc[:name]
-                  end
-                end
-              end
-            end
+            contact_disclose_xml(xml, contact[:disclose]) if contact.key?(:disclose)
           end
         end
       end
@@ -128,17 +135,7 @@ module EPPClient
                     xml.contact :pw, contact[:authInfo]
                   end
                 end
-                if contact.key?(:disclose)
-                  xml.contact :disclose, flag: '1' do # TODO: parameter for flag need
-                    contact[:disclose].each do |disc|
-                      if disc.key?(:type)
-                        xml.contact disc[:name], type: disc[:type]
-                      else
-                        xml.contact disc[:name]
-                      end
-                    end
-                  end
-                end
+                contact_disclose_xml(xml, contact[:disclose]) if contact.key?(:disclose)
               end
             end
           end

data/lib/epp-client/hostmaster-domain.rb

@@ -71,7 +71,7 @@ module EPPClient
             domain_period_xml(xml, args[:period]) if args.key?(:period)
             domain_nss_xml(xml, args[:ns]) if args.key? :ns
             xml.domain :registrant, args[:registrant]
-            domain_contacts_xml(xml, args[:contacts])
+            domain_contacts_xml(xml, args[:contacts]) if args.key? :contacts
             xml.domain :license, args[:license] if args.key? :license
           end
         end

data/lib/epp-client/hostmaster-host.rb

@@ -122,9 +122,11 @@ module EPPClient
         xml.create do
           xml.host :create, 'xmlns:host' => EPPClient::SCHEMAS_URL['host-1.1'] do
             xml.host :name, host[:name]
-            %w(addrv4 addrv6).each do |type|
-              next unless host.key? type
-              host[type].each {|ip| xml.host :addr, ip}
+            if host.key? :addrv4
+              host[:addrv4].each { |ip| xml.host :addr, { ip: 'v4' }, ip }
+            end
+            if host.key? :addrv6
+              host[:addrv6].each { |ip| xml.host :addr, { ip: 'v6' }, ip }
             end
           end
         end
@@ -183,9 +185,11 @@ module EPPClient
               if args.key? operation
                 xml.host operation do
                   args[operation][:status].each {|s| xml.host :status, s: s} if args[operation].key? :status
-                  %w(addrv4 addrv6).each do |type|
-                    next unless args[operation].key? type
-                    args[operation][type].each {|a| xml.host type, a}
+                  if args[operation].key? :addrv4
+                    args[operation][:addrv4].each { |ip| xml.host :addr, { ip: 'v4' }, ip }
+                  end
+                  if args[operation].key? :addrv6
+                    args[operation][:addrv6].each { |ip| xml.host :addr, { ip: 'v6' }, ip }
                   end
                 end
               end

data/lib/epp-client/hostmaster.rb

@@ -9,7 +9,7 @@ require "epp-client/hostmaster-transfer"
 
 module EPPClient
   class Hostmaster < Base
-    VERSION = '0.2.0'
+    VERSION = '0.2.1'
 
     SCHEMAS = %w(domain-1.1 host-1.1 contact-1.1 rgp-1.1)
 

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epp-client-hostmaster
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.2.1
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-11-19 00:00:00.000000000 Z
+date: 2012-11-20 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler