actionpack 1.7.0 → 1.8.0

data/lib/action_controller/vendor/html-scanner/html/tokenizer.rb

@@ -0,0 +1,95 @@
+require 'strscan'
+
+module HTML#:nodoc:
+  
+  # A simple HTML tokenizer. It simply breaks a stream of text into tokens, where each
+  # token is a string. Each string represents either "text", or an HTML element.
+  #
+  # This currently assumes valid XHTML, which means no free < or > characters.
+  #
+  # Usage:
+  #
+  #   tokenizer = HTML::Tokenizer.new(text)
+  #   while token = tokenizer.next
+  #     p token
+  #   end
+  class Tokenizer#:nodoc:
+    
+    # The current (byte) position in the text
+    attr_reader :position
+    
+    # The current line number
+    attr_reader :line
+    
+    # Create a new Tokenizer for the given text.
+    def initialize(text)
+      @scanner = StringScanner.new(text)
+      @position = 0
+      @line = 0
+      @current_line = 1
+    end
+
+    # Return the next token in the sequence, or +nil+ if there are no more tokens in
+    # the stream.
+    def next
+      return nil if @scanner.eos?
+      @position = @scanner.pos
+      @line = @current_line
+      if @scanner.check(/<\S/)
+        update_current_line(scan_tag)
+      else
+        update_current_line(scan_text)
+      end
+    end
+  
+    private
+
+      # Treat the text at the current position as a tag, and scan it. Supports
+      # comments, doctype tags, and regular tags, and ignores less-than and
+      # greater-than characters within quoted strings.
+      def scan_tag
+        tag = @scanner.getch
+        if @scanner.scan(/!--/) # comment
+          tag << @scanner.matched
+          tag << @scanner.scan_until(/--\s*>/)
+        elsif @scanner.scan(/!/) # doctype
+          tag << @scanner.matched
+          tag << consume_quoted_regions
+        else
+          tag << consume_quoted_regions
+        end
+        tag
+      end
+
+      # Scan all text up to the next < character and return it.
+      def scan_text
+        @scanner.scan(/[^<]*/)
+      end
+      
+      # Counts the number of newlines in the text and updates the current line
+      # accordingly.
+      def update_current_line(text)
+        @current_line += text.scan(/\r\n|\r|\n/).length
+        text
+      end
+      
+      # Skips over quoted strings, so that less-than and greater-than characters
+      # within the strings are ignored.
+      def consume_quoted_regions
+        text = ""
+        loop do
+          match = @scanner.scan_until(/['">]/) or break
+          text << match
+          break if (delim = @scanner.matched) == ">"
+          # consume the conqued region
+          while match = @scanner.scan_until(/[\\#{delim}]/)
+            text << match
+            break if @scanner.matched == delim
+            text << @scanner.getch # skip the escaped character
+          end
+        end
+        text
+      end
+  end
+  
+end

data/lib/action_controller/vendor/html-scanner/html/version.rb

@@ -0,0 +1,11 @@
+module HTML#:nodoc:
+  module Version#:nodoc:
+
+    MAJOR = 0
+    MINOR = 5
+    TINY  = 0
+
+    STRING = [ MAJOR, MINOR, TINY ].join(".")
+
+  end
+end

data/lib/action_controller/verification.rb

@@ -44,14 +44,18 @@ module ActionController #:nodoc:
       #   be in the @session in order for the action(s) to be safely called.
       # * <tt>:flash</tt>: a single key or an array of keys that must
       #   be in the flash in order for the action(s) to be safely called.
+      # * <tt>:method</tt>: a single key or an array of keys--any one of which
+      #   must match the current request method in order for the action(s) to
+      #   be safely called. (The key should be a symbol: <tt>:get</tt> or
+      #   <tt>:post</tt>, for example.)
       # * <tt>:add_flash</tt>: a hash of name/value pairs that should be merged
       #   into the session's flash if the prerequisites cannot be satisfied.
       # * <tt>:redirect_to</tt>: the redirection parameters to be used when
       #   redirecting if the prerequisites cannot be satisfied.
-      # * <tt>:only</tt>: only apply this verification to the actions specified in
-      #   the associated array (may also be a single value).
-      # * <tt>:except</tt>: do not apply this verification to the actions specified in
-      #   the associated array (may also be a single value).
+      # * <tt>:only</tt>: only apply this verification to the actions specified
+      #   in the associated array (may also be a single value).
+      # * <tt>:except</tt>: do not apply this verification to the actions
+      #   specified in the associated array (may also be a single value).
       def verify(options={})
         filter_opts = { :only => options[:only], :except => options[:except] }
         before_filter(filter_opts) do |c|
@@ -65,6 +69,11 @@ module ActionController #:nodoc:
         [*options[:params] ].find { |v| @params[v].nil?  } ||
         [*options[:session]].find { |v| @session[v].nil? } ||
         [*options[:flash]  ].find { |v| flash[v].nil?    }
+      
+      if !prereqs_invalid && options[:method]
+        prereqs_invalid ||= 
+          [*options[:method]].all? { |v| @request.method != v.to_sym }
+      end
 
       if prereqs_invalid
         flash.update(options[:add_flash]) if options[:add_flash]

data/lib/action_view/base.rb

@@ -119,7 +119,7 @@ module ActionView #:nodoc:
   class Base
     include ERB::Util
     
-    attr_reader :first_render
+    attr_reader   :first_render
     attr_accessor :base_path, :assigns, :template_extension
     attr_accessor :controller
 
@@ -157,7 +157,7 @@ module ActionView #:nodoc:
     end
 
     def initialize(base_path = nil, assigns_for_first_render = {}, controller = nil)#:nodoc:
-      @base_path, @assigns = base_path, assigns_for_first_render
+      @base_path, @assigns = base_path, assigns_for_first_render.with_indifferent_access
       @controller = controller
     end
 
@@ -264,6 +264,7 @@ module ActionView #:nodoc:
       def evaluate_locals(local_assigns = {})
         b = binding
 
+        local_assigns.stringify_keys!
         local_assigns.each { |key, value| eval "#{key} = local_assigns[\"#{key}\"]", b }
         @assigns.each { |key, value| instance_variable_set "@#{key}", value }
         xml = Builder::XmlMarkup.new(:indent => 2)

data/lib/action_view/helpers/active_record_helper.rb

@@ -101,7 +101,7 @@ module ActionView
           content_tag("div",
             content_tag(
               options[:header_tag] || "h2",
-              "#{pluralize(object.errors.count, "error")} prohibited this #{object_name.gsub("_", " ")} from being saved"
+              "#{pluralize(object.errors.count, "error")} prohibited this #{object_name.to_s.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) }),

data/lib/action_view/helpers/asset_tag_helper.rb

@@ -23,21 +23,35 @@ module ActionView
         )
       end
 
+      # Returns path to a javascript asset. Example:
+      #
+      #   javascript_path "xmlhr" # => /javascripts/xmlhr.js
+      def javascript_path(source)
+        compute_public_path(source, 'javascripts', 'js')        
+      end
+
       # Returns a script include tag per source given as argument. Examples:
       #
       #   javascript_include_tag "xmlhr" # =>
-      #     <script language="JavaScript" type="text/javascript" src="/javascripts/xmlhr.js"></script>
+      #     <script type="text/javascript" src="/javascripts/xmlhr.js"></script>
       #
       #   javascript_include_tag "common.javascript", "/elsewhere/cools" # =>
-      #     <script language="JavaScript" type="text/javascript" src="/javascripts/common.javascript"></script>
-      #     <script language="JavaScript" type="text/javascript" src="/elsewhere/cools.js"></script>
+      #     <script type="text/javascript" src="/javascripts/common.javascript"></script>
+      #     <script type="text/javascript" src="/elsewhere/cools.js"></script>
       def javascript_include_tag(*sources)
         sources.collect { |source|
-          source = compute_public_path(source, 'javascripts', 'js')        
-          content_tag("script", "", "language" => "JavaScript", "type" => "text/javascript", "src" => source)
+          source = javascript_path(source)        
+          content_tag("script", "", "type" => "text/javascript", "src" => source)
         }.join("\n")
       end
 
+      # Returns path to a stylesheet asset. Example:
+      #
+      #   stylesheet_path "style" # => /stylesheets/style.css
+      def stylesheet_path(source)
+        compute_public_path(source, 'stylesheets', 'css')
+      end
+
       # Returns a css link tag per source given as argument. Examples:
       #
       #   stylesheet_link_tag "style" # =>
@@ -48,11 +62,21 @@ module ActionView
       #     <link href="/css/stylish.css" media="screen" rel="Stylesheet" type="text/css" />
       def stylesheet_link_tag(*sources)
         sources.collect { |source|
-          source = compute_public_path(source, 'stylesheets', 'css')
+          source = stylesheet_path(source)
           tag("link", "rel" => "Stylesheet", "type" => "text/css", "media" => "screen", "href" => source)
         }.join("\n")
       end
 
+      # Returns path to an image asset. Example:
+      #
+      # The +src+ can be supplied as a...
+      # * full path, like "/my_images/image.gif"
+      # * file name, like "rss.gif", that gets expanded to "/images/rss.gif"
+      # * file name without extension, like "logo", that gets expanded to "/images/logo.png"
+      def image_path(source)
+        compute_public_path(source, 'images', 'png')
+      end
+
       # Returns an image tag converting the +options+ instead html options on the tag, but with these special cases:
       #
       # * <tt>:alt</tt>  - If no alt text is given, the file name part of the +src+ is used (capitalized and without the extension)
@@ -65,7 +89,7 @@ module ActionView
       def image_tag(source, options = {})
         options.symbolize_keys
                 
-        options[:src] = compute_public_path(source, 'images', 'png')
+        options[:src] = image_path(source)
         options[:alt] ||= source.split("/").last.split(".").first.capitalize
         
         if options[:size]
@@ -77,14 +101,12 @@ module ActionView
       end
       
       private
-      
         def compute_public_path(source, dir, ext)
           source = "/#{dir}/#{source}" unless source.include?("/")
           source = "#{source}.#{ext}" unless source.include?(".")
           source = "#{@request.relative_url_root}#{source}" 
           source
         end
-        
     end
   end
 end

data/lib/action_view/helpers/date_helper.rb

@@ -41,9 +41,11 @@ module ActionView
       end
       
       # Like distance_of_time_in_words, but where <tt>to_time</tt> is fixed to <tt>Time.now</tt>.
-      def distance_of_time_in_words_to_now(from_time, include_seconds = false)
+      def time_ago_in_words(from_time, include_seconds = false)
         distance_of_time_in_words(from_time, Time.now, include_seconds)
       end
+      
+      alias_method :distance_of_time_in_words_to_now, :time_ago_in_words
 
       # Returns a set of select tags (one for year, month, and day) pre-selected for accessing a specified date-based attribute (identified by
       # +method+) on an object assigned to the template (identified by +object+). It's possible to tailor the selects through the +options+ hash,
@@ -102,9 +104,9 @@ module ActionView
         second_options = []
 
         0.upto(59) do |second|
-          second_options << ((datetime.kind_of?(Fixnum) ? datetime : datetime.sec) == second ?
-            "<option selected=\"selected\">#{leading_zero_on_single_digits(second)}</option>\n" :
-            "<option>#{leading_zero_on_single_digits(second)}</option>\n"
+          second_options << ((datetime && (datetime.kind_of?(Fixnum) ? datetime : datetime.sec) == second) ?
+            "<option value=\"#{leading_zero_on_single_digits(second)}\" selected=\"selected\">#{leading_zero_on_single_digits(second)}</option>\n" :
+            "<option value=\"#{leading_zero_on_single_digits(second)}\">#{leading_zero_on_single_digits(second)}</option>\n"
           )
         end
 
@@ -112,14 +114,15 @@ module ActionView
       end
 
       # Returns a select tag with options for each of the minutes 0 through 59 with the current minute selected.
+      # Also can return a select tag with options by <tt>minute_step</tt> from 0 through 59 with the 00 minute selected
       # The <tt>minute</tt> can also be substituted for a minute number.
       def select_minute(datetime, options = {})
         minute_options = []
 
-        0.upto(59) do |minute|
-          minute_options << ((datetime.kind_of?(Fixnum) ? datetime : datetime.min) == minute ?
-            "<option selected=\"selected\">#{leading_zero_on_single_digits(minute)}</option>\n" :
-            "<option>#{leading_zero_on_single_digits(minute)}</option>\n"
+        0.step(59, options[:minute_step] || 1) do |minute|
+          minute_options << ((datetime && (datetime.kind_of?(Fixnum) ? datetime : datetime.min) == minute) ?
+            "<option value=\"#{leading_zero_on_single_digits(minute)}\" selected=\"selected\">#{leading_zero_on_single_digits(minute)}</option>\n" :
+            "<option value=\"#{leading_zero_on_single_digits(minute)}\">#{leading_zero_on_single_digits(minute)}</option>\n"
           )
         end
 
@@ -132,9 +135,9 @@ module ActionView
         hour_options = []
 
         0.upto(23) do |hour|
-          hour_options << ((datetime.kind_of?(Fixnum) ? datetime : datetime.hour) == hour ?
-            "<option selected=\"selected\">#{leading_zero_on_single_digits(hour)}</option>\n" :
-            "<option>#{leading_zero_on_single_digits(hour)}</option>\n"
+          hour_options << ((datetime && (datetime.kind_of?(Fixnum) ? datetime : datetime.hour) == hour) ?
+            "<option value=\"#{leading_zero_on_single_digits(hour)}\" selected=\"selected\">#{leading_zero_on_single_digits(hour)}</option>\n" :
+            "<option value=\"#{leading_zero_on_single_digits(hour)}\">#{leading_zero_on_single_digits(hour)}</option>\n"
           )
         end
 
@@ -147,9 +150,9 @@ module ActionView
         day_options = []
 
         1.upto(31) do |day|
-          day_options << ((date.kind_of?(Fixnum) ? date : date.day) == day ?
-            "<option selected=\"selected\">#{day}</option>\n" :
-            "<option>#{day}</option>\n"
+          day_options << ((date && (date.kind_of?(Fixnum) ? date : date.day) == day) ?
+            "<option value=\"#{day}\" selected=\"selected\">#{day}</option>\n" :
+            "<option value=\"#{day}\">#{day}</option>\n"
           )
         end
 
@@ -177,7 +180,7 @@ module ActionView
             Date::MONTHNAMES[month_number]
           end
 
-          month_options << ((date.kind_of?(Fixnum) ? date : date.month) == month_number ?
+          month_options << ((date && (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)
           )
@@ -193,13 +196,13 @@ module ActionView
       #   select_year(Date.today, :start_year => 1992, :end_year => 2007)
       def select_year(date, options = {})
         year_options = []
-        y = date.kind_of?(Fixnum) ? (y = (date == 0) ? Date.today.year : date) : date.year
+        y = date ? (date.kind_of?(Fixnum) ? (y = (date == 0) ? Date.today.year : date) : date.year) : Date.today.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 ?
-            "<option selected=\"selected\">#{year}</option>\n" :
-            "<option>#{year}</option>\n"
+          year_options << ((date && (date.kind_of?(Fixnum) ? date : date.year) == year) ?
+            "<option value=\"#{year}\" selected=\"selected\">#{year}</option>\n" :
+            "<option value=\"#{year}\">#{year}</option>\n"
           )
         end
 
@@ -211,7 +214,7 @@ module ActionView
           select_html  = %(<select name="#{prefix || DEFAULT_PREFIX})
           select_html << "[#{type}]" unless discard_type
           select_html << %(">\n)
-          select_html << "<option></option>\n" if include_blank
+          select_html << "<option value=\"\"></option>\n" if include_blank
           select_html << options.to_s
           select_html << "</select>\n"
 
@@ -254,7 +257,7 @@ module ActionView
         defaults = { :discard_type => true }
         options  = defaults.merge(options)
         options_with_prefix = Proc.new { |position| options.merge(:prefix => "#{@object_name}[#{@method_name}(#{position}i)]") }
-        datetime = options[:include_blank] ? (value || 0) : (value || Time.now)
+        datetime = options[:include_blank] ? (value || nil) : (value || Time.now)
 
         datetime_select  = select_year(datetime, options_with_prefix.call(1))
         datetime_select << select_month(datetime, options_with_prefix.call(2)) unless options[:discard_month]
@@ -266,4 +269,4 @@ module ActionView
       end
     end
   end
-end
+end

data/lib/action_view/helpers/form_helper.rb

@@ -145,11 +145,12 @@ module ActionView
       attr_reader :method_name, :object_name
 
       DEFAULT_FIELD_OPTIONS     = { "size" => 30 }.freeze unless const_defined?(:DEFAULT_FIELD_OPTIONS)
+      DEFAULT_RADIO_OPTIONS     = { }.freeze unless const_defined?(:DEFAULT_RADIO_OPTIONS)
       DEFAULT_TEXT_AREA_OPTIONS = { "wrap" => "virtual", "cols" => 40, "rows" => 20 }.freeze unless const_defined?(:DEFAULT_TEXT_AREA_OPTIONS)
       DEFAULT_DATE_OPTIONS = { :discard_type => true }.freeze unless const_defined?(:DEFAULT_DATE_OPTIONS)
 
       def initialize(object_name, method_name, template_object, local_binding = nil)
-        @object_name, @method_name = object_name, method_name
+        @object_name, @method_name = object_name.to_s, method_name.to_s
         @template_object, @local_binding = template_object, local_binding
         if @object_name.sub!(/\[\]$/,"")
           @auto_index = @template_object.instance_variable_get("@#{Regexp.last_match.pre_match}").id_before_type_cast
@@ -158,10 +159,10 @@ module ActionView
 
       def to_input_field_tag(field_type, options = {})
         options = options.stringify_keys
+        options["size"] ||= options["maxlength"] || DEFAULT_FIELD_OPTIONS["size"]
+        options = DEFAULT_FIELD_OPTIONS.merge(options)
         if field_type == "hidden"
           options.delete("size")
-        else
-          options["size"] ||= options["maxlength"] || DEFAULT_FIELD_OPTIONS["size"]
         end
         options["type"] = field_type
         options["value"] ||= value_before_type_cast unless field_type == "file"
@@ -170,7 +171,7 @@ module ActionView
       end
 
       def to_radio_button_tag(tag_value, options = {})
-        options = DEFAULT_FIELD_OPTIONS.merge(options.stringify_keys)
+        options = DEFAULT_RADIO_OPTIONS.merge(options.stringify_keys)
         options["type"]     = "radio"
         options["value"]    = tag_value
         options["checked"]  = "checked" if value == tag_value
@@ -198,7 +199,7 @@ module ActionView
           else
             value.to_i != 0
           end
-        if checked
+        if checked || options["checked"] == "checked"
           options["checked"] = "checked"
         else
           options.delete("checked")

data/lib/action_view/helpers/form_options_helper.rb

@@ -92,7 +92,7 @@ module ActionView
           else
             is_selected = ( (selected.respond_to?(:include?) ? selected.include?(element) : element == selected) )
             is_selected = ( (selected.respond_to?(:include?) && !selected.is_a?(String) ? selected.include?(element) : element == selected) )
-            options << ((is_selected) ? "<option selected=\"selected\">#{html_escape(element.to_s)}</option>" : "<option>#{html_escape(element.to_s)}</option>")
+            options << ((is_selected) ? "<option value=\"#{html_escape(element.to_s)}\" selected=\"selected\">#{html_escape(element.to_s)}</option>" : "<option value=\"#{html_escape(element.to_s)}\">#{html_escape(element.to_s)}</option>")
           end
         end
 
@@ -168,7 +168,7 @@ module ActionView
 
         if priority_countries
           country_options += options_for_select(priority_countries, selected)
-          country_options += "<option>-------------</option>\n"
+          country_options += "<option value=\"\">-------------</option>\n"
         end
 
         if priority_countries && priority_countries.include?(selected)
@@ -205,7 +205,7 @@ module ActionView
 
         if priority_zones
           zone_options += options_for_select(convert_zones[priority_zones], selected)
-          zone_options += "<option>-------------</option>\n"
+          zone_options += "<option value=\"\">-------------</option>\n"
 
           zones = zones.reject { |z| priority_zones.include?( z ) }
         end
@@ -298,7 +298,7 @@ module ActionView
 
       private
         def add_blank_option(option_tags, add_blank)
-          add_blank ? "<option></option>\n" + option_tags : option_tags
+          add_blank ? "<option value=\"\"></option>\n" + option_tags : option_tags
         end
     end
   end