@@ -10,5 +10,17 @@ Merb::Plugins.config[:asset_helpers] = { :max_hosts => 4, :asset_domain => "assets%s", :domain => "my-awesome-domain.com", - :use_ssl => false + :use_ssl => false, + + # Global prefix/suffix for css/js include tags, overridable in js_include_tag and css_include_tag + # + # :js_prefix => "http://cdn.example.com" + # require_js :application # => "http://cdn.example.com/javascripts/application.js" + # + # :js_suffix => "_#{MyApp.version}" + # require_js :application # => "/javascripts/application_0.2.2.js" + :js_prefix => nil, + :js_suffix => nil, + :css_prefix => nil, + :css_suffix => nil } if Merb::Plugins.config[:asset_helpers].nil? \ No newline at end of file merb-assets/lib/merb-assets.rb @@ -407,6 +407,10 @@ module Merb # ==== Options # :bundle<~to_s>:: # The name of the bundle the scripts should be combined into. + # :prefix<~to_s>:: + # prefix to add to include tag, overrides any set in Merb::Plugins.config[:asset_helpers][:js_prefix] + # :suffix<~to_s>:: + # suffix to add to include tag, overrides any set in Merb::Plugins.config[:asset_helpers][:js_suffix] # # ==== Returns # String:: The JavaScript include tag(s). @@ -426,12 +430,21 @@ module Merb # # => <script src="/javascripts/jquery.js" type="text/javascript"></script> # # <script src="/javascripts/validation.js" type="text/javascript"></script> # + # js_include_tag :application, :validation, :prefix => "http://cdn.example.com" + # # => <script src="http://cdn.example.com/javascripts/application.js" type="text/javascript"></script> + # # <script src="http://cdn.example.com/javascripts/validation.js" type="text/javascript"></script> + # + # js_include_tag :application, :validation, :suffix => ".#{MyApp.version}" + # # => <script src="/javascripts/application.1.0.3.js" type="text/javascript"></script> + # # <script src="/javascripts/validation.1.0.3.js" type="text/javascript"></script> def js_include_tag(*scripts) options = scripts.last.is_a?(Hash) ? scripts.pop : {} return nil if scripts.empty? reload = options[:reload] || Merb::Config[:reload_templates] - + js_prefix = options[:prefix] || Merb::Plugins.config[:asset_helpers][:js_prefix] + js_suffix = options[:suffix] || Merb::Plugins.config[:asset_helpers][:js_suffix] + if (bundle_name = options[:bundle]) && Merb::Assets.bundle? && scripts.size > 1 bundler = Merb::Assets::JavascriptAssetBundler.new(bundle_name, *scripts) bundled_asset = bundler.bundle! @@ -441,7 +454,13 @@ module Merb tags = "" for script in scripts - src = asset_path(:javascript, script) + src = js_prefix.to_s + asset_path(:javascript, script) + + if js_suffix + ext_length = ASSET_FILE_EXTENSIONS[:javascript].length + 1 + src.insert(-ext_length,js_suffix) + end + src += src.include?('?') ? "&#{random_query_string}" : "?#{random_query_string}" if reload attrs = { :src => src, @@ -464,6 +483,10 @@ module Merb # The name of the bundle the stylesheets should be combined into. # :media<~to_s>:: # The media attribute for the generated link element. Defaults to :all. + # :prefix<~to_s>:: + # prefix to add to include tag, overrides any set in Merb::Plugins.config[:asset_helpers][:css_prefix] + # :suffix<~to_s>:: + # suffix to add to include tag, overrides any set in Merb::Plugins.config[:asset_helpers][:css_suffix] # # ==== Returns # String:: The CSS include tag(s). @@ -488,11 +511,19 @@ module Merb # # css_include_tag :style, :charset => 'iso-8859-1' # # => <link href="/stylesheets/style.css" media="print" rel="Stylesheet" type="text/css" charset="iso-8859-1" /> + # + # css_include_tag :style, :prefix => "http://static.example.com" + # # => <link href="http://static.example.com/stylesheets/style.css" media="print" rel="Stylesheet" type="text/css" /> + # + # css_include_tag :style, :suffix => ".#{MyApp.version}" + # # => <link href="/stylesheets/style.1.0.0.css" media="print" rel="Stylesheet" type="text/css" /> def css_include_tag(*stylesheets) options = stylesheets.last.is_a?(Hash) ? stylesheets.pop : {} return nil if stylesheets.empty? reload = options[:reload] || Merb::Config[:reload_templates] + css_prefix = options[:prefix] || Merb::Plugins.config[:asset_helpers][:css_prefix] + css_suffix = options[:suffix] || Merb::Plugins.config[:asset_helpers][:css_suffix] if (bundle_name = options[:bundle]) && Merb::Assets.bundle? && stylesheets.size > 1 bundler = Merb::Assets::StylesheetAssetBundler.new(bundle_name, *stylesheets) @@ -503,7 +534,13 @@ module Merb tags = "" for stylesheet in stylesheets - href = asset_path(:stylesheet, stylesheet) + href = css_prefix.to_s + asset_path(:stylesheet, stylesheet) + + if css_suffix + ext_length = ASSET_FILE_EXTENSIONS[:stylesheet].length + 1 + href.insert(-ext_length,css_suffix) + end + href += href.include?('?') ? "&#{random_query_string}" : "?#{random_query_string}" if reload attrs = { :href => href, merb-assets/lib/merb-assets/assets_mixin.rb @@ -271,4 +271,34 @@ describe "External JavaScript and Stylesheets" do result.should match(%r{/stylesheets/style.css}) result.should match(%r{/stylesheets/layout.css}) end + + it 'should create a js include tag with a prefix' do + result = js_include_tag('jquery.js', :effects, :prefix => "http://cdn.example.com") + result.scan(/<script/).should have(2).things + result.should match(%r{http://cdn.example.com/javascripts/jquery.js}) + result.should match(%r{http://cdn.example.com/javascripts/effects.js}) + end + + it 'should create a js include tag with a suffix' do + @js_version = "3.0.1" + result = js_include_tag('jquery.js', :effects, :suffix => ".#{@js_version}") + result.scan(/<script/).should have(2).things + result.should match(%r{/javascripts/jquery.3.0.1.js}) + result.should match(%r{/javascripts/effects.3.0.1.js}) + end + + it 'should create a css include tag with a prefix' do + result = css_include_tag('style.css', :layout, :prefix => "http://cdn.example.com") + result.scan(/<link/).should have(2).things + result.should match(%r{http://cdn.example.com/stylesheets/style.css}) + result.should match(%r{http://cdn.example.com/stylesheets/layout.css}) + end + + it 'should create a css include tag with a suffix' do + @css_version = "0.1.3" + result = css_include_tag('style.css', :layout, :suffix => ".#{@css_version}") + result.scan(/<link/).should have(2).things + result.should match(%r{/stylesheets/style.0.1.3.css}) + result.should match(%r{/stylesheets/layout.0.1.3.css}) + end end merb-assets/spec/merb-assets_spec.rb 65a6e7f0a14ccfb1cad8f5d3f0940911e442b914 Cory ODaniel coryodaniel github@coryodaniel.com http://github.com/wycats/merb/commit/9226ab290ff9ddf70aff0296b80960c5c47ecc93 9226ab290ff9ddf70aff0296b80960c5c47ecc93 2009-02-25T10:35:00-08:00 2009-02-23T20:19:18-08:00 added prefix and suffix options for js_include_tag and css_include tag. Also defaults are available in Merb::Plugins.config or set on a case by case basis in js_include_tag or css_include_tag These are good for versioning js/css file file names (to force updates) and for hosting statics on anotehr domain like cdn.example.com 2468b0179f6b429d9a4e3638398851e99e20a073 Matt Aimonetti mattetti mattaimonetti@gmail.com