attached.rb in attached-1.0.6

- old
+ new

@@ -54,15 +54,17 @@
       infi = (1.0 / 0.0)
 
       minimum = options[:minimum] || options[:in] && options[:in].first || zero
       maximum = options[:maximum] || options[:in] && options[:in].last  || infi
 
-      message = options[:message]
-      message ||= "size must be specified" if minimum == zero && maximum == infi
-      message ||= "size must be a minimum of :minimum" if maximum == infi
-      message ||= "size must be a maximum of :maximum" if minimum == zero
-      message ||= "size must be between :minimum and :maximum"
+      message = case
+      when options[:message] then options[:message]
+      when minimum == zero && maximum == infi then "size must be specified"
+      when maximum == infi then "size must be a minimum of :minimum" 
+      when minimum == zero then "size must be a maximum of :maximum"
+      else "size must be between :minimum and :maximum"
+      end
 
       range = minimum..maximum
 
       message.gsub!(/:minimum/, number_to_size(minimum)) unless minimum == zero
       message.gsub!(/:maximum/, number_to_size(maximum)) unless maximum == infi
@@ -86,12 +88,11 @@
     #   validates_attached_extension :avatar, in: %w(png jpg), message: "extension must be :in"
     #   validates_attached_extension :avatar, in: %w(png jpg), message: "extension must be :in"
 
     def validates_attached_extension(name, options = {})
 
-      message = options[:message]
-      message ||= "extension is invalid"
+      message = options[:message] || "extension is invalid"
 
       options[:in] ||= [options[:is]] if options[:is]
 
       range = options[:in].map { |element| ".#{element}" }
 
@@ -110,11 +111,10 @@
     #   validates_attached_presence :avatar
     #   validates_attached_presence :avatar, message: "must be attached"
 
     def validates_attached_presence(name, options = {})
 
-      message = options[:message]
-      message ||= "must be attached"
+      message = options[:message] || "must be attached"
 
       validates_presence_of :"#{name}_identifier", message: message,
         if: options[:if], unless: options[:unless]
 
     end
\ No newline at end of file