actionpack 0.9.5 → 1.0.0

data/lib/action_controller/support/class_inheritable_attributes.rb

@@ -28,6 +28,10 @@ module ClassInheritableAttributes # :nodoc:
       inheritable_attributes[key]
     end
     
+    def reset_inheritable_attributes
+      inheritable_attributes.clear
+    end
+
     private 
       def inherited(child)
         @@classes[child] = inheritable_attributes.dup

data/lib/action_controller/support/inflector.rb

@@ -48,6 +48,7 @@ module Inflector
     def plural_rules #:doc:
       [
         [/(x|ch|ss)$/, '\1es'],               # search, switch, fix, box, process, address
+        [/([^aeiouy]|qu)ies$/, '\1y'],
         [/([^aeiouy]|qu)y$/, '\1ies'],        # query, ability, agency
         [/(?:([^f])fe|([lr])f)$/, '\1\2ves'], # half, safe, wife
         [/sis$/, 'ses'],                      # basis, diagnosis
@@ -62,17 +63,18 @@ module Inflector
 
     def singular_rules #:doc:
       [
-          [/(x|ch|ss)es$/, '\1'],
-          [/([^aeiouy]|qu)ies$/, '\1y'],
-          [/([lr])ves$/, '\1f'],
-          [/([^f])ves$/, '\1fe'],
-          [/(analy|ba|diagno|parenthe|progno|synop|the)ses$/, '\1sis'],
-          [/([ti])a$/, '\1um'],
-          [/people$/, 'person'],
-          [/men$/, 'man'],
-          [/status$/, 'status'],
-          [/children$/, 'child'],
-          [/s$/, '']
-        ]
+        [/(x|ch|ss)es$/, '\1'],
+        [/movies$/, 'movie'],
+        [/([^aeiouy]|qu)ies$/, '\1y'],
+        [/([lr])ves$/, '\1f'],
+        [/([^f])ves$/, '\1fe'],
+        [/(analy|ba|diagno|parenthe|progno|synop|the)ses$/, '\1sis'],
+        [/([ti])a$/, '\1um'],
+        [/people$/, 'person'],
+        [/men$/, 'man'],
+        [/status$/, 'status'],
+        [/children$/, 'child'],
+        [/s$/, '']
+      ]
     end
 end

data/lib/action_controller/support/misc.rb

@@ -0,0 +1,6 @@
+def silence_warnings
+  old_verbose, $VERBOSE = $VERBOSE, nil
+  result = yield
+  $VERBOSE = old_verbose
+  return result
+end

data/lib/action_controller/templates/rescues/_request_and_response.rhtml

@@ -1,6 +1,6 @@
+<% if defined?(Breakpoint) then %><a href="?BP-RETRY=1">Retry with Breakpoint</a><% end %>
+
 <%
-  base_dir = File.expand_path(File.dirname(__FILE__))
-    
   request_parameters_without_action = @request.parameters.clone
   request_parameters_without_action.delete("action")
   request_parameters_without_action.delete("controller")

data/lib/action_controller/templates/rescues/diagnostics.rhtml

@@ -1,8 +1,6 @@
 <%
-  base_dir = File.expand_path(File.dirname(__FILE__))
-    
-  clean_backtrace = @exception.backtrace.collect { |line| line.gsub(base_dir, "").gsub("/../config/environments/../../", "") }
-  app_trace       = clean_backtrace.reject { |line| line[0..6] == "vendor/" || line.include?("dispatch.cgi") }
+  clean_backtrace = @exception.backtrace.collect { |line| Object.const_defined?(:RAILS_ROOT) ? line.gsub(RAILS_ROOT, "") : line }
+  app_trace       = clean_backtrace.reject { |line| line =~ /(vendor|dispatch|ruby)/ }
   framework_trace = clean_backtrace - app_trace
 %>
 
@@ -10,9 +8,9 @@
   <%=h @exception.class.to_s %> in
   <%=h @request.parameters["controller"].capitalize %>#<%=h @request.parameters["action"] %>
 </h1>
-<p><%=h @exception.message %></p>
+<p><%=h Object.const_defined?(:RAILS_ROOT) ? @exception.message.gsub(RAILS_ROOT, "") : @exception.message %></p>
 
