actionpack 4.0.0.beta1 → 4.0.0.rc1

data/lib/action_view/helpers/tags/datetime_select.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class DatetimeSelect < DateSelect #:nodoc:
+    module Tags # :nodoc:
+      class DatetimeSelect < DateSelect # :nodoc:
       end
     end
   end

data/lib/action_view/helpers/tags/email_field.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class EmailField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class EmailField < TextField # :nodoc:
       end
     end
   end

data/lib/action_view/helpers/tags/file_field.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class FileField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class FileField < TextField # :nodoc:
       end
     end
   end

data/lib/action_view/helpers/tags/grouped_collection_select.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class GroupedCollectionSelect < Base #:nodoc:
+    module Tags # :nodoc:
+      class GroupedCollectionSelect < Base # :nodoc:
         def initialize(object_name, method_name, template_object, collection, group_method, group_label_method, option_key_method, option_value_method, options, html_options)
           @collection          = collection
           @group_method        = group_method

data/lib/action_view/helpers/tags/hidden_field.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class HiddenField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class HiddenField < TextField # :nodoc:
       end
     end
   end

data/lib/action_view/helpers/tags/label.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class Label < Base #:nodoc:
+    module Tags # :nodoc:
+      class Label < Base # :nodoc:
         def initialize(object_name, method_name, template_object, content_or_options = nil, options = nil)
           options ||= {}
 

data/lib/action_view/helpers/tags/month_field.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class MonthField < DatetimeField #:nodoc:
+    module Tags # :nodoc:
+      class MonthField < DatetimeField # :nodoc:
         private
 
           def format_date(value)

data/lib/action_view/helpers/tags/number_field.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class NumberField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class NumberField < TextField # :nodoc:
         def render
           options = @options.stringify_keys
 

data/lib/action_view/helpers/tags/password_field.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class PasswordField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class PasswordField < TextField # :nodoc:
         def render
           @options = {:value => nil}.merge!(@options)
           super

data/lib/action_view/helpers/tags/radio_button.rb

@@ -2,8 +2,8 @@ require 'action_view/helpers/tags/checkable'
 
 module ActionView
   module Helpers
-    module Tags
-      class RadioButton < Base #:nodoc:
+    module Tags # :nodoc:
+      class RadioButton < Base # :nodoc:
         include Checkable
 
         def initialize(object_name, method_name, template_object, tag_value, options)

data/lib/action_view/helpers/tags/range_field.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class RangeField < NumberField #:nodoc:
+    module Tags # :nodoc:
+      class RangeField < NumberField # :nodoc:
       end
     end
   end

data/lib/action_view/helpers/tags/search_field.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class SearchField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class SearchField < TextField # :nodoc:
         def render
           options = @options.stringify_keys
 

data/lib/action_view/helpers/tags/select.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class Select < Base #:nodoc:
+    module Tags # :nodoc:
+      class Select < Base # :nodoc:
         def initialize(object_name, method_name, template_object, choices, options, html_options)
           @choices = choices
           @choices = @choices.to_a if @choices.is_a?(Range)
@@ -31,7 +31,6 @@ module ActionView
         #
         #   [nil, []]
         #   { nil => [] }
-        #
         def grouped_choices?
           !@choices.empty? && @choices.first.respond_to?(:last) && Array === @choices.first.last
         end

data/lib/action_view/helpers/tags/tel_field.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class TelField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class TelField < TextField # :nodoc:
       end
     end
   end

data/lib/action_view/helpers/tags/text_area.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class TextArea < Base #:nodoc:
+    module Tags # :nodoc:
+      class TextArea < Base # :nodoc:
         def render
           options = @options.stringify_keys
           add_default_name_and_id(options)

data/lib/action_view/helpers/tags/text_field.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class TextField < Base #:nodoc:
+    module Tags # :nodoc:
+      class TextField < Base # :nodoc:
         def render
           options = @options.stringify_keys
           options["size"] = options["maxlength"] unless options.key?("size")

data/lib/action_view/helpers/tags/time_field.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class TimeField < DatetimeField #:nodoc:
+    module Tags # :nodoc:
+      class TimeField < DatetimeField # :nodoc:
         private
 
           def format_date(value)

