From 22d25fdbebe3b1a85c6011a4215e8b77585cf15f Mon Sep 17 00:00:00 2001
From: Alex Coles <alexbcoles@mac.com>
Date: Thu, 10 Apr 2008 00:49:26 +0200
Subject: [PATCH] Removed Hoe code, dependency. Rake tasks updated -- using
 Radiant rake tasks. Renamed various constants and Radiant -> MerbRadiant
 module.

---
 Rakefile                                           | 21 ++++-------------
 app/controllers/admin/export.rb                    |  2 +-
 app/controllers/admin/extensions.rb                |  2 +-
 app/controllers/application.rb                     |  2 +-
 app/controllers/site.rb                            |  2 +-
 app/helpers/application_helper.rb                  |  4 ++--
 app/models/page.rb                                 |  6 ++---
 app/models/radiant/config.rb                       |  8 +++----
 app/models/radiant/exporter.rb                     |  2 +-
 app/models/radiant/extension_meta.rb               |  2 +-
 app/models/standard_tags.rb                        |  6 ++---
 app/views/radiant_layouts/application.html.erb     |  2 +-
 config/init.rb                                     |  1 +
 config/radiant_environment.rb                      | 16 ++++++-------
 lib/generators/extension/templates/extension.rb    |  2 +-
 lib/generators/extension/templates/test_helper.rb  |  4 ++--
 lib/generators/generator_base_extension.rb         |  4 ++--
 lib/generators/instance/instance_generator.rb      |  2 +-
 lib/generators/instance/templates/instance_boot.rb | 20 ++++++++--------
 .../instance/templates/instance_environment.rb     |  4 ++--
 .../instance/templates/instance_generate           |  2 +-
 .../instance/templates/instance_rakefile           |  2 +-
 .../instance/templates/instance_routes.rb          |  2 +-
 lib/local_time.rb                                  |  2 +-
 lib/merb_radiant.rb                                |  4 ++--
 lib/object_extensions.rb                           |  5 ----
 .../lib/fixture_loading_extension.rb               |  6 ++---
 .../lib/mailer_view_paths_extension.rb             |  4 ++--
 .../extension_patches/lib/routing_extension.rb     |  4 ++--
 lib/radiant/admin_ui.rb                            |  2 +-
 lib/radiant/extension.rb_                          |  2 +-
 lib/radiant/initializer.rb                         | 26 ++++++++++-----------
 lib/radiant/setup.rb                               | 16 ++++++-------
 lib/radiant/taggable.rb                            |  8 +++----
 lib/tasks/database.rake                            |  4 ++--
 lib/tasks/extensions.rake                          | 18 +++++++--------
 lib/tasks/instance.rake                            | 16 ++++++-------
 lib/tasks/release.rake                             | 16 ++++++-------
 lib/tasks/undefine.rake                            | 27 +++++++++++-----------
 .../test/functional/archive_extension_test.rb      |  2 +-
 .../extensions/archive/test/test_helper.rb         |  4 ++--
 .../extensions/markdown_filter/test/test_helper.rb |  4 ++--
 .../extensions/textile_filter/test/test_helper.rb  |  4 ++--
 .../spec/lib/radiant/extension_loader_spec.rb      | 16 ++++++-------
 radiant_specs/spec/lib/radiant/initializer_spec.rb |  2 +-
 radiant_specs/spec/spec_helper.rb                  |  4 ++--
 .../functional/extension_initialization_test.rb    |  2 +-
 radiant_specs/test/test_helper.rb                  |  4 ++--
 48 files changed, 152 insertions(+), 168 deletions(-)
 delete mode 100644 lib/object_extensions.rb

diff --git a/Rakefile b/Rakefile
index 9313f3a..3ea6cf4 100644
--- a/Rakefile
+++ b/Rakefile
@@ -11,23 +11,6 @@ require 'merb-core'
 require 'rubigen'
 include FileUtils
 
-#require 'hoe'
-#require './lib/merb_radiant.rb'
-
-module MerbRadiant
-  VERSION = "0.1.0"
-end
-
-#Hoe.new('merb_radiant', MerbRadiant::VERSION) do |p|
-#  p.rubyforge_name = 'merb_radiant'
-#  p.author = 'Stephane Busso'
-#  p.email = 'stephane.busso@gmail.com'
-#  p.summary = 'A try of Radiant on Merb'
-#  p.description = p.paragraphs_of('README.txt', 2..5).join("\n\n")
-#  p.url = p.paragraphs_of('README.txt', 0).first.split(/\n/)[1..-1]
-#  p.changes = p.paragraphs_of('CHANGELOG.txt', 0..1).join("\n\n")
-#end
-
 ##############################################################################
 # Merb
 ##############################################################################
@@ -49,6 +32,10 @@ end
 # ADD YOUR CUSTOM TASKS BELOW
 ##############################################################################
 
