pepper 0.0.1 → 0.0.2

data/lib/pepper/commands.rb

@@ -56,6 +56,97 @@ module Pepper
           hash.merge( domain => r.response.resdata.chkdata.domain_names_avail.shift == "1")
         }
       end
+      
+      def info(name)
+        login unless @logged_in
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.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.command {
+              xml.info {
+                xml.info("xmlns:domain"       => "http://www.nominet.org.uk/epp/xml/nom-domain-2.0",
+                         "xsi:schemaLocation" => "urn:ietf:params:xml:ns:epp-1.0 epp-1.0.xsd") {
+                  xml.parent.namespace = xml.parent.namespace_definitions.first
+                  xml["domain"].name name
+                }
+              }
+            }
+          }
+        end
+        r = self.write( builder.to_xml )
+        r.response.resdata.infdata.to_hash
+      end
+      
+      def create(opts = {})
+        # OPTIMIZE: Break this up - it's way to clunky
+        login unless @logged_in
+        builder = Nokogiri::XML::Builder.new do |xml|
+          xml.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.command {
+              xml.create {
+                xml.create("xmlns:domain"       => "http://www.nominet.org.uk/epp/xml/nom-domain-2.0",
+                           "xsi:schemaLocation" => "http://www.nominet.org.uk/epp/xml/nom-domain-2.0 nom-domain-2.0.xsd") {
+                  xml.parent.namespace = xml.parent.namespace_definitions.first
+                  xml["domain"].send(:"name",       opts["name"])
+                  xml["domain"].send(:"period",     opts["period"])     if opts.has_key? "period"
+                  xml["domain"].send(:"first-bill", opts["first_bill"]) if opts.has_key? "first_bill"
+                  xml["domain"].send(:"recur-bill", opts["recur_bill"]) if opts.has_key? "recur_bill"
+                  xml["domain"].send(:"auto-bill",  opts["auto_bill"])  if opts.has_key? "auto_bill"
+                  xml["domain"].send(:"next-bill",  opts["next_bill"])  if opts.has_key? "next_bill"
+                  xml["domain"].send(:"notes",      opts["notes"])      if opts.has_key? "notes"
+                  xml["domain"].account {
+                    xml.create("xmlns:account" => "http://www.nominet.org.uk/epp/xml/nom-account-2.0",
+                               "xmlns:contact" => "http://www.nominet.org.uk/epp/xml/nom-contact-2.0"){
+                      account = opts["account"]
+                      xml.parent.namespace = xml.parent.namespace_definitions.select{|ns| ns.prefix == "account"}.first
+                      xml["account"].send(:"name",      account["name"])      if account.has_key? "name"
+                      xml["account"].send(:"trad-name", account["trad_name"]) if account.has_key? "trad_name"
+                      xml["account"].send(:"type_",     account["type"])      if account.has_key? "type"
+                      xml["account"].send(:"co-no",     account["co_no"])     if account.has_key? "co_no"
+                      xml["account"].send(:"opt-out",   account["opt_out"])   if account.has_key? "opt_out"
+                      xml["account"].addr {
+                        addr = account["addr"]
+                        Array[*opts["account"]["addr"]["street"]].each{|s| # Allows either a single string passed in or an array to work
+                          xml.street s
+                        }
+                        %w(locality city county postcode country).each {|f|
+                          xml.send(f.to_sym, addr[f]) if addr.has_key?(f)
+                        }
+                      }
+                      account["contacts"].each_with_index {|c,i|
+                        xml["account"].contact(:order => i+1) {
+                          xml["contact"].create {
+                            %w(name phone email mobile).each {|f|
+                              xml["contact"].send(f.to_sym, c[f]) if c.has_key?(f)
+                            }
+                          }
+                        }
+                      }            
+                    }
+                  }
+                  if opts.has_key? "ns"
+                    xml["domain"].ns {
+                      opts["ns"]["hosts"].each {|host|
+                        xml["domain"].host {
+                          xml["domain"].hostName               host["hostname"]           if host.has_key? "hostname"
+                          xml["domain"].hostAddr(:ip => "v4"){ host["hostaddress_ipv4"] } if host.has_key? "hostaddress_ipv4"
+                          xml["domain"].hostAddr(:ip => "v6"){ host["hostaddress_ipv6"] } if host.has_key? "hostaddress_ipv6"
+                        }
+                      }
+                    }
+                  end
+                }
+              }
+            }
+          }
+        end
+        r = self.write( builder.to_xml )
+        r.response.to_hash
+      end
+      
     end
   end
 end

