Don't fallback to just adding "'s" in TextHelper#pluralize, because the Inflector is always loaded.
This commit is contained in:
Joshua Peek
parent
bc3cc91a3f
commit
603c853a34
|
|
@ -3,19 +3,19 @@ require 'html/document'
|
|||
|
||||
module ActionView
|
||||
module Helpers #:nodoc:
|
||||
# The TextHelper module provides a set of methods for filtering, formatting
|
||||
# and transforming strings, which can reduce the amount of inline Ruby code in
|
||||
# your views. These helper methods extend ActionView making them callable
|
||||
# The TextHelper module provides a set of methods for filtering, formatting
|
||||
# and transforming strings, which can reduce the amount of inline Ruby code in
|
||||
# your views. These helper methods extend ActionView making them callable
|
||||
# within your template files.
|
||||
module TextHelper
|
||||
# The preferred method of outputting text in your views is to use the
|
||||
# <%= "text" %> eRuby syntax. The regular _puts_ and _print_ methods
|
||||
# do not operate as expected in an eRuby code block. If you absolutely must
|
||||
module TextHelper
|
||||
# The preferred method of outputting text in your views is to use the
|
||||
# <%= "text" %> eRuby syntax. The regular _puts_ and _print_ methods
|
||||
# do not operate as expected in an eRuby code block. If you absolutely must
|
||||
# output text within a non-output code block (i.e., <% %>), you can use the concat method.
|
||||
#
|
||||
# ==== Examples
|
||||
# <%
|
||||
# concat "hello", binding
|
||||
# <%
|
||||
# concat "hello", binding
|
||||
# # is the equivalent of <%= "hello" %>
|
||||
#
|
||||
# if (logged_in == true):
|
||||
|
|
@ -30,15 +30,15 @@ module ActionView
|
|||
end
|
||||
|
||||
if RUBY_VERSION < '1.9'
|
||||
# If +text+ is longer than +length+, +text+ will be truncated to the length of
|
||||
# If +text+ is longer than +length+, +text+ will be truncated to the length of
|
||||
# +length+ (defaults to 30) and the last characters will be replaced with the +truncate_string+
|
||||
# (defaults to "...").
|
||||
#
|
||||
# ==== Examples
|
||||
# truncate("Once upon a time in a world far far away", 14)
|
||||
# truncate("Once upon a time in a world far far away", 14)
|
||||
# # => Once upon a...
|
||||
#
|
||||
# truncate("Once upon a time in a world far far away")
|
||||
# truncate("Once upon a time in a world far far away")
|
||||
# # => Once upon a time in a world f...
|
||||
#
|
||||
# truncate("And they found that many people were sleeping better.", 25, "(clipped)")
|
||||
|
|
@ -63,20 +63,20 @@ module ActionView
|
|||
end
|
||||
|
||||
# Highlights one or more +phrases+ everywhere in +text+ by inserting it into
|
||||
# a +highlighter+ string. The highlighter can be specialized by passing +highlighter+
|
||||
# a +highlighter+ string. The highlighter can be specialized by passing +highlighter+
|
||||
# as a single-quoted string with \1 where the phrase is to be inserted (defaults to
|
||||
# '<strong class="highlight">\1</strong>')
|
||||
#
|
||||
# ==== Examples
|
||||
# highlight('You searched for: rails', 'rails')
|
||||
# highlight('You searched for: rails', 'rails')
|
||||
# # => You searched for: <strong class="highlight">rails</strong>
|
||||
#
|
||||
# highlight('You searched for: ruby, rails, dhh', 'actionpack')
|
||||
# # => You searched for: ruby, rails, dhh
|
||||
# # => You searched for: ruby, rails, dhh
|
||||
#
|
||||
# highlight('You searched for: rails', ['for', 'rails'], '<em>\1</em>')
|
||||
# highlight('You searched for: rails', ['for', 'rails'], '<em>\1</em>')
|
||||
# # => You searched <em>for</em>: <em>rails</em>
|
||||
#
|
||||
#
|
||||
# highlight('You searched for: rails', 'rails', "<a href='search?q=\1'>\1</a>")
|
||||
# # => You searched for: <a href='search?q=rails>rails</a>
|
||||
def highlight(text, phrases, highlighter = '<strong class="highlight">\1</strong>')
|
||||
|
|
@ -89,23 +89,23 @@ module ActionView
|
|||
end
|
||||
|
||||
if RUBY_VERSION < '1.9'
|
||||
# Extracts an excerpt from +text+ that matches the first instance of +phrase+.
|
||||
# Extracts an excerpt from +text+ that matches the first instance of +phrase+.
|
||||
# The +radius+ expands the excerpt on each side of the first occurrence of +phrase+ by the number of characters
|
||||
# defined in +radius+ (which defaults to 100). If the excerpt radius overflows the beginning or end of the +text+,
|
||||
# then the +excerpt_string+ will be prepended/appended accordingly. The resulting string will be stripped in any case.
|
||||
# If the +phrase+ isn't found, nil is returned.
|
||||
#
|
||||
# ==== Examples
|
||||
# excerpt('This is an example', 'an', 5)
|
||||
# excerpt('This is an example', 'an', 5)
|
||||
# # => "...s is an exam..."
|
||||
#
|
||||
# excerpt('This is an example', 'is', 5)
|
||||
# excerpt('This is an example', 'is', 5)
|
||||
# # => "This is a..."
|
||||
#
|
||||
# excerpt('This is an example', 'is')
|
||||
# excerpt('This is an example', 'is')
|
||||
# # => "This is an example"
|
||||
#
|
||||
# excerpt('This next thing is an example', 'ex', 2)
|
||||
# excerpt('This next thing is an example', 'ex', 2)
|
||||
# # => "...next..."
|
||||
#
|
||||
# excerpt('This is also an example', 'an', 8, '<chop> ')
|
||||
|
|
@ -147,33 +147,24 @@ module ActionView
|
|||
end
|
||||
end
|
||||
|
||||
# Attempts to pluralize the +singular+ word unless +count+ is 1. If +plural+
|
||||
# is supplied, it will use that when count is > 1, if the ActiveSupport Inflector
|
||||
# is loaded, it will use the Inflector to determine the plural form, otherwise
|
||||
# it will just add an 's' to the +singular+ word.
|
||||
# Attempts to pluralize the +singular+ word unless +count+ is 1. If
|
||||
# +plural+ is supplied, it will use that when count is > 1, otherwise
|
||||
# it will use the Inflector to determine the plural form
|
||||
#
|
||||
# ==== Examples
|
||||
# pluralize(1, 'person')
|
||||
# pluralize(1, 'person')
|
||||
# # => 1 person
|
||||
#
|
||||
# pluralize(2, 'person')
|
||||
# pluralize(2, 'person')
|
||||
# # => 2 people
|
||||
#
|
||||
# pluralize(3, 'person', 'users')
|
||||
# pluralize(3, 'person', 'users')
|
||||
# # => 3 users
|
||||
#
|
||||
# pluralize(0, 'person')
|
||||
# # => 0 people
|
||||
def pluralize(count, singular, plural = nil)
|
||||
"#{count || 0} " + if count == 1 || count == '1'
|
||||
singular
|
||||
elsif plural
|
||||
plural
|
||||
elsif Object.const_defined?("Inflector")
|
||||
Inflector.pluralize(singular)
|
||||
else
|
||||
singular + "s"
|
||||
end
|
||||
"#{count || 0} " + ((count == 1 || count == '1') ? singular : (plural || singular.pluralize))
|
||||
end
|
||||
|
||||
# Wraps the +text+ into lines no longer than +line_width+ width. This method
|
||||
|
|
@ -229,7 +220,7 @@ module ActionView
|
|||
end
|
||||
end
|
||||
|
||||
# Returns the text with all the Textile codes turned into HTML tags,
|
||||
# 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].
|
||||
|
|
@ -273,25 +264,25 @@ module ActionView
|
|||
# # => "<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>
|
||||
# # => "<p>The <a href="http://daringfireball.net/projects/markdown/">Markdown website</a>
|
||||
# # has more information.</p>"
|
||||
#
|
||||
# markdown('')
|
||||
# # => '<p><img src="http://rubyonrails.com/images/rails.png" alt="The ROR logo" title="Ruby on Rails" /></p>'
|
||||
# # => '<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
|
||||
end
|
||||
|
||||
|
||||
# Returns +text+ transformed into HTML using simple formatting rules.
|
||||
# Two or more consecutive newlines(<tt>\n\n</tt>) are considered as a
|
||||
# Two or more consecutive newlines(<tt>\n\n</tt>) are considered as a
|
||||
# paragraph and wrapped in <tt><p></tt> tags. One newline (<tt>\n</tt>) is
|
||||
# considered as a linebreak and a <tt><br /></tt> tag is appended. This
|
||||
# method does not remove the newlines from the +text+.
|
||||
# method does not remove the newlines from the +text+.
|
||||
#
|
||||
# You can pass any HTML attributes into <tt>html_options</tt>. These
|
||||
# You can pass any HTML attributes into <tt>html_options</tt>. These
|
||||
# will be added to all created paragraphs.
|
||||
# ==== Examples
|
||||
# my_text = "Here is some basic text...\n...with a line break."
|
||||
|
|
@ -316,19 +307,19 @@ module ActionView
|
|||
text << "</p>"
|
||||
end
|
||||
|
||||
# Turns all URLs and e-mail addresses into clickable links. The +link+ parameter
|
||||
# Turns all URLs and e-mail addresses into clickable links. The +link+ parameter
|
||||
# will limit what should be linked. You can add HTML attributes to the links using
|
||||
# +href_options+. Options for +link+ are <tt>:all</tt> (default),
|
||||
# <tt>:email_addresses</tt>, and <tt>:urls</tt>. If a block is given, each URL and
|
||||
# +href_options+. Options for +link+ are <tt>:all</tt> (default),
|
||||
# <tt>:email_addresses</tt>, and <tt>:urls</tt>. If a block is given, each URL and
|
||||
# e-mail address is yielded and the result is used as the link text.
|
||||
#
|
||||
# ==== Examples
|
||||
# auto_link("Go to http://www.rubyonrails.org and say hello to david@loudthinking.com")
|
||||
# auto_link("Go to http://www.rubyonrails.org and say hello to david@loudthinking.com")
|
||||
# # => "Go to <a href=\"http://www.rubyonrails.org\">http://www.rubyonrails.org</a> and
|
||||
# # say hello to <a href=\"mailto:david@loudthinking.com\">david@loudthinking.com</a>"
|
||||
#
|
||||
# auto_link("Visit http://www.loudthinking.com/ or e-mail david@loudthinking.com", :urls)
|
||||
# # => "Visit <a href=\"http://www.loudthinking.com/\">http://www.loudthinking.com/</a>
|
||||
# # => "Visit <a href=\"http://www.loudthinking.com/\">http://www.loudthinking.com/</a>
|
||||
# # or e-mail david@loudthinking.com"
|
||||
#
|
||||
# auto_link("Visit http://www.loudthinking.com/ or e-mail david@loudthinking.com", :email_addresses)
|
||||
|
|
@ -338,9 +329,9 @@ module ActionView
|
|||
# auto_link(post_body, :all, :target => '_blank') do |text|
|
||||
# truncate(text, 15)
|
||||
# end
|
||||
# # => "Welcome to my new blog at <a href=\"http://www.myblog.com/\" target=\"_blank\">http://www.m...</a>.
|
||||
# # => "Welcome to my new blog at <a href=\"http://www.myblog.com/\" target=\"_blank\">http://www.m...</a>.
|
||||
# Please e-mail me at <a href=\"mailto:me@email.com\">me@email.com</a>."
|
||||
#
|
||||
#
|
||||
def auto_link(text, link = :all, href_options = {}, &block)
|
||||
return '' if text.blank?
|
||||
case link
|
||||
|
|
@ -349,15 +340,15 @@ module ActionView
|
|||
when :urls then auto_link_urls(text, href_options, &block)
|
||||
end
|
||||
end
|
||||
|
||||
|
||||
# Creates a Cycle object whose _to_s_ method cycles through elements of an
|
||||
# array every time it is called. This can be used for example, to alternate
|
||||
# classes for table rows. You can use named cycles to allow nesting in loops.
|
||||
# Passing a Hash as the last parameter with a <tt>:name</tt> key will create a
|
||||
# named cycle. You can manually reset a cycle by calling reset_cycle and passing the
|
||||
# array every time it is called. This can be used for example, to alternate
|
||||
# classes for table rows. You can use named cycles to allow nesting in loops.
|
||||
# Passing a Hash as the last parameter with a <tt>:name</tt> key will create a
|
||||
# named cycle. You can manually reset a cycle by calling reset_cycle and passing the
|
||||
# name of the cycle.
|
||||
#
|
||||
# ==== Examples
|
||||
# ==== Examples
|
||||
# # Alternate CSS classes for even and odd numbers...
|
||||
# @items = [1,2,3,4]
|
||||
# <table>
|
||||
|
|
@ -370,8 +361,8 @@ module ActionView
|
|||
#
|
||||
#
|
||||
# # Cycle CSS classes for rows, and text colors for values within each row
|
||||
# @items = x = [{:first => 'Robert', :middle => 'Daniel', :last => 'James'},
|
||||
# {:first => 'Emily', :middle => 'Shannon', :maiden => 'Pike', :last => 'Hicks'},
|
||||
# @items = x = [{:first => 'Robert', :middle => 'Daniel', :last => 'James'},
|
||||
# {:first => 'Emily', :middle => 'Shannon', :maiden => 'Pike', :last => 'Hicks'},
|
||||
# {:first => 'June', :middle => 'Dae', :last => 'Jones'}]
|
||||
# <% @items.each do |item| %>
|
||||
# <tr class="<%= cycle("even", "odd", :name => "row_class") -%>">
|
||||
|
|
@ -401,8 +392,8 @@ module ActionView
|
|||
end
|
||||
return cycle.to_s
|
||||
end
|
||||
|
||||
# Resets a cycle so that it starts from the first element the next time
|
||||
|
||||
# Resets a cycle so that it starts from the first element the next time
|
||||
# it is called. Pass in +name+ to reset a named cycle.
|
||||
#
|
||||
# ==== Example
|
||||
|
|
@ -428,12 +419,12 @@ module ActionView
|
|||
|
||||
class Cycle #:nodoc:
|
||||
attr_reader :values
|
||||
|
||||
|
||||
def initialize(first_value, *values)
|
||||
@values = values.unshift(first_value)
|
||||
reset
|
||||
end
|
||||
|
||||
|
||||
def reset
|
||||
@index = 0
|
||||
end
|
||||
|
|
@ -453,7 +444,7 @@ module ActionView
|
|||
@_cycles = Hash.new unless defined?(@_cycles)
|
||||
return @_cycles[name]
|
||||
end
|
||||
|
||||
|
||||
def set_cycle(name, cycle_object)
|
||||
@_cycles = Hash.new unless defined?(@_cycles)
|
||||
@_cycles[name] = cycle_object
|
||||
|
|
@ -462,13 +453,13 @@ module ActionView
|
|||
AUTO_LINK_RE = %r{
|
||||
( # leading text
|
||||
<\w+.*?>| # leading HTML tag, or
|
||||
[^=!:'"/]| # leading punctuation, or
|
||||
[^=!:'"/]| # leading punctuation, or
|
||||
^ # beginning of line
|
||||
)
|
||||
(
|
||||
(?:https?://)| # protocol spec, or
|
||||
(?:www\.) # www.*
|
||||
)
|
||||
)
|
||||
(
|
||||
[-\w]+ # subdomain or domain
|
||||
(?:\.[-\w]+)* # remaining subdomains or domain
|
||||
|
|
@ -502,7 +493,7 @@ module ActionView
|
|||
body = text.dup
|
||||
text.gsub(/([\w\.!#\$%\-+.]+@[A-Za-z0-9\-]+(\.[A-Za-z0-9\-]+)+)/) do
|
||||
text = $1
|
||||
|
||||
|
||||
if body.match(/<a\b[^>]*>(.*)(#{Regexp.escape(text)})(.*)<\/a>/)
|
||||
text
|
||||
else
|
||||
|
|
|
|||
|
|
@ -23,9 +23,9 @@ class TextHelperTest < ActionView::TestCase
|
|||
|
||||
text = "A\r\n \nB\n\n\r\n\t\nC\nD".freeze
|
||||
assert_equal "<p>A\n<br /> \n<br />B</p>\n\n<p>\t\n<br />C\n<br />D</p>", simple_format(text)
|
||||
|
||||
|
||||
assert_equal %q(<p class="test">This is a classy test</p>), simple_format("This is a classy test", :class => 'test')
|
||||
assert_equal %Q(<p class="test">para 1</p>\n\n<p class="test">para 2</p>), simple_format("para 1\n\npara 2", :class => 'test')
|
||||
assert_equal %Q(<p class="test">para 1</p>\n\n<p class="test">para 2</p>), simple_format("para 1\n\npara 2", :class => 'test')
|
||||
end
|
||||
|
||||
def test_truncate
|
||||
|
|
@ -41,7 +41,7 @@ class TextHelperTest < ActionView::TestCase
|
|||
if RUBY_VERSION < '1.9.0'
|
||||
def test_truncate_multibyte
|
||||
with_kcode 'none' do
|
||||
assert_equal "\354\225\210\353\205\225\355...", truncate("\354\225\210\353\205\225\355\225\230\354\204\270\354\232\224", 10)
|
||||
assert_equal "\354\225\210\353\205\225\355...", truncate("\354\225\210\353\205\225\355\225\230\354\204\270\354\232\224", 10)
|
||||
end
|
||||
with_kcode 'u' do
|
||||
assert_equal "\354\225\204\353\246\254\353\236\221 \354\225\204\353\246\254 ...",
|
||||
|
|
@ -73,7 +73,7 @@ class TextHelperTest < ActionView::TestCase
|
|||
"This is a <b>beautiful</b> morning, but also a <b>beautiful</b> day",
|
||||
highlight("This is a beautiful morning, but also a beautiful day", "beautiful", '<b>\1</b>')
|
||||
)
|
||||
|
||||
|
||||
assert_equal(
|
||||
"This text is not changed because we supplied an empty phrase",
|
||||
highlight("This text is not changed because we supplied an empty phrase", nil)
|
||||
|
|
@ -166,18 +166,7 @@ class TextHelperTest < ActionView::TestCase
|
|||
assert_equal("2 counters", pluralize(2, "count", "counters"))
|
||||
assert_equal("0 counters", pluralize(nil, "count", "counters"))
|
||||
assert_equal("2 people", pluralize(2, "person"))
|
||||
assert_equal("10 buffaloes", pluralize(10, "buffalo"))
|
||||
end
|
||||
|
||||
uses_mocha("should_just_add_s_for_pluralize_without_inflector_loaded") do
|
||||
def test_should_just_add_s_for_pluralize_without_inflector_loaded
|
||||
Object.expects(:const_defined?).with("Inflector").times(4).returns(false)
|
||||
assert_equal("1 count", pluralize(1, "count"))
|
||||
assert_equal("2 persons", pluralize(2, "person"))
|
||||
assert_equal("2 personss", pluralize("2", "persons"))
|
||||
assert_equal("2 counts", pluralize(2, "count"))
|
||||
assert_equal("10 buffalos", pluralize(10, "buffalo"))
|
||||
end
|
||||
assert_equal("10 buffaloes", pluralize(10, "buffalo"))
|
||||
end
|
||||
|
||||
def test_auto_link_parsing
|
||||
|
|
@ -298,7 +287,7 @@ class TextHelperTest < ActionView::TestCase
|
|||
assert_equal("2", value.to_s)
|
||||
assert_equal("3", value.to_s)
|
||||
end
|
||||
|
||||
|
||||
def test_cycle_class_with_no_arguments
|
||||
assert_raise(ArgumentError) { value = Cycle.new() }
|
||||
end
|
||||
|
|
@ -311,11 +300,11 @@ class TextHelperTest < ActionView::TestCase
|
|||
assert_equal("2", cycle("one", 2, "3"))
|
||||
assert_equal("3", cycle("one", 2, "3"))
|
||||
end
|
||||
|
||||
|
||||
def test_cycle_with_no_arguments
|
||||
assert_raise(ArgumentError) { value = cycle() }
|
||||
end
|
||||
|
||||
|
||||
def test_cycle_resets_with_new_values
|
||||
assert_equal("even", cycle("even", "odd"))
|
||||
assert_equal("odd", cycle("even", "odd"))
|
||||
|
|
@ -325,7 +314,7 @@ class TextHelperTest < ActionView::TestCase
|
|||
assert_equal("3", cycle(1, 2, 3))
|
||||
assert_equal("1", cycle(1, 2, 3))
|
||||
end
|
||||
|
||||
|
||||
def test_named_cycles
|
||||
assert_equal("1", cycle(1, 2, 3, :name => "numbers"))
|
||||
assert_equal("red", cycle("red", "blue", :name => "colors"))
|
||||
|
|
@ -334,24 +323,24 @@ class TextHelperTest < ActionView::TestCase
|
|||
assert_equal("3", cycle(1, 2, 3, :name => "numbers"))
|
||||
assert_equal("red", cycle("red", "blue", :name => "colors"))
|
||||
end
|
||||
|
||||
|
||||
def test_default_named_cycle
|
||||
assert_equal("1", cycle(1, 2, 3))
|
||||
assert_equal("2", cycle(1, 2, 3, :name => "default"))
|
||||
assert_equal("3", cycle(1, 2, 3))
|
||||
end
|
||||
|
||||
|
||||
def test_reset_cycle
|
||||
assert_equal("1", cycle(1, 2, 3))
|
||||
assert_equal("2", cycle(1, 2, 3))
|
||||
reset_cycle
|
||||
assert_equal("1", cycle(1, 2, 3))
|
||||
end
|
||||
|
||||
|
||||
def test_reset_unknown_cycle
|
||||
reset_cycle("colors")
|
||||
end
|
||||
|
||||
|
||||
def test_recet_named_cycle
|
||||
assert_equal("1", cycle(1, 2, 3, :name => "numbers"))
|
||||
assert_equal("red", cycle("red", "blue", :name => "colors"))
|
||||
|
|
@ -361,7 +350,7 @@ class TextHelperTest < ActionView::TestCase
|
|||
assert_equal("2", cycle(1, 2, 3, :name => "numbers"))
|
||||
assert_equal("red", cycle("red", "blue", :name => "colors"))
|
||||
end
|
||||
|
||||
|
||||
def test_cycle_no_instance_variable_clashes
|
||||
@cycles = %w{Specialized Fuji Giant}
|
||||
assert_equal("red", cycle("red", "blue"))
|
||||
|
|
|
|||
Loading…
Reference in New Issue