test/fixtures/extensions/01_basic/app/metal/basic_metal.rb test/fixtures/extensions/02_overriding/app/metal/basic_metal.rb @@ -2,6 +2,7 @@ === Edge +* Load Metal from Extensions [Jim Gay] * Moved template_name to ApplicationController [Jim Gay, Michael Kessler] * Remove vizres plugin. [Sean Cribbs] * Update instance config/environments to remove ResponseCache [Jim Gay] CHANGELOG @@ -63,6 +63,10 @@ module Radiant def view_paths extensions.map { |extension| "#{extension.root}/app/views" }.select { |d| File.directory?(d) }.reverse end + + def metal_paths + extensions.map { |extension| "#{extension.root}/app/metal" }.select { |d| File.directory?(d) }.reverse + end # Load the extensions def load_extensions @@ -101,7 +105,7 @@ module Radiant def load_paths_for(dir) if File.directory?(dir) - %w(lib app/models app/controllers app/helpers test/helpers).collect do |p| + %w(lib app/models app/controllers app/metal app/helpers test/helpers).collect do |p| path = "#{dir}/#{p}" path if File.directory?(path) end.compact << dir lib/radiant/extension_loader.rb @@ -125,6 +125,12 @@ describe Radiant::ExtensionLoader do @instance.view_paths.all? {|f| File.directory?(f) }.should be_true end + it "should have metal paths" do + @instance.should respond_to(:metal_paths) + @instance.metal_paths.should be_instance_of(Array) + @instance.metal_paths.all? {|f| File.directory?(f) }.should be_true + end + it "should return the view paths in inverse order to the loaded" do extensions = [BasicExtension, OverridingExtension] @instance.extensions = extensions @@ -133,6 +139,15 @@ describe Radiant::ExtensionLoader do "#{RADIANT_ROOT}/test/fixtures/extensions/01_basic/app/views" ] end + + it "should return the metal paths in inverse order to the loaded" do + extensions = [BasicExtension, OverridingExtension] + @instance.extensions = extensions + @instance.metal_paths.should == [ + "#{RADIANT_ROOT}/test/fixtures/extensions/02_overriding/app/metal", + "#{RADIANT_ROOT}/test/fixtures/extensions/01_basic/app/metal" + ] + end it "should load and initialize extensions when discovering" do @instance.should_receive(:load_extension_roots).and_return(@extension_paths) spec/lib/radiant/extension_loader_spec.rb 322e5c16d21fc599ac339378873ee931ae9d60ef Jim Gay jim@saturnflyer.com http://github.com/radiant/radiant/commit/f8163a38ea8475a401db58a01692e67733025da7 f8163a38ea8475a401db58a01692e67733025da7 2009-06-12T10:11:24-07:00 2009-06-12T10:11:24-07:00 load metal from extensions b3df284767650cda436738ebc66fc48bcbe8c5b1 Jim Gay jim@saturnflyer.com