data/lib/action_view/helpers/tags/time_select.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class TimeSelect < DateSelect #:nodoc:
+    module Tags # :nodoc:
+      class TimeSelect < DateSelect # :nodoc:
       end
     end
   end

data/lib/action_view/helpers/tags/time_zone_select.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class TimeZoneSelect < Base #:nodoc:
+    module Tags # :nodoc:
+      class TimeZoneSelect < Base # :nodoc:
         def initialize(object_name, method_name, template_object, priority_zones, options, html_options)
           @priority_zones = priority_zones
           @html_options   = html_options

data/lib/action_view/helpers/tags/url_field.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class UrlField < TextField #:nodoc:
+    module Tags # :nodoc:
+      class UrlField < TextField # :nodoc:
       end
     end
   end

data/lib/action_view/helpers/tags/week_field.rb

@@ -1,7 +1,7 @@
 module ActionView
   module Helpers
-    module Tags
-      class WeekField < DatetimeField #:nodoc:
+    module Tags # :nodoc:
+      class WeekField < DatetimeField # :nodoc:
         private
 
           def format_date(value)

data/lib/action_view/helpers/text_helper.rb

@@ -126,8 +126,8 @@ module ActionView
       # Extracts an excerpt from +text+ that matches the first instance of +phrase+.
       # The <tt>:radius</tt> option expands the excerpt on each side of the first occurrence of +phrase+ by the number of characters
       # defined in <tt>:radius</tt> (which defaults to 100). If the excerpt radius overflows the beginning or end of the +text+,
-      # then the <tt>:omission</tt> option (which defaults to "...") will be prepended/appended accordingly. The
-      # <tt>:separator</tt> enable to choose the delimation. The resulting string will be stripped in any case. If the +phrase+
+      # then the <tt>:omission</tt> option (which defaults to "...") will be prepended/appended accordingly. Use the
+      # <tt>:separator</tt> option to choose the delimitation. The resulting string will be stripped in any case. If the +phrase+
       # isn't found, nil is returned.
       #
       #   excerpt('This is an example', 'an', radius: 5)
@@ -145,7 +145,7 @@ module ActionView
       #   excerpt('This is also an example', 'an', radius: 8, omission: '<chop> ')
       #   # => <chop> is also an example
       #
-      #   excerpt('This is a very beautiful morning', 'very', separator:  ' ', radius: 1)
+      #   excerpt('This is a very beautiful morning', 'very', separator: ' ', radius: 1)
       #   # => ...a very beautiful...
       def excerpt(text, phrase, options = {})
         return unless text && phrase
@@ -250,8 +250,11 @@ module ActionView
       #   simple_format("Look ma! A class!", class: 'description')
       #   # => "<p class='description'>Look ma! A class!</p>"
       #
-      #   simple_format("<span>I'm allowed!</span> It's true.", {}, sanitize: false)
-      #   # => "<p><span>I'm allowed!</span> It's true.</p>"
+      #   simple_format("<blink>Unblinkable.</blink>")
+      #   # => "<p>Unblinkable.</p>"
+      #
+      #   simple_format("<blink>Blinkable!</blink> It's true.", {}, sanitize: false)
+      #   # => "<p><blink>Blinkable!</span> It's true.</p>"
       def simple_format(text, html_options = {}, options = {})
         wrapper_tag = options.fetch(:wrapper_tag, :p)
 

data/lib/action_view/helpers/url_helper.rb

@@ -425,8 +425,8 @@ module ActionView
       # * <tt>:bcc</tt> - Blind Carbon Copy additional recipients on the email.
       #
       # ==== Obfuscation
-      # Prior to Rails 4.0, +mail_to+ provided options for encoding the address 
-      # in order to hinder email harvesters.  To take advantage of these options, 
+      # Prior to Rails 4.0, +mail_to+ provided options for encoding the address
+      # in order to hinder email harvesters.  To take advantage of these options,
       # install the +actionview-encoded_mail_to+ gem.
       #
       # ==== Examples
@@ -439,18 +439,30 @@ module ActionView
       #   mail_to "me@domain.com", "My email", cc: "ccaddress@domain.com",
       #            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 = {})
