lib/dm-paperclip/validations.rb in dm-paperclip-2.1.2.1 vs lib/dm-paperclip/validations.rb in dm-paperclip-2.1.4

@@ -14,13 +14,13 @@
         @options[:in] = (@options[:greater_than]..(1/0)) unless @options[:greater_than].nil?
         @options[:in] = (0..@options[:less_than])        unless @options[:less_than].nil?
         return true if @options[:in].include? field_value.to_i
 
         error_message ||= @options[:message] unless @options[:message].nil?
-        error_message ||= "%s must be less than %s bytes".t(DataMapper::Inflection.humanize(@field_name), @options[:less_than]) unless @options[:less_than].nil?
-        error_message ||= "%s must be greater than %s bytes".t(DataMapper::Inflection.humanize(@field_name), @options[:greater_than]) unless @options[:greater_than].nil?
-        error_message ||= "%s must be between %s and %s bytes".t(DataMapper::Inflection.humanize(@field_name), @options[:in].first, @options[:in].last)
+        error_message ||= "%s must be less than %s bytes".t(Extlib::Inflection.humanize(@field_name), @options[:less_than]) unless @options[:less_than].nil?
+        error_message ||= "%s must be greater than %s bytes".t(Extlib::Inflection.humanize(@field_name), @options[:greater_than]) unless @options[:greater_than].nil?
+        error_message ||= "%s must be between %s and %s bytes".t(Extlib::Inflection.humanize(@field_name), @options[:in].first, @options[:in].last)
         add_error(target, error_message , @field_name)
         return false
       end
     end
 
@@ -31,11 +31,11 @@
       end
 
       def call(target)
         field_value = target.validation_property_value(@field_name)
         if field_value.nil? || field_value.original_filename.blank?
-          error_message = @options[:message] || "%s must be set".t(DataMapper::Inflection.humanize(@field_name))
+          error_message = @options[:message] || "%s must be set".t(Extlib::Inflection.humanize(@field_name))
           add_error(target, error_message , @field_name)
           return false
         end
         return true
       end
@@ -54,10 +54,10 @@
         unless field_value.nil? || field_value.original_filename.blank?
           unless @options[:content_type].blank?
             content_type = target.validation_property_value(:"#{@field_name}_content_type")
             unless valid_types.any?{|t| t === content_type }
               error_message ||= @options[:message] unless @options[:message].nil?
-              error_message ||= "%s's content type of '%s' is not a valid content type".t(DataMapper::Inflection.humanize(@field_name), content_type)
+              error_message ||= "%s's content type of '%s' is not a valid content type".t(Extlib::Inflection.humanize(@field_name), content_type)
               add_error(target, error_message , @field_name)
               return false
             end
           end
         end