deac/middleman
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Remove use of full_path and odd options from auto_tag

Browse source
This commit is contained in:
Ben Hollis 2012-09-16 01:56:14 -07:00
parent 8ec42df641
commit d181ec5f4f
1 changed files with 7 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
middleman-more/lib/middleman-more/core_extensions/default_helpers.rb
View file

@ -29,20 +29,18 @@ module Middleman
module Helpers module Helpers
# Output a stylesheet link tag based on the current path # Output a stylesheet link tag based on the current path
# #
# @param [String] separator How to break up path in parts
# @return [String] # @return [String]
def auto_stylesheet_link_tag(separator="/") def auto_stylesheet_link_tag
auto_tag(:css, separator) do |path| auto_tag(:css) do |path|
stylesheet_link_tag path stylesheet_link_tag path
end end
end end
# Output a javascript tag based on the current path # Output a javascript tag based on the current path
# #
# @param [String] separator How to break up path in parts
# @return [String] # @return [String]
def auto_javascript_include_tag(separator="/") def auto_javascript_include_tag
auto_tag(:js, separator) do |path| auto_tag(:js) do |path|
javascript_include_tag path javascript_include_tag path
end end
end end
@ -53,7 +51,7 @@ module Middleman
# @param [String] separator How to break up path in parts # @param [String] separator How to break up path in parts
# @param [String] asset_dir Where to look for assets # @param [String] asset_dir Where to look for assets
# @return [void] # @return [void]
def auto_tag(asset_ext, separator="/", asset_dir=nil) def auto_tag(asset_ext, asset_dir=nil)
if asset_dir.nil? if asset_dir.nil?
asset_dir = case asset_ext asset_dir = case asset_ext
when :js then js_dir when :js then js_dir
@ -63,12 +61,10 @@ module Middleman
# If the basename of the request as no extension, assume we are serving a # If the basename of the request as no extension, assume we are serving a
# directory and join index_file to the path. # directory and join index_file to the path.
path = full_path(current_path.dup) path = File.join(asset_dir, current_path)
path = path.sub(%r{^/}, '')
path = path.gsub(File.extname(path), ".#{asset_ext}") path = path.gsub(File.extname(path), ".#{asset_ext}")
path = path.gsub("/", separator)
yield path if sitemap.find_resource_by_path(File.join(asset_dir, path)) yield path if sitemap.find_resource_by_path(path)
end end
# Generate body css classes based on the current path # Generate body css classes based on the current path