Change all "can not"s to the correct "cannot".

3 files changed, 55 insertions, 55 deletions

diff --git a/activemodel/README.rdoc b/activemodel/README.rdoc
index a399fe9051..4c00755532 100644
--- a/activemodel/README.rdoc
+++ b/activemodel/README.rdoc
@@ -109,7 +109,7 @@ behavior out of the box:
       attr_reader   :errors
 
       def validate!
-        errors.add(:name, "can not be nil") if name.nil?
+        errors.add(:name, "cannot be nil") if name.nil?
       end
 
       def self.human_attribute_name(attr, options = {})
@@ -118,7 +118,7 @@ behavior out of the box:
     end
 
     person.errors.full_messages
-    # => ["Name can not be nil"]
+    # => ["Name cannot be nil"]
 
   {Learn more}[link:classes/ActiveModel/Errors.html]
 
diff --git a/activemodel/lib/active_model/errors.rb b/activemodel/lib/active_model/errors.rb
index 97fd22f401..010c4bb6f9 100644
--- a/activemodel/lib/active_model/errors.rb
+++ b/activemodel/lib/active_model/errors.rb
@@ -23,7 +23,7 @@ module ActiveModel
   #     attr_reader   :errors
   #
   #     def validate!
-  #       errors.add(:name, "can not be nil") if name == nil
+  #       errors.add(:name, "cannot be nil") if name == nil
   #     end
   #
   #     # The following methods are needed to be minimally implemented
@@ -51,8 +51,8 @@ module ActiveModel
   # The above allows you to do:
   #
   #   person = Person.new
-  #   person.validate!            # => ["can not be nil"]
-  #   person.errors.full_messages # => ["name can not be nil"]
+  #   person.validate!            # => ["cannot be nil"]
+  #   person.errors.full_messages # => ["name cannot be nil"]
   #   # etc..
   class Errors
     include Enumerable
@@ -80,7 +80,7 @@ module ActiveModel
 
     # Clear the error messages.
     #
-    #   person.errors.full_messages # => ["name can not be nil"]
+    #   person.errors.full_messages # => ["name cannot be nil"]
     #   person.errors.clear
     #   person.errors.full_messages # => []
     def clear
@@ -90,7 +90,7 @@ module ActiveModel
     # Returns +true+ if the error messages include an error for the given key
     # +attribute+, +false+ otherwise.
     #
-    #   person.errors.messages        # => {:name=>["can not be nil"]}
+    #   person.errors.messages        # => {:name=>["cannot be nil"]}
     #   person.errors.include?(:name) # => true
     #   person.errors.include?(:age)  # => false
     def include?(attribute)
@@ -101,8 +101,8 @@ module ActiveModel
 
     # Get messages for +key+.
     #
-    #   person.errors.messages   # => {:name=>["can not be nil"]}
-    #   person.errors.get(:name) # => ["can not be nil"]
+    #   person.errors.messages   # => {:name=>["cannot be nil"]}
+    #   person.errors.get(:name) # => ["cannot be nil"]
     #   person.errors.get(:age)  # => nil
     def get(key)
       messages[key]
@@ -110,7 +110,7 @@ module ActiveModel
 
     # Set messages for +key+ to +value+.
     #
-    #   person.errors.get(:name) # => ["can not be nil"]
+    #   person.errors.get(:name) # => ["cannot be nil"]
     #   person.errors.set(:name, ["can't be nil"])
     #   person.errors.get(:name) # => ["can't be nil"]
     def set(key, value)
@@ -119,8 +119,8 @@ module ActiveModel
 
     # Delete messages for +key+. Returns the deleted messages.
     #
-    #   person.errors.get(:name)    # => ["can not be nil"]
-    #   person.errors.delete(:name) # => ["can not be nil"]
+    #   person.errors.get(:name)    # => ["cannot be nil"]
+    #   person.errors.delete(:name) # => ["cannot be nil"]
     #   person.errors.get(:name)    # => nil
     def delete(key)
       messages.delete(key)
@@ -129,8 +129,8 @@ module ActiveModel
     # When passed a symbol or a name of a method, returns an array of errors
     # for the method.
     #
-    #   person.errors[:name]  # => ["can not be nil"]
-    #   person.errors['name'] # => ["can not be nil"]
+    #   person.errors[:name]  # => ["cannot be nil"]
+    #   person.errors['name'] # => ["cannot be nil"]
     def [](attribute)
       get(attribute.to_sym) || set(attribute.to_sym, [])
     end
@@ -175,15 +175,15 @@ module ActiveModel
 
     # Returns all message values.
     #
-    #   person.errors.messages # => {:name=>["can not be nil", "must be specified"]}
-    #   person.errors.values   # => [["can not be nil", "must be specified"]]
+    #   person.errors.messages # => {:name=>["cannot be nil", "must be specified"]}
+    #   person.errors.values   # => [["cannot be nil", "must be specified"]]
     def values
       messages.values
     end
 
     # Returns all message keys.
     #
