actionpack 2.2.3 → 2.3.2

data/lib/action_view/helpers/tag_helper.rb

@@ -1,5 +1,4 @@
-require 'cgi'
-require 'erb'
+require 'action_view/erb/util'
 require 'set'
 
 module ActionView
@@ -98,13 +97,13 @@ module ActionView
       # Returns an escaped version of +html+ without affecting existing escaped entities.
       #
       # ==== Examples
-      #   escape_once("1 > 2 & 3")
+      #   escape_once("1 < 2 &amp; 3")
       #   # => "1 &lt; 2 &amp; 3"
       #
       #   escape_once("&lt;&lt; Accept & Checkout")
       #   # => "&lt;&lt; Accept &amp; Checkout"
       def escape_once(html)
-        ActiveSupport::Multibyte.clean(html.to_s).gsub(/[\"><]|&(?!([a-zA-Z]+|(#\d+));)/) { |special| ERB::Util::HTML_ESCAPE[special] }
+        html.to_s.gsub(/[\"><]|&(?!([a-zA-Z]+|(#\d+));)/) { |special| ERB::Util::HTML_ESCAPE[special] }
       end
 
       private

data/lib/action_view/helpers/text_helper.rb

@@ -1,15 +1,5 @@
 require 'action_view/helpers/tag_helper'
 
-begin
-  require 'html/document'
-rescue LoadError
-  html_scanner_path = "#{File.dirname(__FILE__)}/../../action_controller/vendor/html-scanner"
-  if File.directory?(html_scanner_path)
-    $:.unshift html_scanner_path
-    require 'html/document'
-  end
-end
-
 module ActionView
   module Helpers #:nodoc:
     # The TextHelper module provides a set of methods for filtering, formatting
@@ -117,7 +107,7 @@ module ActionView
           text
         else
           match = Array(phrases).map { |p| Regexp.escape(p) }.join('|')
-          text.gsub(/(#{match})/i, options[:highlighter])
+          text.gsub(/(#{match})(?!(?:[^<]*?)(?:["'])[^<>]*>)/i, options[:highlighter])
         end
       end
 
@@ -226,91 +216,79 @@ module ActionView
         end * "\n"
       end
 
-      begin
-        require_library_or_gem "redcloth" unless Object.const_defined?(:RedCloth)
-
-        # Returns the text with all the Textile[http://www.textism.com/tools/textile] codes turned into HTML tags.
-        #
-        # You can learn more about Textile's syntax at its website[http://www.textism.com/tools/textile].
-        # <i>This method is only available if RedCloth[http://whytheluckystiff.net/ruby/redcloth/]
-        # is available</i>.
-        #
-        # ==== Examples
-        #   textilize("*This is Textile!*  Rejoice!")
-        #   # => "<p><strong>This is Textile!</strong>  Rejoice!</p>"
-        #
-        #   textilize("I _love_ ROR(Ruby on Rails)!")
-        #   # => "<p>I <em>love</em> <acronym title="Ruby on Rails">ROR</acronym>!</p>"
-        #
-        #   textilize("h2. Textile makes markup -easy- simple!")
-        #   # => "<h2>Textile makes markup <del>easy</del> simple!</h2>"
-        #
-        #   textilize("Visit the Rails website "here":http://www.rubyonrails.org/.)
-        #   # => "<p>Visit the Rails website <a href="http://www.rubyonrails.org/">here</a>.</p>"
-        def textilize(text)
-          if text.blank?
-            ""
-          else
-            textilized = RedCloth.new(text, [ :hard_breaks ])
-            textilized.hard_breaks = true if textilized.respond_to?(:hard_breaks=)
-            textilized.to_html
-          end
+      # Returns the text with all the Textile[http://www.textism.com/tools/textile] codes turned into HTML tags.
+      #
+      # You can learn more about Textile's syntax at its website[http://www.textism.com/tools/textile].
+      # <i>This method is only available if RedCloth[http://whytheluckystiff.net/ruby/redcloth/]
+      # is available</i>.
+      #
+      # ==== Examples
+      #   textilize("*This is Textile!*  Rejoice!")
+      #   # => "<p><strong>This is Textile!</strong>  Rejoice!</p>"
+      #
+      #   textilize("I _love_ ROR(Ruby on Rails)!")
+      #   # => "<p>I <em>love</em> <acronym title="Ruby on Rails">ROR</acronym>!</p>"
+      #
+      #   textilize("h2. Textile makes markup -easy- simple!")
+      #   # => "<h2>Textile makes markup <del>easy</del> simple!</h2>"
+      #
+      #   textilize("Visit the Rails website "here":http://www.rubyonrails.org/.)
+      #   # => "<p>Visit the Rails website <a href="http://www.rubyonrails.org/">here</a>.</p>"
+      def textilize(text)
+        if text.blank?
+          ""
+        else
+          textilized = RedCloth.new(text, [ :hard_breaks ])
+          textilized.hard_breaks = true if textilized.respond_to?(:hard_breaks=)
+          textilized.to_html
         end
+      end
 
-        # Returns the text with all the Textile codes turned into HTML tags,
-        # but without the bounding <p> tag that RedCloth adds.
-        #
-        # You can learn more about Textile's syntax at its website[http://www.textism.com/tools/textile].
-        # <i>This method is only available if RedCloth[http://whytheluckystiff.net/ruby/redcloth/]
-        # is available</i>.
-        #
-        # ==== Examples
-        #   textilize_without_paragraph("*This is Textile!*  Rejoice!")
-        #   # => "<strong>This is Textile!</strong>  Rejoice!"
-        #
-        #   textilize_without_paragraph("I _love_ ROR(Ruby on Rails)!")
-        #   # => "I <em>love</em> <acronym title="Ruby on Rails">ROR</acronym>!"
-        #
-        #   textilize_without_paragraph("h2. Textile makes markup -easy- simple!")
-        #   # => "<h2>Textile makes markup <del>easy</del> simple!</h2>"
-        #
-        #   textilize_without_paragraph("Visit the Rails website "here":http://www.rubyonrails.org/.)
-        #   # => "Visit the Rails website <a href="http://www.rubyonrails.org/">here</a>."
-        def textilize_without_paragraph(text)
-          textiled = textilize(text)
-          if textiled[0..2] == "<p>" then textiled = textiled[3..-1] end
-          if textiled[-4..-1] == "</p>" then textiled = textiled[0..-5] end
-          return textiled
-        end
-      rescue LoadError
-        # We can't really help what's not there
+      # Returns the text with all the Textile codes turned into HTML tags,
+      # but without the bounding <p> tag that RedCloth adds.
+      #
+      # You can learn more about Textile's syntax at its website[http://www.textism.com/tools/textile].
+      # <i>This method is requires RedCloth[http://whytheluckystiff.net/ruby/redcloth/]
+      # to be available</i>.
+      #
+      # ==== Examples
+      #   textilize_without_paragraph("*This is Textile!*  Rejoice!")
+      #   # => "<strong>This is Textile!</strong>  Rejoice!"
+      #
+      #   textilize_without_paragraph("I _love_ ROR(Ruby on Rails)!")
+      #   # => "I <em>love</em> <acronym title="Ruby on Rails">ROR</acronym>!"
+      #
+      #   textilize_without_paragraph("h2. Textile makes markup -easy- simple!")
+      #   # => "<h2>Textile makes markup <del>easy</del> simple!</h2>"
+      #
+      #   textilize_without_paragraph("Visit the Rails website "here":http://www.rubyonrails.org/.)
+      #   # => "Visit the Rails website <a href="http://www.rubyonrails.org/">here</a>."
+      def textilize_without_paragraph(text)
+        textiled = textilize(text)
+        if textiled[0..2] == "<p>" then textiled = textiled[3..-1] end
+        if textiled[-4..-1] == "</p>" then textiled = textiled[0..-5] end
+        return textiled
       end
 
-      begin
-        require_library_or_gem "bluecloth" unless Object.const_defined?(:BlueCloth)
-
-        # Returns the text with all the Markdown codes turned into HTML tags.
-        # <i>This method is only available if BlueCloth[http://www.deveiate.org/projects/BlueCloth]
-        # is available</i>.
-        #
-        # ==== Examples
-        #   markdown("We are using __Markdown__ now!")
-        #   # => "<p>We are using <strong>Markdown</strong> now!</p>"
-        #
-        #   markdown("We like to _write_ `code`, not just _read_ it!")
-        #   # => "<p>We like to <em>write</em> <code>code</code>, not just <em>read</em> it!</p>"
-        #
-        #   markdown("The [Markdown website](http://daringfireball.net/projects/markdown/) has more information.")
-        #   # => "<p>The <a href="http://daringfireball.net/projects/markdown/">Markdown website</a>
-        #   #     has more information.</p>"
-        #
-        #   markdown('![The ROR logo](http://rubyonrails.com/images/rails.png "Ruby on Rails")')
-        #   # => '<p><img src="http://rubyonrails.com/images/rails.png" alt="The ROR logo" title="Ruby on Rails" /></p>'
-        def markdown(text)
-          text.blank? ? "" : BlueCloth.new(text).to_html
-        end
-      rescue LoadError
-        # We can't really help what's not there
+      # Returns the text with all the Markdown codes turned into HTML tags.
+      # <i>This method requires BlueCloth[http://www.deveiate.org/projects/BlueCloth]
+      # to be available</i>.
+      #
+      # ==== Examples
+      #   markdown("We are using __Markdown__ now!")
+      #   # => "<p>We are using <strong>Markdown</strong> now!</p>"
+      #
+      #   markdown("We like to _write_ `code`, not just _read_ it!")
+      #   # => "<p>We like to <em>write</em> <code>code</code>, not just <em>read</em> it!</p>"
+      #
+      #   markdown("The [Markdown website](http://daringfireball.net/projects/markdown/) has more information.")
+      #   # => "<p>The <a href="http://daringfireball.net/projects/markdown/">Markdown website</a>
+      #   #     has more information.</p>"
+      #
+      #   markdown('![The ROR logo](http://rubyonrails.com/images/rails.png "Ruby on Rails")')
+      #   # => '<p><img src="http://rubyonrails.com/images/rails.png" alt="The ROR logo" title="Ruby on Rails" /></p>'
+      def markdown(text)
+        text.blank? ? "" : BlueCloth.new(text).to_html
       end
 
       # Returns +text+ transformed into HTML using simple formatting rules.
@@ -392,8 +370,8 @@ module ActionView
         options.reverse_merge!(:link => :all, :html => {})
 
         case options[:link].to_sym
-          when :all                         then auto_link_email_addresses(auto_link_urls(text, options[:html], &block), &block)
-          when :email_addresses             then auto_link_email_addresses(text, &block)
+          when :all                         then auto_link_email_addresses(auto_link_urls(text, options[:html], &block), options[:html], &block)
+          when :email_addresses             then auto_link_email_addresses(text, options[:html], &block)
           when :urls                        then auto_link_urls(text, options[:html], &block)
         end
       end
@@ -545,45 +523,44 @@ module ActionView
         end
 
         AUTO_LINK_RE = %r{
-                        (                          # leading text
-                          <\w+.*?>|                # leading HTML tag, or
-                          [^=!:'"/]|               # leading punctuation, or
-                          ^                        # beginning of line
-                        )
-                        (
-                          (?:https?://)|           # protocol spec, or
-                          (?:www\.)                # www.*
-                        )
-                        (
-                          [-\w]+                   # subdomain or domain
-                          (?:\.[-\w]+)*            # remaining subdomains or domain
-                          (?::\d+)?                # port
-                          (?:/(?:[~\w\+@%=\(\)-]|(?:[,.;:'][^\s$]))*)* # path
-                          (?:\?[\w\+@%&=.;:-]+)?     # query string
-                          (?:\#[\w\-]*)?           # trailing anchor
-                        )
-                        ([[:punct:]]|<|$|)       # trailing text
-                       }x unless const_defined?(:AUTO_LINK_RE)
+            ( https?:// | www\. )
+            [^\s<]+
+          }x unless const_defined?(:AUTO_LINK_RE)
+
+        BRACKETS = { ']' => '[', ')' => '(', '}' => '{' }
 
         # Turns all urls into clickable links.  If a block is given, each url
         # is yielded and the result is used as the link text.
         def auto_link_urls(text, html_options = {})
-          extra_options = tag_options(html_options.stringify_keys) || ""
+          link_attributes = html_options.stringify_keys
           text.gsub(AUTO_LINK_RE) do
-            all, a, b, c, d = $&, $1, $2, $3, $4
-            if a =~ /<a\s/i # don't replace URL's that are already linked
-              all
+            href = $&
+            punctuation = ''
+            left, right = $`, $'
+            # detect already linked URLs and URLs in the middle of a tag
+            if left =~ /<[^>]+$/ && right =~ /^[^>]*>/
+              # do not change string; URL is alreay linked
+              href
             else
-              text = b + c
-              text = yield(text) if block_given?
-              %(#{a}<a href="#{b=="www."?"http://www.":b}#{c}"#{extra_options}>#{text}</a>#{d})
+              # don't include trailing punctuation character as part of the URL
+              if href.sub!(/[^\w\/-]$/, '') and punctuation = $& and opening = BRACKETS[punctuation]
+                if href.scan(opening).size > href.scan(punctuation).size
+                  href << punctuation
+                  punctuation = ''
+                end
+              end
+
+              link_text = block_given?? yield(href) : href
+              href = 'http://' + href unless href.index('http') == 0
+
+              content_tag(:a, h(link_text), link_attributes.merge('href' => href)) + punctuation
             end
           end
         end
 
         # Turns all email addresses into clickable links.  If a block is given,
         # each email is yielded and the result is used as the link text.
-        def auto_link_email_addresses(text)
+        def auto_link_email_addresses(text, html_options = {})
           body = text.dup
           text.gsub(/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/) do
             text = $1
@@ -592,7 +569,7 @@ module ActionView
               text
             else
               display_text = (block_given?) ? yield(text) : text
-              %{<a href="mailto:#{text}">#{display_text}</a>}
+              mail_to text, display_text, html_options
             end
           end
         end

data/lib/action_view/helpers/translation_helper.rb

@@ -3,19 +3,37 @@ require 'action_view/helpers/tag_helper'
 module ActionView
   module Helpers
     module TranslationHelper
+      # Delegates to I18n#translate but also performs two additional functions. First, it'll catch MissingTranslationData exceptions 
+      # and turn them into inline spans that contains the missing key, such that you can see in a view what is missing where.
+      #
+      # Second, it'll scope the key by the current partial if the key starts with a period. So if you call translate(".foo") from the
+      # people/index.html.erb template, you'll actually be calling I18n.translate("people.index.foo"). This makes it less repetitive
+      # to translate many keys within the same partials and gives you a simple framework for scoping them consistently. If you don't
+      # prepend the key with a period, nothing is converted.
       def translate(key, options = {})
         options[:raise] = true
-        I18n.translate(key, options)
+        I18n.translate(scope_key_by_partial(key), options)
       rescue I18n::MissingTranslationData => e
         keys = I18n.send(:normalize_translation_keys, e.locale, e.key, e.options[:scope])
         content_tag('span', keys.join(', '), :class => 'translation_missing')
       end
       alias :t :translate
 
+      # Delegates to I18n.localize with no additional functionality.
       def localize(*args)
         I18n.localize *args
       end
       alias :l :localize
+
+
+      private
+        def scope_key_by_partial(key)
+          if key.to_s.first == "."
+            template.path_without_format_and_extension.gsub(%r{/_?}, ".") + key.to_s
+          else
+            key
+          end
+        end
     end
   end
 end

data/lib/action_view/helpers/url_helper.rb

@@ -507,7 +507,30 @@ module ActionView
       #   current_page?(:controller => 'shop', :action => 'checkout')
       #   # => true
       #
-      #   current_page?(:controller => 'shop', :action => 'checkout', :order => 'asc)
+      #   current_page?(:controller => 'shop', :action => 'checkout', :order => 'asc')
+      #   # => false
+      #
+      #   current_page?(:action => 'checkout')
+      #   # => true
+      #
+      #   current_page?(:controller => 'library', :action => 'checkout')
+      #   # => false
+      #
+      # Let's say we're in the <tt>/shop/checkout?order=desc&page=1</tt> action.
+      #
+      #   current_page?(:action => 'process')
+      #   # => false
+      #
+      #   current_page?(:controller => 'shop', :action => 'checkout')
+      #   # => true
+      #
+      #   current_page?(:controller => 'shop', :action => 'checkout', :order => 'desc', :page=>'1')
+      #   # => true
+      #
+      #   current_page?(:controller => 'shop', :action => 'checkout', :order => 'desc', :page=>'2')
+      #   # => false
+      #
+      #   current_page?(:controller => 'shop', :action => 'checkout', :order => 'desc')
       #   # => false
       #
       #   current_page?(:action => 'checkout')
@@ -516,7 +539,7 @@ module ActionView
       #   current_page?(:controller => 'library', :action => 'checkout')
       #   # => false
       def current_page?(options)
-        url_string = CGI.escapeHTML(url_for(options))
+        url_string = CGI.unescapeHTML(url_for(options))
         request = @controller.request
         # We ignore any extra parameters in the request_uri if the 
         # submitted url doesn't have any either.  This lets the function

data/lib/action_view/inline_template.rb

@@ -12,7 +12,7 @@ module ActionView #:nodoc:
 
     private
       # Always recompile inline templates
-      def recompile?(local_assigns)
+      def recompile?
         true
       end
   end

data/lib/action_view/locale/en.yml

@@ -44,7 +44,18 @@
         # separator: 
         delimiter: ""
         precision: 1
-      storage_units: [Bytes, KB, MB, GB, TB]
+      storage_units:
+        # Storage units output formatting.
+        # %u is the storage unit, %n is the number (default: 2 MB)
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
 
   # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
   datetime:
@@ -80,6 +91,13 @@
       over_x_years:
         one:   "over 1 year"
         other: "over {{count}} years"
+    prompts:
+      year:   "Year"
+      month:  "Month"
+      day:    "Day"
+      hour:   "Hour"
+      minute: "Minute"
+      second: "Seconds"
 
   activerecord:
     errors:

data/lib/action_view/partials.rb

@@ -46,6 +46,38 @@ module ActionView
   #
   # This will render the partial "advertisement/_ad.erb" regardless of which controller this is being called from.
   #
+  # == Rendering objects with the RecordIdentifier
+  #
+  # Instead of explicitly naming the location of a partial, you can also let the RecordIdentifier do the work if
+  # you're following its conventions for RecordIdentifier#partial_path. Examples:
+  #
+  #  # @account is an Account instance, so it uses the RecordIdentifier to replace
+  #  # <%= render :partial => "accounts/account", :locals => { :account => @buyer } %>
+  #  <%= render :partial => @account %>
+  #
+  #  # @posts is an array of Post instances, so it uses the RecordIdentifier to replace
+  #  # <%= render :partial => "posts/post", :collection => @posts %>
+  #  <%= render :partial => @posts %>
+  #
+  # == Rendering the default case
+  #
+  # If you're not going to be using any of the options like collections or layouts, you can also use the short-hand
+  # defaults of render to render partials. Examples:
+  #
+  #  # Instead of <%= render :partial => "account" %>
+  #  <%= render "account" %>
+  #
+  #  # Instead of <%= render :partial => "account", :locals => { :account => @buyer } %>
+  #  <%= render "account", :account => @buyer %>
+  #
+  #  # @account is an Account instance, so it uses the RecordIdentifier to replace
+  #  # <%= render :partial => "accounts/account", :locals => { :account => @account } %>
+  #  <%= render(@account) %>
+  #
+  #  # @posts is an array of Post instances, so it uses the RecordIdentifier to replace
+  #  # <%= render :partial => "posts/post", :collection => @posts %>
+  #  <%= render(@posts) %>
+  #
   # == Rendering partials with layouts
   #
   # Partials can have their own layouts applied to them. These layouts are different than the ones that are
@@ -155,15 +187,20 @@ module ActionView
           builder_partial_path = partial_path.class.to_s.demodulize.underscore.sub(/_builder$/, '')
           local_assigns.merge!(builder_partial_path.to_sym => partial_path)
           render_partial(:partial => builder_partial_path, :object => options[:object], :locals => local_assigns)
-        when Array, ActiveRecord::Associations::AssociationCollection, ActiveRecord::NamedScope::Scope
-          render_partial_collection(options.except(:partial).merge(:collection => partial_path))
         else
-          object = partial_path
-          render_partial(
-            :partial => ActionController::RecordIdentifier.partial_path(object, controller.class.controller_path),
-            :object => object,
-            :locals => local_assigns
-          )
+          if Array === partial_path ||
+            (defined?(ActiveRecord) &&
+             (ActiveRecord::Associations::AssociationCollection === partial_path ||
+              ActiveRecord::NamedScope::Scope === partial_path))
+            render_partial_collection(options.except(:partial).merge(:collection => partial_path))
+          else
+            object = partial_path
+            render_partial(
+              :partial => ActionController::RecordIdentifier.partial_path(object, controller.class.controller_path),
+              :object => object,
+              :locals => local_assigns
+            )
+          end
         end
       end
 
@@ -196,7 +233,7 @@ module ActionView
           path = "_#{partial_path}"
         end
 
-        _pick_template(path)
+        self.view_paths.find_template(path, self.template_format)
       end
       memoize :_pick_partial_template
   end