actionpack 1.4.0 → 1.5.0

data/CHANGELOG

@@ -1,3 +1,69 @@
+*1.5.0* (24th February, 2005)
+
+* Added Routing as a replacement for mod_rewrite pretty urls [Nicholas Seckar]. Read more in ActionController::Base.url_for and on http://manuals.rubyonrails.com/read/book/9
+
+* Added components that allows you to call other actions for their rendered response while execution another action. You can either delegate the entire response rendering or you can mix a partial response in with your other content. Read more on http://manuals.rubyonrails.com/read/book/14
+
+* Fixed that proxy IPs do not follow all RFC1918 nets #251 [caleb@aei-tech.com]
+
+* Added Base#render_to_string to parse a template and get the result back as a string #479
+
+* Fixed that send_file/data can work even if render* has been called before in action processing to render the content of a file to be send for example #601
+
+* Added FormOptionsHelper#time_zone_select and FormOptionsHelper#time_zone_options_for_select to work with the new value object TimeZone in Active Support #688 [Jamis Buck]
+
+* Added FormHelper#file_field and FormTagHelper#file_field_tag for creating file upload fields
+
+* Added :order option for date_select that allows control over the order in which the date dropdowns is used and which of them should be used #619 [Tim Bates]. Examples:
+
+    date_select("post", "written_on", :order => [:day, :month, :year])
+    date_select("user", "birthday",   :order => [:month, :day])
+
+* Added ActionView::Base.register_template_handler for easy integration of an alternative template language to ERb and Builder. See test/controller/custom_handler_test.rb for a usage example #656 [Jamis Buck]
+
+* Added AssetTagHelper that provides methods for linking a HTML page together with other assets, such as javascripts, stylesheets, and feeds.
+
+* Added FormTagHelper that provides a number of methods for creating form tags that doesn't rely on conventions with an object assigned to the template like FormHelper does. With the FormTagHelper, you provide the names and values yourself.
+
+* Added Afghanistan, Iran, and Irak to the countries list used by FormOptions#country_select and FormOptions#country_options_for_select
+
+* Renamed link_to_image to link_image_to (since thats what it actually does) -- kept alias for the old method name
+
+* Fixed textilize for RedCloth3 to keep doing hardbreaks
+
+* Fixed that assert_template_xpath_matches did not indicate when a path was not found #658 [Eric Hodel]
+
+* Added TextHelper#auto_link to turn email addresses and urls into ahrefs
+
+* Fixed that on validation errors, scaffold couldn't find template #654 [mindel]
+
+* Added Base#hide_action(*names) to hide public methods from a controller that would otherwise have been callable through the URL. For the majority of cases, its preferred just to make the methods you don't want to expose protected or private (so they'll automatically be hidden) -- but if you must have a public method, this is a way to make it uncallable. Base#hidden_actions retrieve the list of all hidden actions for the controller #644 [Nicholas Seckar]
+
+* Fixed that a bunch of methods from ActionController::Base was accessible as actions (callable through a URL) when they shouldn't have been #644 [Nicholas Seckar]
+
+* Added UrlHelper#current_page?(options) method to check if the url_for options passed corresponds to the current page
+
+* Fixed https handling on other ports than 443 [Alan Gano]
+
+* Added follow_redirect method for functional tests that'll get-request the redirect that was made. Example:
+
+    def test_create_post
+      post :create, "post" => { "title" => "Exciting!" }
+      assert_redirected_to :action => "show"
+      
+      follow_redirect
+      assert_rendered_file "post/show"
+    end
+  
+  Limitation: Only works for redirects to other actions within the same controller.
+
+* Fixed double requiring of models with the same name as the controller
+
+* Fixed that query params could be forced to nil on a POST due to the raw post fix #562 [moriq@moriq.com]
+
+* Fixed that cookies shouldn't be frozen in TestRequest #571 [Eric Hodel]
+
+
 *1.4.0* (January 25th, 2005)
 
 * Fixed problems with ActiveRecordStore under the development environment in Rails

data/README

@@ -50,7 +50,7 @@ A short rundown of the major features:
         def find_customer() Customer.find(@params["id"]) end
     end
 
