Update stdlib and concat to 6.1.0 both

[mirror/dsa-puppet.git] / 3rdparty / modules / stdlib / lib / puppet / parser / functions / is_domain_name.rb

diff --git a/3rdparty/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb b/3rdparty/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb
index 90ede32..390a868 100644 (file)
--- a/3rdparty/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb
+++ b/3rdparty/modules/stdlib/lib/puppet/parser/functions/is_domain_name.rb
@@ -1,16 +1,22 @@
 #
 # is_domain_name.rb
 #
-
 module Puppet::Parser::Functions
-  newfunction(:is_domain_name, :type => :rvalue, :doc => <<-EOS
-Returns true if the string passed to this function is a syntactically correct domain name.
-    EOS
-  ) do |arguments|
-
-    if (arguments.size != 1) then
-      raise(Puppet::ParseError, "is_domain_name(): Wrong number of arguments "+
-        "given #{arguments.size} for 1")
+  newfunction(:is_domain_name, :type => :rvalue, :doc => <<-DOC
+    @summary
+      **Deprecated:** Returns true if the string passed to this function is
+      a syntactically correct domain name.
+
+    @return [Boolean]
+      Returns `true` or `false`
+
+    > **Note:* **Deprecated** Will be removed in a future version of stdlib. See
+    [`validate_legacy`](#validate_legacy).
+    DOC
+             ) do |arguments|
+
+    if arguments.size != 1
+      raise(Puppet::ParseError, "is_domain_name(): Wrong number of arguments given #{arguments.size} for 1")
     end
 
     # Only allow string types
@@ -19,9 +25,9 @@ Returns true if the string passed to this function is a syntactically correct do
     domain = arguments[0].dup
 
     # Limits (rfc1035, 3.1)
-    domain_max_length=255
-    label_min_length=1
-    label_max_length=63
+    domain_max_length = 255
+    label_min_length = 1
+    label_max_length = 63
 
     # Allow ".", it is the top level domain
     return true if domain == '.'
@@ -35,7 +41,7 @@ Returns true if the string passed to this function is a syntactically correct do
 
     # The top level domain must be alphabetic if there are multiple labels.
     # See rfc1123, 2.1
-    return false if domain.include? '.' and not /\.[A-Za-z]+$/.match(domain)
+    return false if domain.include?('.') && !%r{\.[A-Za-z]+$}.match(domain)
 
     # Check each label in the domain
     labels = domain.split('.')
@@ -44,10 +50,9 @@ Returns true if the string passed to this function is a syntactically correct do
       break if label.length > label_max_length
       break if label[-1..-1] == '-'
       break if label[0..0] == '-'
-      break unless /^[a-z\d-]+$/i.match(label)
+      break unless %r{^[a-z\d-]+$}i =~ label
     end
     return vlabels == labels
-
   end
 end