actionpack 1.12.3 → 1.12.4

data/CHANGELOG

@@ -1,3 +1,38 @@
+*1.12.4* (August 8th, 2006)
+
+* Documentation fix: integration test scripts don't require integration_test.  #4914 [Frederick Ros <sl33p3r@free.fr>]
+
+* ActionController::Base Summary documentation rewrite.  #4900 [kevin.clark@gmail.com]
+
+* Fix text_helper.rb documentation rendering.  #4725 [Frederick Ros]
+
+* Fixes bad rendering of JavaScriptMacrosHelper rdoc.  #4910 [Frederick Ros]
+
+* Enhance documentation for setting headers in integration tests. Skip auto HTTP prepending when its already there.  #4079 [Rick Olson]
+
+* Documentation for AbstractRequest.  #4895 [kevin.clark@gmail.com] 
+
+* Remove all remaining references to @params in the documentation. [Marcel Molina Jr.]
+
+* Add documentation for redirect_to :back's RedirectBackError exception.  [Marcel Molina Jr.]
+
+* Update layout and content_for documentation to use yield rather than magic @content_for instance variables. [Marcel Molina Jr.]
+
+* Cache CgiRequest#request_parameters so that multiple calls don't re-parse multipart data. [Rick]
+
+* Fixed that remote_form_for can leave out the object parameter and default to the instance variable of the object_name, just like form_for [DHH]
+
+* Added ActionController.filter_parameter_logging that makes it easy to remove passwords, credit card numbers, and other sensitive information from being logged when a request is handled.  #1897 [jeremye@bsa.ca.gov]
+
+* Fixed that real files and symlinks should be treated the same when compiling templates.  #5438 [zachary@panandscan.com]
+
+* Add :status option to send_data and send_file. Defaults to '200 OK'.  #5243 [Manfred Stienstra <m.stienstra@fngtps.com>]
+
+* Update documentation for erb trim syntax. #5651 [matt@mattmargolis.net]
+
+* Short documentation to mention use of Mime::Type.register. #5710 [choonkeat@gmail.com]
+
+
 *1.12.3* (June 28th, 2006)
 
 * Fix broken traverse_to_controller. We now:

data/README

@@ -469,3 +469,7 @@ And as Jim from Rake says:
 
 For other information, feel free to ask on the ruby-talk mailing list (which
 is mirrored to comp.lang.ruby) or contact mailto:david@loudthinking.com.
+
+
+
+...

data/Rakefile

@@ -46,8 +46,12 @@ Rake::RDocTask.new { |rdoc|
   rdoc.title    = "Action Pack -- On rails from request to response"
   rdoc.options << '--line-numbers' << '--inline-source'
   rdoc.template = "#{ENV['template']}.rb" if ENV['template']
-  rdoc.rdoc_files.include('README', 'RUNNING_UNIT_TESTS', 'CHANGELOG')
-  rdoc.rdoc_files.include('lib/**/*.rb')
+  if ENV['DOC_FILES'] 
+    rdoc.rdoc_files.include(ENV['DOC_FILES'].split(/,\s*/))
+  else
+    rdoc.rdoc_files.include('README', 'RUNNING_UNIT_TESTS', 'CHANGELOG')
+    rdoc.rdoc_files.include('lib/**/*.rb')
+  end
 }
 
 # Create compressed packages
@@ -73,7 +77,7 @@ spec = Gem::Specification.new do |s|
   s.require_path = 'lib'
   s.autorequire = 'action_controller'
 
-  s.files = [ "Rakefile", "install.rb", "README", "RUNNING_UNIT_TESTS", "CHANGELOG", "MIT-LICENSE", "examples/.htaccess" ]
+  s.files = [ "filler", "Rakefile", "install.rb", "README", "RUNNING_UNIT_TESTS", "CHANGELOG", "MIT-LICENSE", "examples/.htaccess" ]
   dist_dirs.each do |dir|
     s.files = s.files + Dir.glob( "#{dir}/**/*" ).delete_if { |item| item.include?( "\.svn" ) }
   end
@@ -144,4 +148,4 @@ task :release => [ :package ] do
     puts release_command
     system(release_command)
   end
-end
+end

data/filler

