epp 1.3.0 → 1.3.1

data/VERSION

@@ -1 +1 @@
-1.3.0
+1.3.1

data/epp.gemspec

@@ -5,7 +5,7 @@
 
 Gem::Specification.new do |s|
   s.name = %q{epp}
-  s.version = "1.3.0"
+  s.version = "1.3.1"
 
   s.required_rubygems_version = Gem::Requirement.new(">= 0") if s.respond_to? :required_rubygems_version=
   s.authors = ["Josh Delsman"]

data/lib/epp/server.rb

@@ -34,64 +34,6 @@ module Epp #:nodoc:
       @logged_in  = false
     end
     
-    # Sends a standard login request to the EPP server.
-    def login      
-      xml = new_epp_request
-      
-      command = xml.root.add_element("command")
-      login = command.add_element("login")
-      
-      login.add_element("clID").text = tag
-      login.add_element("pw").text = password
-      
-      options = login.add_element("options")
-      options.add_element("version").text = version
-      options.add_element("lang").text = lang
-      
-      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"
-      
-      extensions_container = services.add_element("svcExtension") unless extensions.empty?
-      
-      for uri in extensions
-        extensions_container.add_element("extURI").text = uri
-      end
-      
-      command.add_element("clTRID").text = "ABC-12345"
-
-      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
-    end
-    
-    # Sends a standard logout request to the EPP server.
-    def logout      
-      xml = new_epp_request
-      
-      command = xml.root.add_element("command")
-      login = command.add_element("logout")
-      
-      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 == 1500
-        return true
-      else
-        raise EppErrorResponse.new(:xml => response, :code => result_code, :message => result_message)
-      end
-    end
-    
     def new_epp_request
       xml = Document.new
       xml << XMLDecl.new("1.0", "UTF-8", "no")
@@ -105,14 +47,6 @@ module Epp #:nodoc:
       return xml
     end
     
-    def connection
-      @connection ||= TCPSocket.new(server, port)
-    end
-    
-    def socket
-      @socket ||= OpenSSL::SSL::SSLSocket.new(connection) if connection
-    end
-    
     # Sends an XML request to the EPP server, and receives an XML response. 
     # <tt><login></tt> and <tt><logout></tt> requests are also wrapped
     # around the request, so we can close the socket immediately after
@@ -134,7 +68,7 @@ module Epp #:nodoc:
       
       return @response
     end
-    
+        
     # Wrapper which sends an XML frame to the server, and receives 
     # the response frame in return.
     def send_request(xml)
@@ -147,18 +81,22 @@ module Epp #:nodoc:
 		# the EPP <tt><greeting></tt> frame which is sent by the 
 		# server upon connection.
     def open_connection
-      socket.sync_close
-      socket.connect
+      @connection = TCPSocket.new(server, port)
+      @socket = OpenSSL::SSL::SSLSocket.new(@connection) if @connection
+      
+      @socket.sync_close = true
+      @socket.connect
 
       get_frame
     end
     
     # Closes the connection to the EPP server.
     def close_connection
-      socket.close
-      connection.close
-      
-      connection.closed? and socket.closed?
+      @socket.close if @socket and not @socket.closed?
+      @connection.close if @connection and not @connection.closed?
+      @socket = @connection = nil
+
+      return true
     end
     
     # Receive an EPP frame from the server. Since the connection is blocking,
@@ -166,23 +104,24 @@ module Epp #:nodoc:
     # the connection is broken, a SocketError will be raised. Otherwise,
     # it will return a string containing the XML from the server.
     def get_frame
-      header = socket.read(4)
+      raise SocketError.new("Connection closed by remote server") if !@socket or @socket.eof?
+
+      header = @socket.read(4)
       
-      raise SocketError.new("Connection closed by remote server") if header.nil? and socket.eof?
       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)
+      response = @socket.read(length - 4)
     end
 
     # Send an XML frame to the server. Should return the total byte
     # size of the frame sent to the server. If the socket returns EOF,
     # the connection has closed and a SocketError is raised.
     def send_frame(xml)
-      socket.write(packed(xml) + xml)
+      @socket.write(packed(xml) + xml)
     end
     
     # Pack the XML as a header for the EPP server.
@@ -195,5 +134,69 @@ module Epp #:nodoc:
       unpacked_header = header.unpack("N")
       unpacked_header[0]
     end
