epp 1.1.3 → 1.2.0

data/README.rdoc

@@ -7,25 +7,21 @@ The EPP gem provides basic functionality for connecting and making requests on E
 
 == Installation
 
-If you already have {Gemcutter}[http://gemcutter.org] installed, you can install this gem with:
+You can install this gem with:
 
     $ gem install epp
     
-Otherwise, a few more steps are involved:
-
-    $ gem install gemcutter
-    $ gem tumble
-    $ gem install epp
-    
-Then, you can require it in your Ruby app:
+Then, you can require it in your Ruby/Rails app:
 
     require "epp"
     
-If you're using Rails, add the following line to your Rails <tt>config/environment.rb</tt>:
+If you're using Rails, configure your gem in the following file:
 
-    config.gem "epp", :source => "http://gemcutter.org"
+    # Rails 2.x - config/environment.rb
+    config.gem "epp"
     
-Once you do that, you can install the gem by typing <tt>sudo rake gems:install</tt>.
+    # Rails 3 - Gemfile
+    gem "epp"
 
 == Example Usage
 
@@ -64,7 +60,7 @@ http://github.com/ultraspeed/epp/issues
 
 == Credit
 
-Author: Josh Delsman at Ultraspeed (http://twitter.com/voxxit)
+Author: Josh Delsman (http://twitter.com/voxxit)
 Inspired from: http://labs.centralnic.com/Net_EPP_Client.php
 
 == License

data/Rakefile

@@ -14,7 +14,7 @@ begin
     
     # Dependencies
     gem.add_development_dependency "shoulda"
-    gem.add_dependency "activesupport"
+    gem.add_dependency "active_support"
     gem.add_dependency "hpricot"
   end
 rescue LoadError

data/VERSION

@@ -1 +1 @@
-1.1.3
+1.2.0

data/lib/epp/server.rb

@@ -1,8 +1,9 @@
 module Epp #:nodoc:
   class Server
+    include REXML
     include RequiresParameters
         
-    attr_accessor :tag, :password, :server, :port, :old_server, :lang, :extensions, :version
+    attr_accessor :tag, :password, :server, :port, :old_server, :services, :lang, :extensions, :version
     
     # ==== Required Attrbiutes
     # 
@@ -27,11 +28,10 @@ module Epp #:nodoc:
       @server     = attributes[:server]
       @port       = attributes[:port]       || 700
       @old_server = attributes[:old_server] || false
-      @lang       = attributes[:lang]       || 'en'
+      @lang       = attributes[:lang]       || "en"
       @services   = attributes[:services]   || ["urn:ietf:params:xml:ns:domain-1.0", "urn:ietf:params:xml:ns:contact-1.0", "urn:ietf:params:xml:ns:host-1.0"]
       @extensions = attributes[:extensions] || []
       @version    = attributes[:verison]    || "1.0"
-      @debug_log  = attributes[:debug_log]  || false
       
       @logged_in  = false
     end
@@ -46,10 +46,9 @@ module Epp #:nodoc:
       @logged_in = true if login
       
       begin
-        puts "** EPP - Sending frame..." if @debug_log
         @response = send_request(xml)
       ensure
-        if @logged_in && !@old_server
+        if @logged_in && !old_server
           @logged_in = false if logout
         end
         
@@ -63,19 +62,17 @@ module Epp #:nodoc:
     
     # Sends a standard login request to the EPP server.
     def login
-      puts "** EPP - Attempting login..." if @debug_log
-      
       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
+      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
+      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"
@@ -83,9 +80,9 @@ module Epp #:nodoc:
       services.add_element("objURI").text = "urn:ietf:params:xml:ns:host-1.0"
       
       # Include schema extensions for registrars which require it
-      extensions_container = services.add_element("svcExtension") unless @extensions.empty?
+      extensions_container = services.add_element("svcExtension") unless extensions.empty?
       
-      for uri in @extensions
+      for uri in extensions
         extensions_container.add_element("extURI").text = uri
       end
       
@@ -98,7 +95,6 @@ module Epp #:nodoc:
       result_code     = (response/"epp"/"response"/"result").attr("code").to_i
    
       if result_code == 1000
-        puts "** EPP - Successfully logged in." if @debug_log
         return true
       else
         raise EppErrorResponse.new(:xml => response, :code => result_code, :message => result_message)
@@ -107,8 +103,6 @@ module Epp #:nodoc:
     
     # Sends a standard logout request to the EPP server.
     def logout
-      puts "** EPP - Attempting logout..." if @debug_log
-      
       xml = new_epp_request
       
       command = xml.root.add_element("command")
@@ -121,7 +115,6 @@ module Epp #:nodoc:
       result_code     = (response/"epp"/"response"/"result").attr("code").to_i
       
       if result_code == 1500
-        puts "** EPP - Successfully logged out." if @debug_log
         return true
       else
         raise EppErrorResponse.new(:xml => response, :code => result_code, :message => result_message)
@@ -129,8 +122,8 @@ module Epp #:nodoc:
     end
     
     def new_epp_request
-      xml = REXML::Document.new
-      xml << REXML::XMLDecl.new("1.0", "UTF-8", "no")
+      xml = Document.new
+      xml << XMLDecl.new("1.0", "UTF-8", "no")
       
       xml.add_element("epp", {
         "xmlns" => "urn:ietf:params:xml:ns:epp-1.0",
@@ -153,7 +146,7 @@ module Epp #:nodoc:
 		# the EPP <tt><greeting></tt> frame which is sent by the 
 		# server upon connection.
     def open_connection
-      @connection = TCPSocket.new(@server, @port)
+      @connection = TCPSocket.new(server, port)
       @socket     = OpenSSL::SSL::SSLSocket.new(@connection)
       
       # Synchronously close the connection & socket
@@ -163,12 +156,7 @@ module Epp #:nodoc:
       @socket.connect
       
       # Get the initial frame
-      frame = get_frame
-      
-      if frame
-        puts "EPP - Connection opened." if @debug_log
-        return frame
-      end
+      get_frame
     end
     
     # Closes the connection to the EPP server.
@@ -183,10 +171,7 @@ module Epp #:nodoc:
         @connection = nil
       end
       
-      if @connection.nil? and @socket.nil?
-        puts "EPP - Connection closed." if @debug_log
-        return true
-      end
+      return true if @connection.nil? and @socket.nil?
     end
     
     # Receive an EPP frame from the server. Since the connection is blocking,
@@ -194,7 +179,7 @@ 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
-       if @old_server
+       if old_server
           data = ""
           first_char = @socket.read(1)
           
@@ -235,7 +220,7 @@ module Epp #:nodoc:
     # 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(@old_server ? (xml + "\r\n") : ([xml.size + 4].pack("N") + xml))
+      @socket.write(old_server ? (xml + "\r\n") : ([xml.size + 4].pack("N") + xml))
     end
   end
 end

metadata

@@ -1,13 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: epp
 version: !ruby/object:Gem::Version 
-  hash: 21
-  prerelease: false
-  segments: 
-  - 1
-  - 1
-  - 3
-  version: 1.1.3
+  version: 1.2.0
 platform: ruby
 authors: 
 - Josh Delsman
@@ -15,51 +9,39 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2010-07-01 00:00:00 -04:00
+date: 2010-02-04 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
   name: shoulda
-  prerelease: false
-  requirement: &id001 !ruby/object:Gem::Requirement 
-    none: false
+  type: :development
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :development
-  version_requirements: *id001
+    version: 
 - !ruby/object:Gem::Dependency 
-  name: activesupport
-  prerelease: false
-  requirement: &id002 !ruby/object:Gem::Requirement 
-    none: false
+  name: active_support
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id002
+    version: 
 - !ruby/object:Gem::Dependency 
   name: hpricot
-  prerelease: false
-  requirement: &id003 !ruby/object:Gem::Requirement 
-    none: false
+  type: :runtime
+  version_requirement: 
+  version_requirements: !ruby/object:Gem::Requirement 
     requirements: 
     - - ">="
       - !ruby/object:Gem::Version 
-        hash: 3
-        segments: 
-        - 0
         version: "0"
-  type: :runtime
-  version_requirements: *id003
+    version: 
 description: Basic functionality for connecting and making requests on EPP (Extensible Provisioning Protocol) servers
 email: jdelsman@ultraspeed.com
 executables: []
@@ -90,27 +72,21 @@ rdoc_options:
 require_paths: 
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 required_rubygems_version: !ruby/object:Gem::Requirement 
-  none: false
   requirements: 
   - - ">="
     - !ruby/object:Gem::Version 
-      hash: 3
-      segments: 
-      - 0
       version: "0"
+  version: 
 requirements: []
 
 rubyforge_project: 
-rubygems_version: 1.3.7
+rubygems_version: 1.3.5
 signing_key: 
 specification_version: 3
 summary: EPP (Extensible Provisioning Protocol) for Ruby