data/lib/pepper/connection.rb

@@ -1,6 +1,5 @@
 require "socket"
 require "openssl"
-require "eventmachine"
 
 module Pepper
   module Connection

data/lib/pepper/stanzas.rb

@@ -1,6 +1 @@
-require "sax-machine"
-require "pepper/stanzas/chkdata"
-require "pepper/stanzas/resdata"
-require "pepper/stanzas/result"
-require "pepper/stanzas/response"
 require "pepper/stanzas/epp"

data/lib/pepper/stanzas/account_addr.rb

@@ -0,0 +1,17 @@
+require "pepper/stanzas/sax_machinery"
+
+module Pepper
+  module Stanzas
+    class AccountAddr
+      include SAXMachine
+      
+      elements "account:street",   :as => :street
+      element  "account:locality", :as => :locality
+      element  "account:city",     :as => :city
+      element  "account:county",   :as => :county
+      element  "account:postcode", :as => :postcode
+      element  "account:country",  :as => :country
+      
+    end
+  end
+end

data/lib/pepper/stanzas/account_infdata.rb

@@ -0,0 +1,27 @@
+require "pepper/stanzas/sax_machinery"
+require "pepper/stanzas/account_addr"
+require "pepper/stanzas/contact_infdata"
+
+module Pepper
+  module Stanzas
+    class AccountInfdata
+      include SAXMachine
+      
+      element  "account:roid",       :as => :roid
+      element  "account:name",       :as => :name
+      element  "account:trad-name",  :as => :trad_name
+      element  "account:type",       :as => :type
+      element  "account:co-no",      :as => :co_no
+      element  "account:opt-out",    :as => :opt_out
+      element  "account:addr",       :as => :addr,     :class => AccountAddr
+            
+      element  "account:clID",       :as => :cl_id
+      element  "account:crID",       :as => :cr_id
+      element  "account:crDate",     :as => :cr_date
+      element  "account:upID",       :as => :up_id
+      element  "account:upDate",     :as => :up_date
+      
+      elements "contact:infData",    :as => :contacts, :class => ContactInfdata
+    end
+  end
+end

data/lib/pepper/stanzas/chkdata.rb

@@ -1,10 +1,12 @@
+require "pepper/stanzas/sax_machinery"
+
 module Pepper
   module Stanzas
     class Chkdata
       include SAXMachine
       
       elements "domain:name", :as => :domain_names
-      elements "domain:name", :value => :avail, :as => :domain_names_avail
+      elements "domain:name", :as => :domain_names_avail, :value => :avail
 
     end
   end

data/lib/pepper/stanzas/contact_infdata.rb

@@ -0,0 +1,21 @@
+require "pepper/stanzas/sax_machinery"
+
+module Pepper
+  module Stanzas
+    class ContactInfdata
+      include SAXMachine
+      
+      element "contact:roid",   :as => :roid
+      element "contact:name",   :as => :name
+      element "contact:phone",  :as => :phone
+      element "contact:email",  :as => :email
+      
+      element "contact:clID",   :as => :cl_id
+      element "contact:crID",   :as => :cr_id
+      element "contact:crDate", :as => :cr_date
+      element "contact:upID",   :as => :up_id
+      element "contact:upDate", :as => :up_date
+      
+    end
+  end
+end

data/lib/pepper/stanzas/domain_infdata.rb

@@ -0,0 +1,31 @@
+require "pepper/stanzas/sax_machinery"
+require "pepper/stanzas/account_infdata"
+require "pepper/stanzas/ns"
+
+module Pepper
+  module Stanzas
+    class DomainInfdata
+      include SAXMachine
+      
+      element "domain:name",               :as => :name
+      element "domain:reg-status",         :as => :reg_status
+      element "account:infData",           :as => :account,   :class => AccountInfdata
+      element "domain:ns",                 :as => :ns,        :class => Ns
+      element "domain:reg-status",         :as => :reg_status
+      element "domain:clID",               :as => :cl_id
+      element "domain:crID",               :as => :cr_id
+      element "domain:crDate",             :as => :cr_date
+      element "domain:upID",               :as => :up_id
+      element "domain:upDate",             :as => :up_date
+      element "domain:exDate",             :as => :ex_date
+                                           
+      element "domain:first-bill",         :as => :first_bill
+      element "domain:recur-bill",         :as => :recur_bill
+      element "domain:auto-bill",          :as => :auto_bill
+      element "domain:next-bill",          :as => :next_bill
+      element "domain:notes",              :as => :notes
+      element "domain:renew-not-required", :as => :renew_not_required
+      element "domain:reseller",           :as => :reseller
+    end
+  end
+end