+    
+    private 
+    
+    # Sends a standard login request to the EPP server.
+    def login
+      raise SocketError, "Socket must be opened before logging in" if !@socket or @socket.closed?
+      
+      xml = new_epp_request
+      
+      command = xml.root.add_element("command")
+      login = command.add_element("login")
+      
+      login.add_element("clID").text = tag
+      login.add_element("pw").text = password
+      
+      options = login.add_element("options")
+      options.add_element("version").text = version
+      options.add_element("lang").text = lang
+      
+      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"
+      
+      extensions_container = services.add_element("svcExtension") unless extensions.empty?
+      
+      for uri in extensions
+        extensions_container.add_element("extURI").text = uri
+      end
+      
+      command.add_element("clTRID").text = "ABC-12345"
+
+      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
+    end
+    
+    # Sends a standard logout request to the EPP server.
+    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")
+      
+      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 == 1500
+        return true
+      else
+        raise EppErrorResponse.new(:xml => response, :code => result_code, :message => result_message)
+      end
+    end
   end
 end

data/test/test_epp.rb

@@ -65,19 +65,6 @@ class EppTest < Test::Unit::TestCase
         assert_equal xml, @epp.new_epp_request.to_s
       end
       
-      should "have a TCP socket" do
-        TCPSocket.expects(:new).returns(@tcp_sock)
-        
-        assert @epp.connection
-      end
-      
-      should "have a SSL socket" do
-        TCPSocket.expects(:new).returns(@tcp_sock)
-        OpenSSL::SSL::SSLSocket.expects(:new).returns(@ssl_sock)
-        
-        assert @epp.socket
-      end
-      
       should "open connection and receive a greeting" do
         prepare_socket!
         
@@ -89,39 +76,14 @@ class EppTest < Test::Unit::TestCase
         
         @epp.open_connection
         
-        @tcp_sock.expects(:close).returns(nil)
-        @ssl_sock.expects(:close).returns(nil)
-        @tcp_sock.expects(:closed?).returns(true)
-        @ssl_sock.expects(:closed?).returns(true)
+        @tcp_sock.stubs(:close).returns(nil)
+        @ssl_sock.stubs(:close).returns(nil)
+        @tcp_sock.stubs(:closed?).returns(true)
+        @ssl_sock.stubs(:closed?).returns(true)
         
         assert @epp.close_connection
       end
       
-      should "return false if TCP socket not closed" do
-        prepare_socket!
-        
-        @epp.open_connection
-        
-        @tcp_sock.expects(:close).returns(nil)
-        @ssl_sock.expects(:close).returns(nil)
-        @tcp_sock.expects(:closed?).returns(false)
-        
-        assert !@epp.close_connection
-      end
-      
-      should "return false if SSL socket not closed" do
-        prepare_socket!
-        
-        @epp.open_connection
-        
-        @tcp_sock.expects(:close).returns(nil)
-        @ssl_sock.expects(:close).returns(nil)
-        @tcp_sock.expects(:closed?).returns(true)
-        @ssl_sock.expects(:closed?).returns(false)
-        
-        assert !@epp.close_connection
-      end
-      
       should "get frame from new EPP servers with a header of four bytes" do
         prepare_socket!
         
@@ -142,9 +104,6 @@ class EppTest < Test::Unit::TestCase
         @epp.open_connection
         @epp.close_connection
         
-        @ssl_sock.expects(:read).with(4).returns(nil)
-        @ssl_sock.expects(:eof?).returns(true)
-        
         assert_raises SocketError do
           @epp.get_frame
         end
@@ -156,7 +115,7 @@ class EppTest < Test::Unit::TestCase
         @epp.open_connection
         
         @ssl_sock.expects(:read).with(4).returns(nil)
-        @ssl_sock.expects(:eof?).returns(false)
+        @ssl_sock.stubs(:eof?).returns(false)
         
         assert_raises SocketError do
           @epp.get_frame
@@ -200,95 +159,10 @@ class EppTest < Test::Unit::TestCase
         assert receive, @epp.send_request(send)        
       end
       
