diff --git a/actionpack/CHANGELOG b/actionpack/CHANGELOG index 1b973abf9d776748d33f573b88c73bc9c477d0c0..4e6ebdb5bece9cb7dd466376862c0d20999b9aa6 100644 --- a/actionpack/CHANGELOG +++ b/actionpack/CHANGELOG @@ -1,7 +1,5 @@ *1.9.0* (6 July, 2005) -* Fixed that a SessionRestoreError was thrown if a model object was placed in the session that wasn't available to all controllers - * Added logging of the request URI in the benchmark statement (makes it easy to grep for slow actions) * Added javascript_include_tag :defaults shortcut that'll include all the default javascripts included with Action Pack (prototype, effects, controls, dragdrop) diff --git a/actionpack/lib/action_controller/caching.rb b/actionpack/lib/action_controller/caching.rb index 28c702e60f1472402dbd138738459a1de5e9b725..20a4d7aba1c14d5a39d51bb148aeb4abcb2a3bcb 100644 --- a/actionpack/lib/action_controller/caching.rb +++ b/actionpack/lib/action_controller/caching.rb @@ -458,7 +458,7 @@ def cache_sweeper(*sweepers) end if defined?(ActiveRecord::Observer) - class Sweeper < ActiveRecord::Observer + class Sweeper < ActiveRecord::Observer #:nodoc: attr_accessor :controller def before(controller) diff --git a/actionpack/lib/action_controller/code_generation.rb b/actionpack/lib/action_controller/code_generation.rb index a4800037203d0e6a933a215ad3cb105fc0fe647f..6762b7610d69586de6b4e4b1b2e19e671b0049ea 100644 --- a/actionpack/lib/action_controller/code_generation.rb +++ b/actionpack/lib/action_controller/code_generation.rb @@ -1,9 +1,9 @@ module ActionController - module CodeGeneration #:nodoc - class GenerationError < StandardError + module CodeGeneration #:nodoc: + class GenerationError < StandardError #:nodoc: end - class Source + class Source #:nodoc: attr_reader :lines, :indentation_level IndentationString = ' ' def initialize @@ -24,7 +24,7 @@ def indent def to_s() lines.join("\n") end end - class CodeGenerator + class CodeGenerator #:nodoc: attr_accessor :source, :locals def initialize(source = nil) @locals = [] @@ -72,7 +72,7 @@ def dup end end - class RecognitionGenerator < CodeGenerator + class RecognitionGenerator < CodeGenerator #:nodoc: Attributes = [:after, :before, :current, :results, :constants, :depth, :move_ahead, :finish_statement] attr_accessor(*Attributes) FieldsToDuplicate = CodeGenerator::FieldsToDuplicate + Attributes @@ -163,7 +163,7 @@ def finish(ensure_traversal_finished = true) end end - class GenerationGenerator < CodeGenerator + class GenerationGenerator < CodeGenerator #:nodoc: Attributes = [:after, :before, :current, :segments] attr_accessor(*Attributes) FieldsToDuplicate = CodeGenerator::FieldsToDuplicate + Attributes diff --git a/actionpack/lib/action_controller/layout.rb b/actionpack/lib/action_controller/layout.rb index 07c02f0de33d0c57e13cdc410ec93368a405bdde..d7e01564a0817c894244d57de9ef27a2b1fb14a6 100644 --- a/actionpack/lib/action_controller/layout.rb +++ b/actionpack/lib/action_controller/layout.rb @@ -125,7 +125,7 @@ class << self # # If you have a layout that by default is applied to all the actions of a controller, you still have the option of rendering # a given action or set of actions without a layout, or restricting a layout to only a single action or a set of actions. The - # +:only+ and +:except+ options can be passed to the layout call. For example: + # :only and :except options can be passed to the layout call. For example: # # class WeblogController < ActionController::Base # layout "weblog_standard", :except => :rss @@ -137,8 +137,8 @@ class << self # This will assign "weblog_standard" as the WeblogController's layout except for the +rss+ action, which will not wrap a layout # around the rendered view. # - # Both the +:only+ and +:except+ condition can accept an arbitrary number of method references, so +:except => [ :rss, :text_only ]+ - # is valid, as is # +:except => :rss+. + # Both the :only and :except condition can accept an arbitrary number of method references, so + # #:except => [ :rss, :text_only ] is valid, as is :except => :rss. # # == Using a different layout in the action render call # diff --git a/actionpack/lib/action_controller/routing.rb b/actionpack/lib/action_controller/routing.rb index f8ca5e093004573994e3d752f9ea81d3b1d298de..d2e719bf40a651df6630bce79966c14d369ac12f 100644 --- a/actionpack/lib/action_controller/routing.rb +++ b/actionpack/lib/action_controller/routing.rb @@ -1,7 +1,6 @@ module ActionController - module Routing + module Routing #:nodoc: class << self - def expiry_hash(options, recall) k = v = nil expire_on = {} @@ -44,7 +43,7 @@ def test_condition(expression, condition) end end - class Component #:nodoc + class Component #:nodoc: def dynamic?() false end def optional?() false end @@ -61,7 +60,7 @@ def self.new(string, *args) end end - class StaticComponent < Component #:nodoc + class StaticComponent < Component #:nodoc: attr_reader :value def initialize(value) @@ -79,7 +78,7 @@ def write_generation(g) end end - class DynamicComponent < Component #:nodoc + class DynamicComponent < Component #:nodoc: attr_reader :key, :default attr_accessor :condition @@ -174,7 +173,7 @@ def assign_default(g) end end - class ControllerComponent < DynamicComponent #:nodoc + class ControllerComponent < DynamicComponent #:nodoc: def key() :controller end def add_segments_to(g) @@ -225,7 +224,7 @@ def traverse_to_controller(segments, start_at = 0) end end - class PathComponent < DynamicComponent #:nodoc + class PathComponent < DynamicComponent #:nodoc: def optional?() true end def default() '' end def condition() nil end @@ -255,7 +254,7 @@ def to_s() join '/' end end end - class Route + class Route #:nodoc: attr_accessor :components, :known attr_reader :path, :options, :keys @@ -351,7 +350,7 @@ def configure_components(defaults, conditions) end end - class RouteSet + class RouteSet #:nodoc: attr_reader :routes, :categories, :controller_to_selector def initialize @routes = [] @@ -563,7 +562,7 @@ def extra_keys(options, recall = {}) end end - module NamedRoutes + module NamedRoutes #:nodoc: Helpers = [] class << self def clear() Helpers.clear end diff --git a/actionpack/lib/action_controller/upload_progress.rb b/actionpack/lib/action_controller/upload_progress.rb index 1e45f9daf2ee37862df0a5c8c81e3b0c56f4bfc8..6ffe42975828804f10ba27f7090e6be8623264f4 100644 --- a/actionpack/lib/action_controller/upload_progress.rb +++ b/actionpack/lib/action_controller/upload_progress.rb @@ -6,6 +6,13 @@ require 'action_controller/cgi_ext/multipart_progress' module ActionController #:nodoc: + # == THIS IS AN EXPERIMENTAL FEATURE + # + # Which means that it doesn't yet work on all systems. We're still working on full + # compatibility. It's thus not advised to use this unless you've verified it to work + # fully on all the systems that is a part of your environment. Consider this an extended + # preview. + # # == Action Pack Upload Progress for multipart uploads # # The UploadProgress module aids in the process of viewing an Ajax driven @@ -124,9 +131,7 @@ module ActionController #:nodoc: # def custom_status # render :inline => '<%= upload_progress_status %>