+      #
+      # You can use a block as well if your link target is hard to fit into the name parameter. ERB example:
+      #
+      #   <%= mail_to "me@domain.com" do %>
+      #     <strong>Email me:</strong> <span>me@domain.com</span>
+      #   <% end %>
+      #   # => <a href="mailto:me@domain.com">
+      #          <strong>Email me:</strong> <span>me@domain.com</span>
+      #        </a>
+      def mail_to(email_address, name = nil, html_options = {}, &block)
         email_address = ERB::Util.html_escape(email_address)
 
-        html_options.stringify_keys!
+        html_options, name = name, nil if block_given?
+        html_options = (html_options || {}).stringify_keys
 
         extras = %w{ cc bcc body subject }.map { |item|
           option = html_options.delete(item) || next
           "#{item}=#{Rack::Utils.escape_path(option)}"
         }.compact
         extras = extras.empty? ? '' : '?' + ERB::Util.html_escape(extras.join('&'))
-        
-        content_tag "a", name || email_address.html_safe, html_options.merge("href" => "mailto:#{email_address}#{extras}".html_safe)
+
+        html_options["href"] = "mailto:#{email_address}#{extras}".html_safe
+
+        content_tag(:a, name || email_address.html_safe, html_options, &block)
       end
 
       # True if the current request URI was generated by the given +options+.

data/lib/action_view/lookup_context.rb

@@ -43,7 +43,13 @@ module ActionView
     module Accessors #:nodoc:
     end
 
-    register_detail(:locale)  { [I18n.locale, I18n.default_locale].uniq }
+    register_detail(:locale) do
+      locales = [I18n.locale]
+      locales.concat(I18n.fallbacks[I18n.locale]) if I18n.respond_to? :fallbacks
+      locales << I18n.default_locale
+      locales.uniq!
+      locales
+    end
     register_detail(:formats) { ActionView::Base.default_formats || [:html, :text, :js, :css,  :xml, :json] }
     register_detail(:handlers){ Template::Handlers.extensions }
 

data/lib/action_view/path_set.rb

@@ -1,5 +1,11 @@
 module ActionView #:nodoc:
   # = Action View PathSet
+  #
+  # This class is used to store and access paths in Action View. A number of
+  # operations are defined so that you can search among the paths in this
+  # set and also perform operations on other +PathSet+ objects.
+  #
+  # A +LookupContext+ will use a +PathSet+ to store the paths in its context.
   class PathSet #:nodoc:
     include Enumerable
 

data/lib/action_view/renderer/abstract_renderer.rb

@@ -1,4 +1,19 @@
 module ActionView
+  # This class defines the interface for a renderer. Each class that
+  # subclasses +AbstractRenderer+ is used by the base +Renderer+ class to
+  # render a specific type of object.
+  #
+  # The base +Renderer+ class uses its +render+ method to delegate to the
+  # renderers. These currently consist of
+  #
+  #   PartialRenderer - Used for rendering partials
+  #   TemplateRenderer - Used for rendering other types of templates
+  #   StreamingTemplateRenderer - Used for streaming
+  #
+  # Whenever the +render+ method is called on the base +Renderer+ class, a new
+  # renderer object of the correct type is created, and the +render+ method on
+  # that new object is called in turn. This abstracts the setup and rendering
+  # into a separate classes for partials and templates.
   class AbstractRenderer #:nodoc:
     delegate :find_template, :template_exists?, :with_fallbacks, :with_layout_format, :formats, :to => :@lookup_context
 

data/lib/action_view/renderer/partial_renderer.rb

@@ -313,6 +313,13 @@ module ActionView
 
     private
 
+    # Sets up instance variables needed for rendering a partial. This method
+    # finds the options and details and extracts them. The method also contains
+    # logic that handles the type of object passed in as the partial.
+    #
+    # If +options[:partial]+ is a string, then the +@path+ instance variable is
+    # set to that string. Otherwise, the +options[:partial]+ object must
+    # respond to +to_partial_path+ in order to setup the path.
     def setup(context, options, block)
       @view   = context
       partial = options[:partial]
@@ -413,6 +420,13 @@ module ActionView
       end
     end
 
