nominet-epp 1.0.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 1baec8eaf94460dfaaffe706aab21f691db5e124
-  data.tar.gz: 18c591b8f71fc9af7ff4b67b6bd600e9c4402f37
+  metadata.gz: 300941743173cdc312f08bec2768411870fae78c
+  data.tar.gz: 395332be613671a74c0cd4cc8a8c1107be838e63
 SHA512:
-  metadata.gz: 30bff530d232683cc4b6724c193c562fecd39b4ebfc09208c524c8f4e4a89900038485dd2c34f94714cc09b0088b4aa6afb6c0cbe81bb0f23964ea82b568ed08
-  data.tar.gz: ced5fbd803365d58a870a0e791be50b00f447518cb421a255a2936410ab5f9c8ed0f3d73b99f6384a05724790c19879e24dfd28d6ec126610848be38bf17df54
+  metadata.gz: d246a794a3e732fcc7f4133986d0a4afe041338913531feb8b533489be2cfe40e2762cf9cea5a8c2ef623e15614edae5d765eed6e2e9134ef75a6515b9c8c17f
+  data.tar.gz: b13cb52ba650884feec239b41f75db1158911798b3541944afc566c7ce15faa5dbf4078dd7b3f8cfd0908ebdfe8c5b99256ec01154c4075c1f11ce62cf37a843

data/Gemfile.lock

@@ -1,15 +1,15 @@
 GIT
   remote: git://github.com/m247/epp-client.git
-  revision: a07e51fefcc2a68a317cf1200d4d80ce0b7dbfe0
+  revision: 0fe39d1765c28f728f3a63adad6eb7de49c0f049
   specs:
-    epp-client (1.0.0)
+    epp-client (2.1.0)
       libxml-ruby
 
 PATH
   remote: .
   specs:
-    nominet-epp (1.0.0)
-      epp-client (~> 1.0.0)
+    nominet-epp (2.0.0)
+      epp-client (~> 2.1.0)
 
 GEM
   remote: https://rubygems.org/

data/lib/nominet-epp.rb

@@ -3,7 +3,6 @@ require 'time'
 
 require File.dirname(__FILE__) + '/nominet-epp/version'
 require File.dirname(__FILE__) + '/nominet-epp/operations'
-require File.dirname(__FILE__) + '/nominet-epp/helpers'
 
 require File.dirname(__FILE__) + '/nominet-epp/client'
 require File.dirname(__FILE__) + '/nominet-epp/request'
@@ -13,6 +12,7 @@ require File.dirname(__FILE__) + '/nominet-epp/requests/custom/list'
 require File.dirname(__FILE__) + '/nominet-epp/requests/custom/handshake'
 require File.dirname(__FILE__) + '/nominet-epp/requests/custom/tag_list'
 
+require File.dirname(__FILE__) + '/nominet-epp/requests/domain/request'
 require File.dirname(__FILE__) + '/nominet-epp/requests/domain/check'
 require File.dirname(__FILE__) + '/nominet-epp/requests/domain/create'
 require File.dirname(__FILE__) + '/nominet-epp/requests/domain/delete'

data/lib/nominet-epp/client.rb

@@ -22,13 +22,17 @@ module NominetEPP
     # @param [String] tag Nominet TAG
     # @param [String] passwd Nominet TAG EPP Password
     # @param [String] server Nominet EPP Server address (nil forces default)
-    # @param [String] address_family 'AF_INET' or 'AF_INET6' or either of the
-    #                 appropriate socket constants. Will cause connections to be
-    #                 limited to this address family. Default try all addresses.
-    def initialize(tag, passwd, server = 'epp.nominet.org.uk', address_family = nil)
+    # @param [Hash]   options Options
+    # @option options [String] :address_family 'AF_INET' or 'AF_INET6' or either of the
+    #                          appropriate socket constants. Will cause connections to be
+    #                          limited to this address family. Default try all addresses.
+    # @option options [OpenSSL::SSL::SSLContext] :ssl_context For client certificate auth
+    def initialize(tag, passwd, server = 'epp.nominet.org.uk', options = {})
+      options = {:address_family => options} unless options.kind_of?(Hash) # maintain backwards compatibility with old method signature
+      options = options.merge(:services => SERVICE_URNS, :extensions => SERVICE_EXTENSION_URNS)
+
       @tag, @server = tag, (server || 'epp.nominet.org.uk')