+unless Rake::Task.task_defined? "radiant:release"
+  Dir["#{MERB_RADIANT_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
+end
+
 class Freezer
   
   class << self
diff --git a/app/controllers/admin/export.rb b/app/controllers/admin/export.rb
index 5602eca..77fefc3 100644
--- a/app/controllers/admin/export.rb
+++ b/app/controllers/admin/export.rb
@@ -1,7 +1,7 @@
 module Admin
   class Export < Application
     def yaml
-      render :text => Radiant::Exporter.export, :content_type => "text/yaml"
+      render :text => MerbRadiant::Exporter.export, :content_type => "text/yaml"
     end
   end
 end
\ No newline at end of file
diff --git a/app/controllers/admin/extensions.rb b/app/controllers/admin/extensions.rb
index 605e037..34553db 100644
--- a/app/controllers/admin/extensions.rb
+++ b/app/controllers/admin/extensions.rb
@@ -1,5 +1,5 @@
 class Admin::Extensions < Application
   def index
-    @extensions = Radiant::Extension.descendants.sort_by { |e| e.extension_name }
+    @extensions = MerbRadiant::Extension.descendants.sort_by { |e| e.extension_name }
   end
 end
diff --git a/app/controllers/application.rb b/app/controllers/application.rb
index 6aa5504..93eaaed 100644
--- a/app/controllers/application.rb
+++ b/app/controllers/application.rb
@@ -13,7 +13,7 @@ class Application < Merb::Controller
   
   def initialize
     super
-    @config = Radiant::Config
+    @config = MerbRadiant::Config
   end
   
   # helpers to include additional assets from actions or views
diff --git a/app/controllers/site.rb b/app/controllers/site.rb
index faf3896..076c03b 100644
--- a/app/controllers/site.rb
+++ b/app/controllers/site.rb
@@ -6,7 +6,7 @@ class Site < Application
   attr_accessor :config, :cache
   
   def initialize
-    @config = Radiant::Config
+    @config = MerbRadiant::Config
     @cache = ResponseCache.instance
   end
   
diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb
index 7417360..3b08862 100644
--- a/app/helpers/application_helper.rb
+++ b/app/helpers/application_helper.rb
@@ -2,7 +2,7 @@ module ApplicationHelper
   include LocalTime
   
   def config
-    Radiant::Config
+    MerbRadiant::Config
   end
   
   def default_page_title
@@ -141,7 +141,7 @@ module ApplicationHelper
   end
   
   def admin
-    Radiant::AdminUI.instance
+    MerbRadiant::AdminUI.instance
   end
   
   private
diff --git a/app/models/page.rb b/app/models/page.rb
index b1e0f06..dad9044 100644
--- a/app/models/page.rb
+++ b/app/models/page.rb
@@ -27,7 +27,7 @@ class Page < ActiveRecord::Base
   
   validate :valid_class_name
   
-  include Radiant::Taggable
+  include MerbRadiant::Taggable
   include StandardTags
   include Annotatable
   
@@ -175,12 +175,12 @@ class Page < ActiveRecord::Base
     end
     
     def load_subclasses
-      Dir["#{RADIANT_ROOT}/app/models/*_page.rb"].each do |page|
+      Dir["#{MERB_RADIANT_ROOT}/app/models/*_page.rb"].each do |page|
         $1.camelize.constantize if page =~ %r{/([^/]+)\.rb}
       end
     end
     
-    def new_with_defaults(config = Radiant::Config)
+    def new_with_defaults(config = MerbRadiant::Config)
       default_parts = config['defaults.page.parts'].to_s.strip.split(/\s*,\s*/)
       page = new
       default_parts.each do |name|
diff --git a/app/models/radiant/config.rb b/app/models/radiant/config.rb
index 13f791d..3d0baa9 100644
--- a/app/models/radiant/config.rb
+++ b/app/models/radiant/config.rb
@@ -1,10 +1,10 @@
 module Radiant
   #
-  # The Radiant::Config object emulates a hash with simple bracket methods
+  # The MerbRadiant::Config object emulates a hash with simple bracket methods
   # which allow you to get and set values in the configuration table:
   #
-  #   Radiant::Config['setting.name'] = 'value'
-  #   Radiant::Config['setting.name'] #=> "value"
+  #   MerbRadiant::Config['setting.name'] = 'value'
+  #   MerbRadiant::Config['setting.name'] #=> "value"
   #
   # Currently, there is not a way to edit configuration through the admin
   # system so it must be done manually. The console script is probably the
@@ -12,7 +12,7 @@ module Radiant
   #
   #   % script/console production
   #   Loading production environment.
-  #   >> Radiant::Config['setting.name'] = 'value'
+  #   >> MerbRadiant::Config['setting.name'] = 'value'
   #   => "value"
   #   >> 
   #
diff --git a/app/models/radiant/exporter.rb b/app/models/radiant/exporter.rb
index e7607a8..706065b 100644
--- a/app/models/radiant/exporter.rb
+++ b/app/models/radiant/exporter.rb
@@ -2,7 +2,7 @@ module Radiant
   class Exporter
     def self.export
       hash = {}
-      [Radiant::Config, User, Page, PagePart, Snippet, Layout].each do |klass|
+      [MerbRadiant::Config, User, Page, PagePart, Snippet, Layout].each do |klass|
         hash[klass.name.pluralize] = klass.find(:all).inject({}) { |h, record| h[record.id.to_i] = record.attributes; h }
       end
       hash.to_yaml
diff --git a/app/models/radiant/extension_meta.rb b/app/models/radiant/extension_meta.rb
index 231b4e5..e8ddbd0 100644
--- a/app/models/radiant/extension_meta.rb
+++ b/app/models/radiant/extension_meta.rb
@@ -1,4 +1,4 @@
-class Radiant::ExtensionMeta < ActiveRecord::Base
+class MerbRadiant::ExtensionMeta < ActiveRecord::Base
   set_table_name "extension_meta"
   validates_presence_of :name
   validates_uniqueness_of :name
diff --git a/app/models/standard_tags.rb b/app/models/standard_tags.rb
index 6be23ec..0e5bbb6 100644
--- a/app/models/standard_tags.rb
+++ b/app/models/standard_tags.rb
@@ -1,6 +1,6 @@
 module StandardTags
   
-  include Radiant::Taggable
+  include MerbRadiant::Taggable
   include LocalTime
     
   class TagError < StandardError; end
@@ -581,7 +581,7 @@ module StandardTags
     <pre><code><r:if_dev>...</r:if_dev></code></pre>
   }
   tag 'if_dev' do |tag|
-    config = Radiant::Config
+    config = MerbRadiant::Config
     request = tag.globals.page.request
     unless request.nil?
       if dev_host = config['dev.host']
@@ -599,7 +599,7 @@ module StandardTags
     <pre><code><r:unless_dev>...</r:unless_dev></code></pre>
   }
   tag 'unless_dev' do |tag|
-    config = Radiant::Config
+    config = MerbRadiant::Config
     request = tag.globals.page.request
     unless request.nil?
       if dev_host = config['dev.host']
diff --git a/app/views/radiant_layouts/application.html.erb b/app/views/radiant_layouts/application.html.erb
index 7b3cc25..daf2b60 100644
--- a/app/views/radiant_layouts/application.html.erb
+++ b/app/views/radiant_layouts/application.html.erb
@@ -56,7 +56,7 @@
       <hr class="hidden" />
       <div id="footer">
         <p>This site was made with Ruby and is powered by <a href="http://radiantcms.org">Radiant CMS</a>
-          version <%= Radiant::Version %><% if Radiant.loaded_via_gem? %> (gem)<% end %>.</p>
+          version <%= MerbRadiant::Version %><% if MerbRadiant.loaded_via_gem? %> (gem)<% end %>.</p>
         <p id="site-links">
 <% if logged_in? -%>
   <% if admin? -%>
diff --git a/config/init.rb b/config/init.rb
index c0ed3cc..c34248d 100644
--- a/config/init.rb
+++ b/config/init.rb
@@ -32,6 +32,7 @@ unless defined? MERB_RADIANT_ROOT
 #)
 #      exit 1
  #   end
+    MERB_RADIANT_ROOT = Merb.root
   end
 end
 
diff --git a/config/radiant_environment.rb b/config/radiant_environment.rb
index 86a2340..963bbb7 100644
--- a/config/radiant_environment.rb
+++ b/config/radiant_environment.rb
@@ -1,7 +1,7 @@
 # Be sure to restart your web server when you modify this file.
 
 # Radiant Gem Version
-RADIANT_GEM_VERSION = '0.6.4'
+MERB_RADIANT_GEM_VERSION = '0.6.4'
 
 # Uncomment below to force Rails into production mode when 
 # you don't control web/app server and can't set it the proper way
@@ -12,7 +12,7 @@ require File.join(File.dirname(__FILE__), 'boot')
 
 require 'radius'
 
-Radiant::Initializer.run do |config|
+MerbRadiant::Initializer.run do |config|
   # Settings in config/environments/* take precedence those specified here
   
   # Skip frameworks you're not going to use
@@ -24,9 +24,9 @@ Radiant::Initializer.run do |config|
     app/models
     app/helpers
     lib
-  ).map { |path| File.join(RADIANT_ROOT, path) }
-  config.controller_paths << File.join(RADIANT_ROOT, 'app', 'controllers')
-  config.view_path = File.join(RADIANT_ROOT, 'app', 'views')
+  ).map { |path| File.join(MERB_RADIANT_ROOT, path) }
+  config.controller_paths << File.join(MERB_RADIANT_ROOT, 'app', 'controllers')
+  config.view_path = File.join(MERB_RADIANT_ROOT, 'app', 'views')
   
   # Only load the extensions named here, in the order given. By default all plugins in vendor/extensions are
   # loaded, in alphabetical order. :all can be used as a placeholder for all extensions not explicitly named. 
