epp-xml 0.5.0 → 0.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0a333e53de98c51025b92438d94662959c5f5626
-  data.tar.gz: 6343090f33e1fa9dd2752c02ad5d035696b8deec
+  metadata.gz: e2b66da8a11f78ef522acebe121774e0aef3a800
+  data.tar.gz: 09d4df0f4bfc832d43fc9871666c66cd6e390bae
 SHA512:
-  metadata.gz: 28b3189db593290ed87b157b9e8504b6607ef5b37752d81cb4bb30a2d60a27c837ffd2d9f34abb085ca8ca482d864d47055079bfd255fed2a5ce99523f85d78d
-  data.tar.gz: 90d3dcd3685a80c3b4192cc52dbb423da7061ee6452b8a541bc00f64581b1928a8f2e9936e84f3764cb1bbb53429ede775bf4d9873b32e345309e4ee9f7d9f56
+  metadata.gz: f67ad49770d6f0780eb79dcb5980a52c4229a29cefbcec55820944680442da8ff96cc4412578ddd5fbc01d0c1528554e57c9ba05e7c98ee50ac2b4bdc09b757f
+  data.tar.gz: c08a10f363d819d8e35e28ff5216a00821be7430518e5410a3073bddea995713756100657f66212b4b447d5980349fdd217c86d9c7aa53614f81de0b2313764b

data/lib/epp-xml.rb

@@ -24,8 +24,10 @@ module EppXml
         xml.tag!("#{ns}#{k}", v[:value], v[:attrs])
       # Value is a hash which is nested
       elsif v.is_a?(Hash)
-        xml.tag!("#{ns}#{k}") do
-          generate_xml_from_hash(v, xml, ns)
+        attrs = v.delete(:attrs)
+        value = v.delete(:value) || v
+        xml.tag!("#{ns}#{k}", attrs) do
+          generate_xml_from_hash(value, xml, ns)
         end
       # Value is an array
       elsif v.is_a?(Array)

data/lib/epp-xml/contact.rb

@@ -1,3 +1,57 @@
-module EppXmlCore::Contact
+module EppXmlCore
+  module Contact
+    def create(xml_params = {})
+      build('create', xml_params)
+    end
 
+    def check(xml_params = {})
+      build('check', xml_params)
+    end
+
+    def info(xml_params = {})
+      build('info', xml_params)
+    end
+
+    def delete(xml_params = {})
+      build('delete', xml_params)
+    end
+
+    def update(xml_params = {})
+      build('update', xml_params)
+    end
+
+    def transfer(xml_params = {}, op = 'query')
+      xml = Builder::XmlMarkup.new
+
+      xml.instruct!(:xml, standalone: 'no')
+      xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0') do
+        xml.command do
+          xml.transfer('op' => op) do
+            xml.tag!('contact:transfer', 'xmlns:contact' => 'urn:ietf:params:xml:ns:contact-1.0') do
+              EppXml.generate_xml_from_hash(xml_params, xml, 'contact:')
+            end
+          end
+          xml.clTRID 'ABC-12345'
+        end
+      end
+    end
+
+    private
+
+    def build(command, xml_params)
+      xml = Builder::XmlMarkup.new
+
+      xml.instruct!(:xml, standalone: 'no')
+      xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0') do
+        xml.command do
+          xml.tag!(command) do
+            xml.tag!("contact:#{command}", 'xmlns:contact' => 'urn:ietf:params:xml:ns:contact-1.0') do
+              EppXml.generate_xml_from_hash(xml_params, xml, 'contact:')
+            end
+          end
+          xml.clTRID 'ABC-12345'
+        end
+      end
+    end
+  end
 end

data/lib/epp-xml/domain.rb

@@ -1,36 +1,22 @@
 module EppXmlCore
   module Domain
-    def create(xml_params = {}, dnssec_params = {})
-      defaults = {
-        name: { value: 'example.ee' },
-        period: { value: '1', attrs: { unit: 'y' } },
-        ns: [
-          { hostObj: { value: 'ns1.example.net' } },
-          { hostObj: { value: 'ns2.example.net' } }
-        ],
-        registrant: { value: 'jd1234' },
-        _anonymus: [
-          { contact: { value: 'sh8013', attrs: { type: 'admin' } } },
-          { contact: { value: 'sh8013', attrs: { type: 'tech' } } },
-          { contact: { value: 'sh801333', attrs: { type: 'tech' } } }
-        ]
-      }
+    def info(xml_params = {})
+      build('info', xml_params)
+    end
 
-      xml_params = defaults.deep_merge(xml_params)
+    def check(xml_params = {})
+      build('check', xml_params)
+    end
 
