@@ -2,6 +2,7 @@ === Edge +* Populate config.extensions so extensions can be disabled easily. [Jason Garber] * Convert integration specs to Cucumber stories and update RSpec. [Sean Cribbs] * Use ActionView::PathSet instead of normal arrays for view paths. [Pat CHANGELOG @@ -9,7 +9,7 @@ # # It's strongly recommended to check this file into your version control system. -ActiveRecord::Schema.define(:version => 20081208005628) do +ActiveRecord::Schema.define(:version => 20081203140407) do create_table "config", :force => true do |t| t.string "key", :limit => 40, :default => "", :null => false db/schema.rb @@ -9,13 +9,12 @@ module Radiant class Configuration < Rails::Configuration attr_accessor :extension_paths - attr_accessor :extensions + attr_writer :extensions attr_accessor :view_paths def initialize self.view_paths = [] self.extension_paths = default_extension_paths - self.extensions = [ :all ] super end @@ -27,7 +26,17 @@ module Radiant paths.unshift(RADIANT_ROOT + "/test/fixtures/extensions") if env == "test" paths end - + + def extensions + @extensions ||= all_available_extensions + end + + def all_available_extensions + extension_paths.map do |path| + Dir["#{path}/*"].select {|f| File.directory?(f) } + end.flatten.map {|f| File.basename(f).sub(/^\d+_/, '') }.sort.map(&:to_sym) + end + def admin AdminUI.instance end @@ -159,7 +168,17 @@ module Radiant extension_loader.add_controller_paths super end - + + def extensions + @extensions ||= all_available_extensions + end + + def all_available_extensions + extension_paths.map do |path| + Dir["#{path}/*"].select {|f| File.directory?(f) } + end.flatten.map {|f| File.basename(f).sub(/^\d+_/, '') }.sort.map(&:to_sym) + end + def admin configuration.admin end lib/radiant/initializer.rb @@ -27,6 +27,23 @@ describe Radiant::Configuration do @configuration.extension_paths.should include("#{RADIANT_ROOT}/vendor/extensions") end + it "should initialize the extensions" do + @configuration.extensions.should be_kind_of(Array) + @configuration.extensions.should include(:archive, :textile_filter, :markdown_filter) + end + + it "should remove excluded extensions" do + @configuration.extensions -= [:archive] + @configuration.extensions.should be_kind_of(Array) + @configuration.extensions.should_not include(:archive) + end + + it "should have extensions only found in extension paths" do + @configuration.extension_paths = [RADIANT_ROOT + "/test/fixtures/extensions"] + @configuration.extensions.should include(:basic, :overriding, :load_order_green) + @configuration.extensions.should_not include(:archive, :textile_filter, :markdown_filter) + end + it "should have access to the AdminUI" do @configuration.admin.should == Radiant::AdminUI.instance end spec/lib/radiant/initializer_spec.rb c04a4fc8f3b2957d20ace42a674405d6f85c4c05 Jason Garber jg@jasongarber.com http://github.com/imajes/radiant/commit/eb80a6313fad8af9a20b466128dc4ba6987aaf7e eb80a6313fad8af9a20b466128dc4ba6987aaf7e 2009-04-25T14:21:16-07:00 2009-04-25T10:55:23-07:00 Populate config.extensions so extensions can be disabled easily. [#51 state:resolved] 26597cc23d051e483d74ec6e01cfbfb911f53ce0 Josh French josh@digitalpulp.com