epp 1.3.2 → 1.4.0

data/Rakefile

@@ -16,6 +16,7 @@ begin
     gem.add_development_dependency "shoulda"
     gem.add_development_dependency "mocha"
     gem.add_dependency "hpricot"
+    gem.add_dependency "libxml-ruby"
   end
 rescue LoadError
   puts "Jeweler (or a dependency) not available. Install it with: sudo gem install jeweler"

data/VERSION

@@ -1 +1 @@
-1.3.2
+1.4.0

data/epp.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{epp}
-  s.version = "1.3.2"
+  s.version = "1.4.0"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Delsman"]
@@ -57,15 +57,18 @@ Gem::Specification.new do |s|
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
+      s.add_runtime_dependency(%q<libxml-ruby>, [">= 0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
       s.add_dependency(%q<hpricot>, [">= 0"])
+      s.add_dependency(%q<libxml-ruby>, [">= 0"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
     s.add_dependency(%q<hpricot>, [">= 0"])
+    s.add_dependency(%q<libxml-ruby>, [">= 0"])
   end
 end
 

data/lib/epp.rb

@@ -1,7 +1,7 @@
 # Gem and other dependencies
 require 'rubygems'
 require 'openssl'
-require 'rexml/document'
+require 'libxml'
 require 'hpricot'
 require 'uuidtools'
 

data/lib/epp/server.rb

@@ -1,6 +1,6 @@
 module Epp #:nodoc:
   class Server
-    include REXML
+    include LibXML::XML
     include RequiresParameters
         
     attr_accessor :tag, :password, :server, :port, :lang, :services, :extensions, :version
@@ -34,14 +34,12 @@ module Epp #:nodoc:
     end
     
     def new_epp_request
-      xml  = Document.new
-      xml << XMLDecl.new("1.0", "UTF-8", "no")
+      xml = Document.new
+      xml.root = Node.new("epp")
       
-      xml.add_element("epp", {
-        "xmlns" => "urn:ietf:params:xml:ns:epp-1.0",
-        "xmlns:xsi" => "http://www.w3.org/2001/XMLSchema-instance",
-        "xsi:schemaLocation" => "urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd"
-      })
+      xml.root["xmlns"] = "urn:ietf:params:xml:ns:epp-1.0"
+      xml.root["xmlns:xsi"] = "http://www.w3.org/2001/XMLSchema-instance"
+      xml.root["xsi:schemaLocation"] = "urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd"
       
       return xml
     end
@@ -140,30 +138,32 @@ module Epp #:nodoc:
       
       xml = new_epp_request
       
-      command = xml.root.add_element("command")
-      login = command.add_element("login")
+      xml.root << command = Node.new("command")
+      command << login = Node.new("login")
       
-      login.add_element("clID").text = tag
-      login.add_element("pw").text = password
+      login << Node.new("clID", tag)
+      login << Node.new("pw", password)
       
-      options = login.add_element("options")
-      options.add_element("version").text = version
-      options.add_element("lang").text = lang
+      login << options = Node.new("options")
       
-      services = login.add_element("svcs")
-      services.add_element("objURI").text = "urn:ietf:params:xml:ns:domain-1.0"
-      services.add_element("objURI").text = "urn:ietf:params:xml:ns:contact-1.0"
-      services.add_element("objURI").text = "urn:ietf:params:xml:ns:host-1.0"
+      options << Node.new("version", version)
+      options << Node.new("lang", lang)
       
-      extensions_container = services.add_element("svcExtension") unless extensions.empty?
+      login << services = Node.new("svcs")
+      
+      services << Node.new("objURI", "urn:ietf:params:xml:ns:domain-1.0")
+      services << Node.new("objURI", "urn:ietf:params:xml:ns:contact-1.0")
+      services << Node.new("objURI", "urn:ietf:params:xml:ns:host-1.0")
+      
+      services << extensions_container = Node.new("svcExtension") unless extensions.empty?
       
       for uri in extensions
-        extensions_container.add_element("extURI").text = uri
+        extensions_container << Node.new("extURI", uri)
       end
       
-      command.add_element("clTRID").text = UUIDTools::UUID.timestamp_create.to_s
+      command << Node.new("clTRID", UUIDTools::UUID.timestamp_create.to_s)
 
-      response = Hpricot.XML(send_request(xml.to_s))
+      response = Hpricot::XML(send_request(xml.to_s))
 
       handle_response(response)
     end
@@ -174,12 +174,12 @@ module Epp #:nodoc:
       
       xml = new_epp_request
       
-      command = xml.root.add_element("command")
+      xml.root << command = Node.new("command")
       
-      command.add_element("logout")
-      command.add_element("clTRID").text = UUIDTools::UUID.timestamp_create.to_s
+      command << login = Node.new("logout")
+      command << Node.new("clTRID", UUIDTools::UUID.timestamp_create.to_s)
       
-      response = Hpricot.XML(send_request(xml.to_s))
+      response = Hpricot::XML(send_request(xml.to_s))
       
       handle_response(response, 1500)
     end

data/test/test_epp.rb

@@ -61,7 +61,7 @@ class EppTest < Test::Unit::TestCase
       should "build a new XML request" do
         xml = xml_file("new_request.xml")
         
-        assert @epp.new_epp_request.is_a?(REXML::Document)
+        assert @epp.new_epp_request.is_a?(LibXML::XML::Document)
         assert_equal xml, @epp.new_epp_request.to_s
       end
       

data/test/xml/new_request.xml

@@ -1 +1,2 @@
-<?xml version='1.0' encoding='UTF-8' standalone='no'?><epp xsi:schemaLocation='urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd' xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' xmlns='urn:ietf:params:xml:ns:epp-1.0'/>
+<?xml version="1.0" encoding="UTF-8"?>
+<epp xmlns="urn:ietf:params:xml:ns:epp-1.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd"/>

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: epp
 version: !ruby/object:Gem::Version 
-  hash: 31
+  hash: 7
   prerelease: false
   segments: 
   - 1
-  - 3
-  - 2
-  version: 1.3.2
+  - 4
+  - 0
+  version: 1.4.0
 platform: ruby
 authors: 
 - Josh Delsman
@@ -60,6 +60,20 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
+- !ruby/object:Gem::Dependency 
+  name: libxml-ruby
+  prerelease: false
+  requirement: &id004 !ruby/object:Gem::Requirement 
+    none: false
+    requirements: 
+    - - ">="
+      - !ruby/object:Gem::Version 
+        hash: 3
+        segments: 
+        - 0
+        version: "0"
+  type: :runtime
+  version_requirements: *id004
 description: Basic functionality for connecting and making requests on EPP (Extensible Provisioning Protocol) servers
 email: jdelsman@ultraspeed.com
 executables: []