radiant 0.9.1 → 1.0.0.rc1

data/lib/radiant/initializer.rb

@@ -4,12 +4,36 @@ $LOAD_PATH.unshift "#{RADIANT_ROOT}/vendor/rails/railties/lib"
 require 'initializer'
 require 'radiant/admin_ui'
 require 'radiant/extension_loader'
+require 'radiant/extension_locator'
+require 'radiant/gem_locator'
 
 module Radiant
   autoload :Cache, 'radiant/cache'
   
+  class << self
+    # Radiant.config returns the Radiant::Config eigenclass object, so it can be used wherever you would use Radiant::Config.
+    #
+    #   Radiant.config['site.title']
+    #   Radiant.config['site.url'] = 'example.com'
+    #
+    # but it will also yield itself to a block:
+    #
+    #   Radiant.config do |config|
+    #     config.define 'something', default => 'something'
+    #     config['other.thing'] = 'nothing'
+    #   end
+    #    
+    def config  # method must be defined before any initializers run
+      yield Radiant::Config if block_given?
+      Radiant::Config
+    end
+  end
+  
+  # NB. Radiant::Configuration (aka Rails.configuration) is an extension-aware subclass of Rails::Configuration 
+  #     Radiant::Config (aka Radiant.config) is the application-configuration model class
+  
   class Configuration < Rails::Configuration
-    attr_accessor :extension_paths
+    attr_accessor :extension_paths, :ignored_extensions
     attr_writer :extensions
     attr_accessor :view_paths
     attr_accessor :extension_dependencies
@@ -29,10 +53,34 @@ module Radiant
       paths.unshift(RADIANT_ROOT + "/test/fixtures/extensions") if env == "test"
       paths
     end
+
+    def default_plugin_locators
+      locators = []
+      locators << Radiant::ExtensionLocator if defined? Gem
+      locators << Radiant::GemLocator if defined? Gem
+      locators << Rails::Plugin::FileSystemLocator
+    end
     
     def extensions
       @extensions ||= all_available_extensions
     end
+
+    def extensions_in_order
+      return @extensions_in_order if @extensions_in_order
+      @extensions_in_order = (if extensions.include?(:all)
+        before_all = extensions.collect {|e| e if extensions.index(e).to_i < extensions.index(:all).to_i }.compact
+        after_all = extensions.collect {|e| e if extensions.index(e).to_i > extensions.index(:all).to_i }.compact
+        replacing_all_symbol = all_available_extensions - ((all_available_extensions & before_all) + (all_available_extensions & after_all))
+        before_all + replacing_all_symbol + after_all
+      else
+        extensions
+      end) - ignored_extensions
+    end
+      
+    def ignore_extensions(array)
+      self.ignored_extensions ||= []
+      self.ignored_extensions |= array
+    end
     
     def all_available_extensions
       # load vendorized extensions by inspecting load path(s)
@@ -53,7 +101,6 @@ module Radiant
       AdminUI.instance
     end
 
-
     def extension(ext)
       ::ActiveSupport::Deprecation.warn("Extension dependencies have been deprecated. Extensions may be packaged as gems and use the Gem spec to declare dependencies.", caller)
       @extension_dependencies << ext unless @extension_dependencies.include?(ext)
@@ -61,7 +108,12 @@ module Radiant
 
     def gem(name, options = {})
       super
-      extensions << $1.intern if gems.last.name =~ /^radiant-(.*)-extension$/
+      if gems.last.name =~ /^radiant-(.*)-extension$/ && extension_symbol = $1.intern
+        @extensions ||= []
+        if (@extensions & [extension_symbol, :all]).empty?
+          extensions << extension_symbol
+        end
+      end
     end
 
     def check_extension_dependencies
@@ -88,6 +140,7 @@ end_error
     private
 
       def library_directories