@@ -0,0 +1,53 @@
+this is just a filler file to try and work around the zlib error when unpacking the gem. Please ignore it, thanks.
+
+abcDEfgHijkLMNopqrStUVWxyz
+AbcdefgHIjklMnOpqrsTUvwxYZ
+AbCDEfghIjKLmnoPQrstuVwxyz
+abcDefGhijKlmnopQrstuvWXYz
+AbCdefGhiJKlmnoPqrstuVwxYz
+aBcdefGHijKlmnOpQrStUvwxYz
+AbcdEfGhIJklmnOPQrSTuvwxyZ
+AbcDeFGHijkLmnopqrstuVwxYZ
+ABcdefgHIjkLmnOpqrStuVwxyZ
+aBcdEFGhiJklmnopQrstuVwxyz
+abcDefgHijKlmnoPQrSTuvwxYz
+AbcdefGhiJklmnOpqrstuVwxYZ
+abcdefgHIjKlMNoPqRsTuvwxYz
+ABcDeFghIjklMnopQrstUVwxyZ
+AbcdefGhijkLmNopQRstuVWxYZ
+aBcdefGhijklMNOpqRsTUvwxyz
+abcdEFGhiJKlmnOPQrStUVwxyz
+abcDefghIJklmnOPqRStuVWxyz
+abcdefGhIjklmnoPQrStUVwXyZ
+abcDefghIjkLmnopQrstuVwxyz
+AbcdefGhIjklMNOPqrstuvWXyz
+AbCdEfGHijkLmnopqrstuvwxyz
+abCdEFghijKlmnopqRstuvwXYz
+abCdEfghIJklmnOPqrsTUvwxyz
+AbcdeFghijklmnoPqrStUvWxyZ
+aBcDEFghIJKlmnopqrstuvWXyz
+abcdEfghiJKlmNopqrstuvwXyz
+AbcdEFGHIJKlmnopqRsTuvwxYz
+abcdeFgHiJklmnoPQRsTuvwXYz
+abcdEfGhijkLmnOPqrstUvwXYZ
+abCDeFGhijklmNopQrstUvwxYz
+abCdeFGhIjklmnOpQrstUvwxyZ
+aBcDEFgHijKlmNOPQrsTUvwxYz
+aBcDefghijklmNoPqrstUvWXyz
+AbcDefgHiJklmnOPqRStuvwxYz
+aBcdefGHijklMnopqRstUvwxyz
+AbCdefghijKLmnopqRstuvWXyz
+aBCdefGhiJkLMnopQrsTUvwxyz
+ABcdefGHijKlmnOPqrSTUvWXyz
+aBCdEfGHIJklMnopqRsTUvWxyz
+ABcDEFGHIJklMnopqrSTuVwxyz
+abcdEfghijklMnopqrstuvwxyz
+AbCDEFghIjkLmNOpQRstUVwxyZ
+abCdEFghIJklMNOPqrstUvwXYZ
+abCdefghijklmnoPQrstuVwxyz
+AbcdEfghijkLMnopqRSTUvWxYz
+ABcDEfGhIjKLmNopqrStuVwxyZ
+abCdefgHijklmnOpQRStuvwxYz
+abCdeFghijKLmNopQrstuvwxyZ
+abcdEFGHijKlmnopqrstuvwxYZ
+

data/lib/action_controller/base.rb

@@ -49,13 +49,15 @@ module ActionController #:nodoc:
     end
   end
 
-  # Action Controllers are made up of one or more actions that performs its purpose and then either renders a template or
-  # redirects to another action. An action is defined as a public method on the controller, which will automatically be 
-  # made accessible to the web-server through a mod_rewrite mapping. A sample controller could look like this:
+  # Action Controllers are the core of a web request in Rails. They are made up of one or more actions that are executed 
+  # on request and then either render a template or redirect to another action. An action is defined as a public method
+  # on the controller, which will automatically be made accessible to the web-server through Rails Routes. 
+  #
+  # A sample controller could look like this:
   #
   #   class GuestBookController < ActionController::Base
   #     def index
-  #       @entries = Entry.find_all
+  #       @entries = Entry.find(:all)
   #     end
   #     
   #     def sign
@@ -64,26 +66,17 @@ module ActionController #:nodoc:
   #     end
   #   end
   #
