diff --git a/actionmailer/install.rb b/actionmailer/install.rb
index c559edfff5..8d7c140c3b 100644
--- a/actionmailer/install.rb
+++ b/actionmailer/install.rb
@@ -18,7 +18,7 @@ unless $sitedir
end
end
-# the acual gruntwork
+# the actual gruntwork
Dir.chdir("lib")
Find.find("action_mailer", "action_mailer.rb") { |f|
diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb
index bd250af90e..fd7e9e5244 100755
--- a/actionpack/lib/action_controller/base.rb
+++ b/actionpack/lib/action_controller/base.rb
@@ -577,7 +577,7 @@ module ActionController #:nodoc:
# value that appears in the slot for :first is not equal to default value for :first we stop using
# defaults. On it's own, this rule can account for much of the typical Rails URL behavior.
#
- # Although a convienence, defaults can occasionaly get in your way. In some cases a default persists longer than desired.
+ # Although a convenience, defaults can occasionally get in your way. In some cases a default persists longer than desired.
# The default may be cleared by adding :name => nil to url_for's options.
# This is often required when writing form helpers, since the defaults in play may vary greatly depending upon where the
# helper is used from. The following line will redirect to PostController's default action, regardless of the page it is
@@ -983,7 +983,7 @@ module ActionController #:nodoc:
#
# When using redirect_to :back, if there is no referrer,
# RedirectBackError will be raised. You may specify some fallback
- # behavior for this case by rescueing RedirectBackError.
+ # behavior for this case by rescuing RedirectBackError.
def redirect_to(options = {}) #:doc:
case options
when %r{^\w+://.*}
diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb
index e90e27c388..3689c335fc 100644
--- a/actionpack/lib/action_controller/caching.rb
+++ b/actionpack/lib/action_controller/caching.rb
@@ -291,7 +291,7 @@ module ActionController #:nodoc:
end
def extract_extension(file_path)
- # Don't want just what comes after the last '.' to accomodate multi part extensions
+ # Don't want just what comes after the last '.' to accommodate multi part extensions
# such as tar.gz.
file_path[/^[^.]+\.(.+)$/, 1]
end
diff --git a/actionpack/lib/action_controller/helpers.rb b/actionpack/lib/action_controller/helpers.rb
index 401726b855..ccdb54c2a1 100644
--- a/actionpack/lib/action_controller/helpers.rb
+++ b/actionpack/lib/action_controller/helpers.rb
@@ -102,7 +102,7 @@ module ActionController #:nodoc:
# end
# end
#
- # Finally, all the above styles can be mixed together, and the +helper+ method can be invokved with a mix of
+ # Finally, all the above styles can be mixed together, and the +helper+ method can be invoked with a mix of
# +symbols+, +strings+, +modules+ and blocks.
# helper(:three, BlindHelper) { def mice() 'mice' end }
#
diff --git a/actionpack/lib/action_controller/integration.rb b/actionpack/lib/action_controller/integration.rb
index bfacfb26d1..677d25b6c9 100644
--- a/actionpack/lib/action_controller/integration.rb
+++ b/actionpack/lib/action_controller/integration.rb
@@ -304,7 +304,7 @@ module ActionController
end
end
- # Get a temporarly URL writer object
+ # Get a temporary URL writer object
def generic_url_rewriter
cgi = MockCGI.new('REQUEST_METHOD' => "GET",
'QUERY_STRING' => "",
diff --git a/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb b/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb
index 7ffc1fcfa8..1a3c770254 100644
--- a/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb
+++ b/actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb
@@ -794,7 +794,7 @@ module HTML
# eventually, and array of substitution values.
#
# This method is called from four places, so it helps to put it here
- # for resue. The only logic deals with the need to detect comma
+ # for reuse. The only logic deals with the need to detect comma
# separators (alternate) and apply them to the selector group of the
# top selector.
def next_selector(statement, values)
diff --git a/actionpack/lib/action_view/helpers/capture_helper.rb b/actionpack/lib/action_view/helpers/capture_helper.rb
index 80bff8a4cd..fc8cd66d72 100644
--- a/actionpack/lib/action_view/helpers/capture_helper.rb
+++ b/actionpack/lib/action_view/helpers/capture_helper.rb
@@ -119,7 +119,7 @@ module ActionView
#
# The deprecated way of accessing a content_for block is to use an instance variable
# named @content_for_#{name_of_the_content_block}. So <%= content_for :footer %>
- # would be avaiable as <%= @content_for_footer %>. The preferred usage is now
+ # would be available as <%= @content_for_footer %>. The preferred usage is now
# <%= yield :footer %>.
def content_for(name, content = nil, &block)
existing_content_for = instance_variable_get("@content_for_#{name}").to_s
diff --git a/actionpack/lib/action_view/helpers/javascript_helper.rb b/actionpack/lib/action_view/helpers/javascript_helper.rb
index 8e7542e206..1ea3cbd74e 100644
--- a/actionpack/lib/action_view/helpers/javascript_helper.rb
+++ b/actionpack/lib/action_view/helpers/javascript_helper.rb
@@ -140,7 +140,7 @@ module ActionView
javascript << "\n" << IO.read(filename)
end
- # load other librairies
+ # load other libraries
(Dir.glob(File.join(JAVASCRIPT_PATH, '*')) - prototype_libs).each do |filename|
javascript << "\n" << IO.read(filename)
end
diff --git a/actionpack/lib/action_view/helpers/prototype_helper.rb b/actionpack/lib/action_view/helpers/prototype_helper.rb
index c6669ccde3..def33b9ee1 100644
--- a/actionpack/lib/action_view/helpers/prototype_helper.rb
+++ b/actionpack/lib/action_view/helpers/prototype_helper.rb
@@ -511,7 +511,7 @@ module ActionView
# element's existing content.
# :bottom:: HTML is inserted inside the element, after the
# element's existing content.
- # :before:: HTML is inserted immediately preceeding the element.
+ # :before:: HTML is inserted immediately preceding the element.
# :after:: HTML is inserted immediately following the element.
#
# +options_for_render+ may be either a string of HTML to insert, or a hash
diff --git a/actionpack/lib/action_view/helpers/scriptaculous_helper.rb b/actionpack/lib/action_view/helpers/scriptaculous_helper.rb
index 033000b004..83f4d168a8 100644
--- a/actionpack/lib/action_view/helpers/scriptaculous_helper.rb
+++ b/actionpack/lib/action_view/helpers/scriptaculous_helper.rb
@@ -30,7 +30,7 @@ module ActionView
# variable in the generated JavaScript execution context. This can be
# used for example with drop_receiving_element:
#
- # <%= drop_receving_element (...), :loading => visual_effect(:fade) %>
+ # <%= drop_receiving_element (...), :loading => visual_effect(:fade) %>
#
# This would fade the element that was dropped on the drop receiving
# element.
diff --git a/actionpack/lib/action_view/helpers/text_helper.rb b/actionpack/lib/action_view/helpers/text_helper.rb
index f11eae7969..bb7ddefcad 100644
--- a/actionpack/lib/action_view/helpers/text_helper.rb
+++ b/actionpack/lib/action_view/helpers/text_helper.rb
@@ -82,7 +82,7 @@ module ActionView
end
# Extracts an excerpt from +text+ that matches the first instance of +phrase+.
- # The +radius+ expands the excerpt on each side of the first occurance of +phrase+ by the number of characters
+ # The +radius+ expands the excerpt on each side of the first occurrence of +phrase+ by the number of characters
# defined in +radius+ (which defaults to 100). If the excerpt radius overflows the beginning or end of the +text+,
# then the +excerpt_string+ will be prepended/appended accordingly. If the +phrase+
# isn't found, nil is returned.
diff --git a/actionpack/test/activerecord/active_record_store_test.rb b/actionpack/test/activerecord/active_record_store_test.rb
index d9d03f4492..707a0a75cc 100644
--- a/actionpack/test/activerecord/active_record_store_test.rb
+++ b/actionpack/test/activerecord/active_record_store_test.rb
@@ -53,7 +53,7 @@ class ActiveRecordStoreTest < ActiveRecordTestCase
@new_session['foo'] = 'bar'
end
-# this test only applies for eager sesssion saving
+# this test only applies for eager session saving
# def test_another_instance
# @another = CGI::Session.new(@cgi, 'session_id' => @new_session.session_id, 'database_manager' => CGI::Session::ActiveRecordStore)
# assert_equal @new_session.session_id, @another.session_id
diff --git a/actionpack/test/controller/caching_test.rb b/actionpack/test/controller/caching_test.rb
index 6aab2e8dce..f3cf66232f 100644
--- a/actionpack/test/controller/caching_test.rb
+++ b/actionpack/test/controller/caching_test.rb
@@ -2,7 +2,7 @@ require 'fileutils'
require File.dirname(__FILE__) + '/../abstract_unit'
CACHE_DIR = 'test_cache'
-# Don't change '/../temp/' cavalierly or you might hoze something you don't want hozed
+# Don't change '/../temp/' cavalierly or you might hose something you don't want hosed
FILE_STORE_PATH = File.join(File.dirname(__FILE__), '/../temp/', CACHE_DIR)
ActionController::Base.page_cache_directory = FILE_STORE_PATH
ActionController::Base.fragment_cache_store = :file_store, FILE_STORE_PATH
diff --git a/actionpack/test/controller/components_test.rb b/actionpack/test/controller/components_test.rb
index c046cf045a..debd8a2742 100644
--- a/actionpack/test/controller/components_test.rb
+++ b/actionpack/test/controller/components_test.rb
@@ -127,7 +127,7 @@ class ComponentsTest < Test::Unit::TestCase
test_internal_calling
end
- def test_component_as_string_redirect_renders_redirecte_action
+ def test_component_as_string_redirect_renders_redirected_action
get :calling_redirected_as_string
assert_equal "Lady of the House, speaking", @response.body
diff --git a/actionpack/test/controller/cookie_test.rb b/actionpack/test/controller/cookie_test.rb
index 6a88517582..6722711c56 100644
--- a/actionpack/test/controller/cookie_test.rb
+++ b/actionpack/test/controller/cookie_test.rb
@@ -6,11 +6,11 @@ class CookieTest < Test::Unit::TestCase
cookies["user_name"] = "david"
end
- def authenticate_for_fourten_days
+ def authenticate_for_fourteen_days
cookies["user_name"] = { "value" => "david", "expires" => Time.local(2005, 10, 10) }
end
- def authenticate_for_fourten_days_with_symbols
+ def authenticate_for_fourteen_days_with_symbols
cookies[:user_name] = { :value => "david", :expires => Time.local(2005, 10, 10) }
end
@@ -55,12 +55,12 @@ class CookieTest < Test::Unit::TestCase
end
def test_setting_cookie_for_fourteen_days
- get :authenticate_for_fourten_days
+ get :authenticate_for_fourteen_days
assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david", "expires" => Time.local(2005, 10, 10)) ], @response.headers["cookie"]
end
def test_setting_cookie_for_fourteen_days_with_symbols
- get :authenticate_for_fourten_days
+ get :authenticate_for_fourteen_days
assert_equal [ CGI::Cookie::new("name" => "user_name", "value" => "david", "expires" => Time.local(2005, 10, 10)) ], @response.headers["cookie"]
end
diff --git a/actionpack/test/controller/routing_test.rb b/actionpack/test/controller/routing_test.rb
index d1e829390b..fba5512a2b 100644
--- a/actionpack/test/controller/routing_test.rb
+++ b/actionpack/test/controller/routing_test.rb
@@ -766,7 +766,7 @@ class DynamicSegmentTest < Test::Unit::TestCase
eval(segment.expiry_statement)
rescue RuntimeError
- flunk "Expiry check should not have occured!"
+ flunk "Expiry check should not have occurred!"
end
def test_expiry_should_occur_according_to_expire_on
diff --git a/actionpack/test/controller/selector_test.rb b/actionpack/test/controller/selector_test.rb
index aa91de294e..6ae46594ae 100644
--- a/actionpack/test/controller/selector_test.rb
+++ b/actionpack/test/controller/selector_test.rb
@@ -177,7 +177,7 @@ class SelectorTest < Test::Unit::TestCase
assert_equal 2, @matches.size
assert_equal "foo", @matches[0].attributes["href"]
assert_equal "baz", @matches[1].attributes["href"]
- # And now for the three selector challange.
+ # And now for the three selector challenge.
parse(%Q{
})
select("h1 a, h2 a, h3 a")
assert_equal 3, @matches.size
diff --git a/actionpack/test/controller/test_test.rb b/actionpack/test/controller/test_test.rb
index 8a57f37b68..018b342b68 100644
--- a/actionpack/test/controller/test_test.rb
+++ b/actionpack/test/controller/test_test.rb
@@ -225,9 +225,9 @@ XML
def test_assert_tag_before
process :test_html_output
- # there is a tag preceeding a tag with id 'bar'
+ # there is a tag preceding a tag with id 'bar'
assert_tag :before => { :attributes => { :id => "bar" } }
- # there is no tag preceeding a 'form' tag
+ # there is no tag preceding a 'form' tag
assert_no_tag :before => { :tag => "form" }
end
diff --git a/actionpack/test/template/prototype_helper_test.rb b/actionpack/test/template/prototype_helper_test.rb
index 7bb4245c58..48f947910f 100644
--- a/actionpack/test/template/prototype_helper_test.rb
+++ b/actionpack/test/template/prototype_helper_test.rb
@@ -83,14 +83,14 @@ class PrototypeHelperTest < Test::Unit::TestCase
def test_link_to_remote
assert_dom_equal %(Remote outauthor),
link_to_remote("Remote outauthor", { :url => { :action => "whatnot" }}, { :class => "fine" })
- assert_dom_equal %(Remote outauthor),
- link_to_remote("Remote outauthor", :complete => "alert(request.reponseText)", :url => { :action => "whatnot" })
- assert_dom_equal %(Remote outauthor),
- link_to_remote("Remote outauthor", :success => "alert(request.reponseText)", :url => { :action => "whatnot" })
- assert_dom_equal %(Remote outauthor),
- link_to_remote("Remote outauthor", :failure => "alert(request.reponseText)", :url => { :action => "whatnot" })
- assert_dom_equal %(Remote outauthor),
- link_to_remote("Remote outauthor", :failure => "alert(request.reponseText)", :url => { :action => "whatnot", :a => '10', :b => '20' })
+ assert_dom_equal %(Remote outauthor),
+ link_to_remote("Remote outauthor", :complete => "alert(request.responseText)", :url => { :action => "whatnot" })
+ assert_dom_equal %(Remote outauthor),
+ link_to_remote("Remote outauthor", :success => "alert(request.responseText)", :url => { :action => "whatnot" })
+ assert_dom_equal %(Remote outauthor),
+ link_to_remote("Remote outauthor", :failure => "alert(request.responseText)", :url => { :action => "whatnot" })
+ assert_dom_equal %(Remote outauthor),
+ link_to_remote("Remote outauthor", :failure => "alert(request.responseText)", :url => { :action => "whatnot", :a => '10', :b => '20' })
end
def test_link_to_remote_html_options
diff --git a/actionwebservice/install.rb b/actionwebservice/install.rb
index e2a9048070..da08bf5f95 100644
--- a/actionwebservice/install.rb
+++ b/actionwebservice/install.rb
@@ -18,7 +18,7 @@ unless $sitedir
end
end
-# the acual gruntwork
+# the actual gruntwork
Dir.chdir("lib")
Find.find("action_web_service", "action_web_service.rb") { |f|
diff --git a/actionwebservice/setup.rb b/actionwebservice/setup.rb
index 9ab880d357..aeef0d106b 100644
--- a/actionwebservice/setup.rb
+++ b/actionwebservice/setup.rb
@@ -968,7 +968,7 @@ class ToplevelInstallerMulti < ToplevelInstaller
def print_usage(f)
super
- f.puts 'Inluded packages:'
+ f.puts 'Included packages:'
f.puts ' ' + @packages.sort.join(' ')
f.puts
end
diff --git a/activerecord/install.rb b/activerecord/install.rb
index 592c4b9d9a..c87398b1f4 100644
--- a/activerecord/install.rb
+++ b/activerecord/install.rb
@@ -18,7 +18,7 @@ unless $sitedir
end
end
-# the acual gruntwork
+# the actual gruntwork
Dir.chdir("lib")
Find.find("active_record", "active_record.rb") { |f|
diff --git a/activerecord/lib/active_record/associations.rb b/activerecord/lib/active_record/associations.rb
index cb821ba7f0..e269775fd5 100755
--- a/activerecord/lib/active_record/associations.rb
+++ b/activerecord/lib/active_record/associations.rb
@@ -716,7 +716,7 @@ module ActiveRecord
#
# Option examples:
# has_one :credit_card, :dependent => :destroy # destroys the associated credit card
- # has_one :credit_card, :dependent => :nullify # updates the associated records foriegn key value to null rather than destroying it
+ # has_one :credit_card, :dependent => :nullify # updates the associated records foreign key value to null rather than destroying it
# has_one :last_comment, :class_name => "Comment", :order => "posted_on"
# has_one :project_manager, :class_name => "Person", :conditions => "role = 'project_manager'"
# has_one :attachment, :as => :attachable
@@ -857,7 +857,7 @@ module ActiveRecord
#
# Deprecated: Any additional fields added to the join table will be placed as attributes when pulling records out through
# +has_and_belongs_to_many+ associations. Records returned from join tables with additional attributes will be marked as
- # +ReadOnly+ (because we can't save changes to the additional attrbutes). It's strongly recommended that you upgrade any
+ # +ReadOnly+ (because we can't save changes to the additional attributes). It's strongly recommended that you upgrade any
# associations with attributes to a real join model (see introduction).
#
# Adds the following methods for retrieval and query:
diff --git a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
index 663655213a..d67207fa4d 100644
--- a/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
+++ b/activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
@@ -65,7 +65,7 @@ module ActiveRecord
options[:conditions] = conditions
options[:joins] = @join_sql
- options[:readonly] = finding_with_ambigious_select?(options[:select])
+ options[:readonly] = finding_with_ambiguous_select?(options[:select])
if options[:order] && @reflection.options[:order]
options[:order] = "#{options[:order]}, #{@reflection.options[:order]}"
@@ -154,10 +154,10 @@ module ActiveRecord
{ :find => { :conditions => @finder_sql, :joins => @join_sql, :readonly => false } }
end
- # Join tables with additional columns on top of the two foreign keys must be considered ambigious unless a select
+ # Join tables with additional columns on top of the two foreign keys must be considered ambiguous unless a select
# clause has been explicitly defined. Otherwise you can get broken records back, if, for example, the join column also has
# an id column. This will then overwrite the id column of the records coming back.
- def finding_with_ambigious_select?(select_clause)
+ def finding_with_ambiguous_select?(select_clause)
!select_clause && @owner.connection.columns(@reflection.options[:join_table], "Join Table Columns").size != 2
end
end
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 25cd392f9b..a4ebaf4e93 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -150,7 +150,7 @@ module ActiveRecord #:nodoc:
# end
# end
#
- # You can alternatively use self[:attribute]=(value) and self[:attribute] instead of write_attribute(:attribute, vaule) and
+ # You can alternatively use self[:attribute]=(value) and self[:attribute] instead of write_attribute(:attribute, value) and
# read_attribute(:attribute) as a shorter form.
#
# == Accessing attributes before they have been typecasted
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
index daeaba0904..a80025e7a7 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
@@ -133,7 +133,7 @@ module ActiveRecord
# Do nothing by default. Implement for PostgreSQL, Oracle, ...
end
- # Inserts the given fixture into the table. Overriden in adapters that require
+ # Inserts the given fixture into the table. Overridden in adapters that require
# something beyond a simple insert (eg. Oracle).
def insert_fixture(fixture, table_name)
execute "INSERT INTO #{table_name} (#{fixture.key_list}) VALUES (#{fixture.value_list})", 'Fixture Insert'
diff --git a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
index 0bedffa0e1..2ae19d2b15 100644
--- a/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
@@ -142,7 +142,7 @@ module ActiveRecord
# Sets a new default value for a column. If you want to set the default
# value to +NULL+, you are out of luck. You need to
- # DatabaseStatements#execute the apppropriate SQL statement yourself.
+ # DatabaseStatements#execute the appropriate SQL statement yourself.
# ===== Examples
# change_column_default(:suppliers, :qualification, 'new')
# change_column_default(:accounts, :authorized, 1)
@@ -237,7 +237,7 @@ module ActiveRecord
execute "CREATE TABLE #{ActiveRecord::Migrator.schema_info_table_name} (version #{type_to_sql(:integer)})"
execute "INSERT INTO #{ActiveRecord::Migrator.schema_info_table_name} (version) VALUES(0)"
rescue ActiveRecord::StatementInvalid
- # Schema has been intialized
+ # Schema has been initialized
end
end
@@ -255,7 +255,7 @@ module ActiveRecord
def type_to_sql(type, limit = nil, precision = nil, scale = nil) #:nodoc:
if native = native_database_types[type]
column_type_sql = native.is_a?(Hash) ? native[:name] : native
- if type == :decimal # ignore limit, use precison and scale
+ if type == :decimal # ignore limit, use precision and scale
precision ||= native[:precision]
scale ||= native[:scale]
if precision
diff --git a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
index 8ca23ccdaf..18de0e0739 100755
--- a/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
@@ -129,7 +129,7 @@ module ActiveRecord
end
rescue Exception => e
# Log message and raise exception.
- # Set last_verfication to 0, so that connection gets verified
+ # Set last_verification to 0, so that connection gets verified
# upon reentering the request loop
@last_verification = 0
message = "#{e.class.name}: #{e.message}: #{sql}"
diff --git a/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb b/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
index 99e22ca3f3..c862ebcb7c 100644
--- a/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
@@ -260,7 +260,7 @@ begin
end
- # Inserts the given fixture into the table. Overriden to properly handle lobs.
+ # Inserts the given fixture into the table. Overridden to properly handle lobs.
def insert_fixture(fixture, table_name)
super
diff --git a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
index 6a2b32a370..786ad1c864 100644
--- a/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
@@ -70,7 +70,7 @@ module ActiveRecord
# Unescapes bytea output from a database to the binary string it represents.
def self.binary_to_string(value)
- # In each case, check if the value actually is escaped PostgresSQL bytea output
+ # In each case, check if the value actually is escaped PostgreSQL bytea output
# or an unescaped Active Record attribute that was just written.
if PGconn.respond_to?(:unescape_bytea)
self.class.module_eval do
@@ -784,7 +784,7 @@ module ActiveRecord
row.each_index do |cell_index|
# If this is a money type column and there are any currency symbols,
# then strip them off. Indeed it would be prettier to do this in
- # PostgresSQLColumn.string_to_decimal but would break form input
+ # PostgreSQLColumn.string_to_decimal but would break form input
# fields that call value_before_type_cast.
if res.type(cell_index) == MONEY_COLUMN_TYPE_OID
# Because money output is formatted according to the locale, there are two
diff --git a/activerecord/lib/active_record/connection_adapters/sybase_adapter.rb b/activerecord/lib/active_record/connection_adapters/sybase_adapter.rb
index d8ff88b287..5fc12f4b77 100644
--- a/activerecord/lib/active_record/connection_adapters/sybase_adapter.rb
+++ b/activerecord/lib/active_record/connection_adapters/sybase_adapter.rb
@@ -1,4 +1,4 @@
-# sybase_adaptor.rb
+# sybase_adapter.rb
# Author: John R. Sheets
#
# 01 Mar 2006: Initial version. Based on code from Will Sobel
diff --git a/activerecord/lib/active_record/serializers/xml_serializer.rb b/activerecord/lib/active_record/serializers/xml_serializer.rb
index 89559ce709..5a140019eb 100644
--- a/activerecord/lib/active_record/serializers/xml_serializer.rb
+++ b/activerecord/lib/active_record/serializers/xml_serializer.rb
@@ -1,7 +1,7 @@
module ActiveRecord #:nodoc:
module Serialization
# Builds an XML document to represent the model. Some configuration is
- # availble through +options+, however more complicated cases should use
+ # available through +options+, however more complicated cases should use
# override ActiveRecord's to_xml.
#
# By default the generated XML document will include the processing
diff --git a/activerecord/test/associations_test.rb b/activerecord/test/associations_test.rb
index 8cb3c16a66..e6c7944dbb 100755
--- a/activerecord/test/associations_test.rb
+++ b/activerecord/test/associations_test.rb
@@ -1474,7 +1474,7 @@ class HasAndBelongsToManyAssociationsTest < Test::Unit::TestCase
assert_equal 1, project.access_level.to_i
end
- def test_hatbm_attribute_access_and_respond_to
+ def test_habtm_attribute_access_and_respond_to
project = developers(:jamis).projects[0]
assert project.has_attribute?("name")
assert project.has_attribute?("joined_on")
diff --git a/activerecord/test/base_test.rb b/activerecord/test/base_test.rb
index 4fb7f39ecc..1883f369c3 100755
--- a/activerecord/test/base_test.rb
+++ b/activerecord/test/base_test.rb
@@ -800,7 +800,7 @@ class BasicsTest < Test::Unit::TestCase
assert_nil keyboard.id
end
- def test_customized_primary_key_remains_protected_when_refered_to_as_id
+ def test_customized_primary_key_remains_protected_when_referred_to_as_id
subscriber = Subscriber.new(:id => 'webster123', :name => 'nice try')
assert_nil subscriber.id
diff --git a/activerecord/test/migration_test.rb b/activerecord/test/migration_test.rb
index 69e9212fa6..9ac9bb10fd 100644
--- a/activerecord/test/migration_test.rb
+++ b/activerecord/test/migration_test.rb
@@ -340,7 +340,7 @@ if ActiveRecord::Base.connection.supports_migrations?
assert_equal 127, jonnyg.intelligence_quotient
jonnyg.destroy
ensure
- ActiveRecord::Migration.remove_column :people, :intelligece_quotient rescue nil
+ ActiveRecord::Migration.remove_column :people, :intelligence_quotient rescue nil
end
end
@@ -578,7 +578,7 @@ if ActiveRecord::Base.connection.supports_migrations?
assert_equal BigDecimal("1000234000567.95"), b.big_bank_balance
# This one is fun. The 'value_of_e' field is defined as 'DECIMAL' with
- # precision/scale explictly left out. By the SQL standard, numbers
+ # precision/scale explicitly left out. By the SQL standard, numbers
# assigned to this field should be truncated but that's seldom respected.
if current_adapter?(:PostgreSQLAdapter, :SQLite2Adapter)
# - PostgreSQL changes the SQL spec on columns declared simply as
diff --git a/activerecord/test/pk_test.rb b/activerecord/test/pk_test.rb
index 4daef43062..431ff9af9d 100644
--- a/activerecord/test/pk_test.rb
+++ b/activerecord/test/pk_test.rb
@@ -95,7 +95,7 @@ class PrimaryKeysTest < Test::Unit::TestCase
def test_instance_update_should_quote_pkey
assert_nothing_raised { MixedCaseMonkey.find(1).save }
end
- def test_instance_destry_should_quote_pkey
+ def test_instance_destroy_should_quote_pkey
assert_nothing_raised { MixedCaseMonkey.find(1).destroy }
end
end
diff --git a/activerecord/test/unconnected_test.rb b/activerecord/test/unconnected_test.rb
index 2d06410dd8..8079a051e5 100755
--- a/activerecord/test/unconnected_test.rb
+++ b/activerecord/test/unconnected_test.rb
@@ -3,7 +3,7 @@ require 'abstract_unit'
class TestRecord < ActiveRecord::Base
end
-class TestUnconnectedAdaptor < Test::Unit::TestCase
+class TestUnconnectedAdapter < Test::Unit::TestCase
self.use_transactional_fixtures = false
def setup
diff --git a/activerecord/test/validations_test.rb b/activerecord/test/validations_test.rb
index d0c54d1528..4b91d86b18 100755
--- a/activerecord/test/validations_test.rb
+++ b/activerecord/test/validations_test.rb
@@ -661,7 +661,7 @@ class ValidationsTest < Test::Unit::TestCase
end
end
- def test_validates_length_with_globaly_modified_error_message
+ def test_validates_length_with_globally_modified_error_message
ActiveRecord::Errors.default_error_messages[:too_short] = 'tu est trops petit hombre %d'
Topic.validates_length_of :title, :minimum => 10
t = Topic.create(:title => 'too short')
diff --git a/activesupport/install.rb b/activesupport/install.rb
index f84f06bdaa..9c54d8c1a9 100644
--- a/activesupport/install.rb
+++ b/activesupport/install.rb
@@ -18,7 +18,7 @@ unless $sitedir
end
end
-# the acual gruntwork
+# the actual gruntwork
Dir.chdir("lib")
Find.find("active_support", "active_support.rb") { |f|
diff --git a/activesupport/lib/active_support/core_ext/object/misc.rb b/activesupport/lib/active_support/core_ext/object/misc.rb
index e46cfe1b9b..a3637d7a8a 100644
--- a/activesupport/lib/active_support/core_ext/object/misc.rb
+++ b/activesupport/lib/active_support/core_ext/object/misc.rb
@@ -37,7 +37,7 @@ class Object
# post.has_many :all_comments
# end
#
- # Can also be used with an explicit reciever:
+ # Can also be used with an explicit receiver:
#
# map.with_options :controller => "people" do |people|
# people.connect "/people", :action => "index"
diff --git a/activesupport/lib/active_support/core_ext/string/unicode.rb b/activesupport/lib/active_support/core_ext/string/unicode.rb
index 0e4c76fb86..dd19fe5428 100644
--- a/activesupport/lib/active_support/core_ext/string/unicode.rb
+++ b/activesupport/lib/active_support/core_ext/string/unicode.rb
@@ -1,7 +1,7 @@
module ActiveSupport #:nodoc:
module CoreExtensions #:nodoc:
module String #:nodoc:
- # Define methods for handeling unicode data.
+ # Define methods for handling unicode data.
module Unicode
# +chars+ is a Unicode safe proxy for string methods. It creates and returns an instance of the
# ActiveSupport::Multibyte::Chars class which encapsulates the original string. A Unicode safe version of all
@@ -39,4 +39,4 @@ module ActiveSupport #:nodoc:
end
end
end
-end
\ No newline at end of file
+end
diff --git a/activesupport/lib/active_support/core_ext/time/calculations.rb b/activesupport/lib/active_support/core_ext/time/calculations.rb
index b1ad5a9e99..5754ca1bca 100644
--- a/activesupport/lib/active_support/core_ext/time/calculations.rb
+++ b/activesupport/lib/active_support/core_ext/time/calculations.rb
@@ -29,7 +29,7 @@ module ActiveSupport #:nodoc:
end
end
- # Returns a new Time if requested year can be accomodated by Ruby's Time class
+ # Returns a new Time if requested year can be accommodated by Ruby's Time class
# (i.e., if year is within either 1970..2038 or 1902..2038, depending on system architecture);
# otherwise returns a DateTime
def time_with_datetime_fallback(utc_or_local, year, month=1, day=1, hour=0, min=0, sec=0, usec=0)
diff --git a/activesupport/lib/active_support/vendor/builder/xmlbase.rb b/activesupport/lib/active_support/vendor/builder/xmlbase.rb
index 57c8ddfc30..ad0069ff15 100644
--- a/activesupport/lib/active_support/vendor/builder/xmlbase.rb
+++ b/activesupport/lib/active_support/vendor/builder/xmlbase.rb
@@ -26,7 +26,7 @@ module Builder
end
# Create a tag named +sym+. Other than the first argument which
- # is the tag name, the arguements are the same as the tags
+ # is the tag name, the arguments are the same as the tags
# implemented via method_missing.
def tag!(sym, *args, &block)
self.__send__(sym, *args, &block)
diff --git a/activesupport/lib/active_support/vendor/builder/xmlmarkup.rb b/activesupport/lib/active_support/vendor/builder/xmlmarkup.rb
index 4cdcedb4a1..b7d8b487e5 100644
--- a/activesupport/lib/active_support/vendor/builder/xmlmarkup.rb
+++ b/activesupport/lib/active_support/vendor/builder/xmlmarkup.rb
@@ -153,7 +153,7 @@ module Builder
#
# xml_builder = Builder::XmlMarkup.new
# xml_builder.div { |xml|
- # xml.stong("text")
+ # xml.strong("text")
# }
#
class XmlMarkup < XmlBase
diff --git a/activesupport/lib/active_support/vendor/xml_simple.rb b/activesupport/lib/active_support/vendor/xml_simple.rb
index 48b7289c65..7ea9c8de6b 100644
--- a/activesupport/lib/active_support/vendor/xml_simple.rb
+++ b/activesupport/lib/active_support/vendor/xml_simple.rb
@@ -121,7 +121,7 @@ class XmlSimple
# Create a "global" cache.
@@cache = Cache.new
- # Creates and intializes a new XmlSimple object.
+ # Creates and initializes a new XmlSimple object.
#
# defaults::
# Default values for options.
diff --git a/activesupport/test/core_ext/date_ext_test.rb b/activesupport/test/core_ext/date_ext_test.rb
index 4ec595d918..97b637f974 100644
--- a/activesupport/test/core_ext/date_ext_test.rb
+++ b/activesupport/test/core_ext/date_ext_test.rb
@@ -36,7 +36,7 @@ class DateExtCalculationsTest < Test::Unit::TestCase
assert_equal Date.new(2005,6,22), Date.new(2005,2,22).change(:month => 6)
end
- def test_begining_of_week
+ def test_beginning_of_week
assert_equal Date.new(2005,1,31), Date.new(2005,2,4).beginning_of_week
assert_equal Date.new(2005,11,28), Date.new(2005,11,28).beginning_of_week #monday
assert_equal Date.new(2005,11,28), Date.new(2005,11,29).beginning_of_week #tuesday
diff --git a/activesupport/test/core_ext/date_time_ext_test.rb b/activesupport/test/core_ext/date_time_ext_test.rb
index b7bdbc5deb..204e8cd676 100644
--- a/activesupport/test/core_ext/date_time_ext_test.rb
+++ b/activesupport/test/core_ext/date_time_ext_test.rb
@@ -46,7 +46,7 @@ class DateTimeExtCalculationsTest < Test::Unit::TestCase
assert_equal 86399,DateTime.civil(2005,1,1,23,59,59).seconds_since_midnight
end
- def test_begining_of_week
+ def test_beginning_of_week
assert_equal DateTime.civil(2005,1,31), DateTime.civil(2005,2,4,10,10,10).beginning_of_week
assert_equal DateTime.civil(2005,11,28), DateTime.civil(2005,11,28,0,0,0).beginning_of_week #monday
assert_equal DateTime.civil(2005,11,28), DateTime.civil(2005,11,29,0,0,0).beginning_of_week #tuesday
diff --git a/activesupport/test/core_ext/time_ext_test.rb b/activesupport/test/core_ext/time_ext_test.rb
index 4a64ebd584..5f06a4efa7 100644
--- a/activesupport/test/core_ext/time_ext_test.rb
+++ b/activesupport/test/core_ext/time_ext_test.rb
@@ -49,7 +49,7 @@ class TimeExtCalculationsTest < Test::Unit::TestCase
end
end
- def test_begining_of_week
+ def test_beginning_of_week
assert_equal Time.local(2005,1,31), Time.local(2005,2,4,10,10,10).beginning_of_week
assert_equal Time.local(2005,11,28), Time.local(2005,11,28,0,0,0).beginning_of_week #monday
assert_equal Time.local(2005,11,28), Time.local(2005,11,29,0,0,0).beginning_of_week #tuesday
diff --git a/activesupport/test/multibyte_handler_test.rb b/activesupport/test/multibyte_handler_test.rb
index 9905cf65d6..174d7b790d 100644
--- a/activesupport/test/multibyte_handler_test.rb
+++ b/activesupport/test/multibyte_handler_test.rb
@@ -15,7 +15,7 @@ module UTF8HandlingTest
# This is an ASCII string with some russian strings and a ligature. It's nicely calibrated, because
# slicing it at some specific bytes will kill your characters if you use standard Ruby routines.
# It has both capital and standard letters, so that we can test case conversions easily.
- # It has 26 charactes and 28 when the ligature gets split during normalization.
+ # It has 26 characters and 28 when the ligature gets split during normalization.
@string = "Abcd Блå ffi бла бла бла бла"
@string_kd = "Abcd Блå ffi бла бла бла бла"
@string_kc = "Abcd Блå ffi бла бла бла бла"
diff --git a/railties/lib/commands/plugin.rb b/railties/lib/commands/plugin.rb
index 196e159b0b..b0d1d50600 100644
--- a/railties/lib/commands/plugin.rb
+++ b/railties/lib/commands/plugin.rb
@@ -515,7 +515,7 @@ module Commands
o.on( "--local",
"List locally installed plugins.") {|@local| @remote = false}
o.on( "--remote",
- "List remotely availabled plugins. This is the default behavior",
+ "List remotely available plugins. This is the default behavior",
"unless --local is provided.") {|@remote|}
end
end
diff --git a/railties/lib/rails_generator/base.rb b/railties/lib/rails_generator/base.rb
index 95d716fb90..b55a8db673 100644
--- a/railties/lib/rails_generator/base.rb
+++ b/railties/lib/rails_generator/base.rb
@@ -40,7 +40,7 @@ module Rails
# directory.
#
# The filenames of the templates don't matter, but choose something that
- # will be self-explatatory since you will be referencing these in the
+ # will be self-explanatory since you will be referencing these in the
# +manifest+ method inside your generator subclass.
#
#
diff --git a/railties/lib/rails_generator/commands.rb b/railties/lib/rails_generator/commands.rb
index db9a087f29..4b6f7ecd15 100644
--- a/railties/lib/rails_generator/commands.rb
+++ b/railties/lib/rails_generator/commands.rb
@@ -260,7 +260,7 @@ module Rails
end
# Generate a file for a Rails application using an ERuby template.
- # Looks up and evalutes a template by name and writes the result.
+ # Looks up and evaluates a template by name and writes the result.
#
# The ERB template uses explicit trim mode to best control the
# proliferation of whitespace in generated code. <%- trims leading