epp 1.3.1 → 1.3.2

data/README.rdoc

@@ -1,4 +1,4 @@
-= EPP v1.3.0 (by {Ultraspeed}[http://ultraspeed.co.uk])
+= EPP v1.3.1 (by {Ultraspeed}[http://ultraspeed.co.uk])
 
 The EPP gem provides basic functionality for connecting and making requests on EPP (Extensible Provisioning Protocol) servers. It has been fully tested against the RFC 5730 & 5734 specification.
 
@@ -42,7 +42,7 @@ You would then make an XML request to the server.
     xml       = "<?xml ... </epp>"
     response  = server.request(xml)
   
-You can build this however you'd like. The process is as follows:
+You can build this however you'd like, although we prefer Hpricot. The process is as follows:
 
 * Connect to EPP server and receive the <greeting> frame
 * Send a standard <login> request

data/Rakefile

@@ -15,7 +15,6 @@ begin
     # Dependencies
     gem.add_development_dependency "shoulda"
     gem.add_development_dependency "mocha"
-    gem.add_dependency "activesupport"
     gem.add_dependency "hpricot"
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.3.1
+1.3.2

data/epp.gemspec

@@ -5,11 +5,11 @@
 
 Gem::Specification.new do |s|
   s.name = %q{epp}
-  s.version = "1.3.1"
+  s.version = "1.3.2"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Delsman"]
-  s.date = %q{2010-07-07}
+  s.date = %q{2010-07-14}
   s.description = %q{Basic functionality for connecting and making requests on EPP (Extensible Provisioning Protocol) servers}
   s.email = %q{jdelsman@ultraspeed.com}
   s.extra_rdoc_files = [
@@ -56,18 +56,15 @@ Gem::Specification.new do |s|
     if Gem::Version.new(Gem::VERSION) >= Gem::Version.new('1.2.0') then
       s.add_development_dependency(%q<shoulda>, [">= 0"])
       s.add_development_dependency(%q<mocha>, [">= 0"])
-      s.add_runtime_dependency(%q<activesupport>, [">= 0"])
       s.add_runtime_dependency(%q<hpricot>, [">= 0"])
     else
       s.add_dependency(%q<shoulda>, [">= 0"])
       s.add_dependency(%q<mocha>, [">= 0"])
-      s.add_dependency(%q<activesupport>, [">= 0"])
       s.add_dependency(%q<hpricot>, [">= 0"])
     end
   else
     s.add_dependency(%q<shoulda>, [">= 0"])
     s.add_dependency(%q<mocha>, [">= 0"])
-    s.add_dependency(%q<activesupport>, [">= 0"])
     s.add_dependency(%q<hpricot>, [">= 0"])
   end
 end

data/lib/epp.rb

@@ -1,10 +1,9 @@
 # Gem and other dependencies
 require 'rubygems'
 require 'openssl'
-require 'socket'
-require 'active_support'
 require 'rexml/document'
 require 'hpricot'
+require 'uuidtools'
 
 # Package files
 require File.dirname(__FILE__) + '/require_parameters.rb'

data/lib/epp/server.rb

@@ -3,7 +3,7 @@ module Epp #:nodoc:
     include REXML
     include RequiresParameters
         
-    attr_accessor :tag, :password, :server, :port, :services, :lang, :extensions, :version
+    attr_accessor :tag, :password, :server, :port, :lang, :services, :extensions, :version
     
     # ==== Required Attrbiutes
     # 
@@ -14,7 +14,6 @@ module Epp #:nodoc:
     # ==== Optional Attributes
     #
     # * <tt>:port</tt> - The EPP standard port is 700. However, you can choose a different port to use.
-    # * <tt>:clTRID</tt> - The client transaction identifier is an element that EPP specifies MAY be used to uniquely identify the command to the server. You are responsible for maintaining your own transaction identifier space to ensure uniqueness. Defaults to "ABC-12345"
     # * <tt>:lang</tt> - Set custom language attribute. Default is 'en'.
     # * <tt>:services</tt> - Use custom EPP services in the <login> frame. The defaults use the EPP standard domain, contact and host 1.0 services.
     # * <tt>:extensions</tt> - URLs to custom extensions to standard EPP. Use these to extend the standard EPP (e.g., Nominet uses extensions). Defaults to none.
@@ -35,7 +34,7 @@ module Epp #:nodoc:
     end
     
     def new_epp_request
-      xml = Document.new
+      xml  = Document.new
       xml << XMLDecl.new("1.0", "UTF-8", "no")
       
       xml.add_element("epp", {
@@ -59,10 +58,8 @@ module Epp #:nodoc:
       begin
         @response = send_request(xml)
       ensure
-        if @logged_in
-          @logged_in = false if logout
-        end
-        
+        @logged_in = false if @logged_in && logout
+                
         close_connection
       end
       
@@ -92,8 +89,9 @@ module Epp #:nodoc:
     
     # Closes the connection to the EPP server.
     def close_connection
-      @socket.close if @socket and not @socket.closed?
+      @socket.close     if @socket and not @socket.closed?
       @connection.close if @connection and not @connection.closed?
+      
       @socket = @connection = nil
 
       return true
@@ -107,14 +105,14 @@ module Epp #:nodoc:
       raise SocketError.new("Connection closed by remote server") if !@socket or @socket.eof?
 
       header = @socket.read(4)
-      
+    
       raise SocketError.new("Error reading frame from remote server") if header.nil?
-      
+    
       length = header_size(header)
-      
+    
       raise SocketError.new("Got bad frame header length of #{length} bytes from the server") if length < 5
-      
-      response = @socket.read(length - 4)
+    
+      return @socket.read(length - 4)
     end
 
     # Send an XML frame to the server. Should return the total byte
@@ -131,8 +129,7 @@ module Epp #:nodoc:
     
     # Returns size of header of response from the EPP server.
     def header_size(header)
-      unpacked_header = header.unpack("N")
-      unpacked_header[0]
+      header.unpack("N").first
     end
     
     private 
@@ -164,37 +161,37 @@ module Epp #:nodoc:
         extensions_container.add_element("extURI").text = uri
       end
       
-      command.add_element("clTRID").text = "ABC-12345"
+      command.add_element("clTRID").text = UUIDTools::UUID.timestamp_create.to_s
 
       response = Hpricot.XML(send_request(xml.to_s))
 
-      result_message  = (response/"epp"/"response"/"result"/"msg").text.strip
-      result_code     = (response/"epp"/"response"/"result").attr("code").to_i
-   
-      if result_code == 1000
-        return true
-      else
-        raise EppErrorResponse.new(:xml => response, :code => result_code, :message => result_message)
-      end
+      handle_response(response)
     end
     
     # Sends a standard logout request to the EPP server.
-    def logout      
+    def logout
       raise SocketError, "Socket must be opened before logging out" if !@socket or @socket.closed?
       
       xml = new_epp_request
       
       command = xml.root.add_element("command")
-      login = command.add_element("logout")
+      
+      command.add_element("logout")
+      command.add_element("clTRID").text = UUIDTools::UUID.timestamp_create.to_s
       
       response = Hpricot.XML(send_request(xml.to_s))
       
-      result_message  = (response/"epp"/"response"/"result"/"msg").text.strip
-      result_code     = (response/"epp"/"response"/"result").attr("code").to_i
+      handle_response(response, 1500)
+    end
+    
+    def handle_response(response, acceptable_response = 1000)
+      result_code = (response/"epp"/"response"/"result").attr("code").to_i
       
-      if result_code == 1500
+      if result_code == acceptable_response
         return true
       else
+        result_message  = (response/"epp"/"response"/"result"/"msg").text.strip
+        
         raise EppErrorResponse.new(:xml => response, :code => result_code, :message => result_message)
       end
     end

data/test/test_epp.rb

@@ -211,7 +211,7 @@ class EppTest < Test::Unit::TestCase
   private
   
   def prepare_socket!
-    @response = xml_file("test_request.xml")
+    @response = xml_file("test_response.xml")
     
     TCPSocket.expects(:new).returns(@tcp_sock)
     OpenSSL::SSL::SSLSocket.expects(:new).returns(@ssl_sock)
@@ -221,7 +221,6 @@ class EppTest < Test::Unit::TestCase
     @ssl_sock.expects(:read).with(4).returns("\000\000\003\r")
     @ssl_sock.expects(:read).with(777).returns(@response)
     @ssl_sock.stubs(:eof?)
-    
   end
   
   def check_socket!

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: epp
 version: !ruby/object:Gem::Version 
-  hash: 25
+  hash: 31
   prerelease: false
   segments: 
   - 1
   - 3
-  - 1
-  version: 1.3.1
+  - 2
+  version: 1.3.2
 platform: ruby
 authors: 
 - Josh Delsman
@@ -15,7 +15,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-07 00:00:00 -04:00
+date: 2010-07-14 00:00:00 -04:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -47,7 +47,7 @@ dependencies:
   type: :development
   version_requirements: *id002
 - !ruby/object:Gem::Dependency 
-  name: activesupport
+  name: hpricot
   prerelease: false
   requirement: &id003 !ruby/object:Gem::Requirement 
     none: false
@@ -60,20 +60,6 @@ dependencies:
         version: "0"
   type: :runtime
   version_requirements: *id003
-- !ruby/object:Gem::Dependency 
-  name: hpricot
-  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: []