nominet-epp 0.0.7 → 0.0.8

data/History.md

@@ -1,3 +1,12 @@
+0.0.8 / 2011-05-03
+==================
+
+  * Amend account:contact elements in Create operation to ensure order attribute range
+  * Fix sequencing of elements in account:addr block
+  * Fix sequencing of elements in contact:create block
+  * Fix sequencing of elements in account:create block
+  * Enforce the correct element sequencing for the domain:create operation
+
 0.0.7 / 2011-04-21
 ==================
 

data/VERSION

@@ -1 +1 @@
-0.0.7
+0.0.8

data/lib/nominet-epp/operations/create.rb

@@ -49,14 +49,18 @@ module NominetEPP
               node << p
             end
 
-            acct_xml = XML::Node.new('account', nil, ns)
-            acct_xml << create_account(acct, ns)
-            node << acct_xml
+            # node << XML::Node.new('auto-period', '', ns) # placeholder
+
+            node << XML::Node.new('account', nil, ns).tap do |acct_xml|
+              acct_xml << create_account(acct, ns)
+            end
 
             node << domain_ns_xml(nameservers, ns)
 
-            options.each do |key, value|
-              node << XML::Node.new(key.to_s.gsub('_', '-'), value, ns)
+            # Enforce correct sequencing of option fields
+            [:first_bill, :recur_bill, :auto_bill, :next_bill, :notes].each do |key|
+              next if options[key].nil? || options[key] == ''
+              node << XML::Node.new(key.to_s.gsub('_', '-'), options[key], ns)
             end
           end
         end
@@ -86,17 +90,18 @@ module NominetEPP
           elsif acct.kind_of?(Hash)
             account('create') do |node, ns|
               node << XML::Node.new('name', acct[:name], ns)
-              node << XML::Node.new('trad-name', acct[:trad_name], ns)
+              node << XML::Node.new('trad-name', acct[:trad_name], ns) unless acct[:trad_name].nil? || acct[:trad_name] == ''
               node << XML::Node.new('type', acct[:type], ns)
+              node << XML::Node.new('co-no', acct[:co_no], ns) unless acct[:co_no].nil? || acct[:co_no] == ''
               node << XML::Node.new('opt-out', acct[:opt_out], ns)
 
-              acct[:contacts].each_with_index do |cont, i|
+              node << create_account_address(acct[:addr], ns) unless acct[:addr].nil?
+
+              acct[:contacts][0,3].each_with_index do |cont, i|
                 c = XML::Node.new('contact', nil, ns)
-                c['order'] = i.to_s
+                c['order'] = (i + 1).to_s # Enforce order 1-3
                 node << (c << create_account_contact(cont))
               end
-
-              node << create_account_address(acct[:addr], ns) unless acct[:addr].nil?
             end
           else
             raise ArgumentError, "acct must be String or Hash"
@@ -115,8 +120,9 @@ module NominetEPP
           raise ArgumentError, "Contact requires name and email keys" unless cont.has_key?(:name) && cont.has_key?(:email)
 
           contact('create') do |node, ns|
-            cont.each do |key, value|
-              node << XML::Node.new(key, value, ns)
+            [:name, :phone, :mobile, :email].each do |key|
+              next if cont[key].nil? || cont[key] == ''
+              node << XML::Node.new(key, cont[key], ns)
             end
           end
         end
@@ -132,12 +138,12 @@ module NominetEPP
           raise ArgumentError, "ns must be an xml namespace" unless ns.is_a?(XML::Namespace)
           raise ArgumentError, "Address allowed keys are street, locality, city, county, postcode, country" unless (addr.keys - [:street, :locality, :city, :county, :postcode, :country]).empty?
 
-          addr = XML::Node.new('addr', nil, ns)
-          addr.each do |key, value|
-            addr << XML::Node.new(key, value, ns)
+          XML::Node.new('addr', nil, ns).tap do |a|
+            [:street, :locality, :city, :county, :postcode, :country].each do |key|
+              next if addr[key].nil? || addr[key] == ''
+              a << XML::Node.new(key, addr[key], ns)
+            end
           end
-
-          addr
         end
 
         # Collects created account information

data/lib/nominet-epp/operations/update.rb

@@ -49,6 +49,13 @@ module NominetEPP
     # Fields +:add+ and +:rem+ options
     # - (String) +:v4+ -- IPv4 address to add or remove from the nameserver
     # - (String) +:v6+ -- IPv6 address to add or remove from the nameserver
+    #
+    # Example:
+    #
+    #     fields = {:chg => 'new.ns.example.com',
+    #               :add => {:v4 => '192.168.1.45', :v6 => '2001:db8::1'},
+    #               :rem => {:v4 => '192.168.1.14', :v6 => '2001:db8::b'}}
+    #
     module Update
       # @param [Symbol] entity Entity to update, one of domain, account, contact or nameserver
       # @param [String] id Domain, Account, Contact or Nameserver to update

data/nominet-epp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{nominet-epp}
-  s.version = "0.0.7"
+  s.version = "0.0.8"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Geoff Garside"]
-  s.date = %q{2011-04-21}
+  s.date = %q{2011-05-03}
   s.description = %q{Client for communicating with the Nominet EPP}
   s.email = %q{geoff@geoffgarside.co.uk}
   s.extra_rdoc_files = [

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: nominet-epp
 version: !ruby/object:Gem::Version 
-  hash: 17
+  hash: 15
   prerelease: 
   segments: 
   - 0
   - 0
-  - 7
-  version: 0.0.7
+  - 8
+  version: 0.0.8
 platform: ruby
 authors: 
 - Geoff Garside
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2011-04-21 00:00:00 Z
+date: 2011-05-03 00:00:00 Z
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda