trusty-cms 3.8.2 → 3.8.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 3692c255ff72ea8bacc0f457e1d9ec4d17e24f6fbc42898a00e5af4d5d64fd1b
-  data.tar.gz: f09cdfa8786b2a032f9200a1e0d7537b6fb527a784412bac003c38f543f3ee1d
+  metadata.gz: 03c798051f6a9e3ca039cde76868c92f4c167851a51a7faba5e0f094cbc28bba
+  data.tar.gz: 1622ca9cff174468884c1b605563870e1edbb19ed6a2289b8782f01641f65dd2
 SHA512:
-  metadata.gz: 4416a9fcb0f24f337fee5f589a0881cc0376bbddf6a9ca77ffe615a21eccf48e541c9ca9d37b0e18733d869a48c9b75d533b6d738c7c6449883c9e15af05b98b
-  data.tar.gz: 955e197762b016537768a1d4ed93f19a49547d33d67c893b387f09be44f70a5abce0afd9ba9527dd6b0304911d5db4c86febd9491eda4469766700fdbfefa040
+  metadata.gz: fed160cae1847c602d13b8db042f2d494f4d673fb5eac40745d5214a453bc7d4743199984cd737c07a9be1d739bec5cf6988b2ddf3f9958a0907184bcb2bd76d
+  data.tar.gz: 109ac3bb659fc9ea54806ca3e292e286aeef883a40d315d3a88f7d0e6810efd8647be7db598e919b3adc5abc3b11eb4fff1f96a6f398fc5a330e44fcc841db24

data/.gitignore

@@ -16,7 +16,6 @@ spec/datasets/tmp
 .idea
 rerun.txt
 *.swp
-radiant-*.gem
 .rvmrc
 .bundle
 .ruby-version

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    trusty-cms (3.8.2)
+    trusty-cms (3.8.3)
       RedCloth (= 4.3.2)
       acts_as_list (~> 0.9.5)
       acts_as_tree (>= 2.6.1, < 2.9.0)

data/app/helpers/scoped_helper.rb

@@ -4,7 +4,7 @@ module ScopedHelper
     base.module_eval do
       def title
         t = current_site.name 
-        t = TrustyCms::Config['admin.title'] || 'Radiant CMS' if t.blank?
+        t = TrustyCms::Config['admin.title'] || 'TrustyCMS' if t.blank?
         t
       end
 

data/app/models/trusty_cms/config.rb

@@ -41,7 +41,6 @@ module TrustyCms
     #     end
     #   end
     #
-    # and usually in a config/radiant_config.rb file either in radiant itself, in the application directory
     # or in an extension. TrustyCms currently defines the following settings and makes them editable by
     # admin users on the site configuration page:
     #
@@ -135,7 +134,7 @@ module TrustyCms
       end
 
       def cache_file
-        File.join(cache_path,'radiant_config_cache.txt')
+        File.join(cache_path,'trusty_config_cache.txt')
       end
 
       def site_settings
@@ -177,9 +176,7 @@ module TrustyCms
       # * :allow_blank should be false if the config item must not be blank or nil
       # * :allow_change should be false if the config item can only be set, not changed. Add a default to specify an unchanging config entry.
       # * :allow_display should be false if the config item should not be showable in radius tags
-      #
-      # From the main radiant config/initializers/radiant_config.rb:
-      #
+      #    
       #   TrustyCms.config do |config|
       #     config.define 'defaults.locale', :select_from => lambda { TrustyCms::AvailableLocales.locales }, :allow_blank => true
       #     config.define 'defaults.page.parts', :default => "Body,Extended"

data/config/application.rb

@@ -37,16 +37,16 @@ module TrustyCms
     end
     paths["app/helpers"] = []
     # config.add_plugin_paths(extension_loader.paths(:plugin))
