Permalink
Browse files

Fixed spelling errors (closes #9706) [tarmo/rmm5t]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@7666 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
1 parent 7cb1f93 commit e3b49c052b497827c9f058feaa066bbfe184f4da @dhh dhh committed Sep 28, 2007
Showing with 72 additions and 72 deletions.
  1. +1 −1 actionmailer/install.rb
  2. +2 −2 actionpack/lib/action_controller/base.rb
  3. +1 −1 actionpack/lib/action_controller/caching.rb
  4. +1 −1 actionpack/lib/action_controller/helpers.rb
  5. +1 −1 actionpack/lib/action_controller/integration.rb
  6. +1 −1 actionpack/lib/action_controller/vendor/html-scanner/html/selector.rb
  7. +1 −1 actionpack/lib/action_view/helpers/capture_helper.rb
  8. +1 −1 actionpack/lib/action_view/helpers/javascript_helper.rb
  9. +1 −1 actionpack/lib/action_view/helpers/prototype_helper.rb
  10. +1 −1 actionpack/lib/action_view/helpers/scriptaculous_helper.rb
  11. +1 −1 actionpack/lib/action_view/helpers/text_helper.rb
  12. +1 −1 actionpack/test/activerecord/active_record_store_test.rb
  13. +1 −1 actionpack/test/controller/caching_test.rb
  14. +1 −1 actionpack/test/controller/components_test.rb
  15. +4 −4 actionpack/test/controller/cookie_test.rb
  16. +1 −1 actionpack/test/controller/routing_test.rb
  17. +1 −1 actionpack/test/controller/selector_test.rb
  18. +2 −2 actionpack/test/controller/test_test.rb
  19. +8 −8 actionpack/test/template/prototype_helper_test.rb
  20. +1 −1 actionwebservice/install.rb
  21. +1 −1 actionwebservice/setup.rb
  22. +1 −1 activerecord/install.rb
  23. +2 −2 activerecord/lib/active_record/associations.rb
  24. +3 −3 activerecord/lib/active_record/associations/has_and_belongs_to_many_association.rb
  25. +1 −1 activerecord/lib/active_record/base.rb
  26. +1 −1 activerecord/lib/active_record/connection_adapters/abstract/database_statements.rb
  27. +3 −3 activerecord/lib/active_record/connection_adapters/abstract/schema_statements.rb
  28. +1 −1 activerecord/lib/active_record/connection_adapters/abstract_adapter.rb
  29. +1 −1 activerecord/lib/active_record/connection_adapters/oracle_adapter.rb
  30. +2 −2 activerecord/lib/active_record/connection_adapters/postgresql_adapter.rb
  31. +1 −1 activerecord/lib/active_record/connection_adapters/sybase_adapter.rb
  32. +1 −1 activerecord/lib/active_record/serializers/xml_serializer.rb
  33. +1 −1 activerecord/test/associations_test.rb
  34. +1 −1 activerecord/test/base_test.rb
  35. +2 −2 activerecord/test/migration_test.rb
  36. +1 −1 activerecord/test/pk_test.rb
  37. +1 −1 activerecord/test/unconnected_test.rb
  38. +1 −1 activerecord/test/validations_test.rb
  39. +1 −1 activesupport/install.rb
  40. +1 −1 activesupport/lib/active_support/core_ext/object/misc.rb
  41. +2 −2 activesupport/lib/active_support/core_ext/string/unicode.rb
  42. +1 −1 activesupport/lib/active_support/core_ext/time/calculations.rb
  43. +1 −1 activesupport/lib/active_support/vendor/builder/xmlbase.rb
  44. +1 −1 activesupport/lib/active_support/vendor/builder/xmlmarkup.rb
  45. +1 −1 activesupport/lib/active_support/vendor/xml_simple.rb
  46. +1 −1 activesupport/test/core_ext/date_ext_test.rb
  47. +1 −1 activesupport/test/core_ext/date_time_ext_test.rb
  48. +1 −1 activesupport/test/core_ext/time_ext_test.rb
  49. +1 −1 activesupport/test/multibyte_handler_test.rb
  50. +1 −1 railties/lib/commands/plugin.rb
  51. +1 −1 railties/lib/rails_generator/base.rb
  52. +1 −1 railties/lib/rails_generator/commands.rb
@@ -18,7 +18,7 @@
end
end
-# the acual gruntwork
+# the actual gruntwork
Dir.chdir("lib")
Find.find("action_mailer", "action_mailer.rb") { |f|
@@ -577,7 +577,7 @@ def process(request, response, method = :perform_action, *arguments) #:nodoc:
# value that appears in the slot for <tt>:first</tt> is not equal to default value for <tt>:first</tt> 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 <tt>:name => nil</tt> to <tt>url_for</tt>'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 @@ def default_url_options(options) #:doc:
#
# When using <tt>redirect_to :back</tt>, 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+://.*}
@@ -291,7 +291,7 @@ def add_extension!(path, extension)
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
@@ -102,7 +102,7 @@ def add_template_helper(helper_module) #: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 }
#
@@ -304,7 +304,7 @@ def encode_cookies
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' => "",
@@ -794,7 +794,7 @@ def only_child(of_type)
# 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)
@@ -119,7 +119,7 @@ def capture(*args, &block)
#
# The deprecated way of accessing a content_for block is to use an instance variable
# named <tt>@content_for_#{name_of_the_content_block}</tt>. So <tt><%= content_for :footer %></tt>
- # would be avaiable as <tt><%= @content_for_footer %></tt>. The preferred usage is now
+ # would be available as <tt><%= @content_for_footer %></tt>. The preferred usage is now
# <tt><%= yield :footer %></tt>.
def content_for(name, content = nil, &block)
existing_content_for = instance_variable_get("@content_for_#{name}").to_s
@@ -140,7 +140,7 @@ def define_javascript_functions
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
@@ -511,7 +511,7 @@ def select(pattern)
# element's existing content.
# <tt>:bottom</tt>:: HTML is inserted inside the element, after the
# element's existing content.
- # <tt>:before</tt>:: HTML is inserted immediately preceeding the element.
+ # <tt>:before</tt>:: HTML is inserted immediately preceding the element.
# <tt>:after</tt>:: HTML is inserted immediately following the element.
#
# +options_for_render+ may be either a string of HTML to insert, or a hash
@@ -30,7 +30,7 @@ module ScriptaculousHelper
# 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.
@@ -82,7 +82,7 @@ def highlight(text, phrases, highlighter = '<strong class="highlight">\1</strong
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.
@@ -53,7 +53,7 @@ def setup
@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
@@ -2,7 +2,7 @@
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
@@ -127,7 +127,7 @@ def test_component_multiple_redirect_redirects
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
@@ -6,11 +6,11 @@ def authenticate
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 @@ def test_setting_cookie
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
@@ -766,7 +766,7 @@ def test_expiry_should_not_trigger_once_expired
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
@@ -177,7 +177,7 @@ def test_selector_group
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{<h1 id="1"><a href="foo"></a></h1><h2 id="2"><a href="bar"></a></h2><h3 id="2"><a href="baz"></a></h3>})
select("h1 a, h2 a, h3 a")
assert_equal 3, @matches.size
@@ -225,9 +225,9 @@ def test_assert_tag_after
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
@@ -83,14 +83,14 @@ def setup
def test_link_to_remote
assert_dom_equal %(<a class=\"fine\" href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true}); return false;\">Remote outauthor</a>),
link_to_remote("Remote outauthor", { :url => { :action => "whatnot" }}, { :class => "fine" })
- assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true, onComplete:function(request){alert(request.reponseText)}}); return false;\">Remote outauthor</a>),
- link_to_remote("Remote outauthor", :complete => "alert(request.reponseText)", :url => { :action => "whatnot" })
- assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true, onSuccess:function(request){alert(request.reponseText)}}); return false;\">Remote outauthor</a>),
- link_to_remote("Remote outauthor", :success => "alert(request.reponseText)", :url => { :action => "whatnot" })
- assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true, onFailure:function(request){alert(request.reponseText)}}); return false;\">Remote outauthor</a>),
- link_to_remote("Remote outauthor", :failure => "alert(request.reponseText)", :url => { :action => "whatnot" })
- assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot?a=10&amp;b=20', {asynchronous:true, evalScripts:true, onFailure:function(request){alert(request.reponseText)}}); return false;\">Remote outauthor</a>),
- link_to_remote("Remote outauthor", :failure => "alert(request.reponseText)", :url => { :action => "whatnot", :a => '10', :b => '20' })
+ assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true, onComplete:function(request){alert(request.responseText)}}); return false;\">Remote outauthor</a>),
+ link_to_remote("Remote outauthor", :complete => "alert(request.responseText)", :url => { :action => "whatnot" })
+ assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true, onSuccess:function(request){alert(request.responseText)}}); return false;\">Remote outauthor</a>),
+ link_to_remote("Remote outauthor", :success => "alert(request.responseText)", :url => { :action => "whatnot" })
+ assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot', {asynchronous:true, evalScripts:true, onFailure:function(request){alert(request.responseText)}}); return false;\">Remote outauthor</a>),
+ link_to_remote("Remote outauthor", :failure => "alert(request.responseText)", :url => { :action => "whatnot" })
+ assert_dom_equal %(<a href=\"#\" onclick=\"new Ajax.Request('http://www.example.com/whatnot?a=10&amp;b=20', {asynchronous:true, evalScripts:true, onFailure:function(request){alert(request.responseText)}}); return false;\">Remote outauthor</a>),
+ link_to_remote("Remote outauthor", :failure => "alert(request.responseText)", :url => { :action => "whatnot", :a => '10', :b => '20' })
end
def test_link_to_remote_html_options
@@ -18,7 +18,7 @@
end
end
-# the acual gruntwork
+# the actual gruntwork
Dir.chdir("lib")
Find.find("action_web_service", "action_web_service.rb") { |f|
@@ -968,7 +968,7 @@ def extract_selection(list)
def print_usage(f)
super
- f.puts 'Inluded packages:'
+ f.puts 'Included packages:'
f.puts ' ' + @packages.sort.join(' ')
f.puts
end
@@ -18,7 +18,7 @@
end
end
-# the acual gruntwork
+# the actual gruntwork
Dir.chdir("lib")
Find.find("active_record", "active_record.rb") { |f|
@@ -716,7 +716,7 @@ def has_many(association_id, options = {}, &extension)
#
# 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 @@ def belongs_to(association_id, options = {})
#
# 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:
@@ -65,7 +65,7 @@ def find(*args)
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 @@ def construct_scope
{ :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
@@ -150,7 +150,7 @@ def initialize(errors)
# 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
@@ -133,7 +133,7 @@ def reset_sequence!(table, column, sequence = nil)
# 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'
@@ -142,7 +142,7 @@ def change_column(table_name, column_name, type, options = {})
# 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 @@ def initialize_schema_information
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 @@ def dump_schema_information #:nodoc:
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
@@ -129,7 +129,7 @@ def log(sql, name)
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}"
@@ -260,7 +260,7 @@ def default_sequence_name(table, column) #:nodoc:
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
@@ -70,7 +70,7 @@ def self.string_to_binary(value)
# 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 @@ def select_raw(sql, name = nil)
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
Oops, something went wrong. Retry.

0 comments on commit e3b49c0

Please sign in to comment.