epp-eis 1.0.1 → 1.0.2

data/README.markdown

@@ -20,7 +20,9 @@ In Gemfile add it as a gem:
       :key => OpenSSL::PKey::RSA.new(File.open('priv_key.pem'))
     )
     
-    server.is_domain_available?('fraktal.ee') #=> false
+    server.command_session do
+      server.is_domain_available?('fraktal.ee') #=> false
+    end
     
 ## TODO
 

data/epp-eis.gemspec

@@ -20,7 +20,5 @@ Gem::Specification.new do |s|
   
   s.add_runtime_dependency 'epp-nokogiri'
 
-  s.add_development_dependency 'rspec'
-  s.add_development_dependency 'guard'
-  s.add_development_dependency 'guard-rspec'
+  %w(rake rspec guard guard-rspec rb-fsevent).each { |d| s.add_development_dependency(d) }
 end

data/lib/epp-eis/contact.rb

@@ -153,7 +153,7 @@ module Epp
             xml.check {
               xml.check('xmlns:contact' => XML_NS_CONTACT, 'xsi:schemaLocation' => XML_CONTACT_SCHEMALOC) {
                 xml.parent.namespace = xml.parent.namespace_definitions.first
-                contacts.each { |contact| xml.id_ contact }
+                contacts.each { |contact| xml['contact'].id_ contact }
               }
             }
             xml.clTRID UUIDTools::UUID.timestamp_create.to_s