-    radiant_locale_paths = Dir[File.join(TRUSTY_CMS_ROOT, 'config', 'locales', '*.{rb,yml}')]
-    config.i18n.load_path = radiant_locale_paths + extension_loader.paths(:locale)
+    trusty_locale_paths = Dir[File.join(TRUSTY_CMS_ROOT, 'config', 'locales', '*.{rb,yml}')]
+    config.i18n.load_path = trusty_locale_paths + extension_loader.paths(:locale)
     I18n.enforce_available_locales = true
 
     config.encoding = 'utf-8'
 
     config.middleware.use Rack::Cache,
                           :private_headers => ['Authorization'],
-                          :entitystore => "radiant:tmp/cache/entity",
-                          :metastore => "radiant:tmp/cache/meta",
+                          :entitystore => "trusty:tmp/cache/entity",
+                          :metastore => "trusty:tmp/cache/meta",
                           :verbose => false,
                           :allow_reload => false,
                           :allow_revalidate => false

data/config/initializers/devise.rb

@@ -92,7 +92,7 @@ Devise.setup do |config|
   # It will change confirmation, password recovery and other workflows
   # to behave the same regardless if the e-mail provided was right or wrong.
   # Does not affect registerable.
-  # config.paranoid = true
+  config.paranoid = true
 
   # By default Devise will store the user in session. You can skip storage for
   # particular strategies by setting this option.

data/db/migrate/{001_create_radiant_tables.rb → 001_create_trusty_tables.rb}

@@ -1,4 +1,4 @@
-class CreateRadiantTables < ActiveRecord::Migration[5.2]
+class CreateTrustyTables < ActiveRecord::Migration[5.2]
   def self.up
     create_table "config", :force => true do |t|
       t.column "key", :string, :limit => 40, :default => "", :null => false

data/db/migrate/20111016150725_extend_page_part_content_limit.rb

@@ -1,8 +1,6 @@
 class ExtendPagePartContentLimit < ActiveRecord::Migration[5.2]
   def self.up
     if ActiveRecord::Base.connection.adapter_name =~ /m[sy]sql/i
-      # Make sure text longer than 64kB is not cropped in MySQL and MSSQL
-      # See https://github.com/radiant/radiant-sheets-extension/issues/10
       change_column :page_parts, :content, :text, :limit => 1048575
     end
   end

data/lib/configuration_extensions/configuration_extensions.rb

@@ -27,7 +27,7 @@ module TrustyCms
       Rails.configuration
     end
 
-    # Returns the root directory of this radiant installation (which is usually the gem directory).
+    # Returns the root directory of this installation (which is usually the gem directory).
     # This is not the same as Rails.root, which is the instance directory and tends to contain only site-delivery material.
     #
     def root
@@ -56,7 +56,7 @@ module TrustyCms
     end
 
     def vendor?
-      File.exist?("#{Rails.root}/vendor/radiant")
+      File.exist?("#{Rails.root}/vendor/trusty")
     end
 
     def app?
@@ -82,8 +82,8 @@ class Rails::Application::Configuration
 
   # The TrustyCms::Configuration class extends Rails::Configuration with three purposes:
   # * to reset some rails defaults so that files are found in TRUSTY_CMS_ROOT instead of Rails.root
-  # * to notice that some gems and plugins are in fact radiant extensions
-  # * to notice that some radiant extensions add load paths (for plugins, controllers, metal, etc)
+  # * to notice that some gems and plugins are in fact trusty extensions
+  # * to notice that some trusty extensions add load paths (for plugins, controllers, metal, etc)
 
   attr_accessor :extension_paths, :ignored_extensions
 
@@ -177,7 +177,7 @@ class Rails::Application::Configuration
   end
 
   # Returns an alphabetical list of every extension found among all the load paths and bundled gems. Any plugin or
-  # gem whose path ends in the form +radiant-something-extension+ is considered to be an extension.
+  # gem whose path ends in the form +trusty-something-extension+ is considered to be an extension.
   #
   #   TrustyCms.configuration.available_extensions  # => [:name, :name, :name, :name]
   #
