epp-xml 0.9.0 → 0.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 142969b82d949261109814c2b191204d2a122423
-  data.tar.gz: 836f7c3935770592da472e9952ff962fa55bb455
+  metadata.gz: e8ecdf055fc60d2165333b26890a4468e2cca8eb
+  data.tar.gz: c3cedc145e9b3cc61eb0ee54594baf0d826ffeb8
 SHA512:
-  metadata.gz: d7bbc2ad8b23cd36130613505f6def714546febd00805e72b1aa3a74e4a75a973f6266ce7ada7f6b62ed5a9d5f75357d77ce8372620a15b9a8c025cacc4ba381
-  data.tar.gz: 5a692c5e3fc026f38fd200fd3b78dacfdfa93338dccc25a3b61db67840e01ad684f0d7bb057f31fe94699fda55f28ee6abd41c4e1e7b55bc731dcfa117018af3
+  metadata.gz: f001b44e7ab189e32449e9bdf3026e047a40fea22cdfccf3c242730917b842d27b62f50fb2cc7e0df011e94147a16068017334470f457f3916d996eed00af942
+  data.tar.gz: cf25c49ae2c099f185dec83f03da77510d8009f9a37e9278185398cd780ba2ae127044c87bde4abd9b073537c5ce485a14d8f8cc9793647d937571a82a85588f

data/lib/epp-xml/contact.rb

@@ -1,5 +1,7 @@
-module EppXmlCore
-  module Contact
+module EppXml
+  class Contact
+    include EppXml
+
     def create(xml_params = {})
       build('create', xml_params)
     end
@@ -31,7 +33,7 @@ module EppXmlCore
               EppXml.generate_xml_from_hash(xml_params, xml, 'contact:')
             end
           end
-          xml.clTRID(EppXml.clTRID)
+          xml.clTRID(clTRID)
         end
       end
     end
@@ -49,7 +51,7 @@ module EppXmlCore
               EppXml.generate_xml_from_hash(xml_params, xml, 'contact:')
             end
           end
-          xml.clTRID(EppXml.clTRID)
+          xml.clTRID(clTRID)
         end
       end
     end

data/lib/epp-xml/domain.rb

@@ -1,5 +1,7 @@
-module EppXmlCore
-  module Domain
+module EppXml
+  class Domain
+    include EppXml
+
     def info(xml_params = {})
       build('info', xml_params)
     end
@@ -32,7 +34,7 @@ module EppXmlCore
               EppXml.generate_xml_from_hash(dnssec_params, xml, 'secDNS:')
             end
           end if dnssec_params != false
-          xml.clTRID(EppXml.clTRID)
+          xml.clTRID(clTRID)
         end
       end
     end
@@ -54,7 +56,7 @@ module EppXmlCore
               EppXml.generate_xml_from_hash(dnssec_params, xml, 'secDNS:')
             end
           end if dnssec_params != false
-          xml.clTRID(EppXml.clTRID)
+          xml.clTRID(clTRID)
         end
       end
     end
@@ -70,7 +72,7 @@ module EppXmlCore
               EppXml.generate_xml_from_hash(xml_params, xml, 'domain:')
             end
           end
-          xml.clTRID(EppXml.clTRID)
+          xml.clTRID(clTRID)
         end
       end
     end
@@ -88,7 +90,7 @@ module EppXmlCore
               EppXml.generate_xml_from_hash(xml_params, xml, 'domain:')
             end
           end
-          xml.clTRID(EppXml.clTRID)
+          xml.clTRID(clTRID)
         end
       end
     end

data/lib/epp-xml/keyrelay.rb

@@ -1,5 +1,7 @@
-module EppXmlCore
-  module Keyrelay
+module EppXml
+  class Keyrelay
+    include EppXml
+
     def keyrelay(xml_params = {})
       xml = Builder::XmlMarkup.new
 
@@ -28,7 +30,7 @@ module EppXmlCore
             end if xml_params[:expiry]
 
           end
-          xml.tag!('ext:clTRID', EppXml.clTRID)
+          xml.tag!('ext:clTRID', clTRID)
         end
       end
     end

data/lib/epp-xml/session.rb

@@ -1,5 +1,7 @@
-module EppXmlCore
-  module Session
+module EppXml
+  class Session
+    include EppXml
+
     def login(xml_params = {})
       defaults = {
         clID: { value: 'user' },
@@ -29,7 +31,7 @@ module EppXmlCore
           xml.login do
             EppXml.generate_xml_from_hash(xml_params, xml)
           end
-          xml.clTRID(EppXml.clTRID)
+          xml.clTRID(clTRID)
         end
       end
     end
@@ -47,7 +49,7 @@ module EppXmlCore
       xml.epp('xmlns' => 'urn:ietf:params:xml:ns:epp-1.0') do
         xml.command do
           EppXml.generate_xml_from_hash(xml_params, xml)
-          xml.clTRID(EppXml.clTRID)
+          xml.clTRID(clTRID)
         end
       end
 

data/lib/epp-xml.rb

@@ -6,29 +6,20 @@ require 'epp-xml/contact'
 require 'epp-xml/keyrelay'
 
 module EppXml
-  class Session
-    extend ::EppXmlCore::Session
-  end
-
-  class Domain
-    extend ::EppXmlCore::Domain
-  end
+  attr_accessor :cl_trid_prefix, :cl_trid
 
-  class Contact
-    extend ::EppXmlCore::Contact
+  def initialize(args = {})
+    self.cl_trid = args[:cl_trid]
+    self.cl_trid_prefix = args[:cl_trid_prefix]
   end
 
-  class Keyrelay
-    extend ::EppXmlCore::Keyrelay
+  def clTRID
+    return cl_trid if cl_trid
+    return "#{cl_trid_prefix}-#{Time.now.to_i}" if cl_trid_prefix
+    Time.now.to_i
   end
 
   class << self
-    attr_accessor :cl_trid_prefix, :cl_trid
-
-    def clTRID
-      cl_trid || "#{cl_trid_prefix}-#{Time.now.to_i}"
-    end
-
     def generate_xml_from_hash(xml_params, xml, ns = '')
       xml_params.each do |k, v|
         # Value is a hash which has string type value

metadata

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