Permalink
Browse files

Rewording comments

  • Loading branch information...
1 parent c34a9fb commit 16d59f99bcb1f7eb0fe0bb6a55451e5f244253e5 @squadette squadette committed Jan 5, 2012
Showing with 9 additions and 9 deletions.
  1. +9 −9 lib/paperclip.rb
View
@@ -49,7 +49,7 @@
module Paperclip
class << self
- # Provides configurability to Paperclip. There are a number of options available, such as:
+ # Provides configurability to Paperclip. The options available are:
# * whiny: Will raise an error if Paperclip cannot process thumbnails of
# an uploaded image. Defaults to true.
# * log: Logs progress to the Rails log. Uses ActiveRecord's logger, so honors
@@ -179,9 +179,9 @@ def class_for(class_name)
end
end
rescue ArgumentError => e
- # Sadly, we need to capture ArguementError here because Rails 2.3.x
- # Active Support dependency's management will try to the constant inherited
- # from Object, and fail misably with "Object is not missing constant X" error
+ # Sadly, we need to capture ArgumentError here because Rails 2.3.x
+ # ActiveSupport dependency management will try to the constant inherited
+ # from Object, and fail miserably with "Object is not missing constant X" error
# https://github.com/rails/rails/blob/v2.3.12/activesupport/lib/active_support/dependencies.rb#L124
if e.message =~ /is not missing constant/
raise NameError, "uninitialized constant #{class_name}"
@@ -360,8 +360,8 @@ def has_attached_file name, options = {}
# * +less_than+: equivalent to :in => 0..options[:less_than]
# * +greater_than+: equivalent to :in => options[:greater_than]..Infinity
# * +message+: error message to display, use :min and :max as replacements
- # * +if+: A lambda or name of a method on the instance. Validation will only
- # be run is this lambda or method returns true.
+ # * +if+: A lambda or name of an instance method. Validation will only
+ # be run if this lambda or method returns true.
# * +unless+: Same as +if+ but validates if lambda or method returns false.
def validates_attachment_size name, options = {}
min = options[:greater_than] || (options[:in] && options[:in].first) || 0
@@ -389,7 +389,7 @@ def validates_attachment_thumbnails name, options = {}
# Places ActiveRecord-style validations on the presence of a file.
# Options:
- # * +if+: A lambda or name of a method on the instance. Validation will only
+ # * +if+: A lambda or name of an instance method. Validation will only
# be run if this lambda or method returns true.
# * +unless+: Same as +if+ but validates if lambda or method returns false.
def validates_attachment_presence name, options = {}
@@ -408,13 +408,13 @@ def validates_attachment_presence name, options = {}
# assigned. The possible options are:
# * +content_type+: Allowed content types. Can be a single content type
# or an array. Each type can be a String or a Regexp. It should be
- # noted that Internet Explorer upload files with content_types that you
+ # noted that Internet Explorer uploads files with content_types that you
# may not expect. For example, JPEG images are given image/pjpeg and
# PNGs are image/x-png, so keep that in mind when determining how you
# match. Allows all by default.
# * +message+: The message to display when the uploaded file has an invalid
# content type.
- # * +if+: A lambda or name of a method on the instance. Validation will only
+ # * +if+: A lambda or name of an instance method. Validation will only
# be run is this lambda or method returns true.
# * +unless+: Same as +if+ but validates if lambda or method returns false.
# NOTE: If you do not specify an [attachment]_content_type field on your

0 comments on commit 16d59f9

Please sign in to comment.