actionview 4.1.0.beta2 → 4.1.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9b23cbe6e5836943ca74bf7087aca78ff64e3c9
-  data.tar.gz: e97748e630afc36a648c8160bfff20b8cba563c4
+  metadata.gz: 07c7cfb02baa85d1be095df9bdf486932bae786d
+  data.tar.gz: 43b83b9ee0eb0a2ac07f0a654c6e622bbe71861a
 SHA512:
-  metadata.gz: 9394df9f9b71741dfa33bb7229abbe56c4915eb7a69905c7171c09c059f9ab826c580113f6ecac9e881c06c034e4da1174d6ab4c64567e2e958e771c00125817
-  data.tar.gz: 46f8811a41621bdfbc7af6e9ec5fb79ada9ffcf1f8d96ce673c2945634fb020da611a29a73babe2ac7ef96c6853e52c4e2c31629646442ad8bd1b75617e43e98
+  metadata.gz: bf072d8647e35ca744a19267a9478ed110fa637c1eded7faea8159b6376de476ad9621b857667a7469d152c69994f751b73bdd5541480e09c8d48da4162760d7
+  data.tar.gz: b7e058105db2d0ab080608f1922b3d02ed686fa632e7f5dc8df495250e7896286d3562801dec4f93a3602f6189fcc0d0e6453f7acebdfe38b5f4441e37b47172

data/CHANGELOG.md

@@ -1,3 +1,50 @@
+*   Added `:plain`, `:html` and `:body` option for `render` method. Please see
+    Action Pack's release note for more detail.
+
+    *Prem Sichanugrist*
+
+*   Date select helpers accept a format string for the months selector via the
+    new option `:month_format_string`.
+
+    When rendered, the format string gets passed keys `:number` (integer), and
+    `:name` (string), in order to be able to interpolate them as in
+
+        '%{name} (%<number>02d)'
+
+    for example.
+
+    This option is motivated by #13618.
+
+    *Xavier Noria*
+
+*   Added `config.action_view.raise_on_missing_translations` to define whether an
+    error should be raised for missing translations.
+
+    Fixes #13196.
+
+    *Kassio Borges*
+
+*   Improved ERB dependency detection. New argument types and formattings for the `render`
+    calls can be matched.
+
+    Fixes #13074, #13116.
+
+    *João Britto*
+
+*   Use `display:none` instead of `display:inline` for hidden fields.
+
+    Fixes #6403.
+
+    *Gaelian Ditchburn*
+
+*   The `video_tag` helper accepts a number as `:size`.
+
+    The `:size` option of the `video_tag` helper now can be specified
+    with a stringified number. The `width` and `height` attributes of
+    the generated tag will be the same.
+
+    *Kuldeep Aggarwal*
+
 *   Escape format, negative_format and units options of number helpers
 
     Fixes: CVE-2014-0081
@@ -58,11 +105,11 @@
 
     *Yves Senn*
 
-*   Use `set_backtrace` instead of instance variable `@backtrace` in ActionView exceptions
+*   Use `set_backtrace` instead of instance variable `@backtrace` in ActionView exceptions.
 
     *Shimpei Makimoto*
 
-*   Fix `simple_format` escapes own output when passing `sanitize: true`
+*   Fix `simple_format` escapes own output when passing `sanitize: true`.
 
     *Paul Seidemann*
 
@@ -80,7 +127,9 @@
 
     *Bogdan Gusiev*
 
-*   Ability to pass block to `select` helper
+*   Ability to pass a block to the `select` helper.
+
+    Example:
 
         <%= select(report, "campaign_ids") do %>
           <% available_campaigns.each do |c| -%>
@@ -160,7 +209,7 @@
 *   Fix default rendered format problem when calling `render` without :content_type option.
     It should return :html. Fix #11393.
 
-    *Gleb Mazovetskiy* *Oleg* *kennyj*
+    *Gleb Mazovetskiy*, *Oleg*, *kennyj*
 
 *   Fix `link_to` with block and url hashes.
 