-  #   GuestBookController.template_root = "templates/"
-  #   GuestBookController.process_cgi
-  #
-  # All actions assume that you want to render a template matching the name of the action at the end of the performance
-  # unless you tell it otherwise. The index action complies with this assumption, so after populating the @entries instance
-  # variable, the GuestBookController will render "templates/guestbook/index.rhtml".
+  # Actions, by default, render a template in the <tt>app/views</tt> directory corresponding to the name of the controller and action
+  # after executing code in the action. For example, the +index+ action of the +GuestBookController+  would render the 
+  # template <tt>app/views/guestbook/index.rhtml</tt> by default after populating the <tt>@entries</tt> instance variable.
   #
-  # Unlike index, the sign action isn't interested in rendering a template. So after performing its main purpose (creating a 
-  # new entry in the guest book), it sheds the rendering assumption and initiates a redirect instead. This redirect works by
-  # returning an external "302 Moved" HTTP response that takes the user to the index action.
+  # Unlike index, the sign action will not render a template. After performing its main purpose (creating a 
+  # new entry in the guest book), it initiates a redirect instead. This redirect works by returning an external 
+  # "302 Moved" HTTP response that takes the user to the index action.
   #
   # The index and sign represent the two basic action archetypes used in Action Controllers. Get-and-show and do-and-redirect.
   # Most actions are variations of these themes.
   #
-  # Also note that it's the final call to <tt>process_cgi</tt> that actually initiates the action performance. It will extract
-  # request and response objects from the CGI
-  #
-  # When Action Pack is used inside of Rails, the template_root is automatically configured and you don't need to call process_cgi
-  # yourself.
-  #
   # == Requests
   #
   # Requests are processed by the Action Controller framework by extracting the value of the "action" key in the request parameters.
@@ -94,16 +87,16 @@ module ActionController #:nodoc:
   # The full request object is available with the request accessor and is primarily used to query for http headers. These queries
   # are made by accessing the environment hash, like this:
   #
-  #   def hello_ip
-  #     location = request.env["REMOTE_IP"]
-  #     render :text => "Hello stranger from #{location}"
+  #   def server_ip
+  #     location = request.env["SERVER_ADDR"]
+  #     render :text => "This server hosted at #{location}"
   #   end
   #
   # == Parameters
   #
-  # All request parameters, whether they come from a GET or POST request, or from the URL, are available through the params hash.
-  # So an action that was performed through /weblog/list?category=All&limit=5 will include { "category" => "All", "limit" => 5 }
-  # in params.
+  # All request parameters, whether they come from a GET or POST request, or from the URL, are available through the params method
+  # which returns a hash. For example, an action that was performed through <tt>/weblog/list?category=All&limit=5</tt> will include 
+  # <tt>{ "category" => "All", "limit" => 5 }</tt> in params.
   #
   # It's also possible to construct multi-dimensional parameter hashes by specifying keys using brackets, such as:
   #
@@ -116,12 +109,12 @@ module ActionController #:nodoc:
   #
   # == Sessions
   #
-  # Sessions allows you to store objects in memory between requests. This is useful for objects that are not yet ready to be persisted,
+  # Sessions allows you to store objects in between requests. This is useful for objects that are not yet ready to be persisted,
   # such as a Signup object constructed in a multi-paged process, or objects that don't change much and are needed all the time, such
   # as a User object for a system that requires login. The session should not be used, however, as a cache for objects where it's likely 
   # they could be changed unknowingly. It's usually too much work to keep it all synchronized -- something databases already excel at.
   #
-  # You can place objects in the session by using the <tt>session</tt> hash accessor:
+  # You can place objects in the session by using the <tt>session</tt> method, which accesses a hash:
   #
   #   session[:person] = Person.authenticate(user_name, password)
   #
@@ -129,17 +122,24 @@ module ActionController #:nodoc:
   #
   #   Hello #{session[:person]}
   #
-  # Any object can be placed in the session (as long as it can be Marshalled). But remember that 1000 active sessions each storing a
-  # 50kb object could lead to a 50MB memory overhead. In other words, think carefully about size and caching before resorting to the use
-  # of the session.
-  #
   # For removing objects from the session, you can either assign a single key to nil, like <tt>session[:person] = nil</tt>, or you can
   # remove the entire session with reset_session.
   #
