lib/asset_hat/js/vendors.rb in asset_hat-0.2.1 vs lib/asset_hat/js/vendors.rb in asset_hat-0.3.0
- old
+ new
@@ -31,67 +31,71 @@
# asset can be found. The URL is either local (relative) or external
# depending on the environment configuration. If external, the URL
# points to {Google's CDN}[http://code.google.com/apis/ajaxlibs/].
# Options:
#
+ # [ssl] Boolean for whether to include vendor JS via HTTPS. Defaults
+ # to false.
# [version] The vendor version, e.g., '1.4.0' for jQuery 1.4. By
# default, each vendor version is taken from
# <code>config/assets.yml</code>; use this option to override
# the configuration.
def self.source_for(vendor, options={})
vendor_config =
AssetHat.config['js']['vendors'][vendor.to_s] rescue nil
use_local = ActionController::Base.consider_all_requests_local
+ use_ssl = !!options[:ssl]
version = options[:version] || vendor_config['version'] rescue nil
unless use_local
src = vendor_config['remote_url'] rescue nil
+ src = (vendor_config['remote_ssl_url'] rescue nil) if use_ssl
end
if src.blank?
case vendor
when :jquery
src = use_local || version.blank? ?
"#{['jquery', version].compact.join('-')}.min.js" :
- "http://ajax.googleapis.com/ajax/libs/jquery/#{version}/jquery.min.js"
+ "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/jquery/#{version}/jquery.min.js"
when :jquery_ui
src = use_local || version.blank? ?
"#{['jquery-ui', version].compact.join('-')}.min.js" :
- "http://ajax.googleapis.com/ajax/libs/jqueryui/#{version}/jquery-ui.min.js"
+ "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/jqueryui/#{version}/jquery-ui.min.js"
when :prototype
# Prototype currently doesn't provide an official minified version.
src = use_local || version.blank? ?
"#{['prototype', version].compact.join('-')}.js" :
- "http://ajax.googleapis.com/ajax/libs/prototype/#{version}/prototype.js"
+ "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/prototype/#{version}/prototype.js"
when :scriptaculous
# script.aculo.us currently doesn't provide an official minified version.
src = use_local || version.blank? ?
"#{['scriptaculous', version].compact.join('-')}.js" :
- "http://ajax.googleapis.com/ajax/libs/scriptaculous/#{version}/scriptaculous.js"
+ "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/scriptaculous/#{version}/scriptaculous.js"
when :mootools
src = use_local || version.blank? ?
"#{['mootools', version].compact.join('-')}.min.js" :
- "http://ajax.googleapis.com/ajax/libs/mootools/#{version}/mootools-yui-compressed.js"
+ "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/mootools/#{version}/mootools-yui-compressed.js"
when :dojo
src = use_local || version.blank? ?
"#{['dojo', version].compact.join('-')}.min.js" :
- "http://ajax.googleapis.com/ajax/libs/dojo/#{version}/dojo/dojo.xd.js"
+ "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/dojo/#{version}/dojo/dojo.xd.js"
when :swfobject
src = use_local || version.blank? ?
"#{['swfobject', version].compact.join('-')}.min.js" :
- "http://ajax.googleapis.com/ajax/libs/swfobject/#{version}/swfobject.js"
+ "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/swfobject/#{version}/swfobject.js"
when :yui
src = use_local || version.blank? ?
"#{['yui', version].compact.join('-')}.min.js" :
- "http://ajax.googleapis.com/ajax/libs/yui/#{version}/build/yuiloader/yuiloader-min.js"
+ "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/yui/#{version}/build/yuiloader/yuiloader-min.js"
when :ext_core
src = use_local || version.blank? ?
"#{['ext_core', version].compact.join('-')}.min.js" :
- "http://ajax.googleapis.com/ajax/libs/ext-core/#{version}/ext-core.js"
+ "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/ext-core/#{version}/ext-core.js"
when :webfont
src = use_local || version.blank? ?
"#{['webfont', version].compact.join('-')}.min.js" :
- "http://ajax.googleapis.com/ajax/libs/webfont/#{version}/webfont.js"
+ "http#{'s' if use_ssl}://ajax.googleapis.com/ajax/libs/webfont/#{version}/webfont.js"
else nil # TODO: Write to log
end
end
src