-  Learn more in link:classes/ActionController/Base.html
+  {Learn more}[link:classes/ActionController/Base.html]
 
 
 * Embedded Ruby for templates (no new "easy" template language)
@@ -65,30 +65,32 @@ A short rundown of the major features:
       Not for clients to see...
     <% end %>
   
-  Learn more in link:classes/ActionView.html
+  {Learn more}[link:classes/ActionView.html]
 
 
 * Builder-based templates (great for XML content, like RSS)
 
-  xml.rss("version" => "2.0") do
-    xml.channel do
-      xml.title(@feed_title)
-      xml.link(@url)
-      xml.description "Basecamp: Recent items"
-      xml.language "en-us"
-      xml.ttl "40"
-
-      for item in @recent_items
-        xml.item do
-          xml.title(item_title(item))
-          xml.description(item_description(item))
-          xml.pubDate(item_pubDate(item))
-          xml.guid(@recent_items.url(item))
-          xml.link(@recent_items.url(item))
+    xml.rss("version" => "2.0") do
+      xml.channel do
+        xml.title(@feed_title)
+        xml.link(@url)
+        xml.description "Basecamp: Recent items"
+        xml.language "en-us"
+        xml.ttl "40"
+
+        for item in @recent_items
+          xml.item do
+            xml.title(item_title(item))
+            xml.description(item_description(item))
+            xml.pubDate(item_pubDate(item))
+            xml.guid(@recent_items.url(item))
+            xml.link(@recent_items.url(item))
+          end
         end
       end
     end
-  end
+
+  {Learn more}[link:classes/ActionView/Base.html]
 
 
 * Filters for pre and post processing of the response (as methods, procs, and classes)
@@ -113,7 +115,7 @@ A short rundown of the major features:
         end
     end
   
-  Learn more in link:classes/ActionController/Filters/ClassMethods.html
+  {Learn more}[link:classes/ActionController/Filters/ClassMethods.html]
   
 
 * Helpers for forms, dates, action links, and text
@@ -123,7 +125,7 @@ A short rundown of the major features:
     <%= link_to "New post", :controller => "post", :action => "new" %>
     <%= truncate(post.title, 25) %>
  