+    # Obtains the path to where the object's partial is located. If the object
+    # responds to +to_partial_path+, then +to_partial_path+ will be called and
+    # will provide the path. If the object does not respond to +to_partial_path+,
+    # then an +ArgumentError+ is raised.
+    #
+    # If +prefix_partial_path_with_controller_namespace+ is true, then this
+    # method will prefix the partial paths with a namespace.
     def partial_path(object = @object)
       object = object.to_model if object.respond_to?(:to_model)
 

data/lib/action_view/renderer/renderer.rb

@@ -2,6 +2,12 @@ module ActionView
   # This is the main entry point for rendering. It basically delegates
   # to other objects like TemplateRenderer and PartialRenderer which
   # actually renders the template.
+  #
+  # The Renderer will parse the options from the +render+ or +render_body+
+  # method and render a partial or a template based on the options. The
+  # +TemplateRenderer+ and +PartialRenderer+ objects are wrappers which do all
+  # the setup and logic necessary to render a view and a new object is created
+  # each time +render+ is called.
   class Renderer
     attr_accessor :lookup_context
 

data/lib/action_view/template.rb

@@ -138,7 +138,7 @@ module ActionView
     # we use a bang in this instrumentation because you don't want to
     # consume this in production. This is only slow if it's being listened to.
     def render(view, locals, buffer=nil, &block)
-      ActiveSupport::Notifications.instrument("!render_template.action_view", :virtual_path => @virtual_path) do
+      ActiveSupport::Notifications.instrument("!render_template.action_view", virtual_path: @virtual_path, identifier: @identifier) do
         compile!(view)
         view.send(method_name, locals, buffer, &block)
       end
@@ -324,7 +324,8 @@ module ActionView
       end
 
       def locals_code #:nodoc:
-        @locals.map { |key| "#{key} = local_assigns[:#{key}];" }.join
+        # Double assign to suppress the dreaded 'assigned but unused variable' warning
+        @locals.map { |key| "#{key} = #{key} = local_assigns[:#{key}];" }.join
       end
 
       def method_name #:nodoc:

data/lib/action_view/template/handlers/erb.rb

@@ -6,12 +6,23 @@ module ActionView
     module Handlers
       class Erubis < ::Erubis::Eruby
         def add_preamble(src)
+          @newline_pending = 0
           src << "@output_buffer = output_buffer || ActionView::OutputBuffer.new;"
         end
 
         def add_text(src, text)
           return if text.empty?
-          src << "@output_buffer.safe_concat('" << escape_text(text) << "');"
+
+          if text == "\n"
+            @newline_pending += 1
+          else
+            src << "@output_buffer.safe_append='"
+            src << "\n" * @newline_pending if @newline_pending > 0
+            src << escape_text(text)
+            src << "';"
+
+            @newline_pending = 0
+          end
         end
 
         # Erubis toggles <%= and <%== behavior when escaping is enabled.
@@ -28,24 +39,39 @@ module ActionView
         BLOCK_EXPR = /\s+(do|\{)(\s*\|[^|]*\|)?\s*\Z/
 
         def add_expr_literal(src, code)
+          flush_newline_if_pending(src)
           if code =~ BLOCK_EXPR
             src << '@output_buffer.append= ' << code
           else
-            src << '@output_buffer.append= (' << code << ');'
+            src << '@output_buffer.append=(' << code << ');'
           end
         end
 
         def add_expr_escaped(src, code)
+          flush_newline_if_pending(src)
           if code =~ BLOCK_EXPR
             src << "@output_buffer.safe_append= " << code
           else
-            src << "@output_buffer.safe_concat((" << code << ").to_s);"
+            src << "@output_buffer.safe_append=(" << code << ");"
           end
         end
 
+        def add_stmt(src, code)
+          flush_newline_if_pending(src)
+          super
+        end
+
         def add_postamble(src)
+          flush_newline_if_pending(src)
           src << '@output_buffer.to_s'
         end
+
+        def flush_newline_if_pending(src)
+          if @newline_pending > 0
+            src << "@output_buffer.safe_append='#{"\n" * @newline_pending}';"
+            @newline_pending = 0
+          end
+        end
       end
 
       class ERB