data/MIT-LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2004-2013 David Heinemeier Hansson
+Copyright (c) 2004-2014 David Heinemeier Hansson
 
 Permission is hereby granted, free of charge, to any person obtaining
 a copy of this software and associated documentation files (the

data/lib/action_view.rb

@@ -1,5 +1,5 @@
 #--
-# Copyright (c) 2004-2013 David Heinemeier Hansson
+# Copyright (c) 2004-2014 David Heinemeier Hansson
 #
 # Permission is hereby granted, free of charge, to any person obtaining
 # a copy of this software and associated documentation files (the
@@ -23,10 +23,13 @@
 
 require 'active_support'
 require 'active_support/rails'
+require 'action_view/version'
 
 module ActionView
   extend ActiveSupport::Autoload
 
+  ENCODING_FLAG = '#.*coding[:=]\s*(\S+)[ \t]*'
+
   eager_autoload do
     autoload :Base
     autoload :Context
@@ -53,7 +56,6 @@ module ActionView
     autoload_at "action_view/template/resolver" do
       autoload :Resolver
       autoload :PathResolver
-      autoload :FileSystemResolver
       autoload :OptimizedFileSystemResolver
       autoload :FallbackFileSystemResolver
     end
@@ -80,8 +82,6 @@ module ActionView
 
   autoload :TestCase
 
-  ENCODING_FLAG = '#.*coding[:=]\s*(\S+)[ \t]*'
-
   def self.eager_load!
     super
     ActionView::Helpers.eager_load!

data/lib/action_view/base.rb

@@ -153,6 +153,10 @@ module ActionView #:nodoc:
     # Specify default_formats that can be rendered.
     cattr_accessor :default_formats
 
+    # Specify whether an error should be raised for missing translations
+    cattr_accessor :raise_on_missing_translations
+    @@raise_on_missing_translations = false
+
     class_attribute :_routes
     class_attribute :logger
 

data/lib/action_view/dependency_tracker.rb

@@ -1,7 +1,7 @@
 require 'thread_safe'
 
 module ActionView
-  class DependencyTracker
+  class DependencyTracker # :nodoc:
     @trackers = ThreadSafe::Cache.new
 
     def self.find_dependencies(name, template)
@@ -23,24 +23,52 @@ module ActionView
       @trackers.delete(handler)
     end
 
-    class ERBTracker
+    class ERBTracker # :nodoc:
       EXPLICIT_DEPENDENCY = /# Template Dependency: (\S+)/
 
+      # A valid ruby identifier - suitable for class, method and specially variable names
+      IDENTIFIER = /
+        [[:alpha:]_] # at least one uppercase letter, lowercase letter or underscore
+        [[:word:]]*  # followed by optional letters, numbers or underscores
+      /x
+
+      # Any kind of variable name. e.g. @instance, @@class, $global or local.
+      # Possibly following a method call chain
+      VARIABLE_OR_METHOD_CHAIN = /
+        (?:\$|@{1,2})?            # optional global, instance or class variable indicator
+        (?:#{IDENTIFIER}\.)*      # followed by an optional chain of zero-argument method calls
+        (?<dynamic>#{IDENTIFIER}) # and a final valid identifier, captured as DYNAMIC
+      /x
+
+      # A simple string literal. e.g. "School's out!"
+      STRING = /
+        (?<quote>['"]) # an opening quote
+        (?<static>.*?) # with anything inside, captured as STATIC
+        \k<quote>      # and a matching closing quote
+      /x
+
+      # Part of any hash containing the :partial key
+      PARTIAL_HASH_KEY = /
+        (?:\bpartial:|:partial\s*=>) # partial key in either old or new style hash syntax
+        \s*                          # followed by optional spaces
+      /x
+
       # Matches:
-      #   render partial: "comments/comment", collection: commentable.comments
-      #   render "comments/comments"
-      #   render 'comments/comments'
-      #   render('comments/comments')
+      #   partial: "comments/comment", collection: @all_comments => "comments/comment"
+      #   (object: @single_comment, partial: "comments/comment") => "comments/comment"
       #
-      #   render(@topic)         => render("topics/topic")
-      #   render(topics)         => render("topics/topic")
-      #   render(message.topics) => render("topics/topic")
-      RENDER_DEPENDENCY = /
-        render\s*                     # render, followed by optional whitespace
-        \(?                           # start an optional parenthesis for the render call
-        (partial:|:partial\s+=>)?\s*  # naming the partial, used with collection -- 1st capture
-        ([@a-z"'][@\w\/\."']+)        # the template name itself -- 2nd capture
-      /x
+      #   "comments/comments"
+      #   'comments/comments'
+      #   ('comments/comments')
+      #
+      #   (@topic)         => "topics/topic"
+      #    topics          => "topics/topic"
+      #   (message.topics) => "topics/topic"
+      RENDER_ARGUMENTS = /\A
+        (?:\s*\(?\s*)                             # optional opening paren surrounded by spaces
+        (?:.*?#{PARTIAL_HASH_KEY})?               # optional hash, up to the partial key declaration
+        (?:#{STRING}|#{VARIABLE_OR_METHOD_CHAIN}) # finally, the dependency name of interest
+      /xm
 
       def self.call(name, template)
         new(name, template).dependencies
@@ -68,19 +96,33 @@ module ActionView
         end
 
         def render_dependencies
-          source.scan(RENDER_DEPENDENCY).
-            collect(&:second).uniq.
+          render_dependencies = []
+          render_calls = source.split(/\brender\b/).drop(1)
 
-            # render(@topic)         => render("topics/topic")
-            # render(topics)         => render("topics/topic")
-            # render(message.topics) => render("topics/topic")
-            collect { |name| name.sub(/\A@?([a-z_]+\.)*([a-z_]+)\z/) { "#{$2.pluralize}/#{$2.singularize}" } }.
+          render_calls.each do |arguments|
+            arguments.scan(RENDER_ARGUMENTS) do
+              add_dynamic_dependency(render_dependencies, Regexp.last_match[:dynamic])
+              add_static_dependency(render_dependencies, Regexp.last_match[:static])
+            end
+          end
 
-            # render("headline") => render("message/headline")
-            collect { |name| name.include?("/") ? name : "#{directory}/#{name}" }.
+          render_dependencies.uniq
+        end
+
+        def add_dynamic_dependency(dependencies, dependency)
+          if dependency
+            dependencies << "#{dependency.pluralize}/#{dependency.singularize}"
+          end
+        end
 
-            # replace quotes from string renders
-            collect { |name| name.gsub(/["']/, "") }
+        def add_static_dependency(dependencies, dependency)
+          if dependency
+            if dependency.include?('/')
+              dependencies << dependency
+            else
+              dependencies << "#{directory}/#{dependency}"
+            end
+          end
         end
 
         def explicit_dependencies

data/lib/action_view/helpers/asset_tag_helper.rb

@@ -176,7 +176,7 @@ module ActionView
       # ==== Options
       #
       # You can add HTML attributes using the +options+. The +options+ supports
-      # three additional keys for convenience and conformance:
+      # two additional keys for convenience and conformance:
       #
       # * <tt>:alt</tt>  - If no alt text is given, the file name part of the
       #   +source+ is used (capitalized and without the extension)
@@ -207,14 +207,7 @@ module ActionView
           options[:alt] = options.fetch(:alt){ image_alt(src) }
         end
 
-        if size = options.delete(:size)
-          if size =~ %r{\A\d+x\d+\z}
-            options[:width], options[:height] = size.split('x')
-          elsif size =~ %r{\A\d+\z}
-            options[:width] = options[:height] = size
-          end
-        end
-
+        options[:width], options[:height] = extract_dimensions(options.delete(:size)) if options[:size]
         tag("img", options)
       end
 
@@ -251,9 +244,9 @@ module ActionView
       #
       # * <tt>:poster</tt> - Set an image (like a screenshot) to be shown
       #   before the video loads. The path is calculated like the +src+ of +image_tag+.
-      # * <tt>:size</tt> - Supplied as "{Width}x{Height}", so "30x45" becomes
-      #   width="30" and height="45". <tt>:size</tt> will be ignored if the
-      #   value is not in the correct format.
+      # * <tt>:size</tt> - Supplied as "{Width}x{Height}" or "{Number}", so "30x45" becomes
+      #   width="30" and height="45", and "50" becomes width="50" and height="50".
+      #   <tt>:size</tt> will be ignored if the value is not in the correct format.
       #
       # ==== Examples
       #
@@ -267,6 +260,8 @@ module ActionView
       #   # => <video src="/videos/trailer.m4v" width="16" height="10" poster="/assets/screenshot.png" />
       #   video_tag("/trailers/hd.avi", size: "16x16")
       #   # => <video src="/trailers/hd.avi" width="16" height="16" />
+      #   video_tag("/trailers/hd.avi", size: "16")
+      #   # => <video height="16" src="/trailers/hd.avi" width="16" />
       #   video_tag("/trailers/hd.avi", height: '32', width: '32')
       #   # => <video height="32" src="/trailers/hd.avi" width="32" />
       #   video_tag("trailer.ogg", "trailer.flv")
@@ -278,10 +273,7 @@ module ActionView
       def video_tag(*sources)
         multiple_sources_tag('video', sources) do |options|
           options[:poster] = path_to_image(options[:poster]) if options[:poster]
-
-          if size = options.delete(:size)
-            options[:width], options[:height] = size.split("x") if size =~ %r{^\d+x\d+$}
-          end
+          options[:width], options[:height] = extract_dimensions(options.delete(:size)) if options[:size]
         end
       end
 
@@ -317,6 +309,14 @@ module ActionView
             content_tag(type, nil, options)
           end
         end
+
+        def extract_dimensions(size)
+          if size =~ %r{\A\d+x\d+\z}
+            size.split('x')
+          elsif size =~ %r{\A\d+\z}
+            [size, size]
+          end
+        end
     end
   end
 end

data/lib/action_view/helpers/csrf_helper.rb

@@ -12,8 +12,11 @@ module ActionView
       # These are used to generate the dynamic forms that implement non-remote links with
       # <tt>:method</tt>.
       #
-      # Note that regular forms generate hidden fields, and that Ajax calls are whitelisted,
-      # so they do not use these tags.
+      # You don't need to use these tags for regular forms as they generate their own hidden fields.
+      #
+      # For AJAX requests other than GETs, extract the "csrf-token" from the meta-tag and send as the 
+      # "X-CSRF-Token" HTTP header. If you are using jQuery with jquery-rails this happens automatically.
+      #
       def csrf_meta_tags
         if protect_against_forgery?
           [

data/lib/action_view/helpers/date_helper.rb

@@ -169,9 +169,16 @@ module ActionView
       #   "2 - February" instead of "February").
       # * <tt>:use_month_names</tt>   - Set to an array with 12 month names if you want to customize month names.
       #   Note: You can also use Rails' i18n functionality for this.
+      # * <tt>:month_format_string</tt> - Set to a format string. The string gets passed keys +:number+ (integer)
+      #   and +:name+ (string). A format string would be something like "%{name} (%<number>02d)" for example.
+      #   See <tt>Kernel.sprintf</tt> for documentation on format sequences.
       # * <tt>:date_separator</tt>    - Specifies a string to separate the date fields. Default is "" (i.e. nothing).
-      # * <tt>:start_year</tt>        - Set the start year for the year select. Default is <tt>Time.now.year - 5</tt>.
-      # * <tt>:end_year</tt>          - Set the end year for the year select. Default is <tt>Time.now.year + 5</tt>.
+      # * <tt>:start_year</tt>        - Set the start year for the year select. Default is <tt>Date.today.year - 5</tt>if
+      #   you are creating new record. While editing existing record, <tt>:start_year</tt> defaults to
+      #   the current selected year minus 5.
+      # * <tt>:end_year</tt>          - Set the end year for the year select. Default is <tt>Date.today.year + 5</tt> if
+      #   you are creating new record. While editing existing record, <tt>:end_year</tt> defaults to
+      #   the current selected year plus 5.
       # * <tt>:discard_day</tt>       - Set to true if you don't want to show a day select. This includes the day
       #   as a hidden field instead of showing a select field. Also note that this implicitly sets the day to be the
       #   first of the given month in order to not create invalid dates like 31 February.
@@ -846,24 +853,36 @@ module ActionView
           I18n.translate(key, :locale => @options[:locale])
         end
 
-        # Lookup month name for number.
-        #  month_name(1) => "January"
+        # Looks up month names by number (1-based):
         #
-        # If <tt>:use_month_numbers</tt> option is passed
-        #  month_name(1) => 1
+        #   month_name(1) # => "January"
         #
-        # If <tt>:use_two_month_numbers</tt> option is passed
-        #  month_name(1) => '01'
+        # If the <tt>:use_month_numbers</tt> option is passed:
         #
-        # If <tt>:add_month_numbers</tt> option is passed
-        #  month_name(1) => "1 - January"
+        #   month_name(1) # => 1
+        #
+        # If the <tt>:use_two_month_numbers</tt> option is passed:
+        #
+        #   month_name(1) # => '01'
+        #
+        # If the <tt>:add_month_numbers</tt> option is passed:
+        #
+        #   month_name(1) # => "1 - January"
+        #
+        # If the <tt>:month_format_string</tt> option is passed:
+        #
+        #   month_name(1) # => "January (01)"
+        #
+        # depending on the format string.
         def month_name(number)
           if @options[:use_month_numbers]
             number
           elsif @options[:use_two_digit_numbers]
-            sprintf "%02d", number
+            '%02d' % number
           elsif @options[:add_month_numbers]
             "#{number} - #{month_names[number]}"
+          elsif format_string = @options[:month_format_string]
+            format_string % {number: number, name: month_names[number]}
           else
             month_names[number]
           end
@@ -1062,7 +1081,7 @@ module ActionView
       # Wraps ActionView::Helpers::DateHelper#datetime_select for form builders:
       #
       #   <%= form_for @person do |f| %>
-      #     <%= f.time_select :last_request_at %>
+      #     <%= f.datetime_select :last_request_at %>
       #     <%= f.submit %>
       #   <% end %>
       #

data/lib/action_view/helpers/form_helper.rb

@@ -51,7 +51,7 @@ module ActionView
     # The HTML generated for this would be (modulus formatting):
     #
     #   <form action="/people" class="new_person" id="new_person" method="post">
-    #     <div style="margin:0;padding:0;display:inline">
+    #     <div style="display:none">
     #       <input name="authenticity_token" type="hidden" value="NrOp5bsjoLRuK8IW5+dQEYjKGUJDe7TQoZVvq95Wteg=" />
     #     </div>
     #     <label for="person_first_name">First name</label>:
@@ -81,7 +81,7 @@ module ActionView
     # the code above as is would yield instead:
     #
     #   <form action="/people/256" class="edit_person" id="edit_person_256" method="post">
-    #     <div style="margin:0;padding:0;display:inline">
+    #     <div style="display:none">
     #       <input name="_method" type="hidden" value="patch" />
     #       <input name="authenticity_token" type="hidden" value="NrOp5bsjoLRuK8IW5+dQEYjKGUJDe7TQoZVvq95Wteg=" />
     #     </div>
@@ -315,7 +315,7 @@ module ActionView
       # The HTML generated for this would be:
       #
       #   <form action='http://www.example.com' method='post' data-remote='true'>
-      #     <div style='margin:0;padding:0;display:inline'>
+      #     <div style='display:none'>
       #       <input name='_method' type='hidden' value='patch' />
       #     </div>
       #     ...
@@ -333,7 +333,7 @@ module ActionView
       # The HTML generated for this would be:
       #
       #   <form action='http://www.example.com' method='post' data-behavior='autosave' name='go'>
-      #     <div style='margin:0;padding:0;display:inline'>
+      #     <div style='display:none'>
       #       <input name='_method' type='hidden' value='patch' />
       #     </div>
       #     ...
@@ -762,8 +762,8 @@ module ActionView
       #   text_field(:post, :title, class: "create_input")
       #   # => <input type="text" id="post_title" name="post[title]" value="#{@post.title}" class="create_input" />
       #
-      #   text_field(:session, :user, onchange: "if ($('#session_user').val() === 'admin') { alert('Your login can not be admin!'); }")
-      #   # => <input type="text" id="session_user" name="session[user]" value="#{@session.user}" onchange="if ($('#session_user').val() === 'admin') { alert('Your login can not be admin!'); }"/>
+      #   text_field(:session, :user, onchange: "if ($('#session_user').val() === 'admin') { alert('Your login cannot be admin!'); }")
+      #   # => <input type="text" id="session_user" name="session[user]" value="#{@session.user}" onchange="if ($('#session_user').val() === 'admin') { alert('Your login cannot be admin!'); }"/>
       #
       #   text_field(:snippet, :code, size: 20, class: 'code_input')
       #   # => <input type="text" id="snippet_code" name="snippet[code]" size="20" value="#{@snippet.code}" class="code_input" />

data/lib/action_view/helpers/form_tag_helper.rb

@@ -722,7 +722,7 @@ module ActionView
 
           enforce_utf8 = html_options.delete("enforce_utf8") { true }
           tags = (enforce_utf8 ? utf8_enforcer_tag : ''.html_safe) << method_tag
-          content_tag(:div, tags, :style => 'margin:0;padding:0;display:inline')
+          content_tag(:div, tags, :style => 'display:none')
         end
 
         def form_tag_html(html_options)

data/lib/action_view/helpers/rendering_helper.rb

@@ -12,6 +12,13 @@ module ActionView
       # * <tt>:file</tt> - Renders an explicit template file (this used to be the old default), add :locals to pass in those.
       # * <tt>:inline</tt> - Renders an inline template similar to how it's done in the controller.
       # * <tt>:text</tt> - Renders the text passed in out.
+      # * <tt>:plain</tt> - Renders the text passed in out. Setting the content
+      # type as <tt>text/plain</tt>.
+      # * <tt>:html</tt> - Renders the html safe string passed in out, otherwise
+      # performs html escape on the string first. Setting the content type as
+      # <tt>text/html</tt>.
+      # * <tt>:body</tt> - Renders the text passed in, and does not set content
+      # type in the response.
       #
       # If no options hash is passed or :update specified, the default is to render a partial and use the second parameter
       # as the locals hash.

data/lib/action_view/helpers/text_helper.rb

@@ -82,6 +82,9 @@ module ActionView
       #   # => "And they f... (continued)"
       #
       #   truncate("<p>Once upon a time in a world far far away</p>")
+      #   # => "&lt;p&gt;Once upon a time in a wo..."
+      #
+      #   truncate("<p>Once upon a time in a world far far away</p>", escape: false)
       #   # => "<p>Once upon a time in a wo..."
       #
       #   truncate("Once upon a time in a world far far away") { link_to "Continue", "#" }

data/lib/action_view/helpers/translation_helper.rb

@@ -38,10 +38,10 @@ module ActionView
 
         # If the user has specified rescue_format then pass it all through, otherwise use
         # raise and do the work ourselves
-        if options.key?(:raise) || options.key?(:rescue_format)
-          raise_error = options[:raise] || options[:rescue_format]
-        else
-          raise_error = false
+        options[:raise] ||= ActionView::Base.raise_on_missing_translations
+
+        raise_error = options[:raise] || options.key?(:rescue_format)
+        unless raise_error
           options[:raise] = true
         end
 

data/lib/action_view/helpers/url_helper.rb

@@ -232,6 +232,11 @@ module ActionView
       #   #      <div><input value="New" type="submit" /></div>
       #   #    </form>"
       #
+      #   <%= button_to "New", new_articles_path %>
+      #   # => "<form method="post" action="/articles/new" class="button_to">
+      #   #      <div><input value="New" type="submit" /></div>
+      #   #    </form>"
+      #
       #   <%= button_to [:make_happy, @user] do %>
       #     Make happy <strong><%= @user.name %></strong>
       #   <% end %>

data/lib/action_view/layouts.rb

@@ -420,7 +420,7 @@ module ActionView
     end
 
     def _include_layout?(options)
-      (options.keys & [:text, :inline, :partial]).empty? || options.key?(:layout)
+      (options.keys & [:body, :text, :plain, :html, :inline, :partial]).empty? || options.key?(:layout)
     end
   end
 end

data/lib/action_view/lookup_context.rb

@@ -1,6 +1,7 @@
 require 'thread_safe'
 require 'active_support/core_ext/module/remove_method'
 require 'active_support/core_ext/module/attribute_accessors'
+require 'action_view/template/resolver'
 
 module ActionView
   # = Action View Lookup Context

data/lib/action_view/renderer/template_renderer.rb

@@ -21,8 +21,14 @@ module ActionView
     def determine_template(options) #:nodoc:
       keys = options.fetch(:locals, {}).keys
 
-      if options.key?(:text)
+      if options.key?(:body)
+        Template::Text.new(options[:body])
+      elsif options.key?(:text)
         Template::Text.new(options[:text], formats.first)
+      elsif options.key?(:plain)
+        Template::Text.new(options[:plain])
+      elsif options.key?(:html)
+        Template::HTML.new(options[:html], formats.first)
       elsif options.key?(:file)
         with_fallbacks { find_template(options[:file], nil, false, keys, @details) }
       elsif options.key?(:inline)
@@ -35,7 +41,7 @@ module ActionView
           find_template(options[:template], options[:prefixes], false, keys, @details)
         end
       else
-        raise ArgumentError, "You invoked render but did not give any of :partial, :template, :inline, :file or :text option."
+        raise ArgumentError, "You invoked render but did not give any of :partial, :template, :inline, :file, :plain, :text or :body option."
       end
     end
 

data/lib/action_view/rendering.rb

@@ -94,14 +94,19 @@ module ActionView
         variant = options[:variant]
 
         lookup_context.rendered_format = nil if options[:formats]
-        lookup_context.variants = [variant] if variant
+        lookup_context.variants = variant if variant
 
         view_renderer.render(view_context, options)
       end
 
       # Assign the rendered format to lookup context.
-      def _process_format(format) #:nodoc:
+      def _process_format(format, options = {}) #:nodoc:
         super
+
+        if options[:body]
+          self.no_content_type = true
+        end
+
         lookup_context.formats = [format.to_sym]
         lookup_context.rendered_format = lookup_context.formats.first
       end

data/lib/action_view/template.rb

@@ -90,6 +90,7 @@ module ActionView
     eager_autoload do
       autoload :Error
       autoload :Handlers
+      autoload :HTML
       autoload :Text
       autoload :Types
     end

data/lib/action_view/template/html.rb

@@ -0,0 +1,34 @@
+module ActionView #:nodoc:
+  # = Action View HTML Template
+  class Template
+    class HTML #:nodoc:
+      attr_accessor :type
+
+      def initialize(string, type = nil)
+        @string = string.to_s
+        @type   = Types[type] || type if type
+        @type ||= Types[:html]
+      end
+
+      def identifier
+        'html template'
+      end
+
+      def inspect
+        'html template'
+      end
+
+      def to_str
+        ERB::Util.h(@string)
+      end
+
+      def render(*args)
+        to_str
+      end
+
+      def formats
+        [@type.respond_to?(:ref) ? @type.ref : @type.to_s]
+      end
+    end
+  end
+end

data/lib/action_view/template/text.rb

@@ -27,7 +27,7 @@ module ActionView #:nodoc:
       end
 
       def formats
-        [@type.to_sym]
+        [@type.respond_to?(:ref) ? @type.ref : @type.to_s]
       end
     end
   end

data/lib/action_view/vendor/html-scanner/html/node.rb

@@ -71,12 +71,12 @@ module HTML #:nodoc:
       @line, @position = line, pos
     end
 
-    # Return a textual representation of the node.
+    # Returns a textual representation of the node.
     def to_s
       @children.join()
     end
 
-    # Return false (subclasses must override this to provide specific matching
+    # Returns false (subclasses must override this to provide specific matching
     # behavior.) +conditions+ may be of any type.
     def match(conditions)
       false

data/lib/action_view/vendor/html-scanner/html/selector.rb

@@ -488,7 +488,7 @@ module HTML
     end
 
 
-    # Return the next element after this one. Skips sibling text nodes.
+    # Returns the next element after this one. Skips sibling text nodes.
     #
     # With the +name+ argument, returns the next element with that name,
     # skipping other sibling elements.

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

@@ -30,7 +30,7 @@ module HTML #:nodoc:
       @current_line = 1
     end
 
-    # Return the next token in the sequence, or +nil+ if there are no more tokens in
+    # Returns the next token in the sequence, or +nil+ if there are no more tokens in
     # the stream.
     def next
       return nil if @scanner.eos?

data/lib/action_view/version.rb

@@ -1,7 +1,7 @@
 module ActionView
   # Returns the version of the currently loaded ActionView as a Gem::Version
   def self.version
-    Gem::Version.new "4.1.0.beta2"
+    Gem::Version.new "4.1.0.rc1"
   end
 
   module VERSION #:nodoc:

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: actionview
 version: !ruby/object:Gem::Version
-  version: 4.1.0.beta2
+  version: 4.1.0.rc1
 platform: ruby
 authors:
 - David Heinemeier Hansson
@@ -16,14 +16,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta2
+        version: 4.1.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta2
+        version: 4.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: builder
   requirement: !ruby/object:Gem::Requirement
@@ -58,28 +58,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta2
+        version: 4.1.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta2
+        version: 4.1.0.rc1
 - !ruby/object:Gem::Dependency
   name: activemodel
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta2
+        version: 4.1.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 4.1.0.beta2
+        version: 4.1.0.rc1
 description: Simple, battle-tested conventions and helpers for building web pages.
 email: david@loudthinking.com
 executables: []
@@ -176,6 +176,7 @@ files:
 - lib/action_view/template/handlers/builder.rb
 - lib/action_view/template/handlers/erb.rb
 - lib/action_view/template/handlers/raw.rb
+- lib/action_view/template/html.rb
 - lib/action_view/template/resolver.rb
 - lib/action_view/template/text.rb
 - lib/action_view/template/types.rb