Permalink
Browse files

Added AssetTagHelper#image_path, AssetTagHelper#javascript_path, and …

…AssetTagHelper#stylesheet_path #1110 [Larry Halff]

git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@1176 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
  • Loading branch information...
dhh committed Apr 17, 2005
1 parent 5e3b8b3 commit ffdd4bc25199556bb471767aa0e965c75827efaf
View
@@ -1,5 +1,7 @@
*SVN*
+* Added AssetTagHelper#image_path, AssetTagHelper#javascript_path, and AssetTagHelper#stylesheet_path #1110 [Larry Halff]
+
* Fixed url_for(nil) in functional tests #1116 [Alisdair McDiarmid]
* Fixed error handling of broken layouts #1115 [Michael Schubert]
@@ -23,6 +23,13 @@ def auto_discovery_link_tag(type = :rss, options = {})
)
end
+ # Returns path to a javascript asset. Example:
+ #
+ # javascript_path "xmlhr" # => /javascripts/xmlhr.js
+ def javascript_path(source)
+ compute_public_path(source, 'javascripts', 'js')
+ end
+
# Returns a script include tag per source given as argument. Examples:
#
# javascript_include_tag "xmlhr" # =>
@@ -33,11 +40,18 @@ def auto_discovery_link_tag(type = :rss, options = {})
# <script type="text/javascript" src="/elsewhere/cools.js"></script>
def javascript_include_tag(*sources)
sources.collect { |source|
- source = compute_public_path(source, 'javascripts', 'js')
+ source = javascript_path(source)
content_tag("script", "", "type" => "text/javascript", "src" => source)
}.join("\n")
end
+ # Returns path to a stylesheet asset. Example:
+ #
+ # stylesheet_path "style" # => /stylesheets/style.css
+ def stylesheet_path(source)
+ compute_public_path(source, 'stylesheets', 'css')
+ end
+
# Returns a css link tag per source given as argument. Examples:
#
# stylesheet_link_tag "style" # =>
@@ -48,11 +62,21 @@ def javascript_include_tag(*sources)
# <link href="/css/stylish.css" media="screen" rel="Stylesheet" type="text/css" />
def stylesheet_link_tag(*sources)
sources.collect { |source|
- source = compute_public_path(source, 'stylesheets', 'css')
+ source = stylesheet_path(source)
tag("link", "rel" => "Stylesheet", "type" => "text/css", "media" => "screen", "href" => source)
}.join("\n")
end
+ # Returns path to an image asset. Example:
+ #
+ # The +src+ can be supplied as a...
+ # * full path, like "/my_images/image.gif"
+ # * file name, like "rss.gif", that gets expanded to "/images/rss.gif"
+ # * file name without extension, like "logo", that gets expanded to "/images/logo.png"
+ def image_path(source)
+ compute_public_path(source, 'images', 'png')
+ end
+
# Returns an image tag converting the +options+ instead html options on the tag, but with these special cases:
#
# * <tt>:alt</tt> - If no alt text is given, the file name part of the +src+ is used (capitalized and without the extension)
@@ -65,7 +89,7 @@ def stylesheet_link_tag(*sources)
def image_tag(source, options = {})
options.symbolize_keys
- options[:src] = compute_public_path(source, 'images', 'png')
+ options[:src] = image_path(source)
options[:alt] ||= source.split("/").last.split(".").first.capitalize
if options[:size]
@@ -77,14 +101,12 @@ def image_tag(source, options = {})
end
private
-
def compute_public_path(source, dir, ext)
source = "/#{dir}/#{source}" unless source.include?("/")
source = "#{source}.#{ext}" unless source.include?(".")
source = "#{@request.relative_url_root}#{source}"
source
end
-
end
end
end
@@ -29,16 +29,28 @@ def relative_url_root
%(auto_discovery_link_tag(:rss, :action => "feed")) => %(<link href="http://www.example.com" rel="alternate" title="RSS" type="application/rss+xml" />),
}
+ JavascriptPathToTag = {
+ %(javascript_path("xmlhr")) => %(/javascripts/xmlhr.js),
+ }
+
JavascriptIncludeToTag = {
%(javascript_include_tag("xmlhr")) => %(<script src="/javascripts/xmlhr.js" type="text/javascript"></script>),
%(javascript_include_tag("common.javascript", "/elsewhere/cools")) => %(<script src="/javascripts/common.javascript" type="text/javascript"></script>\n<script src="/elsewhere/cools.js" type="text/javascript"></script>),
}
+ StylePathToTag = {
+ %(stylesheet_path("style")) => %(/stylesheets/style.css),
+ }
+
StyleLinkToTag = {
%(stylesheet_link_tag("style")) => %(<link href="/stylesheets/style.css" media="screen" rel="Stylesheet" type="text/css" />),
%(stylesheet_link_tag("random.styles", "/css/stylish")) => %(<link href="/stylesheets/random.styles" media="screen" rel="Stylesheet" type="text/css" />\n<link href="/css/stylish.css" media="screen" rel="Stylesheet" type="text/css" />)
}
+ ImagePathToTag = {
+ %(image_path("xml")) => %(/images/xml.png),
+ }
+
ImageLinkToTag = {
%(image_tag("xml")) => %(<img alt="Xml" src="/images/xml.png" />),
%(image_tag("rss", :alt => "rss syndication")) => %(<img alt="rss syndication" src="/images/rss.png" />),
@@ -49,14 +61,26 @@ def test_auto_discovery
AutoDiscoveryToTag.each { |method, tag| assert_equal(tag, eval(method)) }
end
+ def test_javascript_path
+ JavascriptPathToTag.each { |method, tag| assert_equal(tag, eval(method)) }
+ end
+
def test_javascript_include
JavascriptIncludeToTag.each { |method, tag| assert_equal(tag, eval(method)) }
end
+ def test_style_path
+ StylePathToTag.each { |method, tag| assert_equal(tag, eval(method)) }
+ end
+
def test_style_link
StyleLinkToTag.each { |method, tag| assert_equal(tag, eval(method)) }
end
+ def test_image_path
+ ImagePathToTag.each { |method, tag| assert_equal(tag, eval(method)) }
+ end
+
def test_image_tag
ImageLinkToTag.each { |method, tag| assert_equal(tag, eval(method)) }
end
@@ -91,15 +115,27 @@ def relative_url_root
%(auto_discovery_link_tag) => %(<link href="http://www.example.com/calloboration/hieraki" rel="alternate" title="RSS" type="application/rss+xml" />),
}
+ JavascriptPathToTag = {
+ %(javascript_path("xmlhr")) => %(/calloboration/hieraki/javascripts/xmlhr.js),
+ }
+
JavascriptIncludeToTag = {
%(javascript_include_tag("xmlhr")) => %(<script src="/calloboration/hieraki/javascripts/xmlhr.js" type="text/javascript"></script>),
%(javascript_include_tag("common.javascript", "/elsewhere/cools")) => %(<script src="/calloboration/hieraki/javascripts/common.javascript" type="text/javascript"></script>\n<script src="/calloboration/hieraki/elsewhere/cools.js" type="text/javascript"></script>),
}
+ StylePathToTag = {
+ %(stylesheet_path("style")) => %(/calloboration/hieraki/stylesheets/style.css),
+ }
+
StyleLinkToTag = {
%(stylesheet_link_tag("style")) => %(<link href="/calloboration/hieraki/stylesheets/style.css" media="screen" rel="Stylesheet" type="text/css" />),
%(stylesheet_link_tag("random.styles", "/css/stylish")) => %(<link href="/calloboration/hieraki/stylesheets/random.styles" media="screen" rel="Stylesheet" type="text/css" />\n<link href="/calloboration/hieraki/css/stylish.css" media="screen" rel="Stylesheet" type="text/css" />)
}
+
+ ImagePathToTag = {
+ %(image_path("xml")) => %(/calloboration/hieraki/images/xml.png),
+ }
ImageLinkToTag = {
%(image_tag("xml")) => %(<img alt="Xml" src="/calloboration/hieraki/images/xml.png" />),
@@ -111,17 +147,29 @@ def test_auto_discovery
AutoDiscoveryToTag.each { |method, tag| assert_equal(tag, eval(method)) }
end
+ def test_javascript_path
+ JavascriptPathToTag.each { |method, tag| assert_equal(tag, eval(method)) }
+ end
+
def test_javascript_include
JavascriptIncludeToTag.each { |method, tag| assert_equal(tag, eval(method)) }
end
+ def test_style_path
+ StylePathToTag.each { |method, tag| assert_equal(tag, eval(method)) }
+ end
+
def test_style_link
StyleLinkToTag.each { |method, tag| assert_equal(tag, eval(method)) }
end
def test_image_tag
assert_equal %(<img alt="Gold" height="70" src="/calloboration/hieraki/images/gold.png" width="45" />), image_tag("gold", :size => "45x70")
end
+
+ def test_image_path
+ ImagePathToTag.each { |method, tag| assert_equal(tag, eval(method)) }
+ end
def test_image_tag
ImageLinkToTag.each { |method, tag| assert_equal(tag, eval(method)) }

0 comments on commit ffdd4bc

Please sign in to comment.