diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index e4c47c9bc3..b852a0354f 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -1848,7 +1848,7 @@ module ActiveRecord #:nodoc: rescue SyntaxError => err self.class.read_methods.delete(attr_name) if logger - logger.warn "Exception occured during reader method compilation." + logger.warn "Exception occurred during reader method compilation." logger.warn "Maybe #{attr_name} is not a valid Ruby identifier?" logger.warn "#{err.message}" end diff --git a/activerecord/lib/active_record/fixtures.rb b/activerecord/lib/active_record/fixtures.rb index af222e38e4..9eb3b5792b 100755 --- a/activerecord/lib/active_record/fixtures.rb +++ b/activerecord/lib/active_record/fixtures.rb @@ -308,7 +308,7 @@ class Fixtures < YAML::Omap end end rescue Exception=>boom - raise Fixture::FormatError, "a YAML error occured parsing #{yaml_file_path}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n #{boom.class}: #{boom}" + raise Fixture::FormatError, "a YAML error occurred parsing #{yaml_file_path}. Please note that YAML must be consistently indented using spaces. Tabs are not allowed. Please have a look at http://www.yaml.org/faq.html\nThe exact error was:\n #{boom.class}: #{boom}" end elsif File.file?(csv_file_path) # CSV fixtures diff --git a/activesupport/lib/active_support/dependencies.rb b/activesupport/lib/active_support/dependencies.rb index c1da53c878..17ca446650 100644 --- a/activesupport/lib/active_support/dependencies.rb +++ b/activesupport/lib/active_support/dependencies.rb @@ -163,11 +163,11 @@ class Exception #:nodoc: def describe_blame return nil if blamed_files.empty? - "This error occured while loading the following files:\n #{blamed_files.join "\n "}" + "This error occurred while loading the following files:\n #{blamed_files.join "\n "}" end def copy_blame!(exc) @blamed_files = exc.blamed_files.clone self end -end \ No newline at end of file +end diff --git a/activesupport/lib/active_support/whiny_nil.rb b/activesupport/lib/active_support/whiny_nil.rb index 61cbe98e2b..cee510afbd 100644 --- a/activesupport/lib/active_support/whiny_nil.rb +++ b/activesupport/lib/active_support/whiny_nil.rb @@ -30,7 +30,7 @@ class NilClass def raise_nil_warning_for(klass = nil, selector = nil, with_caller = nil) message = "You have a nil object when you didn't expect it!" message << "\nYou might have expected an instance of #{klass}." if klass - message << "\nThe error occured while evaluating nil.#{selector}" if selector + message << "\nThe error occurred while evaluating nil.#{selector}" if selector raise NoMethodError, message, with_caller || caller end