actionview 4.1.16 → 4.2.0.beta1

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

@@ -5,8 +5,8 @@ module ActionView
         def render
           options = @options.stringify_keys
           options["value"] ||= format_date(value(object))
-          options["min"] = format_date(options["min"])
-          options["max"] = format_date(options["max"])
+          options["min"] = format_date(datetime_value(options["min"]))
+          options["max"] = format_date(datetime_value(options["max"]))
           @options = options
           super
         end
@@ -16,6 +16,14 @@ module ActionView
           def format_date(value)
             value.try(:strftime, "%Y-%m-%dT%T.%L%z")
           end
+
+          def datetime_value(value)
+            if value.is_a? String
+              DateTime.parse(value) rescue nil
+            else
+              value
+            end
+          end
       end
     end
   end

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

@@ -35,12 +35,12 @@ module ActionView
           if block_given?
             content = @template_object.capture(&block)
           else
+            method_and_value = tag_value.present? ? "#{@method_name}.#{tag_value}" : @method_name
             content = if @content.blank?
                         @object_name.gsub!(/\[(.*)_attributes\]\[\d+\]/, '.\1')
-                        method_and_value = tag_value.present? ? "#{@method_name}.#{tag_value}" : @method_name
 
                         if object.respond_to?(:to_model)
-                          key = object.class.model_name.i18n_key
+                          key = object.model_name.i18n_key
                           i18n_default = ["#{key}.#{method_and_value}".to_sym, ""]
                         end
 
@@ -51,7 +51,7 @@ module ActionView
                       end
 
             content ||= if object && object.class.respond_to?(:human_attribute_name)
-                          object.class.human_attribute_name(@method_name)
+                          object.class.human_attribute_name(method_and_value)
                         end
 
             content ||= @method_name.humanize

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

@@ -0,0 +1,32 @@
+module ActionView
+  module Helpers
+    module Tags # :nodoc:
+      module Placeholderable # :nodoc:
+        def initialize(*)
+          super
+
+          if tag_value = @options[:placeholder]
+            object_name = @object_name.gsub(/\[(.*)_attributes\]\[\d+\]/, '.\1')
+            method_and_value = tag_value.is_a?(TrueClass) ? @method_name : "#{@method_name}.#{tag_value}"
+
+            if object.respond_to?(:to_model)
+              key = object.class.model_name.i18n_key
+              i18n_default = ["#{key}.#{method_and_value}".to_sym, ""]
+            end
+
+            i18n_default ||= ""
+            placeholder = I18n.t("#{object_name}.#{method_and_value}", :default => i18n_default, :scope => "helpers.placeholder").presence
+
+            placeholder ||= if object && object.class.respond_to?(:human_attribute_name)
+                          object.class.human_attribute_name(method_and_value)
+                        end
+
+            placeholder ||= @method_name.humanize
+
+            @options[:placeholder] = placeholder
+          end
+        end
+      end
+    end
+  end
+end

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

@@ -1,7 +1,11 @@
+require 'action_view/helpers/tags/placeholderable'
+
 module ActionView
   module Helpers
     module Tags # :nodoc:
       class TextArea < Base # :nodoc:
+        include Placeholderable
+
         def render
           options = @options.stringify_keys
           add_default_name_and_id(options)

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

@@ -1,13 +1,16 @@
+require 'action_view/helpers/tags/placeholderable'
+
 module ActionView
   module Helpers
     module Tags # :nodoc:
       class TextField < Base # :nodoc:
+        include Placeholderable
+
         def render
           options = @options.stringify_keys
           options["size"] = options["maxlength"] unless options.key?("size")
           options["type"] ||= field_type
           options["value"] = options.fetch("value") { value_before_type_cast(object) } unless field_type == "file"
-          options["value"] &&= ERB::Util.html_escape(options["value"])
           add_default_name_and_id(options)
           tag("input", options)
         end

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

@@ -5,7 +5,7 @@ module ActionView
         private
 
           def format_date(value)
-            value.try(:strftime, "%Y-W%V")
+            value.try(:strftime, "%Y-W%W")
           end
       end
     end

data/lib/action_view/helpers/text_helper.rb

@@ -103,11 +103,14 @@ module ActionView
       # Highlights one or more +phrases+ everywhere in +text+ by inserting it into
       # a <tt>:highlighter</tt> string. The highlighter can be specialized by passing <tt>:highlighter</tt>
       # as a single-quoted string with <tt>\1</tt> where the phrase is to be inserted (defaults to