-<% unless app_trace.empty? %><pre><code><%=h app_trace.collect { |line| line.gsub("/../", "") }.join("\n") %></code></pre><% end %>
+<% unless app_trace.empty? %><pre><code><%=h app_trace.join("\n") %></code></pre><% end %>
 
 <% unless framework_trace.empty? %>
   <a href="#" onclick="document.getElementById('framework_trace').style.display='block'; return false;">Show framework trace</a>

data/lib/action_controller/templates/rescues/template_error.rhtml

@@ -1,11 +1,3 @@
-<%
-  base_dir = File.expand_path(File.dirname(__FILE__))
-  
-  framework_trace = @exception.original_exception.backtrace.collect do |line| 
-    line.gsub(base_dir, "").gsub("/../config/environments/../../", "")
-  end
-%>
-
 <h1>
   <%=h @exception.original_exception.class.to_s %> in
   <%=h @request.parameters["controller"].capitalize %>#<%=h @request.parameters["action"] %>
@@ -21,6 +13,6 @@
 <p><%=h @exception.sub_template_message %></p>
 
 <a href="#" onclick="document.getElementById('framework_trace').style.display='block'">Show template trace</a>
-<pre id="framework_trace" style="display:none"><code><%=h framework_trace.join("\n") %></code></pre>
+<pre id="framework_trace" style="display:none"><code><%=h @exception.original_exception.backtrace.collect { |line| Object.const_defined?(:RAILS_ROOT) ? line.gsub(RAILS_ROOT, "") : line }.join("\n") %></code></pre>
 
 <%= render_file(@rescues_path + "/_request_and_response.rhtml", false) %>

data/lib/action_controller/templates/scaffolds/edit.rhtml

@@ -1,6 +1,7 @@
 <h1>Editing <%= @scaffold_singular_name %></h1>
 
-<%= form(@scaffold_singular_name, :action => "../update" + @scaffold_suffix) %>
+<%= error_messages_for(@scaffold_singular_name) %>
+<%= form(@scaffold_singular_name, :action => "update" + @scaffold_suffix) %>
 
 <%= link_to "Show", :action => "show#{@scaffold_suffix}", :id => instance_variable_get("@#{@scaffold_singular_name}").id %> |
 <%= link_to "Back", :action => "list#{@scaffold_suffix}" %>

data/lib/action_controller/templates/scaffolds/layout.rhtml

@@ -19,6 +19,42 @@
     a { color: #000; }
     a:visited { color: #666; }
     a:hover { color: #fff; background-color:#000; }
+
+    .fieldWithErrors {
+      padding: 2px;
+      background-color: red;
+      display: table;
+    }
+
+    #ErrorExplanation {
+      width: 400px;
+    	border: 2px solid #red;
+    	padding: 7px;
+    	padding-bottom: 12px;
+    	margin-bottom: 20px;
+    	background-color: #f0f0f0;
+    }
+
+    #ErrorExplanation h2 {
+    	text-align: left;
+    	font-weight: bold;
+    	padding: 5px 5px 5px 15px;
+    	font-size: 12px;
+    	margin: -7px;
+    	background-color: #c00;
+    	color: #fff;
+    }
+
+    #ErrorExplanation p {
+    	color: #333;
+    	margin-bottom: 0;
+    	padding: 5px;
+    }
+
+    #ErrorExplanation ul li {
+    	font-size: 12px;
+    	list-style: square;
+    }
   </style>
 </head>
 <body>

data/lib/action_controller/templates/scaffolds/new.rhtml

@@ -1,5 +1,6 @@
 <h1>New <%= @scaffold_singular_name %></h1>
 
+<%= error_messages_for(@scaffold_singular_name) %>
 <%= form(@scaffold_singular_name, :action => "create" + @scaffold_suffix) %>
 
 <%= link_to "Back", :action => "list#{@scaffold_suffix}" %>

data/lib/action_controller/test_process.rb

@@ -177,19 +177,38 @@ end
       @attributes[key] = value
     end
     
+    def session_id
+      ""
+    end
+    
     def update() end
     def close() end
     def delete() @attributes = {} end
   end
 end
 
