@@ -3,7 +3,7 @@ module IncludeGoogleJs @@javascript_expansions = { :defaults => ActionView::Helpers::AssetTagHelper::JAVASCRIPT_DEFAULT_SOURCES.dup } @@include_google_js = false - @@google_js_libs = ['prototype', 'scriptaculous', 'jquery', 'mootools', 'dojo','swfobject','yui'] + @@google_js_libs = %w[prototype scriptaculous jquery jqueryui mootools dojo yui swfobject] @@scriptaculous_files = ['controls','dragdrop','effects'] @@default_google_js_libs = ['prototype','scriptaculous'] @@google_js_to_include = [] @@ -14,21 +14,22 @@ module IncludeGoogleJs end def javascript_include_tag_with_google_js(*sources) - options = sources.extract_options!.stringify_keys - cache = options.delete("cache") - @@include_google_js = options.delete("include_google_js") && IncludeGoogleJs.confirm_internet_connection - @@javascript_versions = options.delete("versions") || {} + # split apart the sources, check for :cache, confirm that we're using :include_google_js, and grab :versions + libraries = sources.extract_options!.stringify_keys + use_cache = libraries.delete("cache") + @@include_google_js = libraries.delete("include_google_js") && IncludeGoogleJs.confirm_internet_connection + @@javascript_versions = libraries.delete("versions") || {} @@google_js_to_include = [] - - if ActionController::Base.perform_caching && cache - joined_javascript_name = (cache == true ? "all" : cache) + ".js" + + if ActionController::Base.perform_caching && use_cache # Using the locally cached libraries + joined_javascript_name = (cache == true ? "all" : use_cache) + ".js" joined_javascript_path = File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, joined_javascript_name) write_asset_file_contents(joined_javascript_path, compute_javascript_paths(sources)) - javascript_src_tag(joined_javascript_name, options) - else - base_html = IncludeGoogleJs.expand_javascript_sources(sources).collect { |source| javascript_src_tag(source, options) }.join("\n") + javascript_src_tag(joined_javascript_name, libraries) + else # Using Google libraries + base_html = IncludeGoogleJs.expand_javascript_sources(sources).collect { |source| javascript_src_tag(source, libraries) }.join("\n") if @@include_google_js html = %Q{ <script src='http://www.google.com/jsapi'></script> @@ -50,7 +51,7 @@ module IncludeGoogleJs end def self.expand_javascript_sources(sources) - if sources.include?(:all) + if sources.include?(:all) # All libraries, get everything in the javascripts folder, see which are hosted by Google all_javascript_files = Dir[File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, '*.js')].collect { |file| File.basename(file).gsub(/\.\w+$/, '') }.sort all_javascript_files = IncludeGoogleJs.determine_if_google_hosts_files(all_javascript_files) if @@include_google_js @@all_javascript_sources ||= ((IncludeGoogleJs.determine_source(:defaults, @@javascript_expansions).dup & all_javascript_files) + all_javascript_files).uniq @@ -75,7 +76,6 @@ module IncludeGoogleJs javascript_files.each do |file| if @@google_js_libs.include?(file.split("-")[0]) @@google_js_to_include << file - # IncludeGoogleJs.get_file_version(file) end if @@scriptaculous_files.include?(file) @@google_js_to_include << 'scriptaculous' unless @@google_js_to_include.include?('scriptaculous') @@ -115,6 +115,8 @@ module IncludeGoogleJs version = IncludeGoogleJs.parse_scriptaculous(file_name) when "jquery" version = IncludeGoogleJs.parse_jquery(file_name) + when "jqueryui" + version = IncludeGoogleJs.parse_jquery_ui(file_name) when "mootools" version = IncludeGoogleJs.parse_mootools(file_name) when "dojo" @@ -143,8 +145,20 @@ module IncludeGoogleJs case file.split("-")[0] # Split on '-' because of jQuery's file names with version numbers when "prototype" return IncludeGoogleJs.parse_prototype(file) + when "scriptaculous" + return IncludeGoogleJs.parse_scriptaculous(file) when "jquery" return IncludeGoogleJs.parse_jquery(file) + when "jqueryui" + return IncludeGoogleJs.parse_jquery_ui(file) + when "mootools" + return IncludeGoogleJs.parse_mootools(file) + when "dojo" + return IncludeGoogleJs.parse_dojo(file) + when "yui" + return IncludeGoogleJs.parse_yui(file) + when "swfobject" + return IncludeGoogleJs.parse_swfobject(file) else return 1 end @@ -170,6 +184,13 @@ module IncludeGoogleJs end end + def self.parse_jquery_ui(file="jquery-ui") + File.open(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, "#{file}.js")).each do |line| + version_array = line.scan(/version:\W?"([\d.]+)"/x).to_s + return version_array.to_s unless version_array.blank? + end + end + def self.parse_mootools(file="mootools") File.open(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, "#{file}.js")).each do |line| return line.match(/version:["|']([\d\.]+)["|']/i)[1] if line.include?("version") lib/include_google_js.rb @@ -1,5 +1,5 @@ namespace :javascript do - libraries = %w[prototype scriptaculous jquery mootools dojo yui swfobject] + libraries = %w[prototype scriptaculous jquery jqueryui mootools dojo yui swfobject] namespace :get do require 'net/http' @@ -32,17 +32,10 @@ namespace :javascript do end when "scriptaculous" # Scriptaculous - http://script.aculo.us/dist/scriptaculous-js-1.8.2.zip + unzip_js_library("http://script.aculo.us/dist/scriptaculous-js-1.8.2.zip") Dir.chdir("#{RAILS_ROOT}/public/javascripts") do - Net::HTTP.start("script.aculo.us") do |http| - zip = http.get("/dist/scriptaculous-js-1.8.2.zip") - open("scriptaculous.zip", 'w') { - |f| f.write(zip.body) - } - `unzip scriptaculous.zip` - `rm scriptaculous.zip` - `mv scriptaculous-js-1.8.2/src/* ../javascripts/` - `rm -rf scriptaculous-js-1.8.2` - end + `mv scriptaculous-js-1.8.2/src/* ./` + `rm -rf scriptaculous-js-1.8.2` end when "jquery" # jQuery - http://jqueryjs.googlecode.com/files/jquery-1.3.2.min.js @@ -51,6 +44,14 @@ namespace :javascript do |f| f.write(http.get('/files/jquery-1.3.2.min.js').body) } end + when "jqueryui" + # jQueryUI - http://www.jqueryui.com/download/jquery-ui-1.7.2.custom.zip + unzip_js_library("http://www.jqueryui.com/download/jquery-ui-1.7.2.custom.zip") + Dir.chdir("#{RAILS_ROOT}/public/javascripts") do + `mv js/jquery-1.3.2.min.js jquery.js` + `mv js/jquery-ui-1.7.2.custom.min.js jquery-ui.js ` + `rm -rf js` + end when "mootools" # mootools - http://mootools.net/download/get/mootools-1.2.2-core-yc.js Net::HTTP.start('mootools.net',80) do |http| @@ -67,32 +68,28 @@ namespace :javascript do end when "yui" # YUI - http://yuilibrary.com/downloads/yui2/yui_2.7.0b.zip - Dir.chdir("#{RAILS_ROOT}/public/javascripts") do - Net::HTTP.start("yuilibrary.com") do |http| - zip = http.get("/downloads/yui2/yui_2.7.0b.zip") - open("yui.zip", 'w') { - |f| f.write(zip.body) - } - `unzip yui.zip` - `rm yui.zip` - end - end + unzip_js_library("http://yuilibrary.com/downloads/yui2/yui_2.7.0b.zip") when "swfobject" # swfobject - http://swfobject.googlecode.com/files/swfobject_2_1.zip - Dir.chdir("#{RAILS_ROOT}/public/javascripts") do - Net::HTTP.start("swfobject.googlecode.com") do |http| - zip = http.get("/files/swfobject_2_1.zip") - open("swfobject.zip", 'w') { - |f| f.write(zip.body) - } - `unzip swfobject.zip` - `rm swfobject.zip` - end - end + unzip_js_library("http://swfobject.googlecode.com/files/swfobject_2_1.zip") else puts "I don't know about #{name}, sorry! Please check for a newer version of include_google_js." end end + + def unzip_js_library(path="") + path_parts = path.match(/http:\/\/([\w.]+)(\/[\w.\/-]+)/i) + Dir.chdir("#{RAILS_ROOT}/public/javascripts") do + Net::HTTP.start(path_parts[1]) do |http| + zip = http.get(path_parts[2]) + open("lib.zip", 'w') { + |f| f.write(zip.body) + } + `unzip lib.zip` + `rm lib.zip` + end + end + end end namespace :remove do @@ -116,14 +113,14 @@ namespace :javascript do case name when "yui" puts "Removing YUI from /public/javascripts/" - `rm -rf yui` + Dir.chdir("#{RAILS_ROOT}/public/javascripts") { `rm -rf yui` } when "scriptaculous" puts "Removing Scriptaculous files from /public/javascripts/" %w[scriptaculous builder controls dragdrop effects slider sound unittest].each do |file| - File.delete("#{RAILS_ROOT}/public/javascripts/#{file}.js") + Dir.chdir("#{RAILS_ROOT}/public/javascripts") { `rm #{file}.js` } end when "swfobject" - `rm -rf swfobject` + Dir.chdir("#{RAILS_ROOT}/public/javascripts") { `rm -rf swfobject` } else if File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, "#{name}.js")) puts "Removing #{name} from /public/javascripts/" tasks/include_google_js_tasks.rake @@ -81,6 +81,10 @@ class IncludeGoogleJsTest < Test::Unit::TestCase assert_equal "1.3.2", IncludeGoogleJs.parse_jquery if js_exists("jquery") end + def test_parsing_jquery_ui_for_version + assert_equal "1.7.2", IncludeGoogleJs.parse_jquery_ui if js_exists("jqueryui") + end + def test_parsing_mootools_for_version assert_equal "1.2.2", IncludeGoogleJs.parse_mootools if js_exists("mootools") end @@ -118,6 +122,8 @@ class IncludeGoogleJsTest < Test::Unit::TestCase File.exist?("#{RAILS_ROOT}/public/javascripts/yui/") when "swfobject" File.exist?("#{RAILS_ROOT}/public/javascripts/swfobject/") + when "jqueryui" + File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, "jquery-ui.js")) else File.exist?(File.join(ActionView::Helpers::AssetTagHelper::JAVASCRIPTS_DIR, "#{library}.js")) end test/include_google_js_test.rb a18baaae70c9fa29581c41f7d83c4c881af6aaba Christopher D Warren chris@expectless.com http://github.com/chriswarren/include_google_js/commit/42839b73f730c0139fd691f115ec86617cc068e9 42839b73f730c0139fd691f115ec86617cc068e9 2009-06-09T23:56:39-07:00 2009-06-09T23:56:39-07:00 * Added jQuery UI * Little more refactoring, dryed up some of the rake tasks. 183696f92d05c60cebc71db733a9051a89d31c6a Christopher D Warren chris@expectless.com