-      # '<mark>\1</mark>')
+      # '<mark>\1</mark>') or passing a block that receives each matched term.
       #
       #   highlight('You searched for: rails', 'rails')
       #   # => You searched for: <mark>rails</mark>
       #
+      #   highlight('You searched for: rails', /for|rails/)
+      #   # => You searched <mark>for</mark>: <mark>rails</mark>
+      #
       #   highlight('You searched for: ruby, rails, dhh', 'actionpack')
       #   # => You searched for: ruby, rails, dhh
       #
@@ -116,15 +119,25 @@ module ActionView
       #
       #   highlight('You searched for: rails', 'rails', highlighter: '<a href="search?q=\1">\1</a>')
       #   # => You searched for: <a href="search?q=rails">rails</a>
+      #
+      #   highlight('You searched for: rails', 'rails') { |match| link_to(search_path(q: match, match)) }
+      #   # => You searched for: <a href="search?q=rails">rails</a>
       def highlight(text, phrases, options = {})
         text = sanitize(text) if options.fetch(:sanitize, true)
 
         if text.blank? || phrases.blank?
           text
         else
-          highlighter = options.fetch(:highlighter, '<mark>\1</mark>')
-          match = Array(phrases).map { |p| Regexp.escape(p) }.join('|')
-          text.gsub(/(#{match})(?![^<]*?>)/i, highlighter)
+          match = Array(phrases).map do |p|
+            Regexp === p ? p.to_s : Regexp.escape(p)
+          end.join('|')
+
+          if block_given?
+            text.gsub(/(#{match})(?![^<]*?>)/i) { |found| yield found }
+          else
+            highlighter = options.fetch(:highlighter, '<mark>\1</mark>')
+            text.gsub(/(#{match})(?![^<]*?>)/i, highlighter)
+          end
         end.html_safe
       end
 
@@ -155,9 +168,13 @@ module ActionView
       def excerpt(text, phrase, options = {})
         return unless text && phrase
 
-        separator = options[:separator] || ''
-        phrase    = Regexp.escape(phrase)
-        regex     = /#{phrase}/i
+        separator = options.fetch(:separator, nil) || ""
+        case phrase
+        when Regexp
+          regex = phrase
+        else
+          regex = /#{Regexp.escape(phrase)}/i
+        end
 
         return unless matches = text.match(regex)
         phrase = matches[0]
@@ -171,7 +188,7 @@ module ActionView
           end
         end
 
-        first_part, second_part = text.split(regex, 2)
+        first_part, second_part = text.split(phrase, 2)
 
         prefix, first_part   = cut_excerpt_part(:first, first_part, separator, options)
         postfix, second_part = cut_excerpt_part(:second, second_part, separator, options)

data/lib/action_view/helpers/translation_helper.rb

@@ -1,14 +1,14 @@
 require 'action_view/helpers/tag_helper'
+require 'active_support/core_ext/string/access'
 require 'i18n/exceptions'
 
 module ActionView
   # = Action View Translation Helpers
   module Helpers
     module TranslationHelper
-      include TagHelper
       # Delegates to <tt>I18n#translate</tt> but also performs three additional functions.
       #
-      # First, it will ensure that any thrown +MissingTranslation+ messages will be turned 
+      # First, it will ensure that any thrown +MissingTranslation+ messages will be turned
       # into inline spans that:
       #
       #   * have a "translation-missing" class set,
@@ -36,22 +36,15 @@ module ActionView
       # you know what kind of output to expect when you call translate in a template.
       def translate(key, options = {})
         options = options.dup
-        has_default = options.has_key?(:default)
-        remaining_defaults = Array(options.delete(:default)).compact
+        options[:default] = wrap_translate_defaults(options[:default]) if options[:default]
 
-        if has_default && !remaining_defaults.first.kind_of?(Symbol)
-          options[:default] = remaining_defaults.shift
-        end
+        # If the user has specified rescue_format then pass it all through, otherwise use
+        # raise and do the work ourselves
+        options[:raise] ||= ActionView::Base.raise_on_missing_translations
 
-        # If the user has explicitly decided to NOT raise errors, pass that option to I18n.
-        # Otherwise, tell I18n to raise an exception, which we rescue further in this method.
-        # Note: `raise_error` refers to us re-raising the error in this method. I18n is forced to raise by default.
-        if options[:raise] == false || (options.key?(:rescue_format) && options[:rescue_format].nil?)
-          raise_error = false
-          i18n_raise = false
-        else
-          raise_error = options[:raise] || options[:rescue_format] || ActionView::Base.raise_on_missing_translations
-          i18n_raise = true
+        raise_error = options[:raise] || options.key?(:rescue_format)
+        unless raise_error
+          options[:raise] = true
         end
 
         if html_safe_translation_key?(key)
@@ -61,21 +54,17 @@ module ActionView
               html_safe_options[name] = ERB::Util.html_escape(value.to_s)
             end
           end
-          translation = I18n.translate(scope_key_by_partial(key), html_safe_options.merge(raise: i18n_raise))
+          translation = I18n.translate(scope_key_by_partial(key), html_safe_options)
 
           translation.respond_to?(:html_safe) ? translation.html_safe : translation
         else
-          I18n.translate(scope_key_by_partial(key), options.merge(raise: i18n_raise))
+          I18n.translate(scope_key_by_partial(key), options)
         end
       rescue I18n::MissingTranslationData => e
-        if remaining_defaults.present?
-          translate remaining_defaults.shift, options.merge(default: remaining_defaults)
-        else
-          raise e if raise_error
+        raise e if raise_error
 
-          keys = I18n.normalize_keys(e.locale, e.key, e.options[:scope])
-          content_tag('span', keys.last.to_s.titleize, :class => 'translation_missing', :title => "translation missing: #{keys.join('.')}")
-        end
+        keys = I18n.normalize_keys(e.locale, e.key, e.options[:scope])
+        content_tag('span', keys.last.to_s.titleize, :class => 'translation_missing', :title => "translation missing: #{keys.join('.')}")
       end
       alias :t :translate
 
@@ -104,6 +93,21 @@ module ActionView
         def html_safe_translation_key?(key)
           key.to_s =~ /(\b|_|\.)html$/
         end
+
+        def wrap_translate_defaults(defaults)
+          new_defaults = []
+          defaults     = Array(defaults)
+          while key = defaults.shift
+            if key.is_a?(Symbol)
+              new_defaults << lambda { |_, options| translate key, options.merge(:default => defaults) }
+              break
+            else
+              new_defaults << key
+            end
+          end
+
+          new_defaults
+        end
     end
   end
 end

data/lib/action_view/helpers/url_helper.rb

@@ -323,7 +323,7 @@ module ActionView
             inner_tags.safe_concat tag(:input, type: "hidden", name: param_name, value: value.to_param)
           end
         end
-        content_tag('form', content_tag('div', inner_tags), form_options)
+        content_tag('form', inner_tags, form_options)
       end
 
       # Creates a link tag of the given +name+ using a URL created by the set of
@@ -389,15 +389,7 @@ module ActionView
       #   # If not...
       #   # => <a href="/accounts/signup">Reply</a>
       def link_to_unless(condition, name, options = {}, html_options = {}, &block)
-        if condition
-          if block_given?
-            block.arity <= 1 ? capture(name, &block) : capture(name, options, html_options, &block)
-          else
-            ERB::Util.html_escape(name)
-          end
-        else
-          link_to(name, options, html_options)
-        end
+        link_to_if !condition, name, options, html_options, &block
       end
 
       # Creates a link tag of the given +name+ using a URL created by the set of
@@ -421,7 +413,15 @@ module ActionView
       #   # If they are logged in...
       #   # => <a href="/accounts/show/3">my_username</a>
       def link_to_if(condition, name, options = {}, html_options = {}, &block)
-        link_to_unless !condition, name, options, html_options, &block
+        if condition
+          link_to(name, options, html_options)
+        else
+          if block_given?
+            block.arity <= 1 ? capture(name, &block) : capture(name, options, html_options, &block)
+          else
+            ERB::Util.html_escape(name)
+          end
+        end
       end
 
       # Creates a mailto link tag to the specified +email_address+, which is
@@ -469,10 +469,9 @@ module ActionView
           option = html_options.delete(item) || next
           "#{item}=#{Rack::Utils.escape_path(option)}"
         }.compact
-        extras = extras.empty? ? '' : '?' + ERB::Util.html_escape(extras.join('&'))
+        extras = extras.empty? ? '' : '?' + extras.join('&')
 
-        encoded_email_address = ERB::Util.url_encode(email_address ? email_address.to_str : '').gsub("%40", "@")
-        html_options["href"] = "mailto:#{encoded_email_address}#{extras}".html_safe
+        html_options["href"] = "mailto:#{email_address}#{extras}"
 
         content_tag(:a, name || email_address, html_options, &block)
       end

data/lib/action_view/log_subscriber.rb

@@ -13,11 +13,11 @@ module ActionView
     end
 
     def render_template(event)
-      return unless logger.info?
-      message = "  Rendered #{from_rails_root(event.payload[:identifier])}"
-      message << " within #{from_rails_root(event.payload[:layout])}" if event.payload[:layout]
-      message << " (#{event.duration.round(1)}ms)"
-      info(message)
+      info do
+        message = "  Rendered #{from_rails_root(event.payload[:identifier])}"
+        message << " within #{from_rails_root(event.payload[:layout])}" if event.payload[:layout]
+        message << " (#{event.duration.round(1)}ms)"
+      end
     end
     alias :render_partial :render_template
     alias :render_collection :render_template

data/lib/action_view/lookup_context.rb

@@ -66,10 +66,7 @@ module ActionView
       def self.get(details)
         if details[:formats]
           details = details.dup
-          syms    = Set.new Mime::SET.symbols
-          details[:formats] = details[:formats].select { |v|
-            syms.include? v
-          }
+          details[:formats] &= Mime::SET.symbols
         end
         @details_keys[details] ||= new
       end
@@ -114,7 +111,7 @@ module ActionView
     module ViewPaths
       attr_reader :view_paths, :html_fallback_for_js
 
-      # Whenever setting view paths, makes a copy so we can manipulate then in
+      # Whenever setting view paths, makes a copy so that we can manipulate them in
       # instance objects as we wish.
       def view_paths=(paths)
         @view_paths = ActionView::PathSet.new(Array(paths))
@@ -125,10 +122,6 @@ module ActionView
       end
       alias :find_template :find
 
-      def find_file(name, prefixes = [], partial = false, keys = [], options = {})
-        @view_paths.find_file(*args_for_lookup(name, prefixes, partial, keys, options))
-      end
-
       def find_all(name, prefixes = [], partial = false, keys = [], options = {})
         @view_paths.find_all(*args_for_lookup(name, prefixes, partial, keys, options))
       end
@@ -138,7 +131,8 @@ module ActionView
       end
       alias :template_exists? :exists?
 
-      # Add fallbacks to the view paths. Useful in cases you are rendering a :file.
+      # Adds fallbacks to the view paths. Useful in cases when you are rendering
+      # a :file.
       def with_fallbacks
         added_resolvers = 0
         self.class.fallbacks.each do |resolver|
@@ -231,7 +225,7 @@ module ActionView
     end
 
     # Overload locale= to also set the I18n.locale. If the current I18n.config object responds
-    # to original_config, it means that it's has a copy of the original I18n configuration and it's
+    # to original_config, it means that it has a copy of the original I18n configuration and it's
     # acting as proxy, which we need to skip.
     def locale=(value)
       if value
@@ -242,7 +236,7 @@ module ActionView
       super(@skip_default_locale ? I18n.locale : default_locale)
     end
 
-    # A method which only uses the first format in the formats array for layout lookup.
+    # Uses the first format in the formats array for layout lookup.
     def with_layout_format
       if formats.size == 1
         yield

data/lib/action_view/model_naming.rb

@@ -6,7 +6,7 @@ module ActionView
     end
 
     def model_name_from_record_or_class(record_or_class)
-      (record_or_class.is_a?(Class) ? record_or_class : convert_to_model(record_or_class).class).model_name
+      convert_to_model(record_or_class).model_name
     end
   end
 end

data/lib/action_view/path_set.rb

@@ -46,35 +46,23 @@ module ActionView #:nodoc:
       find_all(*args).first || raise(MissingTemplate.new(self, *args))
     end
 
-    def find_file(path, prefixes = [], *args)
-      _find_all(path, prefixes, args, true).first || raise(MissingTemplate.new(self, path, prefixes, *args))
-    end
-
     def find_all(path, prefixes = [], *args)
-      _find_all path, prefixes, args, false
-    end
-
-    def exists?(path, prefixes, *args)
-      find_all(path, prefixes, *args).any?
-    end
-
-    private
-
-    def _find_all(path, prefixes, args, outside_app)
       prefixes = [prefixes] if String === prefixes
       prefixes.each do |prefix|
         paths.each do |resolver|
-          if outside_app
-            templates = resolver.find_all_anywhere(path, prefix, *args)
-          else
-            templates = resolver.find_all(path, prefix, *args)
-          end
+          templates = resolver.find_all(path, prefix, *args)
           return templates unless templates.empty?
         end
       end
       []
     end
 
+    def exists?(path, prefixes, *args)
+      find_all(path, prefixes, *args).any?
+    end
+
+    private
+
     def typecast(paths)
       paths.map do |path|
         case path