+  # By default, sessions are stored on the file system in <tt>RAILS_ROOT/tmp/sessions</tt>. Any object can be placed in the session 
+  # (as long as it can be Marshalled). But remember that 1000 active sessions each storing a 50kb object could lead to a 50MB store on the filesystem.
+  # In other words, think carefully about size and caching before resorting to the use of the session on the filesystem.
+  #
+  # An alternative to storing sessions on disk is to use ActiveRecordStore to store sessions in your database, which can solve problems
+  # caused by storing sessions in the file system and may speed up your application. To use ActiveRecordStore, uncomment the line:
+  #   
+  #   config.action_controller.session_store = :active_record_store
+  #
+  # in your <tt>environment.rb</tt> and run <tt>rake db:sessions:create</tt>.
+  #
   # == Responses
   #
   # Each action results in a response, which holds the headers and document to be sent to the user's browser. The actual response
-  # object is generated automatically through the use of renders and redirects, so it's normally nothing you'll need to be concerned about.
+  # object is generated automatically through the use of renders and redirects and requires no user intervention.
   #
   # == Renders
   #
@@ -161,9 +161,9 @@ module ActionController #:nodoc:
   #   def search
   #     @results = Search.find(params[:query])
   #     case @results
-  #       when 0 then render :action=> "no_results"
-  #       when 1 then render :action=> "show"
-  #       when 2..10 then render :action=> "show_many"
+  #       when 0 then render :action => "no_results"
+  #       when 1 then render :action => "show"
+  #       when 2..10 then render :action => "show_many"
   #     end
   #   end
   #
@@ -171,32 +171,21 @@ module ActionController #:nodoc:
   #
   # == Redirects
   #
-  # Redirecting is what actions that update the model do when they're done. The <tt>save_post</tt> method shouldn't be responsible for also
-  # showing the post once it's saved -- that's the job for <tt>show_post</tt>. So once <tt>save_post</tt> has completed its business, it'll
-  # redirect to <tt>show_post</tt>. All redirects are external, which means that when the user refreshes his browser, it's not going to save
-  # the post again, but rather just show it one more time.
-  # 
-  # This sounds fairly simple, but the redirection is complicated by the quest for a phenomenon known as "pretty urls". Instead of accepting
-  # the dreadful being that is "weblog_controller?action=show&post_id=5", Action Controller goes out of its way to represent the former as
-  # "/weblog/show/5". And this is even the simple case. As an example of a more advanced pretty url consider
-  # "/library/books/ISBN/0743536703/show", which can be mapped to books_controller?action=show&type=ISBN&id=0743536703.
-  # 
-  # Redirects work by rewriting the URL of the current action. So if the show action was called by "/library/books/ISBN/0743536703/show", 
-  # we can redirect to an edit action simply by doing <tt>redirect_to(:action => "edit")</tt>, which could throw the user to 
-  # "/library/books/ISBN/0743536703/edit". Naturally, you'll need to setup the routes configuration file to point to the proper controller
-  # and action in the first place, but once you have, it can be rewritten with ease.
-  # 
-  # Let's consider a bunch of examples on how to go from "/clients/37signals/basecamp/project/dash" to somewhere else:
-  #
-  #   redirect_to(:action => "edit") =>
-  #     /clients/37signals/basecamp/project/dash
-  #   
-  #   redirect_to(:client_name => "nextangle", :project_name => "rails") =>
-  #     /clients/nextangle/rails/project/dash
+  # Redirects are used to move from one action to another. For example, after a <tt>create</tt> action, which stores a blog entry to a database,
+  # we might like to show the user the new entry. Because we're following good DRY principles (Don't Repeat Yourself), we're going to reuse (and redirect to)
+  # a <tt>show</tt> action that we'll assume has already been created. The code might look like this:
   #
-  # Those redirects happen under the configuration of:
+  #   def create
+  #     @entry = Entry.new(params[:entry])
+  #     if @entry.save
+  #       # The entry was saved correctly, redirect to show
+  #       redirect_to :action => 'show', :id => @entry.id
+  #     else
+  #       # things didn't go so well, do something else
+  #     end
+  #   end
   #
