radiant 0.6.4 → 0.6.5

data/lib/radiant/initializer.rb

@@ -1,68 +1,161 @@
+# Add necessary Rails path
+$LOAD_PATH.unshift "#{RADIANT_ROOT}/vendor/rails/railties/lib"
+
 require 'initializer'
 require 'radiant/admin_ui'
+require 'radiant/extension_loader'
 
 module Radiant
-  
+
   class Configuration < Rails::Configuration
-    attr_accessor :view_paths
     attr_accessor :extension_paths
     attr_accessor :extensions
-    
+    attr_accessor :view_paths
+
     def initialize
-      self.view_paths = default_view_paths
+      self.view_paths = []
       self.extension_paths = default_extension_paths
-      self.extensions = nil
+      self.extensions = [ :all ]
       super
     end
-    
-    def default_view_paths
-      [view_path].compact
-    end
-    
+
     def default_extension_paths
-      [RADIANT_ROOT + '/vendor/extensions', RAILS_ROOT + '/vendor/extensions'].uniq
+      env = ENV["RAILS_ENV"] || RAILS_ENV
+      paths = [RADIANT_ROOT + '/vendor/extensions', RAILS_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
     end
-    
+
     def admin
       AdminUI.instance
     end
-    
+
+    private
+
+      def library_directories
+        Dir["#{RADIANT_ROOT}/vendor/*/lib"]
+      end
+
+      def framework_root_path
+        RADIANT_ROOT + '/vendor/rails'
+      end
+
+      # Provide the load paths for the Radiant installation
+      def default_load_paths
+        paths = ["#{RADIANT_ROOT}/test/mocks/#{environment}"]
+
+        # Add the app's controller directory
+        paths.concat(Dir["#{RADIANT_ROOT}/app/controllers/"])
+
+        # Then components subdirectories.
+        paths.concat(Dir["#{RADIANT_ROOT}/components/[_a-z]*"])
+
+        # Followed by the standard includes.
+        paths.concat %w(
+          app
+          app/models
+          app/controllers
+          app/helpers
+          config
+          lib
+          vendor
+        ).map { |dir| "#{RADIANT_ROOT}/#{dir}" }.select { |dir| File.directory?(dir) }
+
+        paths.concat builtin_directories
+        paths.concat library_directories
+      end
+
+      def default_plugin_paths
+        [
+          "#{RAILS_ROOT}/vendor/plugins",
+          "#{RADIANT_ROOT}/lib/plugins",
+          "#{RADIANT_ROOT}/vendor/plugins"
+        ]
+      end
+
+      def default_view_path
+        File.join(RADIANT_ROOT, 'app', 'views')
+      end
+
+      def default_controller_paths
+        [File.join(RADIANT_ROOT, 'app', 'controllers')]
+      end
   end
-  
+
   class Initializer < Rails::Initializer
     def self.run(command = :process, configuration = Configuration.new)
       super
     end
-    
-    def after_initialize
-      initialize_extensions
+
+    def set_autoload_paths
+      extension_loader.add_extension_paths
       super
     end
-    
-    def initialize_extensions
-      ActiveRecord::Base.connection.execute("select count(*) from #{ExtensionMeta.table_name}")
-      require 'radiant/extension_loader'
-      ExtensionLoader.instance { |l| l.initializer = self }.run
-    rescue ActiveRecord::StatementInvalid
-      $stderr.puts("Extensions cannot be used until Radiant migrations are up to date.")
+
+    def add_plugin_load_paths
+      # checks for plugins within extensions:
+      extension_loader.add_plugin_paths
+      super
     end
-    
-    def initialize_view_paths
-      [ActionView::Base, ActionMailer::Base].each do |klass|
-        klass.view_paths = configuration.view_paths
-      end
+
+    def load_plugins
+      super
+      extension_loader.load_extensions
+    end
+
+    def after_initialize
+      super
+      extension_loader.activate_extensions
     end
-    
+
     def initialize_default_admin_tabs
       admin.tabs.clear
       admin.tabs.add "Pages",    "/admin/pages"
       admin.tabs.add "Snippets", "/admin/snippets"
       admin.tabs.add "Layouts",  "/admin/layouts", :visibility => [:admin, :developer]
     end
-    
+
+    def initialize_framework_views
+      view_paths = returning [] do |arr|
+        # Add the singular view path if it's not in the list
+        arr << configuration.view_path if !configuration.view_paths.include?(configuration.view_path)
+        # Add the default view paths
+        arr.concat configuration.view_paths
+        # Add the extension view paths
+        arr.concat extension_loader.view_paths
+        # Reverse the list so extensions come first
+        arr.reverse!
+      end
+      if configuration.frameworks.include?(:action_mailer) || defined?(ActionMailer::Base)
+        # This happens before the plugins are loaded so we must load it manually
+        unless ActionMailer::Base.respond_to? :view_paths
+          require "#{RADIANT_ROOT}/lib/plugins/extension_patches/lib/mailer_view_paths_extension"
+        end
+        ActionMailer::Base.view_paths = view_paths
+      end
+      if configuration.frameworks.include?(:action_controller) || defined?(ActionController::Base)
+        view_paths.each do |vp|
+          unless ActionController::Base.view_paths.include?(vp)
+            ActionController::Base.append_view_path vp
+          end
+        end
+      end
+    end
+
+    def initialize_routing
+      extension_loader.add_controller_paths
+      super
+    end
+
     def admin
       configuration.admin
     end
+
+    def extension_loader
+      ExtensionLoader.instance {|l| l.initializer = self }
+    end
   end
-  
-end
+
+end

data/lib/radiant/setup.rb

@@ -65,6 +65,7 @@ module Radiant
       end
       unless filename
         templates = find_and_load_templates("#{RADIANT_ROOT}/db/templates/*.yml")
+        templates.concat find_and_load_templates("#{RAILS_ROOT}/db/templates/*.yml") if RADIANT_ROOT != RAILS_ROOT
         choose do |menu|
           menu.header = "\nSelect a database template"
           menu.prompt = "[1-#{templates.size}]: "

data/lib/tasks/database.rake

@@ -2,8 +2,7 @@ namespace :db do
   desc "Migrate schema to version 0 and back up again. WARNING: Destroys all data in tables!!"
   task :remigrate => :environment do
     require 'highline/import'
-    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] ")
+    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)
@@ -29,4 +28,46 @@ namespace :db do
       :database_template => ENV['DATABASE_TEMPLATE']
     )
   end
-end
+  
+  #
+  # The following tasks are only needed by Scenarios until Rails 2
+  #
+  
+  desc 'Drops the database for the current RAILS_ENV'
+  task :drop => :environment do
+    config = ActiveRecord::Base.configurations[RAILS_ENV]
+    case config['adapter']
+    when 'mysql'
+      ActiveRecord::Base.connection.drop_database config['database']
+    when /^sqlite/
+      FileUtils.rm_f(File.join(RAILS_ROOT, config['database']))
+    when 'postgresql'
+      `dropdb "#{config['database']}"`
+    end
+  end
+    
+  desc 'Create the database defined in config/database.yml for the current RAILS_ENV'
+  task :create => :environment do
+    config = ActiveRecord::Base.configurations[RAILS_ENV]
+    begin
+      ActiveRecord::Base.establish_connection(config)
+      ActiveRecord::Base.connection
+    rescue
+      case config['adapter']
+      when 'mysql'
+        `mysqladmin #{config['password'].nil? ? '' : "-p #{config['password']}"} -u #{config['username']} create #{config['database']}`
+      when 'postgresql'
+        `createdb "#{config['database']}" -E utf8`
+      when 'sqlite'
+        `sqlite "#{config['database']}"`
+      when 'sqlite3'
+        `sqlite3 "#{config['database']}"`
+      end
+    else
+      p "#{config['database']} already exists"
+    end
+  end
+  
+  desc "Drops and recreates the database from db/schema.rb for the current environment."
+  task :reset => ['db:drop', 'db:create', 'db:schema:load']
+end

data/lib/tasks/extensions.rake

