@@ -1,6 +1,7 @@ == Change Log === Edge +* Fix strange Page subclass loading errors in development mode. [Sean Cribbs] * Fix typo in if_content description. [Jim Gay] * Correct error in radiant:update:configs task. [Sean Cribbs] CHANGELOG @@ -188,13 +188,16 @@ class Page < ActiveRecord::Base def load_subclasses ([RADIANT_ROOT] + Radiant::Extension.descendants.map(&:root)).each do |path| Dir["#{path}/app/models/*_page.rb"].each do |page| - require page $1.camelize.constantize if page =~ %r{/([^/]+)\.rb} end end unless Page.connection.tables.empty? # Haven't bootstrapped yet Page.connection.select_values("SELECT DISTINCT class_name FROM pages WHERE class_name <> '' AND class_name IS NOT NULL").each do |p| - eval(%Q{class #{p} < Page; def self.missing?; true end end}, TOPLEVEL_BINDING) unless Object.const_defined?(p) + begin + p.constantize + rescue NameError, LoadError + eval(%Q{class #{p} < Page; def self.missing?; true end end}, TOPLEVEL_BINDING) + end end end end app/models/page.rb @@ -84,6 +84,4 @@ Radiant::Initializer.run do |config| ResponseCache.defaults[:directory] = ActionController::Base.page_cache_directory ResponseCache.defaults[:logger] = ActionController::Base.logger end -end - -Page.load_subclasses \ No newline at end of file +end \ No newline at end of file config/environment.rb @@ -84,6 +84,4 @@ Radiant::Initializer.run do |config| ResponseCache.defaults[:directory] = ActionController::Base.page_cache_directory ResponseCache.defaults[:logger] = ActionController::Base.logger end -end - -Page.load_subclasses \ No newline at end of file +end \ No newline at end of file lib/generators/instance/templates/instance_environment.rb @@ -92,6 +92,8 @@ module Radiant # Reset the admin UI regions initializer.admin.load_default_regions extensions.each &:activate + # Make sure we have our subclasses loaded! + Page.load_subclasses end alias :reactivate :activate_extensions lib/radiant/extension_loader.rb @@ -151,6 +151,16 @@ describe Radiant::ExtensionLoader do @instance.activate_extensions extensions.all?(&:active?).should be_true end + + it "should (re)load Page subclasses activation" do + @initializer.should_receive(:initialize_default_admin_tabs) + @initializer.should_receive(:initialize_framework_views) + @admin.should_receive(:load_default_regions) + extensions = [BasicExtension, OverridingExtension] + @instance.extensions = extensions + Page.should_receive(:load_subclasses) + @instance.activate_extensions + end end spec/lib/radiant/extension_loader_spec.rb @@ -1,3 +1,4 @@ +require 'file_not_found_page' class CustomFileNotFoundPage < FileNotFoundPage end spec/scenarios/file_not_found_scenario.rb bf91004da5efe94220d5fa9804853e70b3782532 Sean Cribbs seancribbs@gmail.com http://github.com/saturnflyer/radiant/commit/e750f28f901d56a6c6307b89e2a64c2ea2c56c07 e750f28f901d56a6c6307b89e2a64c2ea2c56c07 2008-07-28T20:02:01-07:00 2008-07-28T19:12:42-07:00 Fix strange Page subclass loading errors in development mode. c352b37192fb1c7bf7ee619972204b9c30b87425 Sean Cribbs seancribbs@gmail.com