-      should "login to the server" do
-        prepare_socket!
-        
-        @epp.open_connection
-        
-        send = xml_file("login_request.xml")
-        receive = xml_file("login_response.xml")
-        
-        @ssl_sock.expects(:write).with(@epp.packed(send) + send)
-        @ssl_sock.expects(:read).with(4).returns("\000\000\0019")
-        @ssl_sock.expects(:read).with(309).returns(receive)
-        
-        assert @epp.login
-      end
-      
-      should "login to the server with extensions" do
-        prepare_socket!
-     
-        epp = Epp::Server.new(
-          :server => "test-epp.nominet.org.uk",
-          :tag => "TEST",
-          :password => "test",
-          :extensions => ["urn:ietf:params:xml:ns:rgp-1.0"]
-        )
-     
-        epp.open_connection
-        
-        send = xml_file("login_with_extensions_request.xml")
-        receive = xml_file("login_response.xml")
-        
-        @ssl_sock.expects(:write).with(epp.packed(send) + send)
-        @ssl_sock.expects(:read).with(4).returns("\000\000\0019")
-        @ssl_sock.expects(:read).with(309).returns(receive)
-                
-        assert epp.login
-      end
-      
-      should "raise exception if login returns anything other than 1500 response" do
-        prepare_socket!
-     
-        @epp.open_connection
-        
-        send = xml_file("login_request.xml")
-        receive = xml_file("error.xml")
-        
-        @ssl_sock.expects(:write).with(@epp.packed(send) + send)
-        @ssl_sock.expects(:read).with(4).returns("\000\000\001\231")
-        @ssl_sock.expects(:read).with(405).returns(receive)
-                
-        assert_raises EppErrorResponse do
-          @epp.login
-        end
-      end
-      
-      should "log out of the server" do
-        prepare_socket!
-        
-        @epp.open_connection
-        
-        send = xml_file("logout_request.xml")
-        receive = xml_file("logout_response.xml")
-        
-        @ssl_sock.expects(:write).with(@epp.packed(send) + send)
-        @ssl_sock.expects(:read).with(4).returns("\000\000\001I")
-        @ssl_sock.expects(:read).with(325).returns(receive)
-        
-        assert @epp.logout
-      end
-      
-      should "raise exception if logout returns anything other than 1500 response" do
-        prepare_socket!
-     
-        @epp.open_connection
-        
-        send = xml_file("logout_request.xml")
-        receive = xml_file("error.xml")
-        
-        @ssl_sock.expects(:write).with(@epp.packed(send) + send)
-        @ssl_sock.expects(:read).with(4).returns("\000\000\001\231")
-        @ssl_sock.expects(:read).with(405).returns(receive)
-                
-        assert_raises EppErrorResponse do
-          @epp.logout
-        end
-      end
-      
       should "wrap a request around a logging in and logging out request" do
         prepare_socket!
         simulate_close!
+        check_socket!
         
         test_request = xml_file("test_request.xml")
         test_response = xml_file("test_response.xml")
@@ -342,17 +216,23 @@ class EppTest < Test::Unit::TestCase
     TCPSocket.expects(:new).returns(@tcp_sock)
     OpenSSL::SSL::SSLSocket.expects(:new).returns(@ssl_sock)
     
-    @ssl_sock.expects(:sync_close).returns(false)
+    @ssl_sock.expects(:sync_close=).with(true)
     @ssl_sock.expects(:connect).returns(@ssl_sock)
     @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!
+    @ssl_sock.stubs(:closed?)
   end
   
   def simulate_close!
-    @ssl_sock.expects(:close).returns(nil)
-    @tcp_sock.expects(:close).returns(nil)
-    @ssl_sock.expects(:closed?).returns(true)
-    @tcp_sock.expects(:closed?).returns(true)
+    @ssl_sock.stubs(:close).returns(nil)
+    @tcp_sock.stubs(:close).returns(nil)
+    @ssl_sock.stubs(:closed?).returns(true)
+    @tcp_sock.stubs(:closed?).returns(true)
   end
   
   def xml_file(name)

metadata

@@ -1,13 +1,13 @@
 --- !ruby/object:Gem::Specification 
 name: epp
 version: !ruby/object:Gem::Version 
-  hash: 27
+  hash: 25
   prerelease: false
   segments: 
   - 1
   - 3
-  - 0
-  version: 1.3.0
+  - 1
+  version: 1.3.1
 platform: ruby
 authors: 
 - Josh Delsman