diff options
Diffstat (limited to 'actionpack')
18 files changed, 30 insertions, 30 deletions
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 <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 @@ module ActionController #:nodoc: # # 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+://.*} 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 <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 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. # <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 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{<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 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 %(<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&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&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 |