-  #   map.connect 'clients/:client_name/:project_name/:controller/:action'
+  # In this case, after saving our new entry to the database, the user is redirected to the <tt>show</tt> method which is then executed.
   #
   # == Calling multiple redirects or renders
   #
@@ -214,15 +203,6 @@ module ActionController #:nodoc:
   #     render :action => "overthere" # won't be called unless monkeys is nil
   #   end
   #
-  # == Environments
-  #
-  # Action Controller works out of the box with CGI, FastCGI, and mod_ruby. CGI and mod_ruby controllers are triggered just the same using:
-  #
-  #   WeblogController.process_cgi
-  #
-  # FastCGI controllers are triggered using:
-  #
-  #   FCGI.each_cgi{ |cgi| WeblogController.process_cgi(cgi) }
   class Base
     DEFAULT_RENDER_STATUS_CODE = "200 OK"
     
@@ -263,10 +243,10 @@ module ActionController #:nodoc:
 
     # 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 
-    # @params hash. These handlers are invoked for post and put requests.
+    # <tt>params</tt> hash. These handlers are invoked for post and put requests.
     #
     # By default application/xml is enabled. A XmlSimple class with the same param name as the root will be instanciated 
-    # in the @params. This allows XML requests to mask themselves as regular form submissions, so you can have one
+    # in the <tt>params</tt>. This allows XML requests to mask themselves as regular form submissions, so you can have one
     # action serve both regular forms and web service requests.
     # 
     # Example of doing your own parser for a custom content type:
@@ -366,6 +346,53 @@ module ActionController #:nodoc:
       def hide_action(*names)
         write_inheritable_attribute(:hidden_actions, hidden_actions | names.collect { |n| n.to_s })
       end
+      
+      # Replace sensitive paramater data from the request log.
+      # Filters paramaters that have any of the arguments as a substring.
+      # Looks in all subhashes of the param hash for keys to filter.
+      # If a block is given, each key and value of the paramater hash and all
+      # subhashes is passed to it, the value or key
+      # can be replaced using String#replace or similar method.
+      #
+      # Examples:
+      #   filter_parameter_logging
+      #   => Does nothing, just slows the logging process down
+      #
+      #   filter_parameter_logging :password
+      #   => replaces the value to all keys matching /password/i with "[FILTERED]"
+      #
+      #   filter_parameter_logging :foo, "bar"
+      #   => replaces the value to all keys matching /foo|bar/i with "[FILTERED]"
+      #
+      #   filter_parameter_logging { |k,v| v.reverse! if k =~ /secret/i }
+      #   => reverses the value to all keys matching /secret/i
+      #
+      #   filter_parameter_logging(:foo, "bar") { |k,v| v.reverse! if k =~ /secret/i }
+      #   => reverses the value to all keys matching /secret/i, and 
+      #      replaces the value to all keys matching /foo|bar/i with "[FILTERED]"
+      def filter_parameter_logging(*filter_words, &block)
+        parameter_filter = Regexp.new(filter_words.collect{ |s| s.to_s }.join('|'), true) if filter_words.length > 0
+
+        define_method(:filter_parameters) do |unfiltered_parameters|
+          filtered_parameters = {}
+
+          unfiltered_parameters.each do |key, value|
+            if key =~ parameter_filter
+              filtered_parameters[key] = '[FILTERED]'
+            elsif value.is_a?(Hash)
+              filtered_parameters[key] = filter_parameters(value) 
+            elsif block_given?
+              key, value = key.dup, value.dup
+              yield key, value
+              filtered_parameters[key] = value
+            else 
+              filtered_parameters[key] = value
+            end
+          end
+
+          filtered_parameters
+        end
+      end
     end
 
     public      
@@ -803,6 +830,10 @@ module ActionController #:nodoc:
       #   redirect_to :back
       #
       # The redirection happens as a "302 Moved" header.