@@ -204,7 +204,7 @@ class Rails::Application::Configuration
     end
   end
 
-  # Scans the bundled gems for any whose name match the +radiant-something-extension+ format
+  # Scans the bundled gems for any whose name match the +trusty-something-extension+ format
   # and returns a list of their names as symbols.
   #
   #   TrustyCms.configuration.gem_extensions  # => [:name, :name]
@@ -221,7 +221,7 @@ class Rails::Application::Configuration
   # Old extension-dependency mechanism now deprecated
   #
   def extension(ext)
-    ::ActiveSupport::Deprecation.warn("Extension dependencies have been deprecated and are no longer supported in radiant 1.0. Extensions with dependencies should be packaged as gems and use the .gemspec to declare them.", caller)
+    ::ActiveSupport::Deprecation.warn("Extension dependencies have been deprecated and are no longer supported in trusty 1.0. Extensions with dependencies should be packaged as gems and use the .gemspec to declare them.", caller)
   end
 
   # Old gem-invogation method now deprecated
@@ -299,7 +299,7 @@ class VendorBoot < Boot
   end
 
   def load_error_message
-    "Please verify that vendor/radiant contains a complete copy of the TrustyCms sources."
+    "Please verify that vendor/trusty contains a complete copy of the TrustyCms sources."
   end
 end
 
@@ -315,7 +315,7 @@ class AppBoot < Boot
 end
 
 class GemBoot < Boot
-  # The location and version of the radiant gem should be set in your Gemfile
+  # The location and version of the trusty gem should be set in your Gemfile
   def load_error_message
     "Have you run `bundle install`?'."
   end

data/lib/tasks/extensions.rake

@@ -38,9 +38,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 TRUSTY_ENV_FILE=#{Rails.root}/config/environment"
           else
-            system "rake test RADIANT_ENV_FILE=#{Rails.root}/config/environment"
+            system "rake test TRUSTY_ENV_FILE=#{Rails.root}/config/environment"
           end
         end
       end
