From c450a36f1676dd31f86957a1065e1b7e103aca09 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 5 Mar 2006 21:37:12 +0000 Subject: Doc fixes git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3782 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- actionpack/lib/action_controller/base.rb | 6 ++---- actionpack/lib/action_controller/vendor/xml_node.rb | 1 - activerecord/lib/active_record/base.rb | 5 ++++- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/actionpack/lib/action_controller/base.rb b/actionpack/lib/action_controller/base.rb index e4877f82fd..8053cc3faf 100755 --- a/actionpack/lib/action_controller/base.rb +++ b/actionpack/lib/action_controller/base.rb @@ -261,7 +261,7 @@ module ActionController #:nodoc: cattr_accessor :allow_concurrency # Modern REST web services often need to submit complex data to the web application. - # the param_parsers hash lets you register handlers wich will process the http body and add parameters to the + # The param_parsers hash lets you register handlers wich will process the http body and add parameters to the # @params hash. These handlers are invoked for post and put requests. # # By default application/xml is enabled. a XmlNode class with the same param name as the root @@ -281,9 +281,7 @@ module ActionController #:nodoc: # ActionController::Base.param_parsers['application/xml'] = :xml_simple # ActionController::Base.param_parsers['application/x-yaml'] = :yaml # - @@param_parsers = { - 'application/xml' => :xml_node - } + @@param_parsers = { 'application/xml' => :xml_node } cattr_accessor :param_parsers # Template root determines the base from which template references will be made. So a call to render("test/template") diff --git a/actionpack/lib/action_controller/vendor/xml_node.rb b/actionpack/lib/action_controller/vendor/xml_node.rb index c4e2f98fbf..b495ebc207 100644 --- a/actionpack/lib/action_controller/vendor/xml_node.rb +++ b/actionpack/lib/action_controller/vendor/xml_node.rb @@ -1,7 +1,6 @@ require 'rexml/document' # SimpleXML like xml parser. Written by leon breet from the ruby on rails Mailing list -# class XmlNode attr :node diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 6778811f60..1203068aa8 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -528,6 +528,7 @@ module ActiveRecord #:nodoc: update_all "#{counter_name} = #{counter_name} - 1", "#{primary_key} = #{quote(id)}" end + # Attributes named in this macro are protected from mass-assignment, such as new(attributes) and # attributes=(attributes). Their assignment will simply be ignored. Instead, you can use the direct writer # methods to do assignment. This is meant to protect sensitive attributes from being overwritten by URL/form hackers. Example: @@ -565,6 +566,7 @@ module ActiveRecord #:nodoc: read_inheritable_attribute("attr_accessible") end + # Specifies that the attribute by the name of +attr_name+ should be serialized before saving to the database and unserialized # after loading from the database. The serialization is done through YAML. If +class_name+ is specified, the serialized # object must be of that class on retrieval or +SerializationTypeMismatch+ will be raised. @@ -577,6 +579,7 @@ module ActiveRecord #:nodoc: read_inheritable_attribute("attr_serialized") or write_inheritable_attribute("attr_serialized", {}) end + # Guesses the table name (in forced lower-case) based on the name of the class in the inheritance hierarchy descending # directly from ActiveRecord. So if the hierarchy looks like: Reply < Message < ActiveRecord, then Message is used # to guess the table name from even when called on Reply. The rules used to do the guess are handled by the Inflector class @@ -597,7 +600,7 @@ module ActiveRecord #:nodoc: def reset_table_name name = "#{table_name_prefix}#{undecorated_table_name(class_name_of_active_record_descendant(self))}#{table_name_suffix}" - set_table_name name + set_table_name(name) name end -- cgit v1.2.3