@@ -170,19 +170,19 @@ module Epp
             xml.create {
               xml.create('xmlns:contact' => XML_NS_CONTACT, 'xsi:schemaLocation' => XML_CONTACT_SCHEMALOC) {
                 xml.parent.namespace = xml.parent.namespace_definitions.first
-                xml.id_ contact
-                xml.postalInfo {
-                  xml.name name
-                  xml.addr {
-                    xml.street street
-                    xml.city city
-                    xml.pc postal_code
-                    xml.cc country_code
+                xml['contact'].id_ contact
+                xml['contact'].postalInfo {
+                  xml['contact'].name name
+                  xml['contact'].addr {
+                    xml['contact'].street street
+                    xml['contact'].city city
+                    xml['contact'].pc postal_code
+                    xml['contact'].cc country_code
                   }
                 }
-                xml.voice voice
-                xml.email email
-                xml.ident ident, 'type' => ident_type
+                xml['contact'].voice voice
+                xml['contact'].email email
+                xml['contact'].ident ident, 'type' => ident_type
               }
             }
             xml.clTRID UUIDTools::UUID.timestamp_create.to_s
@@ -200,7 +200,7 @@ module Epp
             xml.delete {
               xml.delete('xmlns:contact' => XML_NS_CONTACT, 'xsi:schemaLocation' => XML_CONTACT_SCHEMALOC) {
                 xml.parent.namespace = xml.parent.namespace_definitions.first
-                xml.id_ contact
+                xml['contact'].id_ contact
               }
             }
             xml.clTRID UUIDTools::UUID.timestamp_create.to_s
@@ -217,7 +217,7 @@ module Epp
             xml.info {
               xml.info('xmlns:contact' => XML_NS_CONTACT, 'xsi:schemaLocation' => XML_CONTACT_SCHEMALOC) {
                 xml.parent.namespace = xml.parent.namespace_definitions.first
-                xml.id_ contact
+                xml['contact'].id_ contact
               }
             }
             xml.clTRID UUIDTools::UUID.timestamp_create.to_s
@@ -238,23 +238,23 @@ module Epp
             xml.update {
               xml.update('xmlns:contact' => XML_NS_CONTACT, 'xsi:schemaLocation' => XML_CONTACT_SCHEMALOC) {
                 xml.parent.namespace = xml.parent.namespace_definitions.first
-                xml.id_ contact
+                xml['contact'].id_ contact
                 if [name, street, city, postal_code, country_code].any?{ |item| !item.nil? }
-                  xml.postalInfo {
-                    xml.name name if name
+                  xml['contact'].postalInfo {
+                    xml['contact'].name name if name
                     if [street, city, postal_code, country_code].any?{ |item| !item.nil? }
-                      xml.addr {
-                        xml.street street if street
-                        xml.city city if city
-                        xml.pc postal_code if postal_code
-                        xml.cc country_code if country_code
+                      xml['contact'].addr {
+                        xml['contact'].street street if street
+                        xml['contact'].city city if city
+                        xml['contact'].pc postal_code if postal_code
+                        xml['contact'].cc country_code if country_code
                       }
                     end
                   }
                 end
-                xml.voice voice if voice
-                xml.email email if email
-                xml.ident ident, 'type' => ident_type
+                xml['contact'].voice voice if voice
+                xml['contact'].email email if email
+                xml['contact'].ident ident, 'type' => ident_type
               }
             }
             append_legal_document(xml, legal_document, legal_doc_type)

data/lib/epp-eis/domain.rb

@@ -213,11 +213,11 @@ module Epp
             xml.create {
               xml.create('xmlns:domain' => XML_NS_DOMAIN, 'xsi:schemaLocation' => XML_DOMAIN_SCHEMALOC) {
                 xml.parent.namespace = xml.parent.namespace_definitions.first
-                xml.name domain
-                xml.period '1', 'unit' => 'y'
-                xml.nsset nsset
-                xml.registrant registrant
-                [admins].flatten.each { |admin| xml.admin admin }
+                xml['domain'].name domain
+                xml['domain'].period '1', 'unit' => 'y'
+                xml['domain'].nsset nsset
+                xml['domain'].registrant registrant
+                [admins].flatten.each { |admin| xml['domain'].admin admin }
               }
             }
             append_legal_document(xml, legal_document, legal_doc_type)
@@ -241,7 +241,7 @@ module Epp
             xml.delete {
               xml.delete('xmlns:domain' => XML_NS_DOMAIN, 'xsi:schemaLocation' => XML_DOMAIN_SCHEMALOC) {
                 xml.parent.namespace = xml.parent.namespace_definitions.first
-                xml.name domain
+                xml['domain'].name domain
               }
             }
             append_legal_document(xml, legal_document, legal_doc_type)
@@ -265,7 +265,7 @@ module Epp
             xml.info {
               xml.info('xmlns:domain' => XML_NS_DOMAIN, 'xsi:schemaLocation' => XML_DOMAIN_SCHEMALOC) {
                 xml.parent.namespace = xml.parent.namespace_definitions.first
-                xml.name domain
+                xml['domain'].name domain
               }
             }
             xml.clTRID UUIDTools::UUID.timestamp_create.to_s
@@ -287,9 +287,9 @@ module Epp
             xml.renew {
               xml.renew('xmlns:domain' => XML_NS_DOMAIN, 'xsi:schemaLocation' => XML_DOMAIN_SCHEMALOC) {
                 xml.parent.namespace = xml.parent.namespace_definitions.first
-                xml.name domain
-                xml.curExpDate current_expire_date
-                xml.period '1', 'unit' => 'y'
+                xml['domain'].name domain
+                xml['domain'].curExpDate current_expire_date
+                xml['domain'].period '1', 'unit' => 'y'
               }
             }
             xml.clTRID UUIDTools::UUID.timestamp_create.to_s
@@ -311,8 +311,8 @@ module Epp
             xml.transfer('op' => 'request') {
               xml.transfer('xmlns:domain' => XML_NS_DOMAIN, 'xsi:schemaLocation' => XML_DOMAIN_SCHEMALOC) {
                 xml.parent.namespace = xml.parent.namespace_definitions.first
-                xml.name domain
-                xml.authInfo auth_info
+                xml['domain'].name domain
+                xml['domain'].authInfo auth_info
               }
             }
             append_legal_document(xml, legal_document, legal_doc_type)
@@ -341,22 +341,22 @@ module Epp
             xml.update {
               xml.update('xmlns:domain' => XML_NS_DOMAIN, 'xsi:schemaLocation' => XML_DOMAIN_SCHEMALOC) {
                 xml.parent.namespace = xml.parent.namespace_definitions.first
-                xml.name domain
+                xml['domain'].name domain
                 if !add_admins.nil? && !add_admins.empty?
-                  xml.add {
-                    add_admins.each { |add_admin| xml.admin add_admin }
+                  xml['domain'].add {
+                    add_admins.each { |add_admin| xml['domain'].admin add_admin }
                   }
                 end
                 if !rem_admins.nil? && !rem_admins.empty?
-                  xml.rem {
-                    rem_admins.each { |rem_admin| xml.admin rem_admin }
+                  xml['domain'].rem {
+                    rem_admins.each { |rem_admin| xml['domain'].admin rem_admin }
                   }
                 end
                 if [nsset, registrant, auth_info].any?{ |item| !item.nil? }
-                  xml.chg {
-                    xml.nsset nsset if nsset
-                    xml.registrant registrant if registrant
-                    xml.auth_info auth_info if auth_info
+                  xml['domain'].chg {
+                    xml['domain'].nsset nsset if nsset
+                    xml['domain'].registrant registrant if registrant
+                    xml['domain'].auth_info auth_info if auth_info
                   }
                 end
               }
@@ -383,14 +383,14 @@ module Epp
               xml.check('xmlns:domain' => XML_NS_DOMAIN, 'xsi:schemaLocation' => XML_DOMAIN_SCHEMALOC) {
                 xml.parent.namespace = xml.parent.namespace_definitions.first
                 domains.each do |domain|
-                  xml.name domain
+                  xml['domain'].name domain
                 end
               }
             }
             xml.clTRID UUIDTools::UUID.timestamp_create.to_s
           }
         end
-
+        
         DomainCheckResponse.new(send_request(builder.to_xml))
       end
       

data/lib/epp-eis/extensions.rb

@@ -11,7 +11,7 @@ module Epp
         xml.extension {
           xml.extdata('xmlns:eis' => 'urn:ee:eis:xml:epp:eis-1.0', 'xsi:schemaLocation' => 'urn:ee:eis:xml:epp:eis-1.0 eis-1.0.xsd') {
             xml.parent.namespace = xml.parent.namespace_definitions.first
-            xml.legalDocument Base64.encode64(legal_document), 'type' => legal_doc_type
+            xml['eis'].legalDocument Base64.encode64(legal_document), 'type' => legal_doc_type
           }
         }
       end

data/lib/epp-eis/nsset.rb

@@ -133,7 +133,7 @@ module Epp
             xml.check {
               xml.check('xmlns:nsset' => XML_NS_NSSET, 'xsi:schemaLocation' => XML_NSSET_SCHEMALOC) {
                 xml.parent.namespace = xml.parent.namespace_definitions.first
-                nssets.each { |nsset| xml.id_ nsset }
+                nssets.each { |nsset| xml['nsset'].id_ nsset }
               }
             }
             xml.clTRID UUIDTools::UUID.timestamp_create.to_s
@@ -150,14 +150,14 @@ module Epp
             xml.create {
               xml.create('xmlns:nsset' => XML_NS_NSSET, 'xsi:schemaLocation' => XML_NSSET_SCHEMALOC) {
                 xml.parent.namespace = xml.parent.namespace_definitions.first
-                xml.id_ nsset
+                xml['nsset'].id_ nsset
                 nameservers.each do |nameserver|
-                  xml.ns {
-                    xml.name nameserver[0]
-                    xml.addr nameserver[1]
+                  xml['nsset'].ns {
+                    xml['nsset'].name nameserver[0]
+                    xml['nsset'].addr nameserver[1]
                   }
                 end
-                xml.tech contact
+                xml['nsset'].tech contact
               }
             }
             xml.clTRID UUIDTools::UUID.timestamp_create.to_s
@@ -174,7 +174,7 @@ module Epp
             xml.delete {
               xml.delete('xmlns:nsset' => XML_NS_NSSET, 'xsi:schemaLocation' => XML_NSSET_SCHEMALOC) {
                 xml.parent.namespace = xml.parent.namespace_definitions.first
-                xml.id_ nsset
+                xml['nsset'].id_ nsset
               }
             }
             xml.clTRID UUIDTools::UUID.timestamp_create.to_s
@@ -191,7 +191,7 @@ module Epp
             xml.info {
               xml.info('xmlns:nsset' => XML_NS_NSSET, 'xsi:schemaLocation' => XML_NSSET_SCHEMALOC) {
                 xml.parent.namespace = xml.parent.namespace_definitions.first
-                xml.id_ nsset
+                xml['nsset'].id_ nsset
               }
             }
             xml.clTRID UUIDTools::UUID.timestamp_create.to_s
@@ -213,22 +213,22 @@ module Epp
             xml.update {
               xml.update('xmlns:nsset' => XML_NS_NSSET, 'xsi:schemaLocation' => XML_NSSET_SCHEMALOC) {
                 xml.parent.namespace = xml.parent.namespace_definitions.first
-                xml.id_ nsset
+                xml['nsset'].id_ nsset
                 if add_nameservers or add_contact
-                  xml.add {
+                  xml['nsset'].add {
                     add_nameservers.each do |nameserver|
-                      xml.ns {
-                        xml.name nameserver[0]
-                        xml.addr nameserver[1]
+                      xml['nsset'].ns {
+                        xml['nsset'].name nameserver[0]
+                        xml['nsset'].addr nameserver[1]
                       }
                     end if add_nameservers
-                    xml.tech add_contact if add_contact
+                    xml['nsset'].tech add_contact if add_contact
                   }
                 end
                 if rem_nameserver or rem_contact
-                  xml.rem {
-                    xml.name rem_nameserver
-                    xml.tech rem_contact
+                  xml['nsset'].rem {
+                    xml['nsset'].name rem_nameserver
+                    xml['nsset'].tech rem_contact
                   }
                 end
               }

data/lib/epp-eis/version.rb

@@ -1,5 +1,5 @@
 module Eis
   module Epp
-    VERSION = '1.0.1'
+    VERSION = '1.0.2'
   end
 end

data/spec/lib/epp-eis/contact_spec.rb

@@ -7,100 +7,207 @@ describe Epp::Eis::ContactCommands do
   end
   
   describe 'check_contact' do
-
-    context 'when response is successful' do
-
-      before(:each) do
-        @server.stub(:send_request).and_return(xml_mock('responses/contact/check_contact_1000.xml'))
+    before(:each) do
+      @server.should_receive(:send_request) do |xml|
+        @request = Nokogiri::XML(xml)
+        xml_mock('responses/contact/check_contact_1000.xml')
       end
-
+    end
+    
+    context 'request' do
+      it 'contains contact id' do
+        @server.check_contact('CID:FRAKTAL:1')
+        expect(@request.css('contact|check contact|id', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eq('CID:FRAKTAL:1')
+      end
+    end
+    
+    context 'response' do
       it 'has status code 1000' do
-        @server.check_contact('CID:FRAKTAL:1').code.should == 1000
+        expect(@server.check_contact('CID:FRAKTAL:1').code).to eq(1000)
       end
 
       context 'when multiple contact names are provided' do
         it 'has multiple contact check items in response object' do
-          @server.check_contact('CID:FRAKTAL:1', 'CID:FRAKTAL:2').items.size.should == 2
+          expect(@server.check_contact('CID:FRAKTAL:1', 'CID:FRAKTAL:2').items.size).to eq(2)
         end
       end
     end
   end
   
   describe 'create_contact' do
-    context 'when response is successful' do
-      before(:each) do
-        @server.stub(:send_request).and_return(xml_mock('responses/contact/create_contact_1000.xml'))
-        @response = @server.create_contact('CID:TEST:10', 'Test', 'Test Street 11-2', 'Test City', '123456', 'EE', '+372.5555555', 'test@test.com', '37812124567', 'op')
+    before(:each) do
+      @server.should_receive(:send_request) do |xml|
+        @request = Nokogiri::XML(xml)
+        xml_mock('responses/contact/create_contact_1000.xml')
       end
-
+      @response = @server.create_contact('CID:TEST:10', 'Test', 'Test Street 11-2', 'Test City', '123456', 'EE', '+372.5555555', 'test@test.com', '37812124567', 'op')
+    end
+    
+    context 'request' do
+      it 'contains contact id' do
+        expect(@request.css('contact|create contact|id', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eq('CID:TEST:10')
+      end
+      
+      it 'contains contact name' do
+        expect(@request.css('contact|create contact|postalInfo contact|name', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eq('Test')
+      end
+      
+      it 'contains street' do
+        expect(@request.css('contact|create contact|postalInfo contact|addr contact|street', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eq('Test Street 11-2')
+      end
+      
+      it 'contains city' do
+        expect(@request.css('contact|create contact|postalInfo contact|addr contact|city', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eq('Test City')
+      end
+      
+      it 'contains postal code' do
+        expect(@request.css('contact|create contact|postalInfo contact|addr contact|pc', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eq('123456')
+      end
+      
+      it 'contains country code' do
+        expect(@request.css('contact|create contact|postalInfo contact|addr contact|cc', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eq('EE')
+      end
+      
+      it 'contains phone number' do
+        expect(@request.css('contact|create contact|voice', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eq('+372.5555555')
+      end
+      
+      it 'contains phone email' do
+        expect(@request.css('contact|create contact|email', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eq('test@test.com')
+      end
+      
+      it 'contains identification code' do
+        expect(@request.css('contact|create contact|ident', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eq('37812124567')
+      end
+      
+      it 'contains identification type' do
+        expect(@request.css('contact|create contact|ident', 'contact' => Epp::Eis::XML_NS_CONTACT).first['type']).to eq('op')
+      end
+    end
+    
+    context 'response' do
       it 'returns contact id' do
-        @response.contact_id.should == 'CID:TEST:10'
+        expect(@response.contact_id).to eq('CID:TEST:10')
       end
 
       it 'returns contact create date' do
-        @response.contact_create_date.should == '2010-02-08T15:50:55+02:00'
+        expect(@response.contact_create_date).to eq('2010-02-08T15:50:55+02:00')
       end
     end
   end
   
   describe 'info_contact' do
-    context 'when response is successful' do
-      before(:each) do
-        @server.stub(:send_request).and_return(xml_mock('responses/contact/info_contact_1000.xml'))
-        @response = @server.info_contact('CID:TEST:1')
+    before(:each) do
+      @server.should_receive(:send_request) do |xml|
+        @request = Nokogiri::XML(xml)
+        xml_mock('responses/contact/info_contact_1000.xml')
       end
-      
+      @response = @server.info_contact('CID:TEST:1')
+    end
+    
+    context 'request' do
+      it 'contains contact id' do
+        expect(@request.css('contact|info contact|id', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eq('CID:TEST:1')
+      end
+    end
+    
+    context 'response' do
       it 'returns contact id' do
-        @response.contact_id.should == 'CID:TEST:1'
+        expect(@response.contact_id).to eq('CID:TEST:1')
       end
 
       it 'returns roid' do
-        @response.contact_roid.should == 'C0000000006-EPP'
+        expect(@response.contact_roid).to eq('C0000000006-EPP')
       end
 
       it 'returns status' do
-        @response.contact_status.should == 'linked'
+        expect(@response.contact_status).to eq('linked')
       end
       
       it 'returns name' do
-        @response.contact_name.should == 'Uus nimi ajee'
+        expect(@response.contact_name).to eq('Uus nimi ajee')
       end
       
       it 'returns street' do
-        @response.contact_street.should == 'Kastani'
+        expect(@response.contact_street).to eq('Kastani')
       end
       
       it 'returns city' do
-        @response.contact_city.should == 'Tallinn'
+        expect(@response.contact_city).to eq('Tallinn')
       end
       
       it 'returns postal code' do
-        @response.contact_postal_code.should == '10613'
+        expect(@response.contact_postal_code).to eq('10613')
       end
       
       it 'returns country code' do
-        @response.contact_country_code.should == 'EE'
+        expect(@response.contact_country_code).to eq('EE')
       end
       
       it 'returns contact email' do
-        @response.contact_email.should == 'test@test.host'
+        expect(@response.contact_email).to eq('test@test.host')
       end
     end
   end
   
   describe 'update_contact' do
-    context 'when response is successful' do
-      before(:each) do
-        @server.stub(:send_request).and_return(xml_mock('responses/contact/update_contact_1000.xml'))
-        @response = @server.update_contact('CID:TEST:10', nil, nil, nil, nil, nil, nil, nil, nil, 'op', legal_mock('test.pdf'), 'pdf')
+    before(:each) do
+      @server.should_receive(:send_request) do |xml|
+        @request = Nokogiri::XML(xml)
+        xml_mock('responses/contact/update_contact_1000.xml')
       end
-
+      @response = @server.update_contact('CID:TEST:10', 'Test', 'Test Street 11-2', 'Test City', '123456', 'EE', '+372.5555555', 'test@test.com', '37812124567', 'op', legal_mock('test.pdf'), 'pdf')
+    end
+    
+    context 'request' do
+      it 'contains contact id' do
+        expect(@request.css('contact|update contact|id', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eq('CID:TEST:10')
+      end
+      
+      it 'contains contact name' do
+        expect(@request.css('contact|update contact|postalInfo contact|name', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eql('Test')
+      end
+      
+      it 'contains street' do
+        expect(@request.css('contact|update contact|postalInfo contact|addr contact|street', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eql('Test Street 11-2')
+      end
+      
+      it 'contains city' do
+        expect(@request.css('contact|update contact|postalInfo contact|addr contact|city', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eql('Test City')
+      end
+      
+      it 'contains postal code' do
+        expect(@request.css('contact|update contact|postalInfo contact|addr contact|pc', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eql('123456')
+      end
+      
+      it 'contains country code' do
+        expect(@request.css('contact|update contact|postalInfo contact|addr contact|cc', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eql('EE')
+      end
+      
+      it 'contains phone number' do
+        expect(@request.css('contact|update contact|voice', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eql('+372.5555555')
+      end
+      
+      it 'contains phone email' do
+        expect(@request.css('contact|update contact|email', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eql('test@test.com')
+      end
+      
+      it 'contains identification code' do
+        expect(@request.css('contact|update contact|ident', 'contact' => Epp::Eis::XML_NS_CONTACT).text).to eql('37812124567')
+      end
+      
+      it 'contains identification type' do
+        expect(@request.css('contact|update contact|ident', 'contact' => Epp::Eis::XML_NS_CONTACT).first['type']).to eql('op')
+      end
+    end
+    
+    context 'response' do
       it 'returns response code' do
-        @response.code.should == 1000
+        expect(@response.code).to eq(1000)
       end
 
       it 'returns response message' do
-        @response.message.should == 'Command completed successfully'
+        expect(@response.message).to eq('Command completed successfully')
       end
     end
   end

data/spec/lib/epp-eis/domain_spec.rb

@@ -7,12 +7,41 @@ describe Epp::Eis::DomainCommands do
   end
 
   describe 'create_domain' do
-    context 'when response is successful' do
-      before(:each) do
-        @server.stub(:send_request).and_return(xml_mock('responses/domain/create_domain_1000.xml'))
-        @response = @server.create_domain('testing.ee', 'name_server_set1', 'domain_registrator1', 'administrative_contact1', legal_mock('test.pdf'), 'pdf')
+    before(:each) do
+      @server.should_receive(:send_request) do |xml|
+        @request = Nokogiri::XML(xml)
+        xml_mock('responses/domain/create_domain_1000.xml')
+      end
+      @response = @server.create_domain('testing.ee', 'name_server_set1', 'domain_registrator1', ['administrative_contact1', 'administrative_contact2'], legal_mock('test.pdf'), 'pdf')
+    end
+    
+    context 'request' do
+      it 'contains domain name' do
+        @request.css('domain|create domain|name', 'domain' => Epp::Eis::XML_NS_DOMAIN).text.should == 'testing.ee'
+      end
+
+      it 'contains registration period' do
+        @request.css('domain|create domain|period', 'domain' => Epp::Eis::XML_NS_DOMAIN).text.should == '1'
+      end
+      
+      it 'contains registration period unit' do
+        @request.css('domain|create domain|period', 'domain' => Epp::Eis::XML_NS_DOMAIN).first['unit'].should == 'y'
       end
       
+      it 'contains nsset' do
+        @request.css('domain|create domain|nsset', 'domain' => Epp::Eis::XML_NS_DOMAIN).text.should == 'name_server_set1'
+      end
+
+      it 'contains registrant' do
+        @request.css('domain|create domain|registrant', 'domain' => Epp::Eis::XML_NS_DOMAIN).text.should == 'domain_registrator1'
+      end
+
+      it 'contains administrative contacts' do
+        @request.css('domain|create domain|admin', 'domain' => Epp::Eis::XML_NS_DOMAIN).collect{ |n| n.text }.should include('administrative_contact1', 'administrative_contact2')
+      end
+    end
+    
+    context 'response' do
       it 'returns domain name' do
         @response.domain_name.should == 'testing.ee'
       end

data/spec/lib/epp-eis/nsset_spec.rb

@@ -7,80 +7,147 @@ describe Epp::Eis::NssetCommands do
   end
   
   describe 'check_nsset' do
-
-    context 'when response is successful' do
-
-      before(:each) do
-        @server.stub(:send_request).and_return(xml_mock('responses/nsset/check_nsset_1000.xml'))
+    before(:each) do
+      @server.should_receive(:send_request) do |xml|
+        @request = Nokogiri::XML(xml)
+        xml_mock('responses/nsset/check_nsset_1000.xml')
       end
+    end
+    
+    context 'request' do
+      it 'contains nsset id' do
+        @server.check_nsset('NSSID:TEST:1')
+        expect(@request.css('nsset|check nsset|id', 'nsset' => Epp::Eis::XML_NS_NSSET).text).to eq('NSSID:TEST:1')
+      end
+    end
 
+    context 'response' do
       it 'has status code 1000' do
-        @server.check_nsset('NSSID:TEST:1').code.should == 1000
+        expect(@server.check_nsset('NSSID:TEST:1').code).to eq(1000)
       end
 
       context 'when multiple nsset names are provided' do
         it 'has multiple nsset check items in response object' do
-          @server.check_nsset('NSSID:TEST:1', 'NSSID:TEST:2').items.size.should == 2
+          expect(@server.check_nsset('NSSID:TEST:1', 'NSSID:TEST:2').items.size).to eq(2)
         end
       end
     end
   end
   
   describe 'create_nsset' do
-    context 'when response is successful' do
-      before(:each) do
-        @server.stub(:send_request).and_return(xml_mock('responses/nsset/create_nsset_1000.xml'))
-        @response = @server.create_nsset('NSSID:TEST:2', [['test.com', '123.123.123.123'], ['ns2.test.com', '111.111.111.111']], 'test1')
+    before(:each) do
+      @server.should_receive(:send_request) do |xml|
+        @request = Nokogiri::XML(xml)
+        xml_mock('responses/nsset/create_nsset_1000.xml')
       end
-
+      @response = @server.create_nsset('NSSID:TEST:2', [['test.com', '123.123.123.123'], ['ns2.test.com', '111.111.111.111']], 'test1')
+    end
+    
+    context 'request' do
+      it 'contains nsset id' do
+        expect(@request.css('nsset|create nsset|id', 'nsset' => Epp::Eis::XML_NS_NSSET).text).to eq('NSSID:TEST:2')
+      end
+      
+      it 'contains nameserver names' do
+        expect(@request.css('nsset|create nsset|ns nsset|name', 'nsset' => Epp::Eis::XML_NS_NSSET).collect{ |n| n.text }).to include('test.com', 'ns2.test.com')
+      end
+      
+      it 'contains nameserver ip addresses' do
+        expect(@request.css('nsset|create nsset|ns nsset|addr', 'nsset' => Epp::Eis::XML_NS_NSSET).collect{ |n| n.text }).to include('123.123.123.123', '111.111.111.111')
+      end
+      
+      it 'contains technical contact' do
+        expect(@request.css('nsset|create nsset|tech', 'nsset' => Epp::Eis::XML_NS_NSSET).text).to eq('test1')
+      end
+    end
+    
+    context 'response' do
       it 'returns nsset id' do
-        @response.nsset_id.should == 'NSSID:TEST:2'
+        expect(@response.nsset_id).to eq('NSSID:TEST:2')
       end
 
       it 'returns nsset create date' do
-        @response.nsset_create_date.should == '2010-02-08T16:27:22+02:00'
+        expect(@response.nsset_create_date).to eq('2010-02-08T16:27:22+02:00')
       end
     end
   end
 
   describe 'info_nsset' do
-    context 'when response is successful' do
-      before(:each) do
-        @server.stub(:send_request).and_return(xml_mock('responses/nsset/info_nsset_1000.xml'))
-        @response = @server.info_nsset('NSSID:TEST:2')
+    before(:each) do
+      @server.should_receive(:send_request) do |xml|
+        @request = Nokogiri::XML(xml)
+        xml_mock('responses/nsset/info_nsset_1000.xml')
       end
-      
+      @response = @server.info_nsset('NSSID:TEST:2')
+    end
+    
+    context 'request' do
+      it 'contains nsset id' do
+        expect(@request.css('nsset|info nsset|id', 'nsset' => Epp::Eis::XML_NS_NSSET).text).to eq('NSSID:TEST:2')
+      end
+    end
+    
+    context 'response' do
       it 'returns nsset id' do
-        @response.nsset_id.should == 'NSSID:TEST:2'
+        expect(@response.nsset_id).to eq('NSSID:TEST:2')
       end
 
       it 'returns roid' do
-        @response.nsset_roid.should == 'N0000000051-EPP'
+        expect(@response.nsset_roid).to eq('N0000000051-EPP')
       end
 
       it 'returns status' do
-        @response.nsset_status.should == 'ok'
+        expect(@response.nsset_status).to eq('ok')
       end
       
       it 'returns nameservers' do
-        @response.nameservers.should == [['test.com', '123.123.123.123'], ['ns2.test.com', '111.111.111.111']]
+        expect(@response.nameservers).to eq([['test.com', '123.123.123.123'], ['ns2.test.com', '111.111.111.111']])
       end
     end
   end
   
   describe 'update_nsset' do
-    context 'when response is successful' do
-      before(:each) do
-        @server.stub(:send_request).and_return(xml_mock('responses/nsset/update_nsset_1000.xml'))
-        @response = @server.update_nsset('NSSID:TEST:2', [['ns3.test.com', '112.112.112.112']], 'margustech1', 'ns2.test.com', 'tech1')
+    before(:each) do
+      @server.should_receive(:send_request) do |xml|
+        @request = Nokogiri::XML(xml)
+        xml_mock('responses/nsset/update_nsset_1000.xml')
       end
-
+      @response = @server.update_nsset('NSSID:TEST:2', [['ns3.test.com', '112.112.112.112']], 'margustech1', 'ns2.test.com', 'tech1')
+    end
+    
+    context 'request' do
+      it 'contains nsset id' do
+        expect(@request.css('nsset|update nsset|id', 'nsset' => Epp::Eis::XML_NS_NSSET).text).to eq('NSSID:TEST:2')
+      end
+      
+      it 'contains nameserver names to be added' do
+        expect(@request.css('nsset|update nsset|add nsset|ns nsset|name', 'nsset' => Epp::Eis::XML_NS_NSSET).text).to eq('ns3.test.com')
+      end
+      
+      it 'contains nameserver ip addresses to be added' do
+        expect(@request.css('nsset|update nsset|add nsset|ns nsset|addr', 'nsset' => Epp::Eis::XML_NS_NSSET).text).to eq('112.112.112.112')
+      end
+      
+      it 'contains tech contact to be added' do
+        expect(@request.css('nsset|update nsset|add nsset|tech', 'nsset' => Epp::Eis::XML_NS_NSSET).text).to eq('margustech1')
+      end
+      
+      it 'contains nameserver to be removed' do
+        expect(@request.css('nsset|update nsset|rem nsset|name', 'nsset' => Epp::Eis::XML_NS_NSSET).text).to eq('ns2.test.com')
+      end
+      
+      it 'contains tech contact to be removed' do
+        expect(@request.css('nsset|update nsset|rem nsset|tech', 'nsset' => Epp::Eis::XML_NS_NSSET).text).to eq('tech1')
+      end
+    end
+    
+    context 'response' do
       it 'returns response code' do
-        @response.code.should == 1000
+        expect(@response.code).to eq(1000)
       end
 
       it 'returns response message' do
-        @response.message.should == 'Command completed successfully'
+        expect(@response.message).to eq('Command completed successfully')
       end
     end
   end

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: epp-eis
 version: !ruby/object:Gem::Version 
-  hash: 21
+  hash: 19
   prerelease: 
   segments: 
   - 1
   - 0
-  - 1
-  version: 1.0.1
+  - 2
+  version: 1.0.2
 platform: ruby
 authors: 
 - Priit Haamer
@@ -15,13 +15,25 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2013-04-09 00:00:00 +03:00
+date: 2013-07-02 00:00:00 +03:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id001 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id001
+  type: :runtime
   name: epp-nokogiri
   prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id002 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -30,12 +42,26 @@ dependencies:
         segments: 
         - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id001
+  requirement: *id002
+  type: :development
+  name: rake
+  prerelease: false
 - !ruby/object:Gem::Dependency 
+  version_requirements: &id003 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  requirement: *id003
+  type: :development
   name: rspec
   prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id004 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -44,12 +70,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id004
   type: :development
-  version_requirements: *id002
-- !ruby/object:Gem::Dependency 
   name: guard
   prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id005 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -58,12 +84,12 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id005
   type: :development
-  version_requirements: *id003
-- !ruby/object:Gem::Dependency 
   name: guard-rspec
   prerelease: false
-  requirement: &id004 !ruby/object:Gem::Requirement 
+- !ruby/object:Gem::Dependency 
+  version_requirements: &id006 !ruby/object:Gem::Requirement 
     none: false
     requirements: 
     - - ">="
@@ -72,8 +98,10 @@ dependencies:
         segments: 
         - 0
         version: "0"
+  requirement: *id006
   type: :development
-  version_requirements: *id004
+  name: rb-fsevent
+  prerelease: false
 description: Ruby client for Estonian Internet Foundation EPP service
 email: 
 - priit@fraktal.ee