-    #   person.errors.messages # => {:name=>["can not be nil", "must be specified"]}
+    #   person.errors.messages # => {:name=>["cannot be nil", "must be specified"]}
     #   person.errors.keys     # => [:name]
     def keys
       messages.keys
@@ -211,7 +211,7 @@ module ActiveModel
     # Returns +true+ if no errors are found, +false+ otherwise.
     # If the error message is a string it can be empty.
     #
-    #   person.errors.full_messages # => ["name can not be nil"]
+    #   person.errors.full_messages # => ["name cannot be nil"]
     #   person.errors.empty?        # => false
     def empty?
       all? { |k, v| v && v.empty? && !v.is_a?(String) }
@@ -238,8 +238,8 @@ module ActiveModel
     # object. You can pass the <tt>:full_messages</tt> option. This determines
     # if the json object should contain full messages or not (false by default).
     #
-    #   person.errors.as_json                      # => {:name=>["can not be nil"]}
-    #   person.errors.as_json(full_messages: true) # => {:name=>["name can not be nil"]}
+    #   person.errors.as_json                      # => {:name=>["cannot be nil"]}
+    #   person.errors.as_json(full_messages: true) # => {:name=>["name cannot be nil"]}
     def as_json(options=nil)
       to_hash(options && options[:full_messages])
     end
@@ -247,8 +247,8 @@ module ActiveModel
     # Returns a Hash of attributes with their error messages. If +full_messages+
     # is +true+, it will contain full messages (see +full_message+).
     #
-    #   person.errors.to_hash       # => {:name=>["can not be nil"]}
-    #   person.errors.to_hash(true) # => {:name=>["name can not be nil"]}
+    #   person.errors.to_hash       # => {:name=>["cannot be nil"]}
+    #   person.errors.to_hash(true) # => {:name=>["name cannot be nil"]}
     def to_hash(full_messages = false)
       if full_messages
         messages = {}
diff --git a/activemodel/test/cases/errors_test.rb b/activemodel/test/cases/errors_test.rb
index 4e07e0e00b..bbd186d83d 100644
--- a/activemodel/test/cases/errors_test.rb
+++ b/activemodel/test/cases/errors_test.rb
@@ -11,7 +11,7 @@ class ErrorsTest < ActiveModel::TestCase
     attr_reader   :errors
 
     def validate!
-      errors.add(:name, "can not be nil") if name == nil
+      errors.add(:name, "cannot be nil") if name == nil
     end
 
     def read_attribute_for_validation(attr)
@@ -104,8 +104,8 @@ class ErrorsTest < ActiveModel::TestCase
   test "adding errors using conditionals with Person#validate!" do
     person = Person.new
     person.validate!
-    assert_equal ["name can not be nil"], person.errors.full_messages
-    assert_equal ["can not be nil"], person.errors[:name]
+    assert_equal ["name cannot be nil"], person.errors.full_messages
+    assert_equal ["cannot be nil"], person.errors[:name]
   end
 
   test "assign error" do
@@ -116,8 +116,8 @@ class ErrorsTest < ActiveModel::TestCase
 
   test "add an error message on a specific attribute" do
     person = Person.new
-    person.errors.add(:name, "can not be blank")
-    assert_equal ["can not be blank"], person.errors[:name]
+    person.errors.add(:name, "cannot be blank")
+    assert_equal ["cannot be blank"], person.errors[:name]
   end
 
   test "add an error with a symbol" do
@@ -129,15 +129,15 @@ class ErrorsTest < ActiveModel::TestCase
 
   test "add an error with a proc" do
     person = Person.new
-    message = Proc.new { "can not be blank" }
+    message = Proc.new { "cannot be blank" }
     person.errors.add(:name, message)
-    assert_equal ["can not be blank"], person.errors[:name]
+    assert_equal ["cannot be blank"], person.errors[:name]
   end
 
   test "added? detects if a specific error was added to the object" do
     person = Person.new
-    person.errors.add(:name, "can not be blank")
-    assert person.errors.added?(:name, "can not be blank")
+    person.errors.add(:name, "cannot be blank")
+    assert person.errors.added?(:name, "cannot be blank")
   end
 
   test "added? handles symbol message" do
@@ -148,7 +148,7 @@ class ErrorsTest < ActiveModel::TestCase
 
   test "added? handles proc messages" do
     person = Person.new
-    message = Proc.new { "can not be blank" }
+    message = Proc.new { "cannot be blank" }
     person.errors.add(:name, message)
     assert person.errors.added?(:name, message)
   end
@@ -161,9 +161,9 @@ class ErrorsTest < ActiveModel::TestCase
 
   test "added? matches the given message when several errors are present for the same attribute" do
     person = Person.new