-  Learn more in link:classes/ActionView/Helpers.html
+  {Learn more}[link:classes/ActionView/Helpers.html]
 
 
 * Layout sharing for template reuse (think simple version of Struts 
@@ -145,28 +147,25 @@ A short rundown of the major features:
     Result of running hello_world action:
       <html><body><h1>Hello world</h1></body></html>
 
-  Learn more in link:classes/ActionController/Layout/ClassMethods.html
+  {Learn more}[link:classes/ActionController/Layout/ClassMethods.html]
 
 
-* Advanced redirection that makes pretty urls easy
+* Routing makes pretty urls incredibly easy
 
-    RewriteRule ^/library/books/([A-Z]+)([0-9]+)/([-_a-zA-Z0-9]+)$ \
-      /books_controller.cgi?action=$3&type=$1&code=$2 [QSA] [L]
+    map.connect 'clients/:client_name/:project_name/:controller/:action'
 
-    Accessing /library/books/ISBN/0743536703/show calls BooksController#show
+    Accessing /clients/37signals/basecamp/project/dash calls ProjectController#dash with
+    { "client_name" => "37signals", "project_name" => "basecamp" } in @params["params"]
     
     From that URL, you can rewrite the redirect in a number of ways:
     
     redirect_to(:action => "edit") =>
-      /library/books/ISBN/0743536703/edit
-
-    redirect_to(:path_params => { "type" => "XTC", "code" => "12354345" }) =>
-      /library/books/XTC/12354345/show
+      /clients/37signals/basecamp/project/dash
 
-    redirect_to(:controller_prefix => "admin", :controller => "accounts") =>
-      /admin/accounts/
+    redirect_to(:client_name => "nextangle", :project_name => "rails") =>
+      /clients/nextangle/rails/project/dash
 
-  Learn more in link:classes/ActionController/Base.html
+  {Learn more}[link:classes/ActionController/Base.html]
 
 
 * Easy testing of both controller and template result through TestRequest/Response
@@ -185,7 +184,7 @@ A short rundown of the major features:
       end
     end
 
-  Learn more in link:classes/ActionController/TestRequest.html
+  {Learn more}[link:classes/ActionController/TestRequest.html]
 
 
 * Automated benchmarking and integrated logging
@@ -211,6 +210,58 @@ A short rundown of the major features:
     ActionController::Base.logger = Log4r::Logger.new("Application Log")
 
 
+* Caching at three levels of granularity (page, action, fragment)
+
+    class WeblogController < ActionController::Base
+      caches_page :show
+      caches_action :account
+      
+      def show
+        # the output of the method will be cached as 
+        # ActionController::Base.page_cache_directory + "/weblog/show/n.html"
+        # and the web server will pick it up without even hitting Rails
+      end
+      
+      def account
+        # the output of the method will be cached in the fragment store
+        # but Rails is hit to retrieve it, so filters are run
+      end
+      
+      def update
+        List.update(@params["list"]["id"], @params["list"])
+        expire_page   :action => "show", :id => @params["list"]["id"]
+        expire_action :action => "account"
+        redirect_to   :action => "show", :id => @params["list"]["id"]
+      end
+    end
+
+  {Learn more}[link:classes/ActionController/Caching.html]
+
+
+* Component requests from one controller to another
+
+    class WeblogController < ActionController::Base
+      # Performs a method and then lets hello_world output its render
+      def delegate_action
+        do_other_stuff_before_hello_world
+        render_component :controller => "greeter",  :action => "hello_world"
+      end
+    end
+  
+    class GreeterController < ActionController::Base
+      def hello_world
+        render_text "Hello World!"
+      end
+    end
+  
+    The same can be done in a view to do a partial rendering:
+  
+      Let's see a greeting:
+      <%= render_component :controller => "greeter", :action => "hello_world" %>
+
+  {Learn more}[link:classes/ActionController/Components.html]
+  
+
 * Powerful debugging mechanism for local requests
 
     All exceptions raised on actions performed on the request of a local user
@@ -218,7 +269,7 @@ A short rundown of the major features:
     message, stack trace, request parameters, session contents, and the
     half-finished response.
 
-  Learn more in link:classes/ActionController/Rescue.html
+  {Learn more}[link:classes/ActionController/Rescue.html]
 
 
 * Scaffolding for Action Record model objects
@@ -231,7 +282,7 @@ A short rundown of the major features:
     The AccountController now has the full CRUD range of actions and default
     templates: list, show, destroy, new, create, edit, update
     
-  Learn more in link:classes/ActionController/Scaffolding/ClassMethods.html
+  {Learn more}link:classes/ActionController/Scaffolding/ClassMethods.html
 
 
 * Form building for Active Record model objects
@@ -272,42 +323,21 @@ A short rundown of the major features:
       end
     end
 
-  Learn more in link:classes/ActionView/Helpers/ActiveRecordHelper.html
-
+  {Learn more}[link:classes/ActionView/Helpers/ActiveRecordHelper.html]
 
-* Automated mapping of URLs to controller/action pairs through Apache's
-  mod_rewrite
 
-    Requesting /blog/display/5 will call BlogController#display and 
-    make 5 available as an instance variable through @params["id"]
-
-
-* Runs on top of CGI, FCGI, and mod_ruby
-
-    See the address_book_controller example for all three forms
+* Runs on top of WEBrick, CGI, FCGI, and mod_ruby
 
 
 == Simple example
 
 This example will implement a simple weblog system using inline templates and
-an Active Record model. The first thing we need to do is setup an .htaccess to
-interpret pretty URLs into something the controller can use. Let's use the
-simplest form for starters:
-
-  RewriteRule ^weblog/([-_a-zA-Z0-9]+)/([0-9]+)$ \
-    /weblog_controller.cgi?action=$2&id=$3 [QSA]
-  RewriteRule ^weblog/([-_a-zA-Z0-9]+)$ \
-    /weblog_controller.cgi?action=$2 [QSA]
-  RewriteRule ^weblog/$ \
-    /weblog_controller.cgi?action=index [QSA]
-
-Now we'll be able to access URLs like weblog/display/5 and have
-WeblogController#display called with { "id" => 5 } in the @params array
-available for the action. So let's build that WeblogController with just a few
+an Active Record model. So let's build that WeblogController with just a few
 methods:
 
   require 'action_controller'
   require 'post'
+
   class WeblogController < ActionController::Base
     layout "weblog/layout"
   
@@ -362,7 +392,7 @@ which is called by accessing /weblog/. It uses the form builder for the Active
 Record model to make the new screen, which in turns hand everything over to
 the create action (that's the default target for the form builder when given a
 new model). After creating the post, it'll redirect to the display page using
-an URL such as /weblog/display/5 (where 5 is the id of the post.
+an URL such as /weblog/display/5 (where 5 is the id of the post).
 
 
 == Examples
@@ -386,7 +416,7 @@ The latest version of Action Pack can be found at
 
 Documentation can be found at 
 
-* http://actionpack.rubyonrails.org
+* http://ap.rubyonrails.com
 
 
 == Installation
@@ -400,12 +430,12 @@ from its distribution directory.
 
 == License
 
-Action Pack is released under the same license as Ruby.
+Action Pack is released under the MIT license.
 
 
 == Support
 
-The Action Pack homepage is http://actionpack.rubyonrails.org. You can find
+The Action Pack homepage is http://www.rubyonrails.com. You can find
 the Action Pack RubyForge page at http://rubyforge.org/projects/actionpack.
 And as Jim from Rake says:
 

data/install.rb

@@ -19,8 +19,7 @@ unless $sitedir
 end
 
 makedirs = %w{ action_controller/assertions action_controller/cgi_ext
-               action_controller/session action_controller/support action_controller/support/core_ext 
-               action_controller/support/core_ext/hash action_controller/support/core_ext/numeric action_controller/support/core_ext/string
+               action_controller/session action_controller/support
                action_controller/templates action_controller/templates/rescues
                action_controller/templates/scaffolds
                action_view/helpers action_view/vendor action_view/vendor/builder
@@ -60,24 +59,6 @@ files = %w-
  action_controller/session/drb_store.rb
  action_controller/session/mem_cache_store.rb
  action_controller/session.rb
- action_controller/support/class_inheritable_attributes.rb
- action_controller/support/class_attribute_accessors.rb
- action_controller/support/clean_logger.rb
- action_controller/support/core_ext/hash/keys.rb
- action_controller/support/core_ext/hash.rb
- action_controller/support/core_ext/object_and_class.rb
- action_controller/support/core_ext/numeric/bytes.rb
- action_controller/support/core_ext/numeric/time.rb
- action_controller/support/core_ext/numeric.rb
- action_controller/support/core_ext/string/inflections.rb
- action_controller/support/core_ext/string.rb
- active_record/support/core_ext.rb
- action_controller/support/inflector.rb
- action_controller/support/binding_of_caller.rb
- action_controller/support/breakpoint.rb
- action_controller/support/dependencies.rb
- action_controller/support/misc.rb
- action_controller/support/module_attribute_accessors.rb
  action_controller/templates/rescues/_request_and_response.rhtml
  action_controller/templates/rescues/diagnostics.rhtml
  action_controller/templates/rescues/layout.rhtml

data/lib/action_controller.rb

@@ -23,10 +23,16 @@
 
 $:.unshift(File.dirname(__FILE__))
 
-require 'action_controller/support/core_ext'
-require 'action_controller/support/clean_logger'
-require 'action_controller/support/misc'
-require 'action_controller/support/dependencies'
+begin
+  require 'active_support'
+rescue LoadError
+  begin
+    require File.dirname(__FILE__) + '/../../activesupport/lib/active_support'
+  rescue LoadError
+    require 'rubygems'
+    require_gem 'activesupport'
+  end
+end
 
 require 'action_controller/base'
 require 'action_controller/rescue'
@@ -41,6 +47,10 @@ require 'action_controller/helpers'
 require 'action_controller/cookies'
 require 'action_controller/cgi_process'
 require 'action_controller/caching'
+require 'action_controller/components'
+
+require 'action_view'
+ActionController::Base.template_class = ActionView::Base
 
 ActionController::Base.class_eval do
   include ActionController::Filters
@@ -54,7 +64,5 @@ ActionController::Base.class_eval do
   include ActionController::Cookies
   include ActionController::Session
   include ActionController::Caching
+  include ActionController::Components
 end
-
-require 'action_view'
-ActionController::Base.template_class = ActionView::Base

data/lib/action_controller/assertions/action_pack_assertions.rb

@@ -99,7 +99,7 @@ module Test #:nodoc:
         assert_block(msg) { !response.has_flash? }
       end
       
-      # ensure the flash is empty but existant
+      # ensure the flash is empty but existent
       def assert_flash_empty(message=nil)
         response = acquire_assertion_target
         msg = build_message(message, "the flash is not empty <?>", response.flash)
@@ -141,7 +141,7 @@ module Test #:nodoc:
           end
         end
       end
-
+      
       # ensure our redirection url is an exact match
       def assert_redirect_url(url=nil, message=nil)
         assert_redirect(message)
@@ -158,6 +158,53 @@ module Test #:nodoc:
         assert_block(msg) { response.redirect_url_match?(pattern) }
       end
 
+      # -- routing assertions --------------------------------------------------
+
+      # Asserts that the routing of the given path is handled correctly and that the parsed options match.
+      def assert_recognizes(expected_options, path, extras={}, message=nil)
+        # Load routes.rb if it hasn't been loaded.
+        ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty? 
+        
+        # Assume given controller
+        request = ActionController::TestRequest.new({}, {}, nil)
+        request.path = path
+        ActionController::Routing::Routes.recognize!(request)
+        
+        expected_options = expected_options.clone
+        extras.each_key { |key| expected_options.delete key } unless extras.nil?
+        
+        msg = build_message(message, "The recognized options <?> did not match <?>", 
+            request.path_parameters, expected_options)
+        assert_block(msg) { request.path_parameters == expected_options }
+      end
+
+      # Asserts that the provided options can be used to generate the provided path.
+      def assert_generates(expected_path, options, defaults={}, extras = {}, message=nil)
+        # Load routes.rb if it hasn't been loaded.
+        ActionController::Routing::Routes.reload if ActionController::Routing::Routes.empty? 
+        
+        # Assume given controller
+        request = ActionController::TestRequest.new({}, {}, nil)
+        request.path_parameters = (defaults or {}).clone
+        request.path_parameters[:controller] ||= options[:controller]
+        
+        generated_path, found_extras = ActionController::Routing::Routes.generate(options, request)
+        generated_path = generated_path.join('/')
+        msg = build_message(message, "found extras <?>, not <?>", found_extras, extras)
+        assert_block(msg) { found_extras == extras }
+        
+        msg = build_message(message, "The generated path <?> did not match <?>", generated_path, 
+            expected_path)
+        assert_block(msg) { expected_path == generated_path }
+      end
+
+      # asserts that path and options match both ways, in other words, the URL generated from 
+      # options is same as path, and also that the options recognized from path are same as options
+      def assert_routing(path, options, defaults={}, extras={}, message=nil)
+        assert_recognizes(options, path, extras, message)
+        assert_generates(path, options, defaults, extras, message)
+      end
+      
       # -- template assertions ------------------------------------------------
 
       # ensure that a template object with the given name exists
@@ -187,7 +234,13 @@ module Test #:nodoc:
         response = acquire_assertion_target
         xml, matches = REXML::Document.new(response.body), []
         xml.elements.each(expression) { |e| matches << e.text }
-        matches = matches.first if matches.length < 2
+        if matches.empty? then
+          msg = build_message(message, "<?> not found in document", expression)
+          flunk(msg)
+          return
+        elsif matches.length < 2 then
+          matches = matches.first
+        end
 
         msg = build_message(message, "<?> found <?>, not <?>", expression, matches, expected)
         assert_block(msg) { matches == expected }