@@ -54,8 +54,8 @@ Radiant::Initializer.run do |config|
   # Make sure plugins are loaded from lib and vendor
   config.plugin_paths = [
     "#{Merb.root}/vendor/plugins",
-    "#{RADIANT_ROOT}/lib/plugins",
-    "#{RADIANT_ROOT}/vendor/plugins"
+    "#{MERB_RADIANT_ROOT}/lib/plugins",
+    "#{MERB_RADIANT_ROOT}/vendor/plugins"
   ]
 
   # Use ActiveRecord sessions
@@ -71,7 +71,7 @@ Inflector.inflections do |inflect|
 end
 
 # Auto-require text filters
-Dir["#{RADIANT_ROOT}/app/models/*_filter.rb"].each do |filter|
+Dir["#{MERB_RADIANT_ROOT}/app/models/*_filter.rb"].each do |filter|
   require_dependency File.basename(filter).sub(/\.rb$/, '')
 end
 
diff --git a/lib/generators/extension/templates/extension.rb b/lib/generators/extension/templates/extension.rb
index ed9204f..dbb9d3a 100644
--- a/lib/generators/extension/templates/extension.rb
+++ b/lib/generators/extension/templates/extension.rb
@@ -1,7 +1,7 @@
 # Uncomment this if you reference any of your controllers in activate
 # require_dependency 'application'
 
-class <%= class_name %> < Radiant::Extension
+class <%= class_name %> < MerbRadiant::Extension
   version "1.0"
   description "Describe your extension here"
   url "http://yourwebsite.com/<%= file_name %>"
diff --git a/lib/generators/extension/templates/test_helper.rb b/lib/generators/extension/templates/test_helper.rb
index eef4401..2a2043b 100644
--- a/lib/generators/extension/templates/test_helper.rb
+++ b/lib/generators/extension/templates/test_helper.rb
@@ -1,10 +1,10 @@
 require 'test/unit'
 # # Load the environment
-unless defined? RADIANT_ROOT
+unless defined? MERB_RADIANT_ROOT
   ENV["MERB_ENV"] = "test"
   require "#{File.expand_path(File.dirname(__FILE__) + "/../../../../")}/config/environment"
 end
-require "#{RADIANT_ROOT}/test/test_helper"
+require "#{MERB_RADIANT_ROOT}/test/test_helper"
 
 class Test::Unit::TestCase
   
diff --git a/lib/generators/generator_base_extension.rb b/lib/generators/generator_base_extension.rb
index a1066fd..4887c49 100644
--- a/lib/generators/generator_base_extension.rb
+++ b/lib/generators/generator_base_extension.rb
@@ -1,5 +1,5 @@
 require 'rails_generator'