-      dnssec_defaults = {
-        _anonymus: [
-          {  keyData: {
-            flags: { value: '257' },
-            protocol: { value: '3' },
-            alg: { value: '5' },
-            pubKey: { value: 'AwEAAddt2AkLfYGKgiEZB5SmIF8EvrjxNMH6HtxWEA4RJ9Ao6LCWheg8' }
-          }
-        }]
-      }
+    def delete(xml_params = {})
+      build('delete', xml_params)
+    end
 
-      dnssec_params = dnssec_defaults.deep_merge(dnssec_params) if dnssec_params != false
+    def renew(xml_params = {})
+      build('renew', xml_params)
+    end
 
+    def create(xml_params = {}, dnssec_params = {})
       xml = Builder::XmlMarkup.new
 
       xml.instruct!(:xml, standalone: 'no')
@@ -51,62 +37,7 @@ module EppXmlCore
       end
     end
 
-    def check(xml_params = {})
-      defaults = {
-        _anonymus: [
-          { name: { value: 'example.ee'} }
-        ]
-      }
-
-      xml_params = defaults.deep_merge(xml_params)
-
-      xml = Builder::XmlMarkup.new
-
-      xml.instruct!(:xml, standalone: 'no')
-      xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0') do
-        xml.command do
-          xml.check do
-            xml.tag!('domain:check', 'xmlns:domain' => 'urn:ietf:params:xml:ns:domain-1.0') do
-              EppXml.generate_xml_from_hash(xml_params, xml, 'domain:')
-            end
-          end
-          xml.clTRID 'ABC-12345'
-        end
-      end
-    end
-
-    def info(xml_params = {})
-      defaults = {
-        name: { value: 'example.ee', attrs: { hosts: 'all' } },
-        authInfo: {
-          pw: { value: '2fooBAR' }
-        }
-      }
-
-      xml_params = defaults.deep_merge(xml_params)
-
-      xml = Builder::XmlMarkup.new
-
-      xml.instruct!(:xml, standalone: 'no')
-      xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0') do
-        xml.command do
-          xml.info do
-            xml.tag!('domain:info', 'xmlns:domain' => 'urn:ietf:params:xml:ns:domain-1.0') do
-              EppXml.generate_xml_from_hash(xml_params, xml, 'domain:')
-            end
-          end
-          xml.clTRID 'ABC-12345'
-        end
-      end
-    end
-
     def update(xml_params = {}, dnssec_params = false)
-      defaults = {
-        name: { value: 'example.ee' }
-      }
-
-      xml_params = defaults.deep_merge(xml_params)
-
       xml = Builder::XmlMarkup.new
 
       xml.instruct!(:xml, standalone: 'no')
@@ -128,14 +59,14 @@ module EppXmlCore
       end
     end
 
-    def delete(xml_params = {})
+    def transfer(xml_params = {}, op = 'query')
       xml = Builder::XmlMarkup.new
 
       xml.instruct!(:xml, standalone: 'no')
       xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0') do
         xml.command do
-          xml.delete do
-            xml.tag!('domain:delete', 'xmlns:domain' => 'urn:ietf:params:xml:ns:domain-1.0') do
+          xml.transfer('op' => op) do
+            xml.tag!('domain:transfer', 'xmlns:domain' => 'urn:ietf:params:xml:ns:domain-1.0') do
               EppXml.generate_xml_from_hash(xml_params, xml, 'domain:')
             end
           end
@@ -144,30 +75,16 @@ module EppXmlCore
       end
     end
 
-    def renew(xml_params = {})
-      xml = Builder::XmlMarkup.new
-
-      xml.instruct!(:xml, standalone: 'no')
-      xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0') do
-        xml.command do
-          xml.renew do
-            xml.tag!('domain:renew', 'xmlns:domain' => 'urn:ietf:params:xml:ns:domain-1.0') do
-              EppXml.generate_xml_from_hash(xml_params, xml, 'domain:')
-            end
-          end
-          xml.clTRID 'ABC-12345'
-        end
-      end
-    end
+    private
 
-    def transfer(xml_params = {}, op = 'query')
+    def build(command, xml_params)
       xml = Builder::XmlMarkup.new
 
       xml.instruct!(:xml, standalone: 'no')
       xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0') do
         xml.command do
-          xml.transfer('op' => op) do
-            xml.tag!('domain:transfer', 'xmlns:domain' => 'urn:ietf:params:xml:ns:domain-1.0') do
+          xml.tag!(command) do
+            xml.tag!("domain:#{command}", 'xmlns:domain' => 'urn:ietf:params:xml:ns:domain-1.0') do
               EppXml.generate_xml_from_hash(xml_params, xml, 'domain:')
             end
           end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epp-xml
 version: !ruby/object:Gem::Version
-  version: 0.5.0
+  version: 0.6.0
 platform: ruby
 authors:
 - GiTLAB LTD