+      #
+      # 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.
       def redirect_to(options = {}, *parameters_for_method_reference) #:doc:
         case options
           when %r{^\w+://.*}
@@ -901,7 +932,7 @@ module ActionController #:nodoc:
         if logger
           logger.info "\n\nProcessing #{controller_class_name}\##{action_name} (for #{request_origin}) [#{request.method.to_s.upcase}]"
           logger.info "  Session ID: #{@session.session_id}" if @session and @session.respond_to?(:session_id)
-          logger.info "  Parameters: #{@params.inspect}"
+          logger.info "  Parameters: #{respond_to?(:filter_parameters) ? filter_parameters(@params).inspect : @params.inspect}"
         end
       end
     

data/lib/action_controller/caching.rb

@@ -38,9 +38,9 @@ module ActionController #:nodoc:
     #
     #   class WeblogController < ActionController::Base
     #     def update
-    #       List.update(@params["list"]["id"], @params["list"])
-    #       expire_page :action => "show", :id => @params["list"]["id"]
-    #       redirect_to :action => "show", :id => @params["list"]["id"]
+    #       List.update(params[:list][:id], params[:list])
+    #       expire_page :action => "show", :id => params[:list][:id]
+    #       redirect_to :action => "show", :id => params[:list][:id]
     #     end
     #   end
     #

data/lib/action_controller/cgi_process.rb

@@ -64,11 +64,12 @@ module ActionController #:nodoc:
     end
 
     def request_parameters
-      if ActionController::Base.param_parsers.has_key?(content_type)
-        CGIMethods.parse_formatted_request_parameters(content_type, @env['RAW_POST_DATA'])
-      else
-        CGIMethods.parse_request_parameters(@cgi.params)
-      end
+      @request_parameters ||=
+        if ActionController::Base.param_parsers.has_key?(content_type)
+          CGIMethods.parse_formatted_request_parameters(content_type, @env['RAW_POST_DATA'])
+        else
+          CGIMethods.parse_request_parameters(@cgi.params)
+        end
     end
    
     def cookies

data/lib/action_controller/integration.rb

@@ -140,14 +140,18 @@ module ActionController
 
       # Performs a GET request with the given parameters. The parameters may
       # be +nil+, a Hash, or a string that is appropriately encoded
-      # (application/x-www-form-urlencoded or multipart/form-data).
+      # (application/x-www-form-urlencoded or multipart/form-data).  The headers
+      # should be a hash.  The keys will automatically be upcased, with the 
+      # prefix 'HTTP_' added if needed.
       def get(path, parameters=nil, headers=nil)
         process :get, path, parameters, headers
       end
 
       # Performs a POST request with the given parameters. The parameters may
       # be +nil+, a Hash, or a string that is appropriately encoded
-      # (application/x-www-form-urlencoded or multipart/form-data).
+      # (application/x-www-form-urlencoded or multipart/form-data).  The headers
+      # should be a hash.  The keys will automatically be upcased, with the 
+      # prefix 'HTTP_' added if needed.
       def post(path, parameters=nil, headers=nil)
         process :post, path, parameters, headers
       end
@@ -155,7 +159,9 @@ module ActionController
       # Performs an XMLHttpRequest request with the given parameters, mimicing
       # the request environment created by the Prototype library. The parameters
       # may be +nil+, a Hash, or a string that is appropriately encoded
-      # (application/x-www-form-urlencoded or multipart/form-data).
+      # (application/x-www-form-urlencoded or multipart/form-data).  The headers
+      # should be a hash.  The keys will automatically be upcased, with the 
+      # prefix 'HTTP_' added if needed.
       def xml_http_request(path, parameters=nil, headers=nil)
         headers = (headers || {}).merge("X-Requested-With" => "XMLHttpRequest")
         post(path, parameters, headers)
@@ -218,7 +224,7 @@ module ActionController
 
           (headers || {}).each do |key, value|
             key = key.to_s.upcase.gsub(/-/, "_")
-            key = "HTTP_#{key}" unless env.has_key?(key)
+            key = "HTTP_#{key}" unless env.has_key?(key) || env =~ /^X|HTTP/
             env[key] = value
           end
 
@@ -341,7 +347,6 @@ module ActionController
   # using the get/post methods:
   #
   #   require "#{File.dirname(__FILE__)}/test_helper"
-  #   require "integration_test"
   #
   #   class ExampleTest < ActionController::IntegrationTest
   #     fixtures :people
@@ -366,7 +371,6 @@ module ActionController
   # reference any named routes you happen to have defined!
   #
   #   require "#{File.dirname(__FILE__)}/test_helper"
-  #   require "integration_test"
   #
   #   class AdvancedTest < ActionController::IntegrationTest
   #     fixtures :people, :rooms