-      @client = EPP::Client.new(@tag, passwd, @server, :services => SERVICE_URNS,
-        :extensions => SERVICE_EXTENSION_URNS, :address_family => address_family)
+      @client = EPP::Client.new(@tag, passwd, @server, options)
     end
 
     # @see Object#inspect
@@ -241,17 +245,17 @@ module NominetEPP
       def create(entity, name, attributes = {})
         res = new_create(entity, name, attributes)
 
-        if res.success?
+        if res.success? || res.pending?
           case entity
           when :domain, 'domain'
             { :name => res.name,
               :crDate => res.creation_date,
               :exDate => res.expiration_date }
           when :contact, 'contact'
-            { :name => res.id,
+            { :name => res.name,
               :crDate => res.creation_date }
           when :host, 'host'
-            { :name => res.id,
+            { :name => res.name,
               :crDate => res.creation_date }
           end
         else

data/lib/nominet-epp/notification.rb

@@ -251,6 +251,11 @@ module NominetEPP
             parsed[:updated_date] = Time.parse(node.content.strip)
           end
         end
+        
+        if @parsed.nil? || @parsed.empty?
+          @parsed = parsed
+        end
+        
         parsed
       end
       def parse_contact_postalInfo(data)

data/lib/nominet-epp/requests/domain/check.rb

@@ -3,10 +3,11 @@ module NominetEPP
     class Check < Request
       def initialize(*names)
         rights = names.last.is_a?(Hash) ? names.pop : nil
+        names  = names.compact # handle nil being passed for rights
 
         @command = EPP::Domain::Check.new(*names)
 
-        if rights
+        if rights && !rights.empty?
           raise ArgumentError, "cannot check direct rights on more than one name" if names.count > 1
           @rights_ext = DirectRightsExtension.new(rights)
           @extension  = EPP::Requests::Extension.new(@rights_ext) rescue nil

data/lib/nominet-epp/requests/domain/create.rb

@@ -15,6 +15,8 @@ module NominetEPP
         @domain_ext = CreateExtension.new(@extensions) rescue nil
         @secdns_ext = CreateSecDNSExtension.new(@options.delete(:ds)) rescue nil
 
+        validate_period(options[:period])
+
         @command    = EPP::Domain::Create.new(@name, @options)
         @extension  = EPP::Requests::Extension.new(@domain_ext, @secdns_ext) rescue nil
       end

data/lib/nominet-epp/requests/domain/renew.rb

@@ -2,6 +2,7 @@ module NominetEPP
   module Domain
     class Renew < Request
       def initialize(name, exp_date, period = nil)
+        validate_period(period)
         @command = EPP::Domain::Renew.new(name, exp_date, period)
       end
     end

data/lib/nominet-epp/requests/domain/request.rb

@@ -0,0 +1,14 @@
+module NominetEPP
+  module Domain
+    class Request < ::NominetEPP::Request
+      def validate_period(period)
+        unit = period[-1,1]
+        val  = period.to_i
+        
+        if unit == 'y' && val > 10
+          raise ArgumentError, "maximum period accepted by Nominet is 10 years"
+        end
+      end
+    end
+  end
+end

data/lib/nominet-epp/responses/domain/check_response.rb

@@ -32,6 +32,7 @@ module NominetEPP
 
             node.find('//nom-direct-rights:chkData', namespaces).each do |chkData|
               @right_of_registration = chkData.find('nom-direct-rights:ror').first.content.strip
+              @right_of_registration = nil if @right_of_registration == ""
             end
           end
         end

data/lib/nominet-epp/version.rb

@@ -1,4 +1,4 @@
 module NominetEPP
   # Current gem version number
-  VERSION = "1.0.0"
+  VERSION = "2.0.0"
 end

data/nominet-epp.gemspec

@@ -17,5 +17,5 @@ Gem::Specification.new do |gem|
 
   gem.extra_rdoc_files = %w(LICENSE README.md HISTORY.md)
 
-  gem.add_dependency 'epp-client', '~> 1.0.0'
+  gem.add_dependency 'epp-client', '~> 2.1.0'
 end

data/test/notifications/test_account_change_notification.rb

@@ -0,0 +1,23 @@
+require 'helper'
+
+class TestNominetAccountChangeNotification < Test::Unit::TestCase
+  context 'NominetEPP::Notifications::AccountChange' do
+    setup do
+      @notification =
+        NominetEPP::Notification.new(
+          load_response('notifications/account-change'))
+    end
+    subject { @notification }
+
+    should 'have type' do
+      assert_equal :account_change, subject.type
+    end
+
+    should 'have contact id' do
+      assert_equal 'CMyContactID', subject.id
+    end
+    should 'have roid' do
+      assert_equal '548965487-UK', subject.roid
+    end
+  end
+end

data/test/requests/contact/test_contact_create_request.rb

@@ -53,6 +53,58 @@ class TestNominetContactCreateRequest < Test::Unit::TestCase
         assert !xpath_exists?('//epp:extension'), "should not have extension element"
       end
     end
+    context 'multiple streets' do
+      setup do
+        @request = NominetEPP::Contact::Create.new('UK-4398495',
+          :voice       => "+44.1234567890",
+          :email       => "enoch.root@test.host",
+          :postal_info => {
+            :org       => "Epiphyte",
+            :name      => "Enoch Root",
+            :addr      => {
+              :street  => "Test Suite\n1 Test Avenue",
+              :city    => "Testington",
+              :sp      => "Testshire",
+              :pc      => "TE57 1NG",
+              :cc      => "GB" } })
+        @xml     = prepare_request.to_xml
+
+        namespaces_from_request
+      end
+
+      should 'validate against schema' do
+        assert @xml.validate_schema(schema)
+      end
+
+      should 'set id' do
+        assert_equal 'UK-4398495', xpath_find('//contact:id')
+      end
+
+      should 'set voice' do
+        assert_equal "+44.1234567890", xpath_find('//contact:voice')
+      end
+      should 'set email' do
+        assert_equal "enoch.root@test.host", xpath_find('//contact:email')
+      end
+      should 'set organisation' do
+        assert_equal "Epiphyte", xpath_find('//contact:postalInfo[@type="loc"]/contact:org')
+      end
+      should 'set name' do
+        assert_equal "Enoch Root", xpath_find('//contact:postalInfo[@type="loc"]/contact:name')
+      end
+      should 'set address' do
+        assert_equal "Test Suite", xpath_find('//contact:postalInfo[@type="loc"]/contact:addr/contact:street[1]')
+        assert_equal "1 Test Avenue", xpath_find('//contact:postalInfo[@type="loc"]/contact:addr/contact:street[2]')
+        assert_equal "Testington", xpath_find('//contact:postalInfo[@type="loc"]/contact:addr/contact:city')
+        assert_equal "Testshire", xpath_find('//contact:postalInfo[@type="loc"]/contact:addr/contact:sp')
+        assert_equal "TE57 1NG", xpath_find('//contact:postalInfo[@type="loc"]/contact:addr/contact:pc')
+        assert_equal "GB", xpath_find('//contact:postalInfo[@type="loc"]/contact:addr/contact:cc')
+      end
+
+      should 'not have extension element' do
+        assert !xpath_exists?('//epp:extension'), "should not have extension element"
+      end
+    end
     context 'nominet extensions' do
       setup do
         @request = NominetEPP::Contact::Create.new('UK-4398495',

data/test/requests/contact/test_contact_update_request.rb

@@ -60,6 +60,65 @@ class TestNominetContactUpdateRequest < Test::Unit::TestCase
         assert !xpath_exists?('//epp:extension'), "should not have extension element"
       end
     end
+    context 'multiple streets' do
+      setup do
+        @time    = Time.now.utc
+        @request = NominetEPP::Contact::Update.new('sh8013',
+          :chg => {
+            :voice       => "+44.1234567890",
+            :email       => "enoch.root@test.host",
+            :postal_info => {
+              :org       => "Epiphyte",
+              :name      => "Enoch Root",
+              :addr      => {
+                :street  => "Test Suite\n1 Test Avenue",
+                :city    => "Testington",
+                :sp      => "Testshire",
+                :pc      => "TE57 1NG",
+                :cc      => "GB" }}})
+        @xml     = prepare_request.to_xml
+
+        namespaces_from_request
+      end
+
+      should 'validate against schema' do
+        assert @xml.validate_schema(schema)
+      end
+
+      should 'have update element' do
+        assert xpath_exists?('//contact:update'), "should have update element"
+      end
+
+      should 'have name element' do
+        assert_equal 'sh8013', xpath_find('//contact:id')
+      end
+
+      should 'set voice for change' do
+        assert_equal "+44.1234567890", xpath_find('//contact:chg/contact:voice')
+      end
+      should 'set email for change' do
+        assert_equal "enoch.root@test.host", xpath_find('//contact:chg/contact:email')
+      end
+      should 'not set organisation for change' do
+        # assert_equal "Epiphyte", xpath_find('//contact:chg/contact:postalInfo[@type="loc"]/contact:org')
+        assert !xpath_exists?('//contact:chg/contact:postalInfo[@type="loc"]/contact:org')
+      end
+      should 'set name for change' do
+        assert_equal "Enoch Root", xpath_find('//contact:chg/contact:postalInfo[@type="loc"]/contact:name')
+      end
+      should 'set address for change' do
+        assert_equal "Test Suite", xpath_find('//contact:chg/contact:postalInfo[@type="loc"]/contact:addr/contact:street[1]')
+        assert_equal "1 Test Avenue", xpath_find('//contact:chg/contact:postalInfo[@type="loc"]/contact:addr/contact:street[2]')
+        assert_equal "Testington", xpath_find('//contact:chg/contact:postalInfo[@type="loc"]/contact:addr/contact:city')
+        assert_equal "Testshire", xpath_find('//contact:chg/contact:postalInfo[@type="loc"]/contact:addr/contact:sp')
+        assert_equal "TE57 1NG", xpath_find('//contact:chg/contact:postalInfo[@type="loc"]/contact:addr/contact:pc')
+        assert_equal "GB", xpath_find('//contact:chg/contact:postalInfo[@type="loc"]/contact:addr/contact:cc')
+      end
+
+      should 'not have extension element' do
+        assert !xpath_exists?('//epp:extension'), "should not have extension element"
+      end
+    end
     context 'nominet extensions' do
       setup do
         @time    = Time.now.utc

data/test/requests/domain/test_domain_create_request.rb

@@ -132,5 +132,58 @@ class TestNominetDomainCreateRequest < Test::Unit::TestCase
         assert xpath_exists?('//secDNS:create'), "should have DNSSEC extension element"
       end
     end
+    context 'period = 10y' do
+      setup do
+        @time    = Time.now.utc
+        @request = NominetEPP::Domain::Create.new('example.co.uk',
+          :period => '10y', :registrant => 'UK-2349723',
+          :nameservers => %w(ns1.test.host ns2.test.host),
+          :auth_info => {:pw => '2381728348'})
+        @xml     = prepare_request.to_xml
+
+        namespaces_from_request
+      end
+
+      should 'validate against schema' do
+        assert @xml.validate_schema(schema)
+      end
+
+      should 'have create element' do
+        assert xpath_exists?('//domain:create'), "should have create element"
+      end
+
+      should 'have name element' do
+        assert_equal 'example.co.uk', xpath_find('//domain:name')
+      end
+      
+      should 'have period elemement of 10y' do
+        assert_equal '10', xpath_find('//domain:period')
+        assert_equal 'y', xpath_find('//domain:period/@unit')
+      end
+
+      should 'not have extension element' do
+        assert !xpath_exists?('//epp:extension'), "should not have extension element"
+      end
+    end
+    context 'period = 120m' do
+      should 'raise argument error' do
+        assert_raises ArgumentError do
+          NominetEPP::Domain::Create.new('example.co.uk',
+            :period => '120m', :registrant => 'UK-2349723',
+            :nameservers => %w(ns1.test.host ns2.test.host),
+            :auth_info => {:pw => '2381728348'})
+        end
+      end
+    end
+    context 'period = 11y' do
+      should 'raise argument error' do
+        assert_raises ArgumentError do
+          NominetEPP::Domain::Create.new('example.co.uk',
+            :period => '11y', :registrant => 'UK-2349723',
+            :nameservers => %w(ns1.test.host ns2.test.host),
+            :auth_info => {:pw => '2381728348'})
+        end
+      end
+    end
   end
 end

data/test/requests/domain/test_domain_renew_request.rb

@@ -2,14 +2,48 @@ require 'helper'
 
 class TestNominetDomainRenewRequest < Test::Unit::TestCase
   context 'NominetEPP::Domain::Renew' do
-    setup do
-      @time    = Time.now.utc
-      @request = NominetEPP::Domain::Renew.new('example.co.uk', @time, '2y')
-      @xml     = prepare_request.to_xml
+    context 'normal renewal' do
+      setup do
+        @time    = Time.now.utc
+        @request = NominetEPP::Domain::Renew.new('example.co.uk', @time, '2y')
+        @xml     = prepare_request.to_xml
+      end
+
+      should 'validate against schema' do
+        assert @xml.validate_schema(schema)
+      end
     end
+    context 'period = 10y' do
+      setup do
+        @time    = Time.now.utc
+        @request = NominetEPP::Domain::Renew.new('example.co.uk', @time, '10y')
+        @xml     = prepare_request.to_xml
+        
+        namespaces_from_request
+      end
 
-    should 'validate against schema' do
-      assert @xml.validate_schema(schema)
+      should 'validate against schema' do
+        assert @xml.validate_schema(schema)
+      end
+      
+      should 'have period elemement of 10y' do
+        assert_equal '10', xpath_find('//domain:period')
+        assert_equal 'y', xpath_find('//domain:period/@unit')
+      end
+    end
+    context 'period = 120m' do
+      should 'raise ArgumentError' do
+        assert_raises ArgumentError do
+          NominetEPP::Domain::Renew.new('example.co.uk', Time.now, '120m')
+        end
+      end
+    end
+    context 'period = 11y' do
+      should 'raise argument error' do
+        assert_raises ArgumentError do
+          NominetEPP::Domain::Renew.new('example.co.uk', Time.now, '11y')
+        end
+      end
     end
   end
 end

data/test/responses/contact/test_contact_info_response.rb

@@ -76,4 +76,26 @@ class TestNominetContactInfoResponse < Test::Unit::TestCase
       assert_equal false, @info_response.opt_out
     end
   end
+  context 'NominetEPP::Contact::Info' do
+    setup do
+      @info_response = NominetEPP::Contact::InfoResponse.new(load_response('contact/info-streets'))
+    end
+
+    should 'be successful' do
+      assert @info_response.success?
+      assert_equal 1000, @info_response.code
+    end
+
+    should 'have postal info' do
+      expected = { :name => "Mary Smith",
+        :org  => "Simple Registrant-TESTING",
+        :addr => {
+          :street => "Test Suite\n2 Test Street",
+          :city => "Test City",
+          :sp => "Testshire",
+          :pc => "TE57 1NG",
+          :cc => "GB" }}
+      assert_equal expected, @info_response.postal_info
+    end
+  end
 end

data/test/responses/domain/test_domain_check_response.rb

@@ -28,6 +28,10 @@ class TestNominetDomainCheckResponse < Test::Unit::TestCase
     should 'have an abuse limit' do
       assert_equal 49997, @check_response.abuse_limit
     end
+
+    should 'have nil right of registration' do
+      assert_nil @check_response.right_of_registration
+    end
   end
 
   context 'NominetEPP::Domain::Check with Domain Rights' do

data/test/support/responses/contact/info-streets.xml

@@ -0,0 +1,47 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://www.nominet.org.uk/epp/xml/epp-1.0 epp-1.0.xsd">
+  <response>
+    <result code="1000">
+      <msg>Command completed successfully</msg>
+    </result>
+    <resData>
+      <contact:infData xmlns:contact="urn:ietf:params:xml:ns:contact-1.0" xsi:schemaLocation="urn:ietf:params:xml:ns:contact-1.0 contact-1.0.xsd">
+        <contact:id>EAXXMK1FW0YZTABD</contact:id>
+        <contact:roid>50643904-UK</contact:roid>
+        <contact:status s="ok"/>
+        <contact:postalInfo type="loc">
+          <contact:name>Mary Smith</contact:name>
+          <contact:org>Simple Registrant-TESTING</contact:org>
+          <contact:addr>
+            <contact:street>Test Suite</contact:street>
+            <contact:street>2 Test Street</contact:street>
+            <contact:city>Test City</contact:city>
+            <contact:sp>Testshire</contact:sp>
+            <contact:pc>TE57 1NG</contact:pc>
+            <contact:cc>GB</contact:cc>
+          </contact:addr>
+        </contact:postalInfo>
+        <contact:voice>+44.1234567890</contact:voice>
+        <contact:email>mary.smith@ariel-testing.co.uk</contact:email>
+        <contact:clID>TESTING</contact:clID>
+        <contact:crID>psamathe@nominet</contact:crID>
+        <contact:crDate>2013-09-13T00:09:32</contact:crDate>
+      </contact:infData>
+    </resData>
+    <extension>
+      <contact-nom-ext:infData xmlns:contact-nom-ext="http://www.nominet.org.uk/epp/xml/contact-nom-ext-1.0" xsi:schemaLocation="http://www.nominet.org.uk/epp/xml/contact-nom-ext-1.0 contact-nom-ext-1.0.xsd">
+        <contact-nom-ext:trad-name>Simple Registrant Trading Ltd</contact-nom-ext:trad-name>
+        <contact-nom-ext:type>LTD</contact-nom-ext:type>
+        <contact-nom-ext:co-no>12345678</contact-nom-ext:co-no>
+        <contact-nom-ext:opt-out>N</contact-nom-ext:opt-out>
+      </contact-nom-ext:infData>
+      <warning:truncated-field xmlns:warning="http://www.nominet.org.uk/epp/xml/std-warning-1.1" field-name="contact:crID" xsi:schemaLocation="http://www.nominet.org.uk/epp/xml/std-warning-1.1 std-warning-1.1.xsd">
+        Full entry is 'psamathe@nominet.org.uk'.
+      </warning:truncated-field>
+    </extension>
+    <trID>
+      <clTRID>TESTING-000008</clTRID>
+      <svTRID>231790</svTRID>
+    </trID>
+  </response>
+</epp>

data/test/support/responses/domain/check.xml

@@ -16,6 +16,9 @@
     </resData>
     <extension>
       <domain-nom-ext:chkData xmlns:domain-nom-ext="http://www.nominet.org.uk/epp/xml/domain-nom-ext-1.2" abuse-limit="49997" xsi:schemaLocation="http://www.nominet.org.uk/epp/xml/domain-nom-ext-1.2 domain-nom-ext-1.2.xsd"/>
+      <nom-direct-rights:chkData xmlns:nom-direct-rights="http://www.nominet.org.uk/epp/xml/nom-direct-rights-1.0" xsi:schemaLocation="http://www.nominet.org.uk/epp/xml/nom-direct-rights-1.0 nom-direct-rights-1.0.xsd">
+        <nom-direct-rights:ror/>
+      </nom-direct-rights:chkData>
     </extension>
     <trID>
       <clTRID>NOMINETEPP-000004</clTRID>

data/test/support/responses/notifications/account-change.xml

@@ -31,6 +31,12 @@
         <contact:upDate>2008-06-12T06:46:00Z</contact:upDate>
       </contact:infData>
     </resData>
+    <extension>
+      <contact-nom-ext:infData xmlns:contact-nom-ext="http://www.nominet.org.uk/epp/xml/contact-nom-ext-1.0" xsi:schemaLocation="http://www.nominet.org.uk/epp/xml/contact-nom-ext-1.0 contact-nom-ext-1.0.xsd">
+        <contact-nom-ext:type>IND</contact-nom-ext:type>
+        <contact-nom-ext:opt-out>N</contact-nom-ext:opt-out>
+      </contact-nom-ext:infData>
+    </extension>
     <trID>
       <clTRID>ABC-12345</clTRID>
       <svTRID>123456</svTRID>

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: nominet-epp
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Geoff Garside
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-06-02 00:00:00.000000000 Z
+date: 2014-10-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: epp-client
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.1.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ~>
       - !ruby/object:Gem::Version
-        version: 1.0.0
+        version: 2.1.0
 description: Client for communicating with the Nominet EPP
 email:
 - geoff@geoffgarside.co.uk
@@ -46,7 +46,6 @@ files:
 - gemfiles/Gemfile.ruby18
 - lib/nominet-epp.rb
 - lib/nominet-epp/client.rb
-- lib/nominet-epp/helpers.rb
 - lib/nominet-epp/notification.rb
 - lib/nominet-epp/operations.rb
 - lib/nominet-epp/request.rb
@@ -65,6 +64,7 @@ files:
 - lib/nominet-epp/requests/domain/info.rb
 - lib/nominet-epp/requests/domain/release.rb
 - lib/nominet-epp/requests/domain/renew.rb
+- lib/nominet-epp/requests/domain/request.rb
 - lib/nominet-epp/requests/domain/unrenew.rb
 - lib/nominet-epp/requests/domain/update.rb
 - lib/nominet-epp/requests/host/check.rb
@@ -98,6 +98,7 @@ files:
 - lib/nominet-epp/version.rb
 - nominet-epp.gemspec
 - test/helper.rb
+- test/notifications/test_account_change_notification.rb
 - test/notifications/test_contact_deleted_notification.rb
 - test/notifications/test_domain_cancelled_notification.rb
 - test/notifications/test_domains_released_notification.rb
@@ -152,6 +153,7 @@ files:
 - test/support/responses/contact/check.xml
 - test/support/responses/contact/create.xml
 - test/support/responses/contact/delete.xml
+- test/support/responses/contact/info-streets.xml
 - test/support/responses/contact/info.xml
 - test/support/responses/contact/release.xml
 - test/support/responses/contact/update.xml
@@ -237,6 +239,7 @@ specification_version: 4
 summary: Nominet EPP (Extensible Provisioning Protocol) Client
 test_files:
 - test/helper.rb
+- test/notifications/test_account_change_notification.rb
 - test/notifications/test_contact_deleted_notification.rb
 - test/notifications/test_domain_cancelled_notification.rb
 - test/notifications/test_domains_released_notification.rb
@@ -291,6 +294,7 @@ test_files:
 - test/support/responses/contact/check.xml
 - test/support/responses/contact/create.xml
 - test/support/responses/contact/delete.xml
+- test/support/responses/contact/info-streets.xml
 - test/support/responses/contact/info.xml
 - test/support/responses/contact/release.xml
 - test/support/responses/contact/update.xml

data/lib/nominet-epp/helpers.rb

@@ -1,184 +0,0 @@
-module NominetEPP
-  # Helper methods
-  module Helpers
-    # @param [String, Array] nameservers Nameserver host name or array of host names or hashes
-    # @param [XML::Namespace] ns XML Namespace to create the elements with
-    # @return [XML::Node] +ns+ element of +host+ elements
-    # @see domain_host_xml
-    def domain_ns_xml(nameservers, ns)
-      ns_el = XML::Node.new('ns', nil, ns)
-
-      case nameservers
-      when String
-        ns_el << domain_host_xml(nameservers, ns)
-      when Array
-        nameservers.each do |nameserver|
-          ns_el << domain_host_xml(nameserver, ns)
-        end
-      else
-        raise ArgumentError, "nameservers must either be a string or array"
-      end
-
-      ns_el
-    end
-
-    # @param [String, Hash] nameserver Nameserver host name or hash of +:name+ and +:v4+ or +:v6+ address
-    # @param [XML::Namespace] ns XML Namespace to create the elements with
-    # @return [XML::Node] +host+ element with +hostName+ and optionally +ip+ subelements
-    def domain_host_xml(nameserver, ns)
-      host = XML::Node.new('host', nil, ns)
-
-      case nameserver
-      when String
-        host << XML::Node.new('hostName', nameserver, ns)
-      when Hash
-        host << XML::Node.new('hostName', nameserver[:name], ns)
-        if nameserver[:v4]
-          host << XML::Node.new('hostAddr', nameserver[:v4], ns).tap do |n|
-            n['ip'] = 'v4'
-          end
-        end
-        if nameserver[:v6]
-          host << XML::Node.new('hostAddr', nameserver[:v6], ns).tap do |n|
-            n['ip'] = 'v6'
-          end
-        end
-      end
-
-      host
-    end
-
-    # Adds the attributes from the fields to the +node+.
-    #
-    # @param [Hash] fields Account attributes to marshal
-    # @param [XML::Node] node XML Node to add the attributes to
-    # @param [XML::Namespace] ns XML Namespace to create the elements under
-    def account_fields_xml(fields, node, ns)
-      [:trad_name, :type, :co_no, :opt_out, :addr, :contacts].each do |k|
-        next if fields[k].nil?
-        case k
-        when :contacts
-          account_contacts_to_xml(fields[k], ns) do |n|
-            node << n
-          end
-        when :addr  # Limitation, can only handle one addr at a time
-          node << addr_to_xml(fields[k], ns)
-        else
-          node << generic_field_to_xml(k, fields[k], ns) unless fields[k] == ''
-        end
-      end
-    end
-
-    # Creates an XML node with the dashed form of the +name+.
-    #
-    # @param [String] name Element name, underscores will be converted to hyphens
-    # @param [String] value Element value
-    # @param [XML::Namespace] ns XML Namespace to create the element under
-    # @return [XML::Node]
-    def generic_field_to_xml(name, value, ns)
-      XML::Node.new(name.to_s.gsub('_', '-'), value, ns)
-    end
-
-    # Massage the contacts to ensure they have an :order parameter
-    #
-    # @param [Array<Hash>] contacts Array of contact attributes
-    # @return [Array<Hash>] Fixed array of contact attributes
-    def fixup_account_contacts(contacts)
-      if contacts.all? { |c| c.has_key? :order }
-        return contacts.sort { |a,b| a[:order].to_i <=> b[:order].to_i }
-      elsif contacts.any? { |c| c.has_key? :order }
-        unordered = contacts.map {|c| c if c[:order].nil? }.compact
-        ordered = Array.new
-        contacts.each do |c|
-          next if c[:order].nil?
-          ordered[c[:order].to_i - 1] = c
-        end
-
-        contacts = ordered.map do |i|
-          unless i.nil? then i
-          else unordered.shift
-          end
-        end + unordered
-      end
-
-      contacts.each_with_index { |c,i| c[:order] = (i+1).to_s }
-    end
-
-    # Creates and array of XML::Node objects for each contact passed.
-    #
-    # @param [Array] contacts Array of contacts
-    # @param [XML::Namespace] ns XML Namespace to create the elements under
-    # @yield [node]
-    # @yieldparam [XML::Node] node XML contact element
-    # @return [Array] array of XML contact nodes
-    def account_contacts_to_xml(contacts, ns)
-      raise ArgumentError, "contacts must be an Array" unless contacts.is_a?(Array)
-      raise ArgumentError, "ns must be an xml namespace" unless ns.is_a?(XML::Namespace)
-
-      contacts = fixup_account_contacts(contacts)
-
-      contacts[0,3].map do |contact|
-        account_contact_to_xml(contact, ns).tap do |n|
-          yield n if block_given?
-        end
-      end
-    end
-
-    # Creates an XML contact element
-    #
-    # @param [Hash] contact Contact attributes
-    # @param [XML::Namespace] ns XML Namespace to create the elements under
-    # @return [XML::Node] XML contact element
-    def account_contact_to_xml(contact, ns)
-      raise ArgumentError, "contact must be a hash" unless contact.is_a?(Hash)
-      raise ArgumentError, "ns must be an xml namespace" unless ns.is_a?(XML::Namespace)
-
-      XML::Node.new('contact', nil, ns).tap do |node|
-        node['order'] = contact.delete(:order).to_s if contact.has_key?(:order)
-
-        node << contact_to_xml(contact)
-      end
-    end
-
-    # Creates an XML +contact:create+ or +contact:update+ element.
-    #
-    # The choice to create a +create+ or +update+ element is determined by the presence of
-    # a +:roid+ key in the list of attributes.
-    #
-    # @param [Hash] contact Contact attributes
-    # @return [XML::Node] XML contact:+action+ element with the attributes
-    def contact_to_xml(contact)
-      keys = [:roid, :name, :phone, :mobile, :email]
-      raise ArgumentError, "contact must be a hash" unless contact.is_a?(Hash)
-      raise ArgumentError, "Contact allowed keys are #{keys.join(', ')}" unless (contact.keys - keys).empty?
-      raise ArgumentError, "Contact requires name and email keys" unless contact.has_key?(:name) && contact.has_key?(:email)
-
-      action = contact[:roid].nil? || contact[:roid] == '' ? 'create' : 'update'
-      contact(action) do |node, ns|
-        keys.each do |key|
-          next if contact[key].nil? || contact[key] == ''
-          node << XML::Node.new(key, contact[key], ns)
-        end
-      end
-    end
-
-    # Creates an XML addr element
-    #
-    # @param [Hash] addr Address attributes
-    # @param [XML::Namespace] ns XML Namespace to create the elements in
-    # @return [XML::Node] XML addr element
-    def addr_to_xml(addr, ns)
-      keys = [:street, :locality, :city, :county, :postcode, :country]
-      raise ArgumentError, "addr must be a hash" unless addr.is_a?(Hash)
-      raise ArgumentError, "ns must be an xml namespace" unless ns.is_a?(XML::Namespace)
-      raise ArgumentError, "Address allowed keys are #{keys.join(', ')}" unless (addr.keys - keys).empty?
-
-      XML::Node.new('addr', nil, ns).tap do |a|
-        keys.each do |key|
-          next if addr[key].nil? || addr[key] == ''
-          a << XML::Node.new(key, addr[key], ns)
-        end
-      end
-    end
-  end
-end