+        require "#{RADIANT_ROOT}/lib/radiant/gem_dependency_fix"
         libs = %W{ 
           #{RADIANT_ROOT}/vendor/radius/lib
           #{RADIANT_ROOT}/vendor/highline/lib
@@ -112,7 +165,7 @@ end_error
       end
 
       # Provide the load paths for the Radiant installation
-      def default_load_paths
+      def default_autoload_paths
         paths = ["#{RADIANT_ROOT}/test/mocks/#{environment}"]
 
         # Add the app's controller directory
@@ -185,7 +238,7 @@ end_error
       # checks for plugins within extensions:
       extension_loader.add_plugin_paths
       super
-      ActiveSupport::Dependencies.load_once_paths -= extension_loader.extension_load_paths
+      ActiveSupport::Dependencies.autoload_once_paths -= extension_loader.extension_load_paths
     end
 
     def load_plugins
@@ -195,20 +248,34 @@ end_error
       load_gems
       check_gem_dependencies
     end
+    
+    def load_application_initializers
+      load_radiant_initializers
+      super
+      extension_loader.load_extension_initalizers
+    end
+
+    def load_radiant_initializers
+      unless RADIANT_ROOT == RAILS_ROOT   ## in that case the initializers will be run during normal rails startup
+        Dir["#{RADIANT_ROOT}/config/initializers/**/*.rb"].sort.each do |initializer|
+          load(initializer)
+        end
+      end
+    end
 
     def after_initialize
       super
       extension_loader.activate_extensions
       configuration.check_extension_dependencies
     end
-
+    
     def initialize_default_admin_tabs
       admin.nav.clear
       admin.load_default_nav
     end
 
     def initialize_framework_views
-      view_paths = returning [] do |arr|
+      view_paths = [].tap 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

data/lib/radiant/pagination/controller.rb

@@ -22,6 +22,7 @@ module Radiant::Pagination::Controller
 
   def self.included(base)
     base.class_eval {
+      helper_method :pagination_parameters
       before_filter :configure_pagination
     }
   end

data/lib/radiant/setup.rb

@@ -20,7 +20,7 @@ module Radiant
       UserActionObserver.current_user = @admin
       load_default_configuration
       load_database_template(config[:database_template])
-      announce "Finished.\n\n"
+      announce "Finished."
     end
     
     def create_admin_user(name, username, password)
@@ -50,6 +50,7 @@ module Radiant
         step { Radiant::Config['defaults.page.parts' ] = 'body, extended' }
         step { Radiant::Config['defaults.page.status' ] = 'draft' }
         step { Radiant::Config['defaults.page.filter' ] = nil }
+        step { Radiant::Config['defaults.page.fields'] = 'Keywords, Description' }
         step { Radiant::Config['session_timeout'] = 2.weeks }
         step { Radiant::Config['default_locale'] = 'en' }
       end
@@ -68,7 +69,10 @@ 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
+        templates.concat find_and_load_templates("#{RADIANT_ROOT}/vendor/extensions/**/db/templates/*.yml")
+        templates.concat find_and_load_templates("#{Rails.root}/vendor/extensions/**/db/templates/*.yml")
+        templates.concat find_and_load_templates("#{Rails.root}/db/templates/*.yml")
+        templates.uniq!
         choose do |menu|
           menu.header = "\nSelect a database template"
           menu.prompt = "[1-#{templates.size}]: "
@@ -113,15 +117,19 @@ module Radiant
       end
       
       def find_template_in_path(filename)
-        [
-          filename,
-          "#{RADIANT_ROOT}/#{filename}",
-          "#{RADIANT_ROOT}/db/templates/#{filename}",
-          "#{RAILS_ROOT}/#{filename}",
-          "#{RAILS_ROOT}/db/templates/#{filename}",
-          "#{Dir.pwd}/#{filename}",
-          "#{Dir.pwd}/db/templates/#{filename}",
-        ].find { |name| File.file?(name) }
+        (
+          [
+            filename,
+            "#{RADIANT_ROOT}/#{filename}",
+            "#{RADIANT_ROOT}/db/templates/#{filename}",
+            "#{Rails.root}/#{filename}",
+            "#{Rails.root}/db/templates/#{filename}",
+            "#{Dir.pwd}/#{filename}",
+            "#{Dir.pwd}/db/templates/#{filename}"
+          ] +
+          Dir.glob("#{RADIANT_ROOT}/vendor/extensions/**/db/templates/#{filename}") + 
+          Dir.glob("#{Rails.root}/vendor/extensions/**/db/templates/#{filename}")
+        ).find { |name| File.file?(name) }
       end
       
       def find_and_load_templates(glob)

data/lib/task_support.rb

@@ -16,15 +16,21 @@ class TaskSupport
     end
     def config_import(path = "#{Rails.root}/config/radiant_config.yml", clear = nil)
       self.establish_connection
-      Radiant::Config.delete_all if clear
       if File.exist?(path)
-          configs = YAML.load(YAML.load_file(path))
-          configs.each do |key, value|
-            c = Radiant::Config.find_or_initialize_by_key(key)
-            c.value = value
-            c.save
+        begin
+          Radiant::Config.transaction do
+            Radiant::Config.delete_all if clear
+            configs = YAML.load(YAML.load_file(path))
+            configs.each do |key, value|
+              c = Radiant::Config.find_or_initialize_by_key(key)
+              c.value = value
+              c.save
+            end
           end
-        puts "Radiant::Config updated from #{path}"
+          puts "Radiant::Config updated from #{path}"
+        rescue ActiveRecord::RecordInvalid => e
+          puts "IMPORT FAILED and rolled back. #{e}"
+        end
       else
         puts "No file exists at #{path}"
       end
@@ -37,7 +43,7 @@ class TaskSupport
         File.read(File.join(dir, f)) }.join("\n\n")
 
       cache_path = File.join(dir, cache_file)