@@ -64,9 +64,9 @@ namespace :spec do
         puts %{\nRunning specs on #{extension} extension from #{directory}/spec\n}
         chdir directory do
           if RUBY_PLATFORM =~ /win32/
-            system "rake.cmd spec RADIANT_ENV_FILE=#{Rails.root}/config/environment"
+            system "rake.cmd spec TRUSTY_ENV_FILE=#{Rails.root}/config/environment"
           else
-            system "rake spec RADIANT_ENV_FILE=#{Rails.root}/config/environment"
+            system "rake spec TRUSTY_ENV_FILE=#{Rails.root}/config/environment"
           end
         end
       end

data/lib/tasks/framework.rake

@@ -2,28 +2,28 @@
 unless File.directory? "#{Rails.root}/app"
   namespace :trusty_cms do
     namespace :freeze do
-      desc "Lock this application to the current gems (by unpacking them into vendor/radiant)"
+      desc "Lock this application to the current gems (by unpacking them into vendor/trusty)"
       task :gems do
         require 'rubygems'
         require 'rubygems/gem_runner'
 
-        radiant = (version = ENV['VERSION']) ?
+        trusty = (version = ENV['VERSION']) ?
           Gem.cache.search('trusty-cms', "= #{version}").first :
           Gem.cache.search('trusty-cms').sort_by { |g| g.version }.last
 
-        version ||= radiant.version
+        version ||= trusty.version
 
-        unless radiant
-          puts "No radiant gem #{version} is installed.  Do 'gem list radiant' to see what you have available."
+        unless trusty
+          puts "No trusty gem #{version} is installed.  Do 'gem list trusty' to see what you have available."
           exit
         end
 
-        puts "Freezing to the gems for TrustyCms #{radiant.version}"
-        rm_rf   "vendor/radiant"
+        puts "Freezing to the gems for TrustyCms #{trusty.version}"
+        rm_rf   "vendor/trusty"
 
         chdir("vendor") do
-          Gem::GemRunner.new.run(["unpack", "radiant", "--version", "=#{version}"])
-          FileUtils.mv(Dir.glob("radiant*").first, "radiant")
+          Gem::GemRunner.new.run(["unpack", "trusty", "--version", "=#{version}"])
+          FileUtils.mv(Dir.glob("trusty*").first, "trusty")
         end
       end
 
@@ -35,30 +35,30 @@ unless File.directory? "#{Rails.root}/app"
           exit 1
         end
 
-        radiant_git = "git://github.com/pgharts/trusty-cms.git"
+        trusty_git = "git://github.com/pgharts/trusty-cms.git"
 
         if File.exist?("vendor/trusty_cms/.git/HEAD")
-          cd("vendor/radiant") { system "git checkout master"; system "git pull origin master"}
+          cd("vendor/trusty") { system "git checkout master"; system "git pull origin master"}
         else
-          system "git clone #{radiant_git} vendor/radiant"
+          system "git clone #{trusty_git} vendor/trusty"
         end
 
         case
         when ENV['TAG']
-          cd("vendor/radiant") { system "git checkout -b v#{ENV['TAG']} #{ENV['TAG']}"}
+          cd("vendor/trusty") { system "git checkout -b v#{ENV['TAG']} #{ENV['TAG']}"}
         when ENV['BRANCH']
-          cd("vendor/radiant") { system "git checkout --track -b #{ENV['BRANCH']} origin/#{ENV['BRANCH']}"}
+          cd("vendor/trusty") { system "git checkout --track -b #{ENV['BRANCH']} origin/#{ENV['BRANCH']}"}
         when ENV['REVISION']
-          cd("vendor/radiant") { system "git checkout -b REV_#{ENV['REVISION']} #{ENV['REVISION']}"}
+          cd("vendor/trusty") { system "git checkout -b REV_#{ENV['REVISION']} #{ENV['REVISION']}"}
         end
 
-        cd("vendor/radiant") { system "git submodule update --init"}
+        cd("vendor/trusty") { system "git submodule update --init"}
       end
     end
 
     desc "Unlock this application from freeze of gems or edge and return to a fluid use of system gems"
     task :unfreeze do
-      rm_rf "vendor/radiant"
+      rm_rf "vendor/trusty"
     end
 
     desc "Update configs, scripts, html, images, sass, stylesheets and javascripts from TrustyCms."
@@ -94,7 +94,7 @@ unless File.directory? "#{Rails.root}/app"
         install "#{File.dirname(__FILE__)}/../generators/instance/templates/instance_generate", "#{local_base}/generate", :mode => 0755
       end
 
-      desc "Update your javascripts from your current radiant install"
+      desc "Update your javascripts from your current trusty install"
       task :javascripts do
         FileUtils.mkdir_p("#{Rails.root}/public/javascripts/admin/")
         copy_javascripts = proc do |project_dir, scripts|
@@ -110,7 +110,7 @@ unless File.directory? "#{Rails.root}/app"
         TrustyCms::TaskSupport.cache_admin_js
       end
 
-      desc "Update Gemfile from your current radiant install, backing up if required."
+      desc "Update Gemfile from your current trusty install, backing up if required."
       task :bundle do
         require 'erb'
         file = "#{Rails.root}/Gemfile"
@@ -128,7 +128,7 @@ unless File.directory? "#{Rails.root}/app"
         active_db_gem = db_gems.keys.find { |g| Gem.loaded_specs[g] } || 'sqlite3'
 
         File.open(tmpfile, 'w') do |f|
-          radiant_version = TrustyCms::VERSION.to_s
+          trusty_version = TrustyCms::VERSION.to_s
           db = db_gems[active_db_gem]
           f.write ERB.new(File.read(genfile)).result(binding)
         end
@@ -138,7 +138,7 @@ unless File.directory? "#{Rails.root}/app"
           if File.exist?(file)
             FileUtils.cp(file, backfile)
             warning << "** WARNING **
-Your old Gemfile has been saved as Gemfile.bak. If you had radiant extensions or other gems in that file, please copy those lines to the new file. After checking the Gemfile, please run `bundle install` to update your application."
+Your old Gemfile has been saved as Gemfile.bak. If you had trusty extensions or other gems in that file, please copy those lines to the new file. After checking the Gemfile, please run `bundle install` to update your application."
           else
             warning << "** WARNING **
 A Gemfile has been created in your application directory. If you have config.gem entries in your old environment.rb (now .bak), please move them to the Gemfile. When you're happy with it, run `bundle install` to install the gems."
@@ -149,7 +149,7 @@ A Gemfile has been created in your application directory. If you have config.gem
         puts warning
       end
 
-      desc "Update configuration files from your current radiant install"
+      desc "Update configuration files from your current trusty install"
       task :configs do
         require 'erb'
         instances = {
@@ -187,7 +187,7 @@ A Gemfile has been created in your application directory. If you have config.gem
         [:env, :development, :test, :cucumber, :production].each do |env_file|
           File.open(tmps[env_file], 'w') do |f|
             app_name        = File.basename(File.expand_path(Rails.root))
-            radiant_version = TrustyCms::VERSION.to_s
+            trusty_version = TrustyCms::VERSION.to_s
             f.write ERB.new(File.read(gens[env_file])).result(binding)
           end
           unless File.exist?(instances[env_file]) && FileUtils.compare_file(instances[env_file], tmps[env_file])
@@ -206,16 +206,16 @@ the new files: #{warning}"
         end
       end
 
-      desc "Update static HTML files from your current radiant install"
+      desc "Update static HTML files from your current trusty install"
       task :static_html do
         project_dir = Rails.root + "/public/"
         html_files = Dir["#{File.dirname(__FILE__)}/../../public/*.html"].delete_if { |f| f =~ /404.html|500.html/ }
         FileUtils.cp(html_files, project_dir)
       end
 
-      desc "Update admin and radiant images from your current radiant install"
+      desc "Update admin and trusty images from your current trusty install"
       task :images do
-        %w{admin radiant}.each do |d|
+        %w{admin trusty}.each do |d|
           project_dir = Rails.root + "/public/images/#{d}/"
           FileUtils.mkdir_p(project_dir)
           images = Dir["#{File.dirname(__FILE__)}/../../public/images/#{d}/*"]
@@ -223,7 +223,7 @@ the new files: #{warning}"
         end
       end
 
-      desc "Update admin stylesheets from your current radiant install"
+      desc "Update admin stylesheets from your current trusty install"
       task :stylesheets do
         project_dir = Rails.root + '/public/stylesheets/admin/'
 
@@ -234,7 +234,7 @@ the new files: #{warning}"
         copy_stylesheets[Rails.root + '/public/stylesheets/admin/',Dir["#{File.dirname(__FILE__)}/../../public/stylesheets/admin/*.css"]]
       end
 
-      desc "Update admin sass files from your current radiant install"
+      desc "Update admin sass files from your current trusty install"
       task :sass do
         copy_sass = proc do |project_dir, sass_files|
           sass_files.reject!{|s| File.basename(s) == 'overrides.sass'} if File.exists?(project_dir + 'overrides.sass') || File.exists?(project_dir + '../overrides.css')

data/lib/tasks/radiant_config.rake

@@ -1,16 +1,16 @@
 require 'trusty_cms/task_support'
 namespace :trusty_cms do
   namespace :config do
-    desc "Export TrustyCms::Config to Rails.root/config/radiant_config.yml. Specify a path with RADIANT_CONFIG_PATH - defaults to Rails.root/config/radiant_config.yml"
+    desc "Export TrustyCms::Config to Rails.root/config/trusty_config.yml. Specify a path with TRUSTY_CONFIG_PATH - defaults to Rails.root/config/trusty_config.yml"
     task :export => :environment do
-      config_path = ENV['RADIANT_CONFIG_PATH'] || "#{Rails.root}/config/radiant_config.yml"
+      config_path = ENV['TRUSTY_CONFIG_PATH'] || "#{Rails.root}/config/trusty_config.yml"
       clear = ENV['CLEAR_CONFIG'] || nil
       TrustyCms::TaskSupport.config_export(config_path)
     end
 
-    desc "Import TrustyCms::Config from Rails.root/config/radiant_config.yml. Specify a path with RADIANT_CONFIG_PATH - defaults to Rails.root/config/radiant_config.yml Set CLEAR_CONFIG=true to delete all existing settings before import"
+    desc "Import TrustyCms::Config from Rails.root/config/trusty_config.yml. Specify a path with TRUSTY_CONFIG_PATH - defaults to Rails.root/config/trusty_config.yml Set CLEAR_CONFIG=true to delete all existing settings before import"
     task :import => :environment do
-      config_path = ENV['RADIANT_CONFIG_PATH'] || "#{Rails.root}/config/radiant_config.yml"
+      config_path = ENV['TRUSTY_CONFIG_PATH'] || "#{Rails.root}/config/trusty_config.yml"
       clear = ENV['CLEAR_CONFIG'] || nil
       TrustyCms::TaskSupport.config_import(config_path, clear)
     end

data/lib/trusty_cms.rb

@@ -2,6 +2,6 @@ TRUSTY_CMS_ROOT = File.expand_path(File.join(File.dirname(__FILE__), "..")) unle
 
 unless defined? TrustyCms::VERSION
   module TrustyCms
-    VERSION = '3.8.2'
+    VERSION = '3.8.3'
   end
 end

data/lib/trusty_cms/config/definition.rb

@@ -6,7 +6,7 @@ module TrustyCms
 
       # Configuration 'definitions' are metadata held in memory that add restriction and description to individual config entries.
       #
-      # By default radiant's configuration machinery is open and ad-hoc: config items are just globally-accessible variables.
+      # By default trusty's configuration machinery is open and ad-hoc: config items are just globally-accessible variables.
       # They're created when first mentioned and then available in all parts of the application. The definition mechanism is a way
       # to place limits on that behavior. It allows you to protect a config entry, to specify the values it can take and to
       # validate it when it changes. In the next update it will also allow you to declare that

data/lib/trusty_cms/extension_loader.rb

@@ -120,7 +120,7 @@ module TrustyCms
       # Builds an ExtensionPath object from the supplied path, working out the name of the extension on the way.
       # The ExtensionPath object will later be used to scan and load the extension.
       # An extension name can be supplied in addition to the path. It will be processed in the usual way to
-      # remove radiant- and -extension and any verion numbering.
+      # remove trusty- and -extension and any verion numbering.
       #
       def record_path(path, name=nil)
         ExtensionPath.from_path(path, name)

data/lib/trusty_cms/extension_path.rb

@@ -37,7 +37,7 @@ module TrustyCms
     end
 
     # Builds a new ExtensionPath object from the supplied path, working out the name of the extension by
-    # stripping the extra bits from radiant-something-extension-1.0.0 to leave just 'something'. The object
+    # stripping the extra bits from trusty-something-extension-1.0.0 to leave just 'something'. The object
     # is returned, and also remembered here for later use by the initializer (to find load paths) and the
     # ExtensionLoader, to load and activate the extension.
     #

data/lib/trusty_cms/initializer.rb

@@ -23,13 +23,13 @@ module TrustyCms
   module Initializer
 
     # Rails::Initializer is essentially a list of startup steps and we extend it here by:
-    # * overriding or extending some of those steps so that they use radiant and extension paths
+    # * overriding or extending some of those steps so that they use trusty and extension paths
     #   as well as (or instead of) the rails defaults.
     # * appending some extra steps to set up the admin UI and activate extensions
 
 
-    # Returns true in the very unusual case where radiant has been deployed as a rails app itself, rather than
-    # loaded as a gem or from vendor/. This is only likely in situations where radiant is customised so heavily
+    # Returns true in the very unusual case where trusty has been deployed as a rails app itself, rather than
+    # loaded as a gem or from vendor/. This is only likely in situations where trusty is customised so heavily
     # that extensions are not sufficient.
     #
     def deployed_as_app?
@@ -43,7 +43,7 @@ module TrustyCms
       super
     end
 
-    # Overrides the Rails initializer to load metal from TRUSTY_CMS_ROOT and from radiant extensions.
+    # Overrides the Rails initializer to load metal from TRUSTY_CMS_ROOT and from trusty extensions.
     #
     def initialize_metal
       Rails::Rack::Metal.requested_metals = configuration.metals
@@ -57,11 +57,11 @@ module TrustyCms
         Rails::Rack::Metal, :if => Rails::Rack::Metal.metals.any?)
     end
 
-    # Extends the Rails initializer to add locale paths from TRUSTY_CMS_ROOT and from radiant extensions.
+    # Extends the Rails initializer to add locale paths from TRUSTY_CMS_ROOT and from trusty extensions.
     #
     def initialize_i18n
-      radiant_locale_paths = Dir[File.join(TRUSTY_CMS_ROOT, 'config', 'locales', '*.{rb,yml}')]
-      configuration.i18n.load_path = radiant_locale_paths + extension_loader.paths(:locale)
+      trusty_locale_paths = Dir[File.join(TRUSTY_CMS_ROOT, 'config', 'locales', '*.{rb,yml}')]
+      configuration.i18n.load_path = trusty_locale_paths + extension_loader.paths(:locale)
       super
     end
 
@@ -81,40 +81,40 @@ module TrustyCms
       @bundler_loaded ||= Bundler.require :default, Rails.env
     end
 
-    # Extends the Rails initializer also to load radiant extensions (which have been excluded from the list of plugins).
+    # Extends the Rails initializer also to load trusty extensions (which have been excluded from the list of plugins).
     #
     def load_plugins
       super
       extension_loader.load_extensions
     end
 
-    # Extends the Rails initializer to run initializers from radiant and from extensions. The load order will be:
+    # Extends the Rails initializer to run initializers from trusty and from extensions. The load order will be:
     # 1. TRUSTY_CMS_ROOT/config/intializers/*.rb
     # 2. Rails.root/config/intializers/*.rb
     # 3. config/initializers/*.rb found in extensions, in extension load order.
     #
-    # In the now rare case where radiant is deployed as an ordinary rails application, step 1 is skipped
+    # In the now rare case where trusty is deployed as an ordinary rails application, step 1 is skipped
     # because it is equivalent to step 2.
     #
     def load_application_initializers
-      load_radiant_initializers unless deployed_as_app?
+      load_trusty_initializers unless deployed_as_app?
       super
       extension_loader.load_extension_initalizers
     end
 
     # Loads initializers found in TRUSTY_CMS_ROOT/config/initializers.
     #
-    def load_radiant_initializers
+    def load_trusty_initializers
       Dir["#{TRUSTY_CMS_ROOT}/config/initializers/**/*.rb"].sort.each do |initializer|
         load(initializer)
       end
     end
 
     # Extends the Rails initializer with some extra steps at the end of initialization:
-    # * hook up radiant view paths in controllers and notifiers
+    # * hook up trusty view paths in controllers and notifiers
     # * initialize the navigation tabs in the admin interface
     # * initialize the extendable partial sets that make up the admin interface
-    # * call +activate+ on all radiant extensions
+    # * call +activate+ on all trusty extensions
     # * add extension controller paths
     # * mark extension app paths for eager loading
     #