From 7677e8108835e0b94c7104bdea4bd60c5ae64169 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 9 Jan 2017 01:19:11 +0200 Subject: [PATCH 1/5] Replace xml schema "eis-1.0.xsd" with "ee-1.1.xsd" #6 --- lib/epp-xml.rb | 2 +- lib/epp-xml/domain.rb | 2 +- lib/epp-xml/keyrelay.rb | 2 +- lib/epp-xml/session.rb | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/epp-xml.rb b/lib/epp-xml.rb index f6d26d2..cf54c96 100644 --- a/lib/epp-xml.rb +++ b/lib/epp-xml.rb @@ -58,7 +58,7 @@ def generate_xml_from_hash(xml_params, xml, ns = '') def custom_ext(xml, custom_params) xml.extension do xml.tag!('eis:extdata', - 'xmlns:eis' => 'https://epp.tld.ee/schema/eis-1.0.xsd') do + 'xmlns:eis' => 'https://epp.tld.ee/schema/ee-1.1.xsd') do EppXml.generate_xml_from_hash(custom_params, xml, 'eis:') end if custom_params.any? end if custom_params.any? diff --git a/lib/epp-xml/domain.rb b/lib/epp-xml/domain.rb index a2893b1..d80a57a 100644 --- a/lib/epp-xml/domain.rb +++ b/lib/epp-xml/domain.rb @@ -10,7 +10,7 @@ class Domain XMLNS_SECDNS = 'urn:ietf:params:xml:ns:secDNS-1.1'.freeze - XMLNS_EIS = 'https://epp.tld.ee/schema/eis-1.0.xsd'.freeze + XMLNS_EIS = 'https://epp.tld.ee/schema/ee-1.1.xsd'.freeze def info(xml_params = {}, custom_params = {}) build('info', xml_params, custom_params) diff --git a/lib/epp-xml/keyrelay.rb b/lib/epp-xml/keyrelay.rb index 5e6084a..8188ee9 100644 --- a/lib/epp-xml/keyrelay.rb +++ b/lib/epp-xml/keyrelay.rb @@ -34,7 +34,7 @@ def keyrelay(xml_params = {}, custom_params = {}) end xml.tag!('eis:extdata', - 'xmlns:eis' => 'https://epp.tld.ee/schema/eis-1.0.xsd') do + 'xmlns:eis' => 'https://epp.tld.ee/schema/ee-1.1.xsd') do EppXml.generate_xml_from_hash(custom_params, xml, 'eis:') end if custom_params.any? diff --git a/lib/epp-xml/session.rb b/lib/epp-xml/session.rb index 64689f0..4c5e28a 100644 --- a/lib/epp-xml/session.rb +++ b/lib/epp-xml/session.rb @@ -22,7 +22,7 @@ def login(xml_params = {}) ], svcExtension: [ { extURI: { value: 'urn:ietf:params:xml:ns:secDNS-1.1' } }, - { extURI: { value: 'https://epp.tld.ee/schema/eis-1.0.xsd' } } + { extURI: { value: 'https://epp.tld.ee/schema/ee-1.1.xsd' } } ] } } From 6d04e9de3c0fa8523c763c0b85d94724f9ebdc82 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 9 Jan 2017 01:20:01 +0200 Subject: [PATCH 2/5] Replace "ddoc" with "bdoc" in specs #6 --- spec/contact_spec.rb | 12 ++++++------ spec/domain_spec.rb | 18 +++++++++--------- spec/keyrelay_spec.rb | 6 +++--- spec/session_spec.rb | 10 +++++----- 4 files changed, 23 insertions(+), 23 deletions(-) diff --git a/spec/contact_spec.rb b/spec/contact_spec.rb index 059b534..9973f2d 100644 --- a/spec/contact_spec.rb +++ b/spec/contact_spec.rb @@ -32,8 +32,8 @@ - - base64 + + base64 ABC-12345 @@ -49,7 +49,7 @@ ] }, { _anonymus: [ - legalDocument: { value: 'base64', attrs: { type: 'ddoc' } } + legalDocument: { value: 'base64', attrs: { type: 'bdoc' } } ] }) @@ -148,8 +148,8 @@ - - base64 + + base64 ABC-12345 @@ -164,7 +164,7 @@ } }, 'query', { _anonymus: [ - legalDocument: { value: 'base64', attrs: { type: 'ddoc' } } + legalDocument: { value: 'base64', attrs: { type: 'bdoc' } } ] }) diff --git a/spec/domain_spec.rb b/spec/domain_spec.rb index 2621ea7..9a081e6 100644 --- a/spec/domain_spec.rb +++ b/spec/domain_spec.rb @@ -207,8 +207,8 @@ - - base64 + + base64 ABC-12345 @@ -241,7 +241,7 @@ ] }, {}, { _anonymus: [ - legalDocument: { value: 'base64', attrs: { type: 'ddoc' } } + legalDocument: { value: 'base64', attrs: { type: 'bdoc' } } ] }) @@ -529,8 +529,8 @@ - - base64 + + base64 ABC-12345 @@ -571,7 +571,7 @@ ] }, { _anonymus: [ - legalDocument: { value: 'base64', attrs: { type: 'ddoc' } } + legalDocument: { value: 'base64', attrs: { type: 'bdoc' } } ] }) @@ -607,8 +607,8 @@ - - base64 + + base64 ABC-12345 @@ -620,7 +620,7 @@ name: { value: 'one.ee' } }, { _anonymus: [ - legalDocument: { value: 'base64', attrs: { type: 'ddoc' } } + legalDocument: { value: 'base64', attrs: { type: 'bdoc' } } ] }) diff --git a/spec/keyrelay_spec.rb b/spec/keyrelay_spec.rb index ff0c5de..cda91bc 100644 --- a/spec/keyrelay_spec.rb +++ b/spec/keyrelay_spec.rb @@ -25,8 +25,8 @@ P1M13D - - base64 + + base64 ABC-12345 @@ -49,7 +49,7 @@ } }, { _anonymus: [ - legalDocument: { value: 'base64', attrs: { type: 'ddoc' } } + legalDocument: { value: 'base64', attrs: { type: 'bdoc' } } ] }) diff --git a/spec/session_spec.rb b/spec/session_spec.rb index 8b4d5f1..f61c92e 100644 --- a/spec/session_spec.rb +++ b/spec/session_spec.rb @@ -21,7 +21,7 @@ urn:ietf:params:xml:ns:keyrelay-1.0 urn:ietf:params:xml:ns:secDNS-1.1 - https://epp.tld.ee/schema/eis-1.0.xsd + https://epp.tld.ee/schema/ee-1.1.xsd @@ -53,7 +53,7 @@ urn:ietf:params:xml:ns:keyrelay-1.0 urn:ietf:params:xml:ns:secDNS-1.1 - https://epp.tld.ee/schema/eis-1.0.xsd + https://epp.tld.ee/schema/ee-1.1.xsd @@ -113,8 +113,8 @@ - - base64 + + base64 ABC-12345 @@ -128,7 +128,7 @@ } }, { _anonymus: [ - legalDocument: { value: 'base64', attrs: { type: 'ddoc' } } + legalDocument: { value: 'base64', attrs: { type: 'bdoc' } } ] }) From 9176dfe9644e7e0caccadf7ce95eeb2da92b9e20 Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 9 Jan 2017 01:20:45 +0200 Subject: [PATCH 3/5] Release 1.2.0 #6 --- epp-xml.gemspec | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/epp-xml.gemspec b/epp-xml.gemspec index cf5d16c..28ae677 100644 --- a/epp-xml.gemspec +++ b/epp-xml.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'epp-xml' - s.version = '1.1.0' + s.version = '1.2.0' s.summary = 'Gem for generating XML for EIS EPP requests' s.description = 'Gem for generating valid XML for EIS Extensible Provisioning Protocol requests' s.author = 'Estonian Internet Foundation' From 351bb504e203cfa852938ec04f0d99c0bbcd3c2a Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Mon, 9 Jan 2017 01:23:04 +0200 Subject: [PATCH 4/5] Update readme #6 --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 05a954b..3c09a12 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +1.2.0 +* EPP XML schema "eis-1.0.xsd" replaced with "ee-1.1.xsd" + 1.1.0 * EPP XML schema namespace "urn:ietf:params:xml:ns:epp-1.0" replaced with "https://epp.tld.ee/schema/epp-ee-1.0.xsd" * EPP XML schema contact-eis-1.0 replaced with contact-ee-1.1 From e483de16c06856a2d0dfe29aef74ddcbc901704b Mon Sep 17 00:00:00 2001 From: Artur Beljajev Date: Thu, 12 Jan 2017 15:35:27 +0200 Subject: [PATCH 5/5] Release 2.0.0 #6 --- CHANGELOG.md | 2 +- epp-xml.gemspec | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 3c09a12..2beaa54 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,4 +1,4 @@ -1.2.0 +2.0.0 * EPP XML schema "eis-1.0.xsd" replaced with "ee-1.1.xsd" 1.1.0 diff --git a/epp-xml.gemspec b/epp-xml.gemspec index 28ae677..b32e605 100644 --- a/epp-xml.gemspec +++ b/epp-xml.gemspec @@ -1,6 +1,6 @@ Gem::Specification.new do |s| s.name = 'epp-xml' - s.version = '1.2.0' + s.version = '2.0.0' s.summary = 'Gem for generating XML for EIS EPP requests' s.description = 'Gem for generating valid XML for EIS Extensible Provisioning Protocol requests' s.author = 'Estonian Internet Foundation'