data/lib/pepper/stanzas/epp.rb

@@ -1,3 +1,6 @@
+require "pepper/stanzas/sax_machinery"
+require "pepper/stanzas/response"
+
 module Pepper
   module Stanzas
     class Epp

data/lib/pepper/stanzas/host.rb

@@ -0,0 +1,14 @@
+require "pepper/stanzas/sax_machinery"
+
+module Pepper
+  module Stanzas
+    class Host
+      include SAXMachine
+      
+      element "domain:hostName", :as => :hostname
+      element "domain:hostAddr", :as => :hostaddress_ipv4, :with => {:ip => "v4"}
+      element "domain:hostAddr", :as => :hostaddress_ipv6, :with => {:ip => "v6"}
+      
+    end
+  end
+end

data/lib/pepper/stanzas/ns.rb

@@ -0,0 +1,13 @@
+require "pepper/stanzas/sax_machinery"
+require "pepper/stanzas/host"
+
+module Pepper
+  module Stanzas
+    class Ns
+      include SAXMachine
+      
+      elements "domain:host", :as => :hosts, :class => Host
+
+    end
+  end
+end

data/lib/pepper/stanzas/resdata.rb

@@ -1,9 +1,14 @@
+require "pepper/stanzas/sax_machinery"
+require "pepper/stanzas/chkdata"
+require "pepper/stanzas/domain_infdata"
+
 module Pepper
   module Stanzas
     class Resdata
       include SAXMachine
         
       element "domain:chkData", :as => :chkdata, :class => Chkdata
+      element "domain:infData", :as => :infdata, :class => DomainInfdata
     end
   end
 end

data/lib/pepper/stanzas/response.rb

@@ -1,11 +1,15 @@
+require "pepper/stanzas/sax_machinery"
+require "pepper/stanzas/result"
+require "pepper/stanzas/resdata"
+
 module Pepper
   module Stanzas
     class Response
       include SAXMachine
       
-      element :result, :class => Result
-      element :result, :as => :result_code, :value => :code
-      element :resData, :as => :resdata, :class => Resdata
+      element :result,  :class => Result
+      element :result,  :as => :result_code, :value => :code
+      element :resData, :as => :resdata,     :class => Resdata
     end
   end
 end

data/lib/pepper/stanzas/result.rb

@@ -1,3 +1,5 @@
+require "pepper/stanzas/sax_machinery"
+
 module Pepper
   module Stanzas
     class Result

data/lib/pepper/stanzas/sax_machinery.rb

@@ -0,0 +1,20 @@
+require "sax-machine"
+
+# Mixup the mixin - to add functionality for simplifying results down to a hash
+module SAXMachine
+  def to_hash
+    convert = Proc.new {|v| 
+      if v.methods.include? "to_hash"
+        v.to_hash
+      elsif v.is_a? Array
+        v.map {|e| convert.call e }
+      else
+        v
+      end
+    }
+    
+    instance_variables.inject({}) do |h,v|
+      h.merge v.gsub("@","") => convert.call( instance_variable_get v )
+    end
+  end
+end

data/test/live_pepper_test.rb

@@ -46,6 +46,91 @@ class LivePepperTest < Test::Unit::TestCase
         assert_equal domains, Pepper.check( *domains.keys )
       end
     end
