@@ -58,6 +58,7 @@ module IncludeGoogleJs google_javascript_files += [] end else + sources = IncludeGoogleJs.check_for_dependencies(sources) sources.collect do |source| if IncludeGoogleJs.does_google_host?(source) && use_google_libraries google_javascript_files << source @@ -69,6 +70,15 @@ module IncludeGoogleJs return { "google" => google_javascript_files, "local" => local_javascript_files } end + def self.check_for_dependencies(source) + if source.include?("scriptaculous") && !source.include?("prototype") + source.unshift("prototype") + elsif source.include?("jquery-ui") && !source.include?("jquery") + source.unshift("jquery") + end + return source + end + def self.determine_source(source, collection) case source when Symbol @@ -84,8 +94,8 @@ module IncludeGoogleJs <script> } libraries.each do |js_lib| - version = versions.has_key?(js_lib.split("-")[0].to_sym) ? versions.fetch(js_lib.split("-")[0].to_sym) : IncludeGoogleJs.get_file_version(js_lib) - html += %Q{google.load("#{js_lib.split("-")[0]}", "#{version}"); + version = versions.has_key?(js_lib.to_sym) ? versions.fetch(js_lib.to_sym) : IncludeGoogleJs.get_file_version(js_lib) + html += %Q{google.load("#{js_lib}", "#{version}"); } end html += %Q{</script> @@ -95,7 +105,7 @@ module IncludeGoogleJs def self.determine_if_google_hosts_files(javascript_files) @@google_js_to_include = [] javascript_files.each do |file| - if @@google_js_libs.include?(file.split("-")[0]) + if @@google_js_libs.include?(file) @@google_js_to_include << file end if @@scriptaculous_files.include?(file) @@ -160,8 +170,8 @@ module IncludeGoogleJs def self.get_file_version(file) version = "1" # split file_name for instances where the file has a version number at the end - library = file.split("-")[0] - return IncludeGoogleJs.send("parse_#{library}") + # library = file.replace("-","_") + return IncludeGoogleJs.send("parse_#{file.gsub("-","_")}") end def self.parse_prototype(file="prototype") lib/include_google_js.rb @@ -60,23 +60,23 @@ class IncludeGoogleJsTest < Test::Unit::TestCase should_not_match(string, unmatched_values) end - # def test_javascript_tag_for_scriptaculous_with_google - # string = javascript_include_tag("scriptaculous", :include_google_js => true) - # matched_values = ["google.load(\"prototype\", \"1.6.0.3\")", "google.load(\"scriptaculous\", \"1.8.2\")"] - # unmatched_values = ["src=\"/javascripts/prototype.js"] - # - # should_match(string, matched_values) - # should_not_match(string, unmatched_values) - # end - # - # def test_javascript_tag_for_scriptaculous_without_google - # string = javascript_include_tag("scriptaculous", :include_google_js => false) - # matched_values = ["src=\"/javascripts/prototype.js", "src=\"/javascripts/scriptaculous.js"] - # unmatched_values = ["google.load(\"prototype\", \"1.6.0.3\")", "google.load(\"scriptaculous\", \"1.8.2\")"] - # - # should_match(string, matched_values) - # should_not_match(string, unmatched_values) - # end + def test_javascript_tag_for_scriptaculous_with_google + string = javascript_include_tag("scriptaculous", :include_google_js => true) + matched_values = ["google.load(\"prototype\", \"1.6.0.3\")", "google.load(\"scriptaculous\", \"1.8.2\")"] + unmatched_values = ["src=\"/javascripts/prototype.js"] + + should_match(string, matched_values) + should_not_match(string, unmatched_values) + end + + def test_javascript_tag_for_scriptaculous_without_google + string = javascript_include_tag("scriptaculous", :include_google_js => false) + matched_values = ["src=\"/javascripts/prototype.js", "src=\"/javascripts/scriptaculous.js"] + unmatched_values = ["google.load(\"prototype\", \"1.6.0.3\")", "google.load(\"scriptaculous\", \"1.8.2\")"] + + should_match(string, matched_values) + should_not_match(string, unmatched_values) + end def test_javascript_tag_for_jquery_with_google string = javascript_include_tag("jquery", :include_google_js => true) @@ -96,23 +96,23 @@ class IncludeGoogleJsTest < Test::Unit::TestCase should_not_match(string, unmatched_values) end - # def test_javascript_tag_for_jquery_ui_with_google - # string = javascript_include_tag("jquery-ui", :include_google_js => true) - # matched_values = ["google.load(\"jquery\", \"1.3.2\")", ] - # unmatched_values = ["src=\"/javascripts/jquery.js"] - # - # should_match(string, matched_values) - # should_not_match(string, unmatched_values) - # end - # - # def test_javascript_tag_for_jquery_ui_without_google - # string = javascript_include_tag("jquery-ui", :include_google_js => false) - # matched_values = ["src=\"/javascripts/jquery.js"] - # unmatched_values = ["google.load(\"jquery\", \"1.3.2\")"] - # - # should_match(string, matched_values) - # should_not_match(string, unmatched_values) - # end + def test_javascript_tag_for_jquery_ui_with_google + string = javascript_include_tag("jquery-ui", :include_google_js => true) + matched_values = ["google.load(\"jquery\", \"1.3.2\")", "google.load(\"jquery-ui\", \"1.7.2\")"] + unmatched_values = ["src=\"/javascripts/jquery.js"] + + should_match(string, matched_values) + should_not_match(string, unmatched_values) + end + + def test_javascript_tag_for_jquery_ui_without_google + string = javascript_include_tag("jquery-ui", :include_google_js => false) + matched_values = ["src=\"/javascripts/jquery.js", "src=\"/javascripts/jquery-ui.js"] + unmatched_values = ["google.load(\"jquery\", \"1.3.2\")"] + + should_match(string, matched_values) + should_not_match(string, unmatched_values) + end def test_javascript_tag_for_all_with_google string = javascript_include_tag(:all, :include_google_js => true) @@ -147,7 +147,7 @@ class IncludeGoogleJsTest < Test::Unit::TestCase end def test_parsing_jquery_ui_for_version - assert_equal "1.7.2", IncludeGoogleJs.parse_jquery_ui if js_exists("jqueryui") + assert_equal "1.7.2", IncludeGoogleJs.parse_jquery_ui if js_exists("jquery-ui") end def test_parsing_mootools_for_version @@ -255,6 +255,19 @@ class IncludeGoogleJsTest < Test::Unit::TestCase assert libraries["local"].include?("jquery-ui") end + # Library dependency checks + def test_if_prototype_added_to_scriptaculous_request + source = ["scriptaculous"] + updated_source = IncludeGoogleJs.check_for_dependencies(source) + assert_equal updated_source.first, "prototype" + end + + def test_if_jquery_added_to_jqueryui_request + source = ["jquery-ui"] + updated_source = IncludeGoogleJs.check_for_dependencies(source) + assert_equal updated_source.first, "jquery" + end + # helper methods def should_match(string="", values=[]) check_values(string,values,true) test/include_google_js_test.rb 0fb1fae693454ff45a573a2aa9f85d9830c14aad Christopher D Warren chris@expectless.com http://github.com/chriswarren/include_google_js/commit/df84ade4590bb6f20fb65e85831fb2ab17970f1d df84ade4590bb6f20fb65e85831fb2ab17970f1d 2009-06-16T22:34:07-07:00 2009-06-16T22:34:07-07:00 * Added a dependency check, so if you load scriptaculous without prototype or jquery-ui without jquery, it'll automatically add them in. 76417c8597c24c4d036ec00f551b96185704c374 Christopher D Warren chris@expectless.com