-      rm(cache_path) if File.exists?(cache_path)
+      File.delete(cache_path) if File.exists?(cache_path)
       File.open(cache_path, "w+") { |f| f.write(cache_content) }
     end
 

data/lib/tasks/database.rake

@@ -27,5 +27,7 @@ namespace :db do
       :admin_password => ENV['ADMIN_PASSWORD'],
       :database_template => ENV['DATABASE_TEMPLATE']
     )
+    Rake::Task['db:migrate:extensions'].invoke
+    Rake::Task['radiant:extensions:update_all'].invoke
   end
 end

data/lib/tasks/framework.rake

@@ -61,9 +61,9 @@ unless File.directory? "#{RAILS_ROOT}/app"
       rm_rf "vendor/radiant"
     end
 
-    desc "Update configs, scripts, sass, stylesheets and javascripts from Radiant."
+    desc "Update configs, scripts, html, images, sass, stylesheets and javascripts from Radiant."
     task :update do
-      tasks = %w{scripts javascripts configs initializers images sass stylesheets cached_assets}
+      tasks = %w{scripts javascripts configs static_html images sass stylesheets cached_assets}
       tasks = tasks & ENV['ONLY'].split(',') if ENV['ONLY']
       tasks = tasks - ENV['EXCEPT'].split(',') if ENV['EXCEPT']
       tasks.each do |task| 
@@ -166,11 +166,21 @@ the new files:"
         end
       end
 
-      desc "Update admin images from your current radiant install"
+      desc "Update static HTML files from your current radiant 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"
       task :images do
-        project_dir = RAILS_ROOT + '/public/images/admin/'
-        images = Dir["#{File.dirname(__FILE__)}/../../public/images/admin/*"]
-        FileUtils.cp(images, project_dir)
+        %w{admin radiant}.each do |d|
+          project_dir = RAILS_ROOT + "/public/images/#{d}/"
+          FileUtils.mkdir_p(project_dir)
+          images = Dir["#{File.dirname(__FILE__)}/../../public/images/#{d}/*"]
+          FileUtils.cp(images, project_dir)
+        end
       end
 
       desc "Update admin stylesheets from your current radiant install"
@@ -188,19 +198,26 @@ the new files:"
       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')