-module Radiant
+module MerbRadiant
   module GeneratorBaseExtension
     def self.included(base)
       base.class_eval %{
@@ -20,4 +20,4 @@ module Radiant
     end
   end
 end
-Rails::Generator::Commands::Base.class_eval { include Radiant::GeneratorBaseExtension }
\ No newline at end of file
+Rails::Generator::Commands::Base.class_eval { include MerbRadiant::GeneratorBaseExtension }
\ No newline at end of file
diff --git a/lib/generators/instance/instance_generator.rb b/lib/generators/instance/instance_generator.rb
index c09431b..4c7ac01 100644
--- a/lib/generators/instance/instance_generator.rb
+++ b/lib/generators/instance/instance_generator.rb
@@ -28,7 +28,7 @@ class InstanceGenerator < Rails::Generator::Base
 
   def manifest
     # The absolute location of the Radiant files
-    root = File.expand_path(RADIANT_ROOT) 
+    root = File.expand_path(MERB_RADIANT_ROOT) 
     
     # Use /usr/bin/env if no special shebang was specified
     script_options     = { :chmod => 0755, :shebang => options[:shebang] == DEFAULT_SHEBANG ? nil : options[:shebang] }
diff --git a/lib/generators/instance/templates/instance_boot.rb b/lib/generators/instance/templates/instance_boot.rb
index c82d274..33609ec 100644
--- a/lib/generators/instance/templates/instance_boot.rb
+++ b/lib/generators/instance/templates/instance_boot.rb
@@ -4,7 +4,7 @@
 # TODO: check this is needed?
 Merb.root = File.expand_path("#{File.dirname(__FILE__)}/..") unless defined?(Merb.root)
 
-module Radiant
+module MerbRadiant
   class << self
     def boot!
       unless booted?
@@ -13,7 +13,7 @@ module Radiant
     end
 
     def booted?
-      defined? Radiant::Initializer
+      defined? MerbRadiant::Initializer
     end
 
     def pick_boot
@@ -43,7 +43,7 @@ module Radiant
   class Boot
     def run
       load_initializer
-      Radiant::Initializer.run(:set_load_path)
+      MerbRadiant::Initializer.run(:set_load_path)
     end
     
     def load_initializer
@@ -97,7 +97,7 @@ module Radiant
         gem 'radiant'
       end
     rescue Gem::LoadError => load_error
-      $stderr.puts %(Missing the Radiant #{version} gem. Please `gem install -v=#{version} radiant`, update your RADIANT_GEM_VERSION setting in config/environment.rb for the Radiant version you do have installed, or comment out RADIANT_GEM_VERSION to use the latest version installed.)
+      $stderr.puts %(Missing the Radiant #{version} gem. Please `gem install -v=#{version} radiant`, update your MERB_RADIANT_GEM_VERSION setting in config/environment.rb for the Radiant version you do have installed, or comment out MERB_RADIANT_GEM_VERSION to use the latest version installed.)
       exit 1
     end
 
@@ -107,10 +107,10 @@ module Radiant
       end
 
       def gem_version
-        if defined? RADIANT_GEM_VERSION
-          RADIANT_GEM_VERSION
-        elsif ENV.include?('RADIANT_GEM_VERSION')
-          ENV['RADIANT_GEM_VERSION']
+        if defined? MERB_RADIANT_GEM_VERSION
+          MERB_RADIANT_GEM_VERSION
+        elsif ENV.include?('MERB_RADIANT_GEM_VERSION')
+          ENV['MERB_RADIANT_GEM_VERSION']
         else
           parse_gem_version(read_environment_rb)
         end
@@ -130,7 +130,7 @@ module Radiant
       end
 
       def parse_gem_version(text)
-        $1 if text =~ /^[^#]*RADIANT_GEM_VERSION\s*=\s*'([!~<>=]*\s*[\d.]+)'/
+        $1 if text =~ /^[^#]*MERB_RADIANT_GEM_VERSION\s*=\s*'([!~<>=]*\s*[\d.]+)'/
       end
 
       private
@@ -142,4 +142,4 @@ module Radiant
 end
 
 # All that for this:
-Radiant.boot!
+MerbRadiant.boot!
diff --git a/lib/generators/instance/templates/instance_environment.rb b/lib/generators/instance/templates/instance_environment.rb
index 9bdefb9..35e5ac6 100644
--- a/lib/generators/instance/templates/instance_environment.rb
+++ b/lib/generators/instance/templates/instance_environment.rb
@@ -9,7 +9,7 @@ require File.join(File.dirname(__FILE__), 'boot')
 
 require 'radius'
 
-Radiant::Initializer.run do |config|
+MerbRadiant::Initializer.run do |config|
   # Settings in config/environments/* take precedence over those specified here.
   # Application configuration should go into files in config/initializers
   # -- all .rb files in that directory are automatically loaded.
@@ -75,7 +75,7 @@ Inflector.inflections do |inflect|
 end
 
 # Auto-require text filters
-Dir["#{RADIANT_ROOT}/app/models/*_filter.rb"].each do |filter|
+Dir["#{MERB_RADIANT_ROOT}/app/models/*_filter.rb"].each do |filter|
   require_dependency File.basename(filter).sub(/\.rb$/, '')
 end
 
diff --git a/lib/generators/instance/templates/instance_generate b/lib/generators/instance/templates/instance_generate
index 12d0911..32e6b07 100644
--- a/lib/generators/instance/templates/instance_generate
+++ b/lib/generators/instance/templates/instance_generate
@@ -7,7 +7,7 @@ require 'rails_generator/scripts/generate'
 class Rails::Generator::Base
   def self.use_application_sources!
     reset_sources
-    sources << Rails::Generator::PathSource.new(:builtin, "#{RADIANT_ROOT}/lib/generators")
+    sources << Rails::Generator::PathSource.new(:builtin, "#{MERB_RADIANT_ROOT}/lib/generators")
   end
 end
 
diff --git a/lib/generators/instance/templates/instance_rakefile b/lib/generators/instance/templates/instance_rakefile
index 40a2913..aded495 100644
--- a/lib/generators/instance/templates/instance_rakefile
+++ b/lib/generators/instance/templates/instance_rakefile
@@ -1,3 +1,3 @@
 require File.join(File.dirname(__FILE__), 'config', 'boot')
 
-import File.join(RADIANT_ROOT, 'Rakefile')
\ No newline at end of file
+import File.join(MERB_RADIANT_ROOT, 'Rakefile')
\ No newline at end of file
diff --git a/lib/generators/instance/templates/instance_routes.rb b/lib/generators/instance/templates/instance_routes.rb
index 451fd2b..d99918f 100644
--- a/lib/generators/instance/templates/instance_routes.rb
+++ b/lib/generators/instance/templates/instance_routes.rb
@@ -1 +1 @@
-load File.join(RADIANT_ROOT, "config", "routes.rb") 
+load File.join(MERB_RADIANT_ROOT, "config", "routes.rb") 
diff --git a/lib/local_time.rb b/lib/local_time.rb
index c62ef85..8d8a3f4 100644
--- a/lib/local_time.rb
+++ b/lib/local_time.rb
@@ -1,7 +1,7 @@
 require 'radiant/config'
 module LocalTime
   def adjust_time(time)
-    if (tz_string = Radiant::Config["local.timezone"]) and 
+    if (tz_string = MerbRadiant::Config["local.timezone"]) and 
         timezone = (TimeZone[tz_string] || TimeZone[tz_string.to_i]) 
       # adjust time 
       timezone.adjust(time)
diff --git a/lib/merb_radiant.rb b/lib/merb_radiant.rb
index dcf84e1..4514b58 100644
--- a/lib/merb_radiant.rb
+++ b/lib/merb_radiant.rb
@@ -1,6 +1,6 @@
-RADIANT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unless defined? RADIANT_ROOT
+MERB_RADIANT_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unless defined? MERB_RADIANT_ROOT
 
-unless defined? Radiant::Version
+unless defined? MerbRadiant::Version
   module MerbRadiant
     module Version
       Major = '0'
diff --git a/lib/object_extensions.rb b/lib/object_extensions.rb
deleted file mode 100644
index b051da4..0000000
--- a/lib/object_extensions.rb
+++ /dev/null
@@ -1,5 +0,0 @@
-class Object
-  def self.descendants
-    subclasses_of(self)
-  end
-end
\ No newline at end of file
diff --git a/lib/plugins/extension_patches/lib/fixture_loading_extension.rb b/lib/plugins/extension_patches/lib/fixture_loading_extension.rb
index 99d7b7a..4277a93 100644
--- a/lib/plugins/extension_patches/lib/fixture_loading_extension.rb
+++ b/lib/plugins/extension_patches/lib/fixture_loading_extension.rb
@@ -1,11 +1,11 @@
-module Radiant
+module MerbRadiant
   module FixtureLoadingExtension
     def self.included(base)
       class << base
         include ClassMethods
         alias_method_chain :create_fixtures, :multiple_paths
       end
-    end
+    end
 
     module ClassMethods
       def create_fixtures_with_multiple_paths(fixtures_directory, table_names, class_names = {})
@@ -45,7 +45,7 @@ module Radiant
 end
 
 require 'active_record/fixtures'
-Fixtures.class_eval { include Radiant::FixtureLoadingExtension }
+Fixtures.class_eval { include MerbRadiant::FixtureLoadingExtension }
 
 require 'action_controller/test_process'
 module ActionController::TestProcess
diff --git a/lib/plugins/extension_patches/lib/mailer_view_paths_extension.rb b/lib/plugins/extension_patches/lib/mailer_view_paths_extension.rb
index 3ebb9f0..f78ccce 100644
--- a/lib/plugins/extension_patches/lib/mailer_view_paths_extension.rb
+++ b/lib/plugins/extension_patches/lib/mailer_view_paths_extension.rb
@@ -1,6 +1,6 @@
 require 'action_mailer'
 
-module Radiant
+module MerbRadiant
   module MailerViewPathsExtension
     def self.included(base)
       base.class_eval do
@@ -90,4 +90,4 @@ module Radiant
   end
 end
 
-ActionMailer::Base.send(:include, Radiant::MailerViewPathsExtension)
\ No newline at end of file
+ActionMailer::Base.send(:include, MerbRadiant::MailerViewPathsExtension)
\ No newline at end of file
diff --git a/lib/plugins/extension_patches/lib/routing_extension.rb b/lib/plugins/extension_patches/lib/routing_extension.rb
index 6c83f8a..1ae989d 100644
--- a/lib/plugins/extension_patches/lib/routing_extension.rb
+++ b/lib/plugins/extension_patches/lib/routing_extension.rb
@@ -1,4 +1,4 @@
-module Radiant
+module MerbRadiant
   module RoutingExtension
   
     def self.included(base)
@@ -28,4 +28,4 @@ module Radiant
   end
 end
 
-ActionController::Routing::RouteSet.class_eval { include Radiant::RoutingExtension }
\ No newline at end of file
+ActionController::Routing::RouteSet.class_eval { include MerbRadiant::RoutingExtension }
\ No newline at end of file
diff --git a/lib/radiant/admin_ui.rb b/lib/radiant/admin_ui.rb
index 67d31d7..7c2fbb6 100644
--- a/lib/radiant/admin_ui.rb
+++ b/lib/radiant/admin_ui.rb
@@ -2,7 +2,7 @@
 
 require 'simpleton'
 
-module Radiant
+module MerbRadiant
   class AdminUI
     
     class DuplicateTabNameError < StandardError; end
diff --git a/lib/radiant/extension.rb_ b/lib/radiant/extension.rb_
index 451a5f3..ed86b6e 100644
--- a/lib/radiant/extension.rb_
+++ b/lib/radiant/extension.rb_
@@ -55,7 +55,7 @@ module Radiant
       end
 
       def meta
-        Radiant::ExtensionMeta.find_or_create_by_name(extension_name)
+        MerbRadiant::ExtensionMeta.find_or_create_by_name(extension_name)
       end
 
       def route_definitions
diff --git a/lib/radiant/initializer.rb b/lib/radiant/initializer.rb
index 5c60176..381a387 100644
--- a/lib/radiant/initializer.rb
+++ b/lib/radiant/initializer.rb
@@ -7,7 +7,7 @@ require 'initializer'
 require 'radiant/admin_ui'
 #require 'radiant/extension_loader'
 
-module Radiant
+module MerbRadiant
 
   class Configuration < Rails::Configuration
     attr_accessor :extension_paths
@@ -23,10 +23,10 @@ module Radiant
 
     def default_extension_paths
       env = ENV["MERB_ENV"] || Merb.environment
-      paths = [RADIANT_ROOT + '/vendor/extensions', Merb.root + '/vendor/extensions'].uniq
+      paths = [MERB_RADIANT_ROOT + '/vendor/extensions', Merb.root + '/vendor/extensions'].uniq
       # There's no other way it will work, config/environments/test.rb loads too late
       # TODO: Should figure out how to include this extension path only for the tests that need it
-      paths.unshift(RADIANT_ROOT + "/test/fixtures/extensions") if env == "test"
+      paths.unshift(MERB_RADIANT_ROOT + "/test/fixtures/extensions") if env == "test"
       paths
     end
 
@@ -37,22 +37,22 @@ module Radiant
     private
 
       def library_directories
-        Dir["#{RADIANT_ROOT}/vendor/*/lib"]
+        Dir["#{MERB_RADIANT_ROOT}/vendor/*/lib"]
       end
 
       def framework_root_path
-        RADIANT_ROOT + '/vendor/rails'
+        MERB_RADIANT_ROOT + '/vendor/rails'
       end
 
       # Provide the load paths for the Radiant installation
       def default_load_paths
-        paths = ["#{RADIANT_ROOT}/test/mocks/#{environment}"]
+        paths = ["#{MERB_RADIANT_ROOT}/test/mocks/#{environment}"]
 
         # Add the app's controller directory
-        paths.concat(Dir["#{RADIANT_ROOT}/app/controllers/"])
+        paths.concat(Dir["#{MERB_RADIANT_ROOT}/app/controllers/"])
 
         # Then components subdirectories.
-        paths.concat(Dir["#{RADIANT_ROOT}/components/[_a-z]*"])
+        paths.concat(Dir["#{MERB_RADIANT_ROOT}/components/[_a-z]*"])
 
         # Followed by the standard includes.
         paths.concat %w(
@@ -63,7 +63,7 @@ module Radiant
           config
           lib
           vendor
-        ).map { |dir| "#{RADIANT_ROOT}/#{dir}" }.select { |dir| File.directory?(dir) }
+        ).map { |dir| "#{MERB_RADIANT_ROOT}/#{dir}" }.select { |dir| File.directory?(dir) }
 
         paths.concat builtin_directories
         paths.concat library_directories
@@ -72,17 +72,17 @@ module Radiant
       def default_plugin_paths
         [
           "#{Merb.root}/vendor/plugins",
-          "#{RADIANT_ROOT}/lib/plugins",
-          "#{RADIANT_ROOT}/vendor/plugins"
+          "#{MERB_RADIANT_ROOT}/lib/plugins",
+          "#{MERB_RADIANT_ROOT}/vendor/plugins"
         ]
       end
 
       def default_view_path
-        File.join(RADIANT_ROOT, 'app', 'views')
+        File.join(MERB_RADIANT_ROOT, 'app', 'views')
       end
 
       def default_controller_paths
-        [File.join(RADIANT_ROOT, 'app', 'controllers')]
+        [File.join(MERB_RADIANT_ROOT, 'app', 'controllers')]
       end
   end
 
diff --git a/lib/radiant/setup.rb b/lib/radiant/setup.rb
index 88909be..c3ee525 100644
--- a/lib/radiant/setup.rb
+++ b/lib/radiant/setup.rb
@@ -3,7 +3,7 @@
 require "highline"
 require "forwardable"
 
-module Radiant
+module MerbRadiant
   class Setup
   
     class << self
@@ -47,10 +47,10 @@ module Radiant
     
     def load_default_configuration
       feedback "\nInitializing configuration" do
-        step { Radiant::Config['admin.title'   ] = 'Radiant CMS' }
-        step { Radiant::Config['admin.subtitle'] = 'Publishing for Small Teams' }
-        step { Radiant::Config['defaults.page.parts' ] = 'body, extended' }
-        step { Radiant::Config['defaults.page.status' ] = 'draft' }
+        step { MerbRadiant::Config['admin.title'   ] = 'Radiant CMS' }
+        step { MerbRadiant::Config['admin.subtitle'] = 'Publishing for Small Teams' }
+        step { MerbRadiant::Config['defaults.page.parts' ] = 'body, extended' }
+        step { MerbRadiant::Config['defaults.page.status' ] = 'draft' }
       end
     end
     
@@ -66,7 +66,7 @@ module Radiant
         end
       end
       unless filename
-        templates = find_and_load_templates("#{RADIANT_ROOT}/db/templates/*.yml")
+        templates = find_and_load_templates("#{MERB_RADIANT_ROOT}/db/templates/*.yml")
         choose do |menu|
           menu.header = "\nSelect a database template"
           menu.prompt = "[1-#{templates.size}]: "
@@ -113,8 +113,8 @@ module Radiant
       def find_template_in_path(filename)
         [
           filename,
-          "#{RADIANT_ROOT}/#{filename}",
-          "#{RADIANT_ROOT}/db/templates/#{filename}",
+          "#{MERB_RADIANT_ROOT}/#{filename}",
+          "#{MERB_RADIANT_ROOT}/db/templates/#{filename}",
           "#{Merb.root}/#{filename}",
           "#{Merb.root}/db/templates/#{filename}",
           "#{Dir.pwd}/#{filename}",
diff --git a/lib/radiant/taggable.rb b/lib/radiant/taggable.rb
index 1626149..600f18a 100644
--- a/lib/radiant/taggable.rb
+++ b/lib/radiant/taggable.rb
@@ -33,16 +33,16 @@ module MerbRadiant::Taggable
     end
     
     def tag_descriptions(hash = nil)
-      Radiant::Taggable.tag_descriptions[self.name] ||= (hash ||{})
+      MerbRadiant::Taggable.tag_descriptions[self.name] ||= (hash ||{})
     end
   
     def desc(text)
-      Radiant::Taggable.last_description = RedCloth.new(Util.strip_leading_whitespace(text)).to_html
+      MerbRadiant::Taggable.last_description = RedCloth.new(Util.strip_leading_whitespace(text)).to_html
     end
     
     def tag(name, &block)
-      self.tag_descriptions[name] = Radiant::Taggable.last_description if Radiant::Taggable.last_description
-      Radiant::Taggable.last_description = nil
+      self.tag_descriptions[name] = MerbRadiant::Taggable.last_description if MerbRadiant::Taggable.last_description
+      MerbRadiant::Taggable.last_description = nil
       define_method("tag:#{name}", &block)
     end
     
diff --git a/lib/tasks/database.rake b/lib/tasks/database.rake
index 8de3414..1df0330 100644
--- a/lib/tasks/database.rake
+++ b/lib/tasks/database.rake
@@ -5,7 +5,7 @@ namespace :db do
     if ENV['OVERWRITE'].to_s.downcase == 'true' or agree("This task will destroy any data in the database. Are you sure you want to \ncontinue? [yn] ")
       
       # Migrate downward
-      ActiveRecord::Migrator.migrate("#{RADIANT_ROOT}/db/migrate/", 0)
+      ActiveRecord::Migrator.migrate("#{MERB_RADIANT_ROOT}/db/migrate/", 0)
     
       # Migrate upward 
       Rake::Task["db:migrate"].invoke
@@ -21,7 +21,7 @@ namespace :db do
   desc "Bootstrap your database for Radiant."
   task :bootstrap => :remigrate do
     require 'radiant/setup'
-    Radiant::Setup.bootstrap(
+    MerbRadiant::Setup.bootstrap(
       :admin_name => ENV['ADMIN_NAME'],
       :admin_username => ENV['ADMIN_USERNAME'],
       :admin_password => ENV['ADMIN_PASSWORD'],
diff --git a/lib/tasks/extensions.rake b/lib/tasks/extensions.rake
index 1d08135..1236925 100644
--- a/lib/tasks/extensions.rake
+++ b/lib/tasks/extensions.rake
@@ -5,7 +5,7 @@ namespace :db do
     desc "Run all Radiant extension migrations"
     task :extensions => :environment do
       require 'radiant/extension_migrator'
-      Radiant::ExtensionMigrator.migrate_extensions
+      MerbRadiant::ExtensionMigrator.migrate_extensions
     end
   end
   namespace :remigrate do
@@ -14,7 +14,7 @@ namespace :db do
       require 'highline/import'
       if agree("This task will destroy any data stored by extensions in the database. Are you sure you want to \ncontinue? [yn] ")
         require 'radiant/extension_migrator'
-        Radiant::Extension.descendants.map(&:migrator).each {|m| m.migrate(0) }
+        MerbRadiant::Extension.descendants.map(&:migrator).each {|m| m.migrate(0) }
         Rake::Task['db:migrate:extensions'].invoke
       end
     end
@@ -24,7 +24,7 @@ end
 namespace :test do
   desc "Runs tests on all available Radiant extensions, pass EXT=extension_name to test a single extension"
   task :extensions => "db:test:prepare" do
-    extension_roots = Radiant::Extension.descendants.map(&:root)
+    extension_roots = MerbRadiant::Extension.descendants.map(&:root)
     if ENV["EXT"]
       extension_roots = extension_roots.select {|x| /\/(\d+_)?#{ENV["EXT"]}$/ === x }
       if extension_roots.empty?
@@ -35,9 +35,9 @@ namespace :test do
       if File.directory?(File.join(directory, 'test'))
         chdir directory do
           if RUBY_PLATFORM =~ /win32/
-            system "rake.cmd test RADIANT_ENV_FILE=#{RAILS_ROOT}/config/environment"
+            system "rake.cmd test MERB_RADIANT_ENV_FILE=#{RAILS_ROOT}/config/environment"
           else
-            system "rake test RADIANT_ENV_FILE=#{RAILS_ROOT}/config/environment"
+            system "rake test MERB_RADIANT_ENV_FILE=#{RAILS_ROOT}/config/environment"
           end
         end
       end
@@ -48,7 +48,7 @@ end
 namespace :spec do
   desc "Runs specs on all available Radiant extensions, pass EXT=extension_name to test a single extension"
   task :extensions => "db:test:prepare" do
-    extension_roots = Radiant::Extension.descendants.map(&:root)
+    extension_roots = MerbRadiant::Extension.descendants.map(&:root)
     if ENV["EXT"]
       extension_roots = extension_roots.select {|x| /\/(\d+_)?#{ENV["EXT"]}$/ === x }
       if extension_roots.empty?
@@ -59,9 +59,9 @@ namespace :spec do
       if File.directory?(File.join(directory, 'spec'))
         chdir directory do
           if RUBY_PLATFORM =~ /win32/
-            system "rake.cmd spec RADIANT_ENV_FILE=#{RAILS_ROOT}/config/environment"
+            system "rake.cmd spec MERB_RADIANT_ENV_FILE=#{RAILS_ROOT}/config/environment"
           else
-            system "rake spec RADIANT_ENV_FILE=#{RAILS_ROOT}/config/environment"
+            system "rake spec MERB_RADIANT_ENV_FILE=#{RAILS_ROOT}/config/environment"
           end
         end
       end
@@ -70,6 +70,6 @@ namespace :spec do
 end
 
 # Load any custom rakefiles from extensions
-[Merb.root, RADIANT_ROOT].uniq.each do |root|
+[Merb.root, MERB_RADIANT_ROOT].uniq.each do |root|
   Dir[root + '/vendor/extensions/**/tasks/**/*.rake'].sort.each { |ext| load ext }
 end
diff --git a/lib/tasks/instance.rake b/lib/tasks/instance.rake
index 4a29b6d..fa21b6f 100644
--- a/lib/tasks/instance.rake
+++ b/lib/tasks/instance.rake
@@ -2,22 +2,22 @@
 unless File.directory? "#{Merb.root}/app"
   require 'rake/testtask'
   
-  ENV['RADIANT_ENV_FILE'] = File.join(Merb.root, 'config', 'environment')
+  ENV['MERB_RADIANT_ENV_FILE'] = File.join(Merb.root, 'config', 'environment')
   
-  Dir["#{RADIANT_ROOT}/vendor/rails/railties/lib/tasks/*.rake", "#{RADIANT_ROOT}/vendor/plugins/rspec_on_rails/tasks/*.rake"].each do |rake|
+  Dir["#{MERB_RADIANT_ROOT}/vendor/rails/railties/lib/tasks/*.rake", "#{MERB_RADIANT_ROOT}/vendor/plugins/rspec_on_rails/tasks/*.rake"].each do |rake|
     lines = IO.readlines(rake)
     lines.map! do |line|
-      line.gsub!('Merb.root', 'RADIANT_ROOT') unless rake =~ /(misc|rspec)\.rake$/
+      line.gsub!('Merb.root', 'MERB_RADIANT_ROOT') unless rake =~ /(misc|rspec)\.rake$/
       case rake
       when /testing\.rake$/
-        line.gsub!(/t.libs << (["'])/, 't.libs << \1' + RADIANT_ROOT + '/')
-        line.gsub!(/t\.pattern = (["'])/, 't.pattern = \1' + RADIANT_ROOT + '/')
+        line.gsub!(/t.libs << (["'])/, 't.libs << \1' + MERB_RADIANT_ROOT + '/')
+        line.gsub!(/t\.pattern = (["'])/, 't.pattern = \1' + MERB_RADIANT_ROOT + '/')
       when /databases\.rake$/
-        line.gsub!(/migrate\((["'])/, 'migrate(\1' + RADIANT_ROOT + '/')
+        line.gsub!(/migrate\((["'])/, 'migrate(\1' + MERB_RADIANT_ROOT + '/')
         line.sub!("db/schema.rb", "#{Merb.root}/db/schema.rb")
       when /rspec\.rake$/
-        line.gsub!('Merb.root', 'RADIANT_ROOT') unless line =~ /:noop/
-        line.gsub!(/FileList\[(["'])/, "FileList[\\1#{RADIANT_ROOT}/")
+        line.gsub!('Merb.root', 'MERB_RADIANT_ROOT') unless line =~ /:noop/
+        line.gsub!(/FileList\[(["'])/, "FileList[\\1#{MERB_RADIANT_ROOT}/")
       end
       line
     end
diff --git a/lib/tasks/release.rake b/lib/tasks/release.rake
index e685cae..07e7719 100644
--- a/lib/tasks/release.rake
+++ b/lib/tasks/release.rake
@@ -2,10 +2,10 @@ require 'rubygems'
 require 'rake/testtask'
 require 'rake/rdoctask'
 require 'rake/gempackagetask'
-require 'radiant'
+require 'merb_radiant'
 
-PKG_NAME = 'radiant'
-PKG_VERSION = Radiant::Version.to_s
+PKG_NAME = 'merb_radiant'
+PKG_VERSION = MerbRadiant::Version.to_s
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBY_FORGE_PROJECT = PKG_NAME
 RUBY_FORGE_USER = ENV['RUBY_FORGE_USER'] || 'jlong'
@@ -14,22 +14,22 @@ RELEASE_NAME  = PKG_VERSION
 RUBY_FORGE_GROUPID = '1337'
 RUBY_FORGE_PACKAGEID = '1638'
 
-RDOC_TITLE = "Radiant -- Publishing for Small Teams"
+RDOC_TITLE = "MerbRadiant -- Publishing for Small Teams"
 RDOC_EXTRAS = ["README", "CONTRIBUTORS", "CHANGELOG", "INSTALL", "LICENSE"]
 
-namespace 'radiant' do
+namespace 'merb_radiant' do
   spec = Gem::Specification.new do |s|
     s.name = PKG_NAME
     s.version = PKG_VERSION
     s.summary = 'A no-fluff content management system designed for small teams.'
-    s.description = "Radiant is a simple and powerful publishing system designed for small teams.\nIt is built with Rails and is similar to Textpattern or MovableType, but is\na general purpose content managment system--not merely a blogging engine."
+    s.description = "MerbRadiant is a simple and powerful publishing system designed for small teams.\nIt is built with Merb and is similar to Textpattern or MovableType, but is\na general purpose content managment system--not merely a blogging engine."
     s.homepage = 'http://radiantcms.org'
     s.rubyforge_project = RUBY_FORGE_PROJECT
     s.platform = Gem::Platform::RUBY
     s.bindir = 'bin'
     s.executables = (Dir['bin/*'] + Dir['scripts/*']).map { |file| File.basename(file) } 
     s.add_dependency 'rake', '>= 0.7.1'
-    s.autorequire = 'radiant'
+    s.autorequire = 'merb_radiant'
     s.has_rdoc = true
     s.rdoc_options << '--title' << RDOC_TITLE << '--line-numbers' << '--main' << 'README'
     rdoc_excludes = Dir["**"].reject { |f| !File.directory? f }
@@ -70,7 +70,7 @@ namespace 'radiant' do
 
     desc "Build and install Gem from source"
     task :install => [:package, :uninstall] do
-      chdir("#{RADIANT_ROOT}/pkg") do
+      chdir("#{MERB_RADIANT_ROOT}/pkg") do
         latest = Dir["#{PKG_NAME}-*.gem"].last
         sh "gem install #{latest}"
       end
diff --git a/lib/tasks/undefine.rake b/lib/tasks/undefine.rake
index e09ce74..392b3f1 100644
--- a/lib/tasks/undefine.rake
+++ b/lib/tasks/undefine.rake
@@ -7,18 +7,19 @@ unless File.directory? "#{Merb.root}/app"
   end
   
   undefine_task %w(
-    radiant:clobber_package 
-    radiant:install_gem
-    radiant:package
-    radiant:release
-    radiant:repackage
-    radiant:uninstall_gem
-    rails:freeze:edge
-    rails:freeze:gems
-    rails:unfreeze
-    rails:update
-    rails:update:configs
-    rails:update:javascripts
-    rails:update:scripts
+    merb_radiant:clobber_package 
+    merb_radiant:install_gem
+    merb_radiant:package
+    merb_radiant:release
+    merb_radiant:repackage
+    merb_radiant:uninstall_gem
   )
+  # TODO: add Merb equivalents for the following, if applicable:
+  # rails:freeze:edge
+  # rails:freeze:gems
+  # rails:unfreeze
+  # rails:update
+  # rails:update:configs
+  # rails:update:javascripts
+  # rails:update:scripts
 end
\ No newline at end of file
diff --git a/radiant_extensions_plugins/extensions/archive/test/functional/archive_extension_test.rb b/radiant_extensions_plugins/extensions/archive/test/functional/archive_extension_test.rb
index 3687e19..9a252d4 100644
--- a/radiant_extensions_plugins/extensions/archive/test/functional/archive_extension_test.rb
+++ b/radiant_extensions_plugins/extensions/archive/test/functional/archive_extension_test.rb
@@ -3,7 +3,7 @@ require File.dirname(__FILE__) + '/../test_helper'
 class ArchiveExtensionTest < Test::Unit::TestCase
     
   def test_initialization
-    assert_equal File.join(File.expand_path(RADIANT_ROOT), 'vendor', 'extensions', 'archive'), ArchiveExtension.root
+    assert_equal File.join(File.expand_path(MERB_RADIANT_ROOT), 'vendor', 'extensions', 'archive'), ArchiveExtension.root
     assert_equal 'Archive', ArchiveExtension.extension_name
   end
   
diff --git a/radiant_extensions_plugins/extensions/archive/test/test_helper.rb b/radiant_extensions_plugins/extensions/archive/test/test_helper.rb
index ee8d101..830e8f9 100644
--- a/radiant_extensions_plugins/extensions/archive/test/test_helper.rb
+++ b/radiant_extensions_plugins/extensions/archive/test/test_helper.rb
@@ -1,6 +1,6 @@
 require 'test/unit'
 # # Load the environment
-unless defined? RADIANT_ROOT
+unless defined? MERB_RADIANT_ROOT
   ENV["MERB_ENV"] = "test"
   env_file = "#{File.expand_path(File.dirname(__FILE__) + "/" + "../" * 6)}/config/environment.rb"
   unless File.exist?(env_file)
@@ -8,7 +8,7 @@ unless defined? RADIANT_ROOT
   end
   require env_file
 end
-require "#{RADIANT_ROOT}/test/test_helper"
+require "#{MERB_RADIANT_ROOT}/test/test_helper"
 
 class Test::Unit::TestCase
   
diff --git a/radiant_extensions_plugins/extensions/markdown_filter/test/test_helper.rb b/radiant_extensions_plugins/extensions/markdown_filter/test/test_helper.rb
index 1437d78..0223e0c 100644
--- a/radiant_extensions_plugins/extensions/markdown_filter/test/test_helper.rb
+++ b/radiant_extensions_plugins/extensions/markdown_filter/test/test_helper.rb
@@ -1,4 +1,4 @@
-unless defined? RADIANT_ROOT
+unless defined? MERB_RADIANT_ROOT
   ENV["MERB_ENV"] = "test"
   env_file = "#{File.expand_path(File.dirname(__FILE__) + "/" + "../" * 6)}/config/environment.rb"
   unless File.exist?(env_file)
@@ -6,7 +6,7 @@ unless defined? RADIANT_ROOT
   end
   require env_file
 end
-require "#{RADIANT_ROOT}/test/test_helper"
+require "#{MERB_RADIANT_ROOT}/test/test_helper"
 
 class Test::Unit::TestCase
   self.use_transactional_fixtures = true
diff --git a/radiant_extensions_plugins/extensions/textile_filter/test/test_helper.rb b/radiant_extensions_plugins/extensions/textile_filter/test/test_helper.rb
index 1437d78..0223e0c 100644
--- a/radiant_extensions_plugins/extensions/textile_filter/test/test_helper.rb
+++ b/radiant_extensions_plugins/extensions/textile_filter/test/test_helper.rb
@@ -1,4 +1,4 @@
-unless defined? RADIANT_ROOT
+unless defined? MERB_RADIANT_ROOT
   ENV["MERB_ENV"] = "test"
   env_file = "#{File.expand_path(File.dirname(__FILE__) + "/" + "../" * 6)}/config/environment.rb"
   unless File.exist?(env_file)
@@ -6,7 +6,7 @@ unless defined? RADIANT_ROOT
   end
   require env_file
 end
-require "#{RADIANT_ROOT}/test/test_helper"
+require "#{MERB_RADIANT_ROOT}/test/test_helper"
 
 class Test::Unit::TestCase
   self.use_transactional_fixtures = true
diff --git a/radiant_specs/spec/lib/radiant/extension_loader_spec.rb b/radiant_specs/spec/lib/radiant/extension_loader_spec.rb
index 25ad3ee..482e9c4 100644
--- a/radiant_specs/spec/lib/radiant/extension_loader_spec.rb
+++ b/radiant_specs/spec/lib/radiant/extension_loader_spec.rb
@@ -13,7 +13,7 @@ describe Radiant::ExtensionLoader do
     
     @extensions = %w{01_basic 02_overriding load_order_blue load_order_green load_order_red}
     @extension_paths = @extensions.map do |ext|
-      File.expand_path("#{RADIANT_ROOT}/test/fixtures/extensions/#{ext}")
+      File.expand_path("#{MERB_RADIANT_ROOT}/test/fixtures/extensions/#{ext}")
     end
     Radiant::AdminUI.tabs.clear
   end
@@ -30,12 +30,12 @@ describe Radiant::ExtensionLoader do
   it "should only load extensions specified in the configuration" do
     @configuration.should_receive(:extensions).at_least(:once).and_return([:basic])
     @instance.stub!(:all_extension_roots).and_return(@extension_paths)
-    @instance.send(:select_extension_roots).should == [File.expand_path("#{RADIANT_ROOT}/test/fixtures/extensions/01_basic")]  
+    @instance.send(:select_extension_roots).should == [File.expand_path("#{MERB_RADIANT_ROOT}/test/fixtures/extensions/01_basic")]  
   end
   
   it "should select extensions in an explicit order from the configuration" do
     extensions = [:load_order_red, :load_order_blue, :load_order_green]
-    extension_roots = extensions.map {|ext| File.expand_path("#{RADIANT_ROOT}/test/fixtures/extensions/#{ext}") }
+    extension_roots = extensions.map {|ext| File.expand_path("#{MERB_RADIANT_ROOT}/test/fixtures/extensions/#{ext}") }
     @instance.stub!(:all_extension_roots).and_return(@extension_paths)
     @configuration.should_receive(:extensions).at_least(:once).and_return(extensions)
     @instance.send(:select_extension_roots).should == extension_roots
@@ -57,11 +57,11 @@ describe Radiant::ExtensionLoader do
   end
   
   it "should determine load paths from an extension path" do
-    @instance.send(:load_paths_for, "#{RADIANT_ROOT}/vendor/extensions/archive").should == %W{
-        #{RADIANT_ROOT}/vendor/extensions/archive/lib
-        #{RADIANT_ROOT}/vendor/extensions/archive/app/models
-        #{RADIANT_ROOT}/vendor/extensions/archive/test/helpers
-        #{RADIANT_ROOT}/vendor/extensions/archive}
+    @instance.send(:load_paths_for, "#{MERB_RADIANT_ROOT}/vendor/extensions/archive").should == %W{
+        #{MERB_RADIANT_ROOT}/vendor/extensions/archive/lib
+        #{MERB_RADIANT_ROOT}/vendor/extensions/archive/app/models
+        #{MERB_RADIANT_ROOT}/vendor/extensions/archive/test/helpers
+        #{MERB_RADIANT_ROOT}/vendor/extensions/archive}
   end
   
   it "should have load paths" do
diff --git a/radiant_specs/spec/lib/radiant/initializer_spec.rb b/radiant_specs/spec/lib/radiant/initializer_spec.rb
index 2475a12..390bfd3 100644
--- a/radiant_specs/spec/lib/radiant/initializer_spec.rb
+++ b/radiant_specs/spec/lib/radiant/initializer_spec.rb
@@ -24,7 +24,7 @@ describe Radiant::Configuration do
   it "should initialize the extension paths" do
     @configuration.extension_paths.should_not be_nil
     @configuration.extension_paths.should be_kind_of(Array)
-    @configuration.extension_paths.should include("#{RADIANT_ROOT}/vendor/extensions") 
+    @configuration.extension_paths.should include("#{MERB_RADIANT_ROOT}/vendor/extensions") 
   end
   
   it "should have access to the AdminUI" do
diff --git a/radiant_specs/spec/spec_helper.rb b/radiant_specs/spec/spec_helper.rb
index c9b1d28..546c2c8 100644
--- a/radiant_specs/spec/spec_helper.rb
+++ b/radiant_specs/spec/spec_helper.rb
@@ -3,8 +3,8 @@ unless defined? SPEC_ROOT
   
   SPEC_ROOT = File.expand_path(File.dirname(__FILE__))
   
-  unless defined? RADIANT_ROOT
-    if env_file = ENV["RADIANT_ENV_FILE"]
+  unless defined? MERB_RADIANT_ROOT
+    if env_file = ENV["MERB_RADIANT_ENV_FILE"]
       require env_file
     else
       require File.expand_path(SPEC_ROOT + "/../config/environment")
diff --git a/radiant_specs/test/functional/extension_initialization_test.rb b/radiant_specs/test/functional/extension_initialization_test.rb
index 090f54f..0c807f6 100644
--- a/radiant_specs/test/functional/extension_initialization_test.rb
+++ b/radiant_specs/test/functional/extension_initialization_test.rb
@@ -12,7 +12,7 @@ class ExtensionInitializationTest < Test::Unit::TestCase
 
   def test_load_paths
     assert_nothing_raised { BasicExtension }
-    assert_equal File.join(File.expand_path(RADIANT_ROOT), 'test', 'fixtures', 'extensions', '01_basic'), BasicExtension.root
+    assert_equal File.join(File.expand_path(MERB_RADIANT_ROOT), 'test', 'fixtures', 'extensions', '01_basic'), BasicExtension.root
     assert_equal 'Basic', BasicExtension.extension_name
     assert_nothing_raised { BasicExtensionController }
     assert_nothing_raised { BasicExtensionModel }
diff --git a/radiant_specs/test/test_helper.rb b/radiant_specs/test/test_helper.rb
index dc9868e..1cf2840 100644
--- a/radiant_specs/test/test_helper.rb
+++ b/radiant_specs/test/test_helper.rb
@@ -5,8 +5,8 @@ unless defined? TEST_ROOT
   
   TEST_ROOT = File.expand_path(File.dirname(__FILE__))
   
-  unless defined? RADIANT_ROOT
-    if env_file = ENV["RADIANT_ENV_FILE"]
+  unless defined? MERB_RADIANT_ROOT
+    if env_file = ENV["MERB_RADIANT_ENV_FILE"]
       require env_file
     else
       require File.expand_path(TEST_ROOT + "/../config/environment")
-- 
2.11.4.GIT