-class Test::Unit::TestCase #:nodoc:
-  private  
-    # execute the request and set/volley the response
-    def process(action, parameters = nil, session = nil)
-      @request.action = action.to_s
-      @request.parameters.update(parameters) unless parameters.nil?
-      @request.session = ActionController::TestSession.new(session) unless session.nil?
-      @controller.process(@request, @response)
+module Test
+  module Unit
+    class TestCase #:nodoc:
+      private  
+        # execute the request and set/volley the response
+        def process(action, parameters = nil, session = nil)
+          @request.env['REQUEST_METHOD'] ||= "GET"
+          @request.action = action.to_s
+          @request.parameters.update(parameters) unless parameters.nil?
+          @request.session = ActionController::TestSession.new(session) unless session.nil?
+          @controller.process(@request, @response)
+        end
+    
+        # execute the request simulating a specific http method and set/volley the response
+        %w( get post put delete head ).each do |method|
+          class_eval <<-EOV
+            def #{method}(action, parameters = nil, session = nil)
+              @request.env['REQUEST_METHOD'] = "#{method.upcase}"
+              process(action, parameters, session)
+            end
+          EOV
+        end
     end
+  end
 end

data/lib/action_controller/url_rewriter.rb

@@ -1,7 +1,7 @@
 module ActionController
   # Rewrites urls for Base.redirect_to and Base.url_for in the controller.
   class UrlRewriter #:nodoc:
-    VALID_OPTIONS = [:action, :action_prefix, :action_suffix, :controller, :controller_prefix, :anchor, :params, :path_params, :id, :only_path, :overwrite_params ]
+    VALID_OPTIONS = [:action, :action_prefix, :action_suffix, :module, :controller, :controller_prefix, :anchor, :params, :path_params, :id, :only_path, :overwrite_params ]
   
     def initialize(request, controller, action)
       @request, @controller, @action = request, controller, action
@@ -12,7 +12,7 @@ module ActionController
       validate_options(VALID_OPTIONS, options.keys)
 
       rewrite_url(
-        rewrite_path(@rewritten_path, options), 
+        rewrite_path(@rewritten_path, resolve_aliases(options)), 
         options
       )
     end
@@ -30,8 +30,13 @@ module ActionController
         unknown_option_keys = supplied_option_keys - valid_option_keys
         raise(ActionController::ActionControllerError, "Unknown options: #{unknown_option_keys}") unless unknown_option_keys.empty?
       end
+  
+      def resolve_aliases(options)
+        options[:controller_prefix] = options[:module] unless options[:module].nil?
+        options
+      end
 
-      def rewrite_url(path, options)
+      def rewrite_url(path, options)        
         rewritten_url = ""
         rewritten_url << @request.protocol unless options[:only_path]
         rewritten_url << @request.host_with_port unless options[:only_path]
@@ -123,7 +128,13 @@ module ActionController
       
       def controller_name(options, controller_prefix)
         ensure_slash_suffix(options, :controller_prefix)
-        controller_name = options[:controller_prefix] || controller_prefix || ""
+
+        controller_name = case options[:controller_prefix]
+          when String:  options[:controller_prefix]
+          when false : ""
+          when nil   : controller_prefix || ""
+        end
+
         controller_name << (options[:controller] + "/") if options[:controller] 
         return controller_name
       end

data/lib/action_view/base.rb

@@ -141,7 +141,7 @@ module ActionView #:nodoc:
       end
     end
 
-    def self.controller_delegate(*methods)
+    def self.controller_delegate(*methods)#:nodoc:
       methods.flatten.each do |method|
         class_eval <<-end_eval
           def #{method}(*args, &block)
@@ -238,7 +238,8 @@ module ActionView #:nodoc:
       end
 
       def template_exists?(template_path, extension)
-        FileTest.exists?(full_template_path(template_path, extension))
+        (cache_template_loading && @@loaded_templates.has_key?(template_path)) ||
+          FileTest.exists?(full_template_path(template_path, extension))
       end
 
       def read_template_file(template_path)
@@ -250,7 +251,7 @@ module ActionView #:nodoc:
       end
 
       def rhtml_render(template, binding)
-        @@compiled_erb_templates[template] ||= ERB.new(template)
+        @@compiled_erb_templates[template] ||= ERB.new(template, nil, '-')
         @@compiled_erb_templates[template].result(binding)
       end
 

data/lib/action_view/helpers/active_record_helper.rb

