epp-client 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 593b7e211a6bc863d15336709228708ce22368d2
-  data.tar.gz: 8cacbdd420ff80c12238956fba39510219f66a82
+  metadata.gz: 647990ec77baa9d7c30a81821f7a3a13908ccf1a
+  data.tar.gz: 47c5fe61eeb149e4b04c903c908724351bc1b3e1
 SHA512:
-  metadata.gz: d7df5c50e3af2f3db322e3c8ec211ac64c191cb4641e8774c8a089bc16da3ca1820a76357eb05095581a127546ba1b18090a3c1616ed854154cd4c39cbc37905
-  data.tar.gz: b698287a84811a9305236a1113bd74d553280512c4baa920fb6a7548566807de6efa42ec4cf7c34b81110153792f0dcdbd9170ebdb9feaef008b8b41caac6f84
+  metadata.gz: 38ae880ae1595ebe6f8931e26360f94a7a21f075c30e284d7043a7533fef8288a0534c61657cb8e9b2dc882a486133cafa2fea4388c48009b560f520ec4d8101
+  data.tar.gz: c0711203d7872ff0f0585d39f343aa0953c98434ea365ce3f786e43baadc1f6401c7b2467a377451cc4bbfcc4fadef72b8e4ef6b6f0ca88de318972c51599f11

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    epp-client (2.0.0)
+    epp-client (2.1.0)
       libxml-ruby
 
 GEM

data/lib/epp-client/domain/command.rb

@@ -32,15 +32,15 @@ module EPP
           return @namespaces['domain'] if @namespaces.has_key?('domain')
           @namespaces['domain'] = xml_namespace(node, 'domain', NAMESPACE)
         end
-
-        def period_to_xml(period)
-          unit = period[-1,1]
-          val  = period.to_i.to_s
-
-          p = domain_node('period', val)
-          p['unit'] = unit
-
-          p
+        
+        def validate_period(period)
+          unit = period[-1,1].downcase
+          val  = period.to_i
+          
+          raise ArgumentError, "period suffix must either be 'm' or 'y'" unless %w(m y).include?(unit)
+          raise ArgumentError, "period value must be in the range 1-99" if val < 1 || val > 99
+          
+          return val.to_s, unit
         end
 
         def auth_info_to_xml(auth_info)

data/lib/epp-client/domain/create.rb

@@ -21,6 +21,8 @@ module EPP
         @registrant = options.delete(:registrant)
         @contacts = options.delete(:contacts)
         @auth_info = options.delete(:auth_info)
+
+        @period_val, @period_unit = validate_period(@period)
       end
 
       def name
@@ -30,7 +32,13 @@ module EPP
       def to_xml
         node = super
         node << domain_node('name', @name)
-        node << period_to_xml(@period) if @period
+
+        if @period_val && @period_unit
+          p = domain_node('period', @period_val)
+          p['unit'] = @period_unit
+
+          node << p
+        end
 
         unless @nameservers.empty?
           node << nameservers_to_xml(@nameservers)

data/lib/epp-client/domain/renew.rb

@@ -3,14 +3,16 @@ require File.expand_path('../command', __FILE__)
 module EPP
   module Domain
     class Renew < Command
+      # @param [String] name Domain name to renew
+      # @param [Time,String] exp_date Expiration date of the domain
+      # @param [String] period Renewal period in XXy years or XXm months. XX must be between 1 and 99.
       def initialize(name, exp_date, period = nil)
         @name, @exp_date = name, exp_date
         @exp_date = Time.parse(exp_date) if exp_date.kind_of?(String)
 
-        @period_unit = period[-1,1]
-        @period_val  = period.to_i.to_s
-        
-        raise ArgumentError, "period suffix must either be 'm' or 'y'" unless %w(m y).include?(@period_unit)
+        if period
+          @period_val, @period_unit = validate_period(period)
+        end
       end
 
       def name
@@ -22,10 +24,12 @@ module EPP
         node << domain_node('name', @name)
         node << domain_node('curExpDate', @exp_date.strftime("%Y-%m-%d"))
 
-        p = domain_node('period', @period_val)
-        p['unit'] = @period_unit
+        if @period_val && @period_unit
+          p = domain_node('period', @period_val)
+          p['unit'] = @period_unit
 
-        node << p
+          node << p
+        end
 
         node
       end

data/lib/epp-client/domain/transfer.rb

@@ -6,8 +6,11 @@ module EPP
       # @auth_info[:ext] should be an XML::Node with whatever is required
       def initialize(name, period = nil, auth_info = {})
         @name = name
-        @period = period
         @auth_info = auth_info
+        
+        if period
+          @period_val, @period_unit = validate_period(period)
+        end
       end
 
       def name
@@ -17,7 +20,14 @@ module EPP
       def to_xml
         node = super
         node << domain_node('name', @name)
-        node << period_to_xml(@period) if @period
+
+        if @period_val && @period_unit
+          p = domain_node('period', @period_val)
+          p['unit'] = @period_unit
+
+          node << p
+        end
+
         node << auth_info_to_xml(@auth_info) unless @auth_info.empty?
 
         node

