actionpack 2.1.2 → 2.2.2

data/lib/action_view/helpers/translation_helper.rb

@@ -0,0 +1,21 @@
+require 'action_view/helpers/tag_helper'
+
+module ActionView
+  module Helpers
+    module TranslationHelper
+      def translate(key, options = {})
+        options[:raise] = true
+        I18n.translate(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
+
+      def localize(*args)
+        I18n.localize *args
+      end
+      alias :l :localize
+    end
+  end
+end

data/lib/action_view/helpers/url_helper.rb

@@ -3,8 +3,8 @@ require 'action_view/helpers/javascript_helper'
 module ActionView
   module Helpers #:nodoc:
     # Provides a set of methods for making links and getting URLs that
-    # depend on the routing subsystem (see ActionController::Routing). 
-    # This allows you to use the same format for links in views 
+    # depend on the routing subsystem (see ActionController::Routing).
+    # This allows you to use the same format for links in views
     # and controllers.
     module UrlHelper
       include JavaScriptHelper
@@ -33,8 +33,8 @@ module ActionView
       #
       # If you instead of a hash pass a record (like an Active Record or Active Resource) as the options parameter,
       # you'll trigger the named route for that record. The lookup will happen on the name of the class. So passing
-      # a Workshop object will attempt to use the workshop_path route. If you have a nested route, such as 
-      # admin_workshop_path you'll have to call that explicitly (it's impossible for url_for to guess that route). 
+      # a Workshop object will attempt to use the workshop_path route. If you have a nested route, such as
+      # admin_workshop_path you'll have to call that explicitly (it's impossible for url_for to guess that route).
       #
       # ==== Examples
       #   <%= url_for(:action => 'index') %>
@@ -62,19 +62,33 @@ module ActionView
       #   <%= url_for(@workshop) %>
       #   # calls @workshop.to_s
       #   # => /workshops/5
+      #
+      #   <%= url_for("http://www.example.com") %>
+      #   # => http://www.example.com
+      #
+      #   <%= url_for(:back) %>
+      #   # if request.env["HTTP_REFERER"] is set to "http://www.example.com"
+      #   # => http://www.example.com
+      #
+      #   <%= url_for(:back) %>
+      #   # if request.env["HTTP_REFERER"] is not set or is blank
+      #   # => javascript:history.back()
       def url_for(options = {})
         options ||= {}
-        case options
+        url = case options
+        when String
+          escape = true
+          options
         when Hash
           options = { :only_path => options[:host].nil? }.update(options.symbolize_keys)
           escape  = options.key?(:escape) ? options.delete(:escape) : true
-          url     = @controller.send(:url_for, options)
-        when String
-          escape = true
-          url    = options
+          @controller.send(:url_for, options)
+        when :back
+          escape = false
+          @controller.request.env["HTTP_REFERER"] || 'javascript:history.back()'
         else
           escape = false
-          url    = polymorphic_path(options)
+          polymorphic_path(options)
         end
 
         escape ? escape_once(url) : url
@@ -88,6 +102,13 @@ module ActionView
       # link will be used in place of a referrer if none exists. If nil is passed as
       # a name, the link itself will become the name.
       #
+      # ==== Signatures
+      #
+      #   link_to(name, options = {}, html_options = nil)
+      #   link_to(options = {}, html_options = nil) do
+      #     # name
+      #   end
+      #
       # ==== Options
       # * <tt>:confirm => 'question?'</tt> - This will add a JavaScript confirm
       #   prompt with the question specified. If the user accepts, the link is
@@ -109,8 +130,8 @@ module ActionView
       #
       # Note that if the user has JavaScript disabled, the request will fall back
       # to using GET. If <tt>:href => '#'</tt> is used and the user has JavaScript disabled
-      # clicking the link will have no effect. If you are relying on the POST 
-      # behavior, your should check for it in your controller's action by using the 
+      # clicking the link will have no effect. If you are relying on the POST
+      # behavior, your should check for it in your controller's action by using the
       # request object's methods for <tt>post?</tt>, <tt>delete?</tt> or <tt>put?</tt>.
       #
       # You can mix and match the +html_options+ with the exception of
@@ -134,8 +155,8 @@ module ActionView
       #
       #   link_to "Profile", :controller => "profiles", :action => "show", :id => @profile
       #   # => <a href="/profiles/show/1">Profile</a>
-      # 
-      # Similarly, 
+      #
+      # Similarly,
       #
       #   link_to "Profiles", profiles_path
       #   # => <a href="/profiles">Profiles</a>
@@ -145,6 +166,13 @@ module ActionView
       #   link_to "Profiles", :controller => "profiles"
       #   # => <a href="/profiles">Profiles</a>
       #
+      # You can use a block as well if your link target is hard to fit into the name parameter. ERb example:
+      #
+      #   <% link_to(@profile) do %>
+      #     <strong><%= @profile.name %></strong> -- <span>Check it out!!</span>
+      #   <% end %>
+      #   # => <a href="/profiles/1"><strong>David</strong> -- <span>Check it out!!</span></a>
+      #
       # Classes and ids for CSS are easy to produce:
       #
       #   link_to "Articles", articles_path, :id => "news", :class => "article"
@@ -171,7 +199,7 @@ module ActionView
       #   link_to "Nonsense search", searches_path(:foo => "bar", :baz => "quux")
       #   # => <a href="/searches?foo=bar&amp;baz=quux">Nonsense search</a>
       #
-      # The three options specfic to +link_to+ (<tt>:confirm</tt>, <tt>:popup</tt>, and <tt>:method</tt>) are used as follows:
+      # The three options specific to +link_to+ (<tt>:confirm</tt>, <tt>:popup</tt>, and <tt>:method</tt>) are used as follows:
       #
       #   link_to "Visit Other Site", "http://www.rubyonrails.org/", :confirm => "Are you sure?"
       #   # => <a href="http://www.rubyonrails.org/" onclick="return confirm('Are you sure?');">Visit Other Site</a>
@@ -183,31 +211,34 @@ module ActionView
       #   # => <a href="/images/9" onclick="window.open(this.href,'new_window_name','height=300,width=600');return false;">View Image</a>
       #
       #   link_to "Delete Image", @image, :confirm => "Are you sure?", :method => :delete
-      #   # => <a href="/images/9" onclick="if (confirm('Are you sure?')) { var f = document.createElement('form'); 
+      #   # => <a href="/images/9" onclick="if (confirm('Are you sure?')) { var f = document.createElement('form');
       #        f.style.display = 'none'; this.parentNode.appendChild(f); f.method = 'POST'; f.action = this.href;
-      #        var m = document.createElement('input'); m.setAttribute('type', 'hidden'); m.setAttribute('name', '_method'); 
+      #        var m = document.createElement('input'); m.setAttribute('type', 'hidden'); m.setAttribute('name', '_method');
       #        m.setAttribute('value', 'delete'); f.appendChild(m);f.submit(); };return false;">Delete Image</a>
-      def link_to(name, options = {}, html_options = nil)
-        url = case options
-          when String
-            options
-          when :back
-            @controller.request.env["HTTP_REFERER"] || 'javascript:history.back()'
+      def link_to(*args, &block)
+        if block_given?
+          options      = args.first || {}
+          html_options = args.second
+          concat(link_to(capture(&block), options, html_options))
+        else
+          name         = args.first
+          options      = args.second || {}
+          html_options = args.third
+
+          url = url_for(options)
+
+          if html_options
+            html_options = html_options.stringify_keys
+            href = html_options['href']
+            convert_options_to_javascript!(html_options, url)
+            tag_options = tag_options(html_options)
           else
-            self.url_for(options)
+            tag_options = nil
           end
 
-        if html_options
-          html_options = html_options.stringify_keys
-          href = html_options['href']
-          convert_options_to_javascript!(html_options, url)
-          tag_options = tag_options(html_options)
-        else
-          tag_options = nil
+          href_attr = "href=\"#{url}\"" unless href
+          "<a #{href_attr}#{tag_options}>#{name || url}</a>"
         end
-        
-        href_attr = "href=\"#{url}\"" unless href
-        "<a #{href_attr}#{tag_options}>#{name || url}</a>"
       end
 
       # Generates a form containing a single button that submits to the URL created
@@ -236,7 +267,7 @@ module ActionView
       # * <tt>:confirm</tt> - This will add a JavaScript confirm
       #   prompt with the question specified. If the user accepts, the link is
       #   processed normally, otherwise no action is taken.
-      # 
+      #
       # ==== Examples
       #   <%= button_to "New", :action => "new" %>
       #   # => "<form method="post" action="/controller/new" class="button-to">
@@ -262,12 +293,12 @@ module ActionView
         end
 
         form_method = method.to_s == 'get' ? 'get' : 'post'
-        
+
         request_token_tag = ''
         if form_method == 'post' && protect_against_forgery?
           request_token_tag = tag(:input, :type => "hidden", :name => request_forgery_protection_token.to_s, :value => form_authenticity_token)
         end
-        
+
         if confirm = html_options.delete("confirm")
           html_options["onclick"] = "return #{confirm_javascript_function(confirm)};"
         end
@@ -285,7 +316,7 @@ module ActionView
       # Creates a link tag of the given +name+ using a URL created by the set of
       # +options+ unless the current request URI is the same as the links, in
       # which case only the name is returned (or the given block is yielded, if
-      # one exists).  You can give link_to_unless_current a block which will 
+      # one exists).  You can give link_to_unless_current a block which will
       # specialize the default behavior (e.g., show a "Start Here" link rather
       # than the link's text).
       #
@@ -312,13 +343,13 @@ module ActionView
       #   </ul>
       #
       # The implicit block given to link_to_unless_current is evaluated if the current
-      # action is the action given.  So, if we had a comments page and wanted to render a 
+      # action is the action given.  So, if we had a comments page and wanted to render a
       # "Go Back" link instead of a link to the comments page, we could do something like this...
-      #   
-      #    <%= 
+      #
+      #    <%=
       #        link_to_unless_current("Comment", { :controller => 'comments', :action => 'new}) do
-      #           link_to("Go back", { :controller => 'posts', :action => 'index' }) 
-      #        end 
+      #           link_to("Go back", { :controller => 'posts', :action => 'index' })
+      #        end
       #     %>
       def link_to_unless_current(name, options = {}, html_options = {}, &block)
         link_to_unless current_page?(options), name, options, html_options, &block
@@ -335,10 +366,10 @@ module ActionView
       #   # If the user is logged in...
       #   # => <a href="/controller/reply/">Reply</a>
       #
-      #   <%= 
+      #   <%=
       #      link_to_unless(@current_user.nil?, "Reply", { :action => "reply" }) do |name|
       #        link_to(name, { :controller => "accounts", :action => "signup" })
-      #      end 
+      #      end
       #   %>
       #   # If the user is logged in...
       #   # => <a href="/controller/reply/">Reply</a>
@@ -367,10 +398,10 @@ module ActionView
       #   # If the user isn't logged in...
       #   # => <a href="/sessions/new/">Login</a>
       #
-      #   <%= 
+      #   <%=
       #      link_to_if(@current_user.nil?, "Login", { :controller => "sessions", :action => "new" }) do
       #        link_to(@current_user.login, { :controller => "accounts", :action => "show", :id => @current_user })
-      #      end 
+      #      end
       #   %>
       #   # If the user isn't logged in...
       #   # => <a href="/sessions/new/">Login</a>
@@ -407,20 +438,20 @@ module ActionView
       # * <tt>:bcc</tt>  - Blind Carbon Copy additional recipients on the email.
       #
       # ==== Examples
-      #   mail_to "me@domain.com" 
+      #   mail_to "me@domain.com"
       #   # => <a href="mailto:me@domain.com">me@domain.com</a>
       #
-      #   mail_to "me@domain.com", "My email", :encode => "javascript"  
-      #   # => <script type="text/javascript">eval(unescape('%64%6f%63...%6d%65%6e'))</script>
+      #   mail_to "me@domain.com", "My email", :encode => "javascript"
+      #   # => <script type="text/javascript">eval(decodeURIComponent('%64%6f%63...%27%29%3b'))</script>
       #
-      #   mail_to "me@domain.com", "My email", :encode => "hex"  
+      #   mail_to "me@domain.com", "My email", :encode => "hex"
       #   # => <a href="mailto:%6d%65@%64%6f%6d%61%69%6e.%63%6f%6d">My email</a>
       #
-      #   mail_to "me@domain.com", nil, :replace_at => "_at_", :replace_dot => "_dot_", :class => "email"  
+      #   mail_to "me@domain.com", nil, :replace_at => "_at_", :replace_dot => "_dot_", :class => "email"
       #   # => <a href="mailto:me@domain.com" class="email">me_at_domain_dot_com</a>
       #
       #   mail_to "me@domain.com", "My email", :cc => "ccaddress@domain.com",
-      #            :subject => "This is an example email"  
+      #            :subject => "This is an example email"
       #   # => <a href="mailto:me@domain.com?cc=ccaddress@domain.com&subject=This%20is%20an%20example%20email">My email</a>
       def mail_to(email_address, name = nil, html_options = {})
         html_options = html_options.stringify_keys
@@ -445,7 +476,7 @@ module ActionView
           "document.write('#{content_tag("a", name || email_address_obfuscated, html_options.merge({ "href" => "mailto:"+email_address+extras }))}');".each_byte do |c|
             string << sprintf("%%%x", c)
           end
-          "<script type=\"#{Mime::JS}\">eval(unescape('#{string}'))</script>"
+          "<script type=\"#{Mime::JS}\">eval(decodeURIComponent('#{string}'))</script>"
         elsif encode == "hex"
           email_address_encoded = ''
           email_address_obfuscated.each_byte do |c|
@@ -468,7 +499,7 @@ module ActionView
       # True if the current request URI was generated by the given +options+.
       #
       # ==== Examples
-      # Let's say we're in the <tt>/shop/checkout</tt> action.
+      # Let's say we're in the <tt>/shop/checkout?order=desc</tt> action.
       #
       #   current_page?(:action => 'process')
       #   # => false
@@ -476,6 +507,9 @@ module ActionView
       #   current_page?(:controller => 'shop', :action => 'checkout')
       #   # => true
       #
+      #   current_page?(:controller => 'shop', :action => 'checkout', :order => 'asc)
+      #   # => false
+      #
       #   current_page?(:action => 'checkout')
       #   # => true
       #
@@ -484,10 +518,18 @@ module ActionView
       def current_page?(options)
         url_string = CGI.escapeHTML(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
+        # work with things like ?order=asc 
+        if url_string.index("?")
+          request_uri = request.request_uri
+        else
+          request_uri = request.request_uri.split('?').first
+        end
         if url_string =~ /^\w+:\/\//
-          url_string == "#{request.protocol}#{request.host_with_port}#{request.request_uri}"
+          url_string == "#{request.protocol}#{request.host_with_port}#{request_uri}"
         else
-          url_string == request.request_uri
+          url_string == request_uri
         end
       end
 
@@ -509,7 +551,7 @@ module ActionView
             when method
               "#{method_javascript_function(method, url, href)}return false;"
             when popup
-              popup_javascript_function(popup) + 'return false;'
+              "#{popup_javascript_function(popup)}return false;"
             else
               html_options["onclick"]
           end

data/lib/action_view/inline_template.rb

@@ -1,20 +1,19 @@
 module ActionView #:nodoc:
-  class InlineTemplate < Template #:nodoc:
-    
-    def initialize(view, source, locals = {}, type = nil)
-      @view = view
-      @finder = @view.finder
-      
+  class InlineTemplate #:nodoc:
+    include Renderable
+
+    attr_reader :source, :extension, :method_segment
+
+    def initialize(source, type = nil)
       @source = source
       @extension = type
-      @locals = locals || {}
-      
-      @handler = self.class.handler_class_for_extension(@extension).new(@view)
+      @method_segment = "inline_#{@source.hash.abs}"
     end
-    
-    def method_key
-      @source
-    end
-    
+
+    private
+      # Always recompile inline templates
+      def recompile?(local_assigns)
+        true
+      end
   end
 end

data/lib/action_view/locale/en.yml

@@ -0,0 +1,91 @@
+"en":
+  number:
+    # Used in number_with_delimiter()
+    # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
+    format:
+      # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
+      separator: "."
+      # Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three)
+      delimiter: ","
+      # Number of decimals, behind the separator (the number 1 with a precision of 2 gives: 1.00)
+      precision: 3
+      
+    # Used in number_to_currency()
+    currency:
+      format:
+        # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
+        format: "%u%n"
+        unit: "$"
+        # These three are to override number.format and are optional
+        separator: "."
+        delimiter: ","
+        precision: 2
+        
+    # Used in number_to_percentage()
+    percentage:
+      format:
+        # These three are to override number.format and are optional
+        # separator: 
+        delimiter: ""
+        # precision: 
+        
+    # Used in number_to_precision()
+    precision:
+      format:
+        # These three are to override number.format and are optional
+        # separator:
+        delimiter: ""
+        # precision:
+        
+    # Used in number_to_human_size()
+    human:
+      format:
+        # These three are to override number.format and are optional
+        # separator: 
+        delimiter: ""
+        precision: 1
+
+  # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
+  datetime:
+    distance_in_words:
+      half_a_minute: "half a minute"
+      less_than_x_seconds:
+        one:   "less than 1 second"
+        other: "less than {{count}} seconds"
+      x_seconds:
+        one:   "1 second"
+        other: "{{count}} seconds"
+      less_than_x_minutes:
+        one:   "less than a minute"
+        other: "less than {{count}} minutes"
+      x_minutes:
+        one:   "1 minute"
+        other: "{{count}} minutes"
+      about_x_hours:
+        one:   "about 1 hour"
+        other: "about {{count}} hours"
+      x_days:
+        one:   "1 day"
+        other: "{{count}} days"
+      about_x_months:
+        one:   "about 1 month"
+        other: "about {{count}} months"
+      x_months:
+        one:   "1 month"
+        other: "{{count}} months"
+      about_x_years:
+        one:   "about 1 year"
+        other: "about {{count}} years"
+      over_x_years:
+        one:   "over 1 year"
+        other: "over {{count}} years"
+
+  activerecord:
+    errors:
+      template:
+        header:
+          one:    "1 error prohibited this {{model}} from being saved"
+          other:  "{{count}} errors prohibited this {{model}} from being saved"
+        # The variable :count is also available
+        body: "There were problems with the following fields:"
+