get_object_url.rb in fog-maestrodev-1.8.0.20130109172219

- old
+ new

@@ -9,11 +9,11 @@
             raise ArgumentError.new('bucket_name is required')
           end
           unless object_name
             raise ArgumentError.new('object_name is required')
           end
-          host, path = if bucket_name =~ /^(?:[a-z]|\d(?!\d{0,2}(?:\.\d{1,3}){3}$))(?:[a-z0-9]|\-(?![\.])){1,61}[a-z0-9]$/
+          host, path = if bucket_name =~ Fog::AWS::COMPLIANT_BUCKET_NAMES
             ["#{bucket_name}.#{@host}", object_name]
           else
             [@host, "#{bucket_name}/#{object_name}"]
           end
           scheme_host_path_query({
@@ -30,20 +30,17 @@
 
       class Real
 
         # Get an expiring object url from S3
         #
-        # ==== Parameters
-        # * bucket_name<~String> - Name of bucket containing object
-        # * object_name<~String> - Name of object to get expiring url for
-        # * expires<~Time> - An expiry time for this url
+        # @param bucket_name [String] Name of bucket containing object
+        # @param object_name [String] Name of object to get expiring url for
+        # @param expires [Time] An expiry time for this url
         #
-        # ==== Returns
-        # * response<~Excon::Response>:
-        #   * body<~String> - url for object
+        # @return [Excon::Response] response:
+        #   * body [String] - url for object
         #
-        # ==== See Also
-        # http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
+        # @see http://docs.amazonwebservices.com/AmazonS3/latest/dev/S3_QSAuth.html
 
         include GetObjectUrl
 
       end
 