data/lib/epp-client/version.rb

@@ -1,3 +1,3 @@
 module EPP
-  VERSION = '2.0.0'
+  VERSION = '2.1.0'
 end

data/test/domain/test_domain_create.rb

@@ -50,4 +50,59 @@ class TestEppDomainCreateCommand < Test::Unit::TestCase
       assert_equal '2381728348', xpath_find('//domain:authInfo/domain:pw')
     end
   end
+  
+  # Outside context for Ruby 1.8
+  def create_period(period)
+    EPP::Domain::Create.new('example.com',
+      :period => period, :registrant => 'UK-2349723',
+      :nameservers => %w(ns1.test.host ns2.test.host),
+      :auth_info => {:pw => '2381728348'})
+  end
+  context 'EPP::Domain::Create period' do
+    should 'accept 1m' do
+      assert_nothing_raised do
+        create_period '1m'
+      end
+    end
+    should 'accept 1y' do
+      assert_nothing_raised do
+        create_period '1m'
+      end
+    end
+    should 'accept 99m' do
+      assert_nothing_raised do
+        create_period '1m'
+      end
+    end
+    should 'accept 99y' do
+      assert_nothing_raised do
+        create_period '1m'
+      end
+    end
+    should 'reject 0m' do
+      assert_raises ArgumentError do
+        create_period '0m'
+      end
+    end
+    should 'reject 100m' do
+      assert_raises ArgumentError do
+        create_period '100m'
+      end
+    end
+    should 'reject 0y' do
+      assert_raises ArgumentError do
+        create_period '0y'
+      end
+    end
+    should 'reject 100y' do
+      assert_raises ArgumentError do
+        create_period '100y'
+      end
+    end
+    should 'reject 12c' do
+      assert_raises ArgumentError do
+        create_period '12c'
+      end
+    end
+  end
 end

data/test/domain/test_domain_renew.rb

@@ -36,4 +36,56 @@ class TestEppDomainRenewCommand < Test::Unit::TestCase
       assert_equal 'm', xpath_find('//domain:period/@unit')
     end
   end
+  
+  # Outside context for Ruby 1.8
+  def renew_period(period)
+    EPP::Domain::Renew.new('example.com', Time.now, period)
+  end
+  context 'EPP::Domain::Renew period' do
+    should 'accept 1m' do
+      assert_nothing_raised do
+        renew_period '1m'
+      end
+    end
+    should 'accept 1y' do
+      assert_nothing_raised do
+        renew_period '1m'
+      end
+    end
+    should 'accept 99m' do
+      assert_nothing_raised do
+        renew_period '1m'
+      end
+    end
+    should 'accept 99y' do
+      assert_nothing_raised do
+        renew_period '1m'
+      end
+    end
+    should 'reject 0m' do
+      assert_raises ArgumentError do
+        renew_period '0m'
+      end
+    end
+    should 'reject 100m' do
+      assert_raises ArgumentError do
+        renew_period '100m'
+      end
+    end
+    should 'reject 0y' do
+      assert_raises ArgumentError do
+        renew_period '0y'
+      end
+    end
+    should 'reject 100y' do
+      assert_raises ArgumentError do
+        renew_period '100y'
+      end
+    end
+    should 'reject 12c' do
+      assert_raises ArgumentError do
+        renew_period '12c'
+      end
+    end
+  end  
 end

data/test/domain/test_domain_transfer.rb

@@ -34,4 +34,56 @@ class TestEppDomainTransferCommand < Test::Unit::TestCase
       assert_equal '2381728348', xpath_find('//domain:authInfo/domain:pw')
     end
   end
+
+  # Outside context for Ruby 1.8
+  def transfer_period(period)
+    EPP::Domain::Transfer.new('example.com', period, :pw => '2381728348')
+  end
+  context 'EPP::Domain::Transfer period' do
+    should 'accept 1m' do
+      assert_nothing_raised do
+        transfer_period '1m'
+      end
+    end
+    should 'accept 1y' do
+      assert_nothing_raised do
+        transfer_period '1m'
+      end
+    end
+    should 'accept 99m' do
+      assert_nothing_raised do
+        transfer_period '1m'
+      end
+    end
+    should 'accept 99y' do
+      assert_nothing_raised do
+        transfer_period '1m'
+      end
+    end
+    should 'reject 0m' do
+      assert_raises ArgumentError do
+        transfer_period '0m'
+      end
+    end
+    should 'reject 100m' do
+      assert_raises ArgumentError do
+        transfer_period '100m'
+      end
+    end
+    should 'reject 0y' do
+      assert_raises ArgumentError do
+        transfer_period '0y'
+      end
+    end
+    should 'reject 100y' do
+      assert_raises ArgumentError do
+        transfer_period '100y'
+      end
+    end
+    should 'reject 12c' do
+      assert_raises ArgumentError do
+        transfer_period '12c'
+      end
+    end
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: epp-client
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - Geoff Garside