@@ -24,26 +24,44 @@ 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)
     if ENV["EXT"]
-      extension = RAILS_ROOT + "/vendor/extensions/" + ENV["EXT"]
-      if File.directory?(extension)
-        chdir extension do
+      extension_roots = extension_roots.select {|x| /\/(\d+_)?#{ENV["EXT"]}$/ === x }
+      if extension_roots.empty?
+        puts "Sorry, that extension is not installed."
+      end
+    end
+    extension_roots.each do |directory|
+      if File.directory?(File.join(directory, 'test'))
+        chdir directory do
           if RUBY_PLATFORM =~ /win32/
-            system "rake.cmd test"
+            system "rake.cmd test RADIANT_ENV_FILE=#{RAILS_ROOT}/config/environment"
           else
-            system "rake test"
+            system "rake test RADIANT_ENV_FILE=#{RAILS_ROOT}/config/environment"
           end
         end
-      else
+      end
+    end
+  end
+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)
+    if ENV["EXT"]
+      extension_roots = extension_roots.select {|x| /\/(\d+_)?#{ENV["EXT"]}$/ === x }
+      if extension_roots.empty?
         puts "Sorry, that extension is not installed."
       end
-    else
-      Dir["#{RAILS_ROOT}/vendor/extensions/*"].sort.select { |f| File.directory?(f) }.each do |directory|
+    end
+    extension_roots.each do |directory|
+      if File.directory?(File.join(directory, 'spec'))
         chdir directory do
           if RUBY_PLATFORM =~ /win32/
-            system "rake.cmd test"
+            system "rake.cmd spec RADIANT_ENV_FILE=#{RAILS_ROOT}/config/environment"
           else
-            system "rake test"
+            system "rake spec RADIANT_ENV_FILE=#{RAILS_ROOT}/config/environment"
           end
         end
       end
@@ -53,5 +71,5 @@ end
 
 # Load any custom rakefiles from extensions
 [RAILS_ROOT, RADIANT_ROOT].uniq.each do |root|
-  Dir[root + '/vendor/extensions/**/tasks/**/*.rake'].sort.each { |ext| load ext }
+  Dir[root + '/vendor/extensions/*/lib/tasks/*.rake'].sort.each { |ext| load ext }
 end

data/lib/tasks/framework.rake

@@ -5,6 +5,7 @@ unless File.directory? "#{RAILS_ROOT}/app"
       desc "Lock this application to the current gems (by unpacking them into vendor/radiant)"
       task :gems do
         require 'rubygems'
+        require 'rubygems/gem_runner'
         Gem.manage_gems
 
         radiant = (version = ENV['VERSION']) ?
@@ -22,7 +23,7 @@ unless File.directory? "#{RAILS_ROOT}/app"
         rm_rf   "vendor/radiant"
 
         chdir("vendor") do
-          Gem::GemRunner.new.run(["unpack", "-v", "=#{version}", "radiant"])
+          Gem::GemRunner.new.run(["unpack", "radiant", "--version", "=#{version}"])
           FileUtils.mv(Dir.glob("radiant*").first, "radiant")
         end
       end
@@ -39,7 +40,7 @@ unless File.directory? "#{RAILS_ROOT}/app"
         rm_rf   "vendor/radiant"
         mkdir_p "vendor/radiant"
 
-        svn_root = "http://dev.radiantcms.org/svn/radiant/"
+        svn_root = "http://svn.radiantcms.org/radiant/"
 
         case
         when ENV['TAG']
@@ -94,15 +95,28 @@ unless File.directory? "#{RAILS_ROOT}/app"
 
       desc "Update your javascripts from your current radiant install"
       task :javascripts do
-        project_dir = RAILS_ROOT + '/public/javascripts/'
-        scripts = Dir["#{File.dirname(__FILE__)}/../../public/javascripts/*.js"]
-        scripts.reject!{|s| File.basename(s) == 'application.js'} if File.exists?(project_dir + 'application.js')
-        FileUtils.cp(scripts, project_dir)
+        copy_javascripts = proc do |project_dir, scripts|
+          scripts.reject!{|s| File.basename(s) == 'application.js'} if File.exists?(project_dir + 'application.js') 
+          FileUtils.cp(scripts, project_dir) 
+        end
+        copy_javascripts[RAILS_ROOT + '/public/javascripts/', Dir["#{File.dirname(__FILE__)}/../../public/javascripts/*.js"]] 
+        copy_javascripts[RAILS_ROOT + '/public/javascripts/admin/', Dir["#{File.dirname(__FILE__)}/../../public/javascripts/admin/*.js"]]
       end
 
       desc "Update config/boot.rb from your current radiant install"
       task :configs do
         FileUtils.cp("#{File.dirname(__FILE__)}/../generators/instance/templates/instance_boot.rb", RAILS_ROOT + '/config/boot.rb')
+        instance_env = "#{RAILS_ROOT}/config/environment.rb"
+        gen_env = "#{File.dirname(__FILE__)}/../generators/instance/templates/instance_environment.rb"
+        backup_env = "#{RAILS_ROOT}/config/environment.bak"
+        unless FileUtils.compare_file(instance_env, gen_env)
+          FileUtils.cp(instance_env, backup_env)
+          FileUtils.cp(gen_env, instance_env)
+          puts "** WARNING **
+config/environment.rb has changed in Radiant 0.6.5. Your original has been
+backed up to config/environment.bak and replaced with the packaged version.
+Please copy your customizations to the new file."
+        end
       end
       
       desc "Update admin images from your current radiant install"

data/lib/tasks/instance.rake

@@ -4,10 +4,10 @@ unless File.directory? "#{RAILS_ROOT}/app"
   
   ENV['RADIANT_ENV_FILE'] = File.join(RAILS_ROOT, 'config', 'environment')
   
-  Dir["#{RADIANT_ROOT}/vendor/rails/railties/lib/tasks/*.rake"].each do |rake|
+  [Dir["#{RADIANT_ROOT}/vendor/rails/railties/lib/tasks/*.rake"], Dir["#{RADIANT_ROOT}/vendor/plugins/rspec_on_rails/tasks/*.rake"]].flatten.each do |rake|
     lines = IO.readlines(rake)
     lines.map! do |line|
-      line.gsub!('RAILS_ROOT', 'RADIANT_ROOT') unless rake =~ /misc\.rake$/
+      line.gsub!('RAILS_ROOT', 'RADIANT_ROOT') unless rake =~ /(misc|rspec)\.rake$/
       case rake
       when /testing\.rake$/
         line.gsub!(/t.libs << (["'])/, 't.libs << \1' + RADIANT_ROOT + '/')
@@ -15,6 +15,9 @@ unless File.directory? "#{RAILS_ROOT}/app"
       when /databases\.rake$/
         line.gsub!(/migrate\((["'])/, 'migrate(\1' + RADIANT_ROOT + '/')
         line.sub!("db/schema.rb", "#{RAILS_ROOT}/db/schema.rb")
+      when /rspec\.rake$/
+        line.gsub!('RAILS_ROOT', 'RADIANT_ROOT') unless line =~ /:noop/
+        line.gsub!(/FileList\[(["'])/, "FileList[\\1#{RADIANT_ROOT}/")
       end
       line
     end

data/lib/tasks/release.rake

@@ -40,6 +40,7 @@ namespace 'radiant' do
     files = FileList['**/*']
     files.exclude '**/._*'
     files.exclude '**/*.rej'
+    files.exclude '.git*'
     files.exclude 'cache/'
     files.exclude 'config/database.yml'
     files.exclude 'config/locomotive.yml'

data/public/javascripts/admin/admin.js

@@ -0,0 +1,142 @@
+document.observe('dom:loaded', function() {
+  when('site-map', function(table) { new SiteMap(table) });
+
+  when('page_title', function(title) {
+    var slug = $('page_slug'),
+        breadcrumb = $('page_breadcrumb'),
+        oldTitle = title.value;
+
+    if (!slug || !breadcrumb) return;
+
+    new Form.Element.Observer(title, 0.15, function() {
+      if (oldTitle.toSlug() == slug.value) slug.value = title.value.toSlug();
+      if (oldTitle == breadcrumb.value) breadcrumb.value = title.value;
+      oldTitle = title.value;
+    });
+  });
+
+  when('tab-control', function(element) {
+    tabControl = new TabControl(element);
+
+    $$('#pages div.part > input[type=hidden]:first-child').each(function(part, index) {
+      var page = part.up('.page');
+      tabControl.addTab('tab-' + (index + 1), part.value, page.id);
+    });
+
+    tabControl.autoSelect();
+  });
+
+  when('tag-reference-popup', function(popup) {
+    var tags, searchingOn = "";
+
+    new Form.Element.Observer('search-tag-reference', 0.5, function(element, value) {
+      if (!tags) tags = popup.select('.tag-description')
+
+      if (value.length < 3 && searchingOn != "") {
+        searchingOn = "";
+        tags.invoke('show');
+      } else if (value.length >= 3 && searchingOn != value) {
+        searchingOn = value
+        tags.each(function(div) {
+          div[div.hasWord(value) ? 'show' : 'hide']();
+        });
+      }
+    });
+
+    popup.down('p a.close').observe('click', function(e) {
+      e.findElement('.popup').hide();
+      e.stop();
+    });
+  });
+
+  when('page_status_id', function(select){
+    if($F('page_status_id') == '100')
+      $('publication-date').show().select('select').invoke('enable');
+
+    select.observe('change', function(){
+      if($F(this) == '100')
+        $('publication-date').show().select('select').invoke('enable');
+      else
+        $('publication-date').hide().select('select').invoke('disable');
+    })
+  });
+
+  when('notice', function(notice) {
+    new Effect.Fade(notice, {delay: 3});
+  });
+
+});
+
+Element.addMethods({
+  hasWord: function(element, word) {
+    element = $(element);
+    if (element.nodeType == Node.TEXT_NODE) {
+      return element.nodeValue.include(word);
+    } else {
+      return $A(element.childNodes).any(function(child) {
+        return Element.hasWord(child, word);
+      });
+    }
+  }
+})
+
+// When object is available, do function fn.
+function when(obj, fn) {
+  if (Object.isString(obj)) obj = /^[\w-]+$/.test(obj) ? $(obj) : $(document.body).down(obj);
+  if (Object.isArray(obj) && !obj.length) return;
+  if (obj) fn(obj);
+}
+
+function part_added() {
+  var partNameField = $('part-name-field');
+  var partIndexField = $('part-index-field');
+  var index = parseInt(partIndexField.value || 0) + 1;
+  var tab = 'tab-' + index;
+  var caption = partNameField.value;
+  var page = 'page-' + index;
+  tabControl.addTab(tab, caption, page);
+  Element.hide('add-part-popup');
+  Element.hide('busy');
+  partNameField.value = '';
+  partIndexField.value = (index + 1).toString();
+  $('add-part-button').disabled = false;
+  Field.focus(partNameField);
+  tabControl.select(tab);
+}
+function part_loading() {
+  $('add-part-button').disabled = true;
+  $('busy').appear();
+}
+function valid_part_name() {
+  var partNameField = $('part-name-field');
+  var name = partNameField.value.downcase().strip();
+  var result = true;
+  if (name == '') {
+    alert('Part name cannot be empty.');
+    return false;
+  }
+  tabControl.tabs.each(function(pair){
+    if (tabControl.tabs.get(pair.key).caption == name) {
+      result = false;
+      alert('Part name must be unique.');
+      throw $break;
+    }
+  })
+  return result;
+}
+function center(element) {
+  var header = $('header')
+  element = $(element);
+  element.style.position = 'absolute';
+  var dim = Element.getDimensions(element);
+  var top = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop;
+  element.style.top = (top + 200) + 'px';
+  element.style.left = ((header.offsetWidth - dim.width) / 2) + 'px';
+}
+function toggle_add_part_popup() {
+  var popup = $('add-part-popup');
+  var partNameField = $('part-name-field');
+  center(popup);
+  Element.toggle(popup);
+  Field.focus(partNameField);
+}