@@ -11,11 +11,13 @@ module Radiant attr_accessor :extension_paths attr_accessor :extensions attr_accessor :view_paths + attr_accessor :extension_dependencies def initialize self.view_paths = [] self.extension_paths = default_extension_paths self.extensions = [ :all ] + self.extension_dependencies = [] super end @@ -32,6 +34,31 @@ module Radiant AdminUI.instance end + def extension(ext) + @extension_dependencies << ext unless @extension_dependencies.include?(ext) + end + + def check_extension_dependencies + unloaded_extensions = [] + @extension_dependencies.each do |ext| + extension = ext.camelcase + 'Extension' + begin + extension_class = extension.constantize + unloaded_extensions << extension unless defined?(extension_class) && (extension_class.active?) + rescue NameError + unloaded_extensions << extension + end + end + if unloaded_extensions.any? + abort <<-end_error +Missing these required extensions: +#{unloaded_extensions} +end_error + else + return true + end + end + private def library_directories @@ -122,6 +149,7 @@ module Radiant def after_initialize super extension_loader.activate_extensions + configuration.check_extension_dependencies end def initialize_default_admin_tabs lib/radiant/initializer.rb @@ -170,6 +170,7 @@ describe Radiant::ExtensionLoader do Page.should_receive(:load_subclasses) @instance.activate_extensions end + end spec/lib/radiant/extension_loader_spec.rb @@ -30,6 +30,29 @@ describe Radiant::Configuration do it "should have access to the AdminUI" do @configuration.admin.should == Radiant::AdminUI.instance end + + it "should initialize extension dependencies" do + @configuration.extension_dependencies.should eql([]) + end + + it "should add extension dependencies" do + @configuration.extension('basic') + @configuration.extension_dependencies.should eql(['basic']) + end + + it "should validate dependencies" do + @configuration.extensions = [BasicExtension] + @configuration.extension('basic') + @configuration.check_extension_dependencies.should be_true + end + + it "should report missing dependencies" do + @configuration.extensions = [BasicExtension] + @configuration.extension('does_not_exist') + lambda { + @configuration.check_extension_dependencies + }.should raise_error(SystemExit) + end end describe Radiant::Initializer do @@ -77,4 +100,10 @@ describe Radiant::Initializer do it "should have access to the AdminUI" do @initializer.admin.should == Radiant::AdminUI.instance end + + it "should check dependent extensions" do + @initializer.configuration.should_receive(:check_extension_dependencies) + @initializer.after_initialize + end + end spec/lib/radiant/initializer_spec.rb fc383df21f69235e5139691d15ece8e35345fae5 Josh French josh@digitalpulp.com http://github.com/hairballopolis/radiant/commit/73f9cfc9b3caf62080d2b1b6b3a5fc4e42d01a49 73f9cfc9b3caf62080d2b1b6b3a5fc4e42d01a49 2009-05-11T12:00:11-07:00 2009-05-11T12:00:11-07:00 Extension dependencies cfed314aed380df991ccd059ad1420c8a1808a62 Josh French josh@digitalpulp.com