+          sass_files.reject!{|s| File.directory?(s) }
           FileUtils.mkpath(project_dir)
-          FileUtils.cp_r(sass_files, project_dir)
+          FileUtils.cp(sass_files, project_dir)
+        end
+        sass_dir = "#{RADIANT_ROOT}/public/stylesheets/sass/admin"
+        copy_sass[RAILS_ROOT + '/public/stylesheets/sass/admin/', Dir["#{sass_dir}/*"]]
+        Dir["#{sass_dir}/*"].each do |d|
+          if File.directory?(d)
+            copy_sass[RAILS_ROOT + "/public/stylesheets/sass/admin/#{File.basename(d)}/", Dir["#{d}/*"]]
+          end
         end
-        copy_sass[RAILS_ROOT + '/public/stylesheets/sass/admin/', Dir["#{RADIANT_ROOT}/public/stylesheets/sass/admin/*"]]
       end
 
-      desc "Update initializers from your current radiant install"
-      task :initializers do
-        project_dir = RAILS_ROOT + '/config/initializers/'
-        FileUtils.mkpath project_dir
-        initializers = Dir["#{File.dirname(__FILE__)}/../../config/initializers/*.rb"]
-        FileUtils.cp(initializers, project_dir)
-      end
+      # desc "Update initializers from your current radiant install"
+      # task :initializers do
+      #   project_dir = RAILS_ROOT + '/config/initializers/'
+      #   FileUtils.mkpath project_dir
+      #   initializers = Dir["#{File.dirname(__FILE__)}/../../config/initializers/*.rb"]
+      #   FileUtils.cp(initializers, project_dir)
+      # end
     end
   end
 end

data/lib/tasks/prototype.rake

@@ -3,30 +3,27 @@ namespace :radiant do
     namespace :prototype do
       
       desc "Import images, javascripts, and styles from prototype"
-      task :assets => [:images, :javascripts, :styles]
+      task :assets => [:images, :javascripts, :stylesheets]
       
       desc "Import images from prototype"
       task :images do
+        FileUtils.rm_r "public/images/admin"
         FileUtils.mkpath "public/images/admin"
-        FileUtils.cp_r "../prototype/images/admin", "public/images"
+        FileUtils.cp_r "../prototype/public/images/admin", "public/images"
       end
       
       desc "Import javascripts from prototype"
       task :javascripts do
+        FileUtils.rm_r "public/javascripts/admin"
         FileUtils.mkpath "public/javascripts/admin"
-        FileUtils.cp_r "../prototype/javascripts/admin", "public/javascripts"
+        FileUtils.cp_r "../prototype/public/javascripts/admin", "public/javascripts"
       end
       
-      desc "Import styles from prototype"
-      task :styles do
+      desc "Import stylesheets from prototype"
+      task :stylesheets do
+        FileUtils.rm_r "public/stylesheets/sass/admin"
         FileUtils.mkpath "public/stylesheets/sass/admin"
         FileUtils.cp_r "../prototype/stylesheets/admin", "public/stylesheets/sass"
-        filename = 'public/stylesheets/sass/admin/main.sass'
-        content = IO.read(filename)
-        File.open(filename, "w") do |f|
-          f.write(content.gsub(%r{@import _}, '@import admin/_'))
-        end
-        FileUtils.rm_rf "public/stylesheets/admin"
       end
       
     end

data/lib/tasks/release.rake

@@ -34,6 +34,7 @@ namespace 'radiant' do
     s.executables = (Dir['bin/*'] + Dir['scripts/*']).map { |file| File.basename(file) } 
     s.add_dependency 'rake', '>= 0.8.3'
     s.add_dependency 'rack', '~> 1.1.0' # No longer bundled in actionpack
+    s.add_dependency 'compass', '~> 0.10.4'
     s.add_dependency 'will_paginate', '~> 2.3.11'
     s.add_dependency 'RedCloth', '>=4.0.0'
     s.has_rdoc = true