-    person.errors.add(:name, "can not be blank")
+    person.errors.add(:name, "cannot be blank")
     person.errors.add(:name, "is invalid")
-    assert person.errors.added?(:name, "can not be blank")
+    assert person.errors.added?(:name, "cannot be blank")
   end
 
   test "added? returns false when no errors are present" do
@@ -174,52 +174,52 @@ class ErrorsTest < ActiveModel::TestCase
   test "added? returns false when checking a nonexisting error and other errors are present for the given attribute" do
     person = Person.new
     person.errors.add(:name, "is invalid")
-    assert !person.errors.added?(:name, "can not be blank")
+    assert !person.errors.added?(:name, "cannot be blank")
   end
 
   test "size calculates the number of error messages" do
     person = Person.new
-    person.errors.add(:name, "can not be blank")
+    person.errors.add(:name, "cannot be blank")
     assert_equal 1, person.errors.size
   end
 
   test "to_a returns the list of errors with complete messages containing the attribute names" do
     person = Person.new
-    person.errors.add(:name, "can not be blank")
-    person.errors.add(:name, "can not be nil")
-    assert_equal ["name can not be blank", "name can not be nil"], person.errors.to_a
+    person.errors.add(:name, "cannot be blank")
+    person.errors.add(:name, "cannot be nil")
+    assert_equal ["name cannot be blank", "name cannot be nil"], person.errors.to_a
   end
 
   test "to_hash returns the error messages hash" do
     person = Person.new
-    person.errors.add(:name, "can not be blank")
-    assert_equal({ name: ["can not be blank"] }, person.errors.to_hash)
+    person.errors.add(:name, "cannot be blank")
+    assert_equal({ name: ["cannot be blank"] }, person.errors.to_hash)
   end
 
   test "full_messages creates a list of error messages with the attribute name included" do
     person = Person.new
-    person.errors.add(:name, "can not be blank")
-    person.errors.add(:name, "can not be nil")
-    assert_equal ["name can not be blank", "name can not be nil"], person.errors.full_messages
+    person.errors.add(:name, "cannot be blank")
+    person.errors.add(:name, "cannot be nil")
+    assert_equal ["name cannot be blank", "name cannot be nil"], person.errors.full_messages
   end
 
   test "full_messages_for contains all the error messages for the given attribute" do
     person = Person.new
-    person.errors.add(:name, "can not be blank")
-    person.errors.add(:name, "can not be nil")
-    assert_equal ["name can not be blank", "name can not be nil"], person.errors.full_messages_for(:name)
+    person.errors.add(:name, "cannot be blank")
+    person.errors.add(:name, "cannot be nil")
+    assert_equal ["name cannot be blank", "name cannot be nil"], person.errors.full_messages_for(:name)
   end
 
   test "full_messages_for does not contain error messages from other attributes" do
     person = Person.new
-    person.errors.add(:name, "can not be blank")
-    person.errors.add(:email, "can not be blank")
-    assert_equal ["name can not be blank"], person.errors.full_messages_for(:name)
+    person.errors.add(:name, "cannot be blank")
+    person.errors.add(:email, "cannot be blank")
+    assert_equal ["name cannot be blank"], person.errors.full_messages_for(:name)
   end
 
   test "full_messages_for returns an empty list in case there are no errors for the given attribute" do
     person = Person.new
-    person.errors.add(:name, "can not be blank")
+    person.errors.add(:name, "cannot be blank")
     assert_equal [], person.errors.full_messages_for(:email)
   end
 
@@ -230,22 +230,22 @@ class ErrorsTest < ActiveModel::TestCase
 
   test "full_message returns the given message with the attribute name included" do
     person = Person.new
-    assert_equal "name can not be blank", person.errors.full_message(:name, "can not be blank")
-    assert_equal "name_test can not be blank", person.errors.full_message(:name_test, "can not be blank")
+    assert_equal "name cannot be blank", person.errors.full_message(:name, "cannot be blank")
+    assert_equal "name_test cannot be blank", person.errors.full_message(:name_test, "cannot be blank")
   end
 
   test "as_json creates a json formatted representation of the errors hash" do
     person = Person.new
     person.validate!
 
-    assert_equal({ name: ["can not be nil"] }, person.errors.as_json)
+    assert_equal({ name: ["cannot be nil"] }, person.errors.as_json)
   end
 
   test "as_json with :full_messages option creates a json formatted representation of the errors containing complete messages" do
     person = Person.new
     person.validate!
 
-    assert_equal({ name: ["name can not be nil"] }, person.errors.as_json(full_messages: true))
+    assert_equal({ name: ["name cannot be nil"] }, person.errors.as_json(full_messages: true))
   end
 
   test "generate_message works without i18n_scope" do