@@ -24,7 +24,7 @@ module ActionView
       # Returns an entire form with input tags and everything for a specified Active Record object. Example
       # (post is a new record that has a title using VARCHAR and a body using TEXT):
       #   form("post") =>
-      #     <form action='create' method='POST'>
+      #     <form action='/post/create' method='post'>
       #       <p>
       #         <label for="post_title">Title</label><br />
       #         <input id="post_title" name="post[title]" size="30" type="text" value="Hello World" />
@@ -44,20 +44,24 @@ module ActionView
       #   form("entry", :action => "sign", :input_block => 
       #        Proc.new { |record, column| "#{column.human_name}: #{input(record, column.name)}<br />" }) =>
       #
-      #     <form action='sign' method='POST'>
+      #     <form action='/post/sign' method='post'>
       #       Message:
       #       <input id="post_title" name="post[title]" size="30" type="text" value="Hello World" /><br />
       #       <input type='submit' value='Sign' />
       #     </form>
       def form(record_name, options = {})
         record   = instance_eval("@#{record_name}")
-        action   = options[:action] || (record.new_record? ? "create" : "update")
-        id_field = record.new_record? ? "" : InstanceTag.new(record_name, "id", self).to_input_field_tag("hidden")
 
-        "<form action='#{action}' method='POST'>" +
-        id_field + all_input_tags(record, record_name, options) +
-        "<input type='submit' value='#{action.gsub(/[^A-Za-z]/, "").capitalize}' />" +
-        "</form>"
+        options[:action] ||= record.new_record? ? "create" : "update"
+        action   = url_for(:action => options[:action])
+
+        submit_value = options[:submit_value] || options[:action].gsub(/[^\w]/, '').capitalize
+        
+        id_field = record.new_record? ? "" : InstanceTag.new(record_name, "id", self).to_input_field_tag("hidden")
+        
+        %(<form action="#{action}" method="post">#{id_field}) +
+          all_input_tags(record, record_name, options) +
+          %(<input type="submit" value="#{submit_value}" /></form>)
       end
 
       # Returns a string containing the error message attached to the +method+ on the +object+, if one exists.
@@ -76,14 +80,24 @@ module ActionView
         end
       end
       
-      def error_messages_for(object_name)
-        object = instance_eval("@#{object_name}")
+      # Returns a string with a div containing all the error messages for the object located as an instance variable by the name
+      # of <tt>object_name</tt>. This div can be tailored by the following options:
+      #
+      # * <tt>header_tag</tt> - Used for the header of the error div (default: h2)
+      # * <tt>id</tt> - The id of the error div (default: errorExplanation)
+      # * <tt>class</tt> - The class of the error div (default: errorExplanation)
+      def error_messages_for(object_name, options={})
+        object = instance_eval "@#{object_name}"
         unless object.errors.empty?
-          "<div id=\"errorExplanation\">" +
-          "<h2>#{object.errors.count} error#{"s" unless object.errors.count == 1} prohibited this #{object_name.gsub("_", " ")} from being saved</h2>" +
-          "<p>There were problems with the following fields (marked in red below):</p>" +
-          "<ul>#{object.errors.full_messages.collect { |msg| "<li>#{msg}</li>"}}</ul>" +
-          "</div>"
+          content_tag("div",
+            content_tag(
+              options[:header_tag] || "h2", 
+              "#{pluralize(object.errors.count, "error")} prohibited this #{object_name.gsub("_", " ")} from being saved"
+            ) +
+            content_tag("p", "There were problems with the following fields:") +
+            content_tag("ul", object.errors.full_messages.collect { |msg| content_tag("li", msg) }),
+            "id" => options[:id] || "errorExplanation", "class" => options[:class] || "errorExplanation"
+          )
         end
       end
       

data/lib/action_view/helpers/date_helper.rb

@@ -143,8 +143,8 @@ module ActionView
           end
 
           month_options << ((date.kind_of?(Fixnum) ? date : date.month) == month_number ?
-            "<option value='#{month_number}' selected=\"selected\">#{month_name}</option>\n" : 
-            "<option value='#{month_number}'>#{month_name}</option>\n"
+            %(<option value="#{month_number}" selected="selected">#{month_name}</option>\n) : 
+            %(<option value="#{month_number}">#{month_name}</option>\n)
           )
         end
 
@@ -158,7 +158,8 @@ module ActionView
       #   select_year(Date.today, :start_year => 1992, :end_year => 2007)
       def select_year(date, options = {})
         year_options = []
-        unless date.kind_of?(Fixnum) then default_start_year, default_end_year = date.year - 5, date.year + 5 end
+        y = date.kind_of?(Fixnum) ? (y = (date == 0) ? Date.today.year : date) : date.year
+        default_start_year, default_end_year = y-5, y+5
 
         (options[:start_year] || default_start_year).upto(options[:end_year] || default_end_year) do |year|
           year_options << ((date.kind_of?(Fixnum) ? date : date.year) == year ?
@@ -172,9 +173,9 @@ module ActionView
       
       private
         def select_html(type, options, prefix = nil, include_blank = false, discard_type = false)
-          select_html  = "<select name='#{prefix || DEFAULT_PREFIX}"
+          select_html  = %(<select name="#{prefix || DEFAULT_PREFIX})
           select_html << "[#{type}]" unless discard_type
-          select_html << "'>\n"
+          select_html << %(">\n)
           select_html << "<option></option>\n" if include_blank
           select_html << options.to_s
           select_html << "</select>\n"

data/lib/action_view/helpers/form_helper.rb

@@ -91,14 +91,30 @@ module ActionView
       #
       # Example (call, result). Imagine that @post.validated? returns 1:
       #   check_box("post", "validated")
-      #     <input type="checkbox" id="post_validate" name="post[validated] value="1" checked="checked" /><input name="post[validated]" type="hidden" value="0" />
+      #     <input type="checkbox" id="post_validate" name="post[validated] value="1" checked="checked" />
+      #     <input name="post[validated]" type="hidden" value="0" />
       #
       # Example (call, result). Imagine that @puppy.gooddog returns no:
       #   check_box("puppy", "gooddog", {}, "yes", "no")
-      #     <input type="checkbox" id="puppy_gooddog" name="puppy[gooddog] value="yes" /><input name="puppy[gooddog]" type="hidden" value="no" />
+      #     <input type="checkbox" id="puppy_gooddog" name="puppy[gooddog] value="yes" />
+      #     <input name="puppy[gooddog]" type="hidden" value="no" />
       def check_box(object, method, options = {}, checked_value = "1", unchecked_value = "0")
         InstanceTag.new(object, method, self).to_check_box_tag(options, checked_value, unchecked_value)
       end
+
+      # Returns a radio button tag for accessing a specified attribute (identified by +method+) on an object
+      # assigned to the template (identified by +object+). If the current value of +method+ is +tag_value+ the
+      # radio button will be checked. Additional options on the input tag can be passed as a
+      # hash with +options+. 
+      # Example (call, result). Imagine that @post.category returns "rails":
+      #   radio_button("post", "category", "rails")
+      #   radio_button("post", "category", "java")
+      #     <input type="radio" id="post_category" name="post[category] value="rails" checked="checked" />
+      #     <input type="radio" id="post_category" name="post[category] value="java" />
+      #     
+      def radio_button(object, method, tag_value, options = {})
+        InstanceTag.new(object, method, self).to_radio_button_tag(tag_value, options)
+      end
     end
 
     class InstanceTag #:nodoc:
@@ -117,7 +133,18 @@ module ActionView
       def to_input_field_tag(field_type, options = {})
         html_options = DEFAULT_FIELD_OPTIONS.merge(options)
         html_options.merge!({ "size" => options["maxlength"]}) if options["maxlength"] && !options["size"]
-        html_options.merge!({ "type" =>  field_type, "value" => value.to_s })
+        html_options.delete("size") if field_type == "hidden"
+        html_options.merge!({ "type" =>  field_type})
+        html_options.merge!({ "value" => value.to_s }) unless options["value"]
+        add_default_name_and_id(html_options)
+        tag("input", html_options)
+      end
+
+      def to_radio_button_tag(tag_value, options={})
+        html_options = DEFAULT_FIELD_OPTIONS.merge(options)
+        html_options.merge!({"checked"=>"checked"}) if value == tag_value
+        html_options.merge!({"type"=>"radio", "value"=>tag_value.to_s})
+                       
         add_default_name_and_id(html_options)
         tag("input", html_options)
       end
@@ -179,4 +206,4 @@ module ActionView
         end
     end
   end
-end
+end