+    
+    context "'info'" do
+      should "return correct hash for 'adriana-TAG.co.uk'" do
+        # We cannot predict exactly when it was created at
+        info       = Pepper.info( "adriana-#{@hash[:tag]}.co.uk" )
+        created_at = Time.xmlschema(info["cr_date"])
+        
+        expected = {
+          "reg_status" => "Registered until expiry date.",
+          "name"       => "adriana-#{@hash[:tag].downcase}.co.uk",
+          "cr_id"      => "psamathe@nominet.org.uk",
+          "first_bill" => "th",
+          "recur_bill" => "th",
+          "cl_id"      => @hash[:tag],
+          "ex_date"    => (created_at + 2 * 60*60*24*365).strftime("%FT%T"), # 2 years
+          "cr_date"    => created_at.strftime("%FT%T"),
+          "account"    => {
+            "trad_name"  => "Simple Registrant Trading Ltd",
+            "name"       => "Simple Registrant-#{@hash[:tag]}",
+            "cr_id"      => "psamathe@nominet.org.uk",
+            "cl_id"      => @hash[:tag],
+            "type"       => "LTD",
+            "opt_out"    => "N",
+            "roid"       => "105097-UK",
+            "cr_date"    => (created_at + 1 * 60*60*24*365).strftime("%FT%T"), # 1 year
+            "contacts"   => [{
+              "name"       => "Mary Smith",
+              "up_id"      => "psamathe@nominet.org.uk",
+              "cl_id"      => @hash[:tag],
+              "roid"       => "C112040-UK",
+              "phone"      => "01234 567890",
+              "up_date"    => (created_at + 1 * 60*60*24*365).strftime("%FT%T"), # 1 year
+              "email"      => "mary.smith@ariel-#{@hash[:tag].downcase}.co.uk"
+            }],
+            "addr"       => {
+              "city"       => "Test City",
+              "country"    => "GB",
+              "postcode"   => "TE57 1NG",
+              "street"     => [ "2 Test Street" ],
+              "county"     => "Testshire"
+            }
+          },
+          "ns"         => {
+            "hosts"      => [{
+              "hostname"   => "ns1.ariel-#{@hash[:tag].downcase}.co.uk."
+            }]
+          }
+        }
+        
+        assert_equal( expected, Pepper.info( "adriana-#{@hash[:tag]}.co.uk" ))
+      end
+    end
+    
+    context "'create'" do
+      should "register a domain" do
+        expected = {
+          "result"      => { "msg" => "Command completed successfully" },
+          "resdata"     => { },
+          "result_code" => "1000"
+        }
+        options = {
+          "name"    => "#{Time.now.to_i}-testingdomain-#{@hash[:tag]}.co.uk",
+          "account" => {
+            "name"     => "Foo Bar",
+            "type"     => "LTD",
+            "co_no"    => "NI123456",
+            "opt_out"  => "N",
+            "addr"     => {
+              "street"   => "1 Test",
+              "locality" => "Testville",
+              "city"     => "Test",
+              "county"   => "Testshire",
+              "postcode" => "TE57 7ES",
+              "country"  => "GB"
+            },
+            "contacts" => [{
+              "name"     => "Joe Test",
+              "phone"    => "01234 567890",
+              "email"    => "joe@test.com"
+            }]
+          }
+        }
+        assert_equal( expected, Pepper.create( options ) )
+      end
+    end
   end
 
 end

data/test/test_helper.rb

@@ -7,7 +7,7 @@ require "rubygems"
 require "test/unit"
 require "shoulda"
 require "rr"
-require 'stringio'
+require "time"
 
 class Test::Unit::TestCase
   include RR::Adapters::TestUnit

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: pepper
 version: !ruby/object:Gem::Version 
-  version: 0.0.1
+  version: 0.0.2
 platform: ruby
 authors: 
 - Theo Cushion
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2009-12-16 00:00:00 +00:00
+date: 2010-01-24 00:00:00 +00:00
 default_executable: 
 dependencies: 
 - !ruby/object:Gem::Dependency 
@@ -65,11 +65,18 @@ files:
 - lib/pepper/commands.rb
 - lib/pepper/connection.rb
 - lib/pepper/error.rb
+- lib/pepper/stanzas/account_addr.rb
+- lib/pepper/stanzas/account_infdata.rb
 - lib/pepper/stanzas/chkdata.rb
+- lib/pepper/stanzas/contact_infdata.rb
+- lib/pepper/stanzas/domain_infdata.rb
 - lib/pepper/stanzas/epp.rb
+- lib/pepper/stanzas/host.rb
+- lib/pepper/stanzas/ns.rb
 - lib/pepper/stanzas/resdata.rb
 - lib/pepper/stanzas/response.rb
 - lib/pepper/stanzas/result.rb
+- lib/pepper/stanzas/sax_machinery.rb
 - lib/pepper/stanzas.rb
 - lib/pepper/stream_parser.rb
 - lib/pepper.rb