radiant 0.5.2 → 0.6.0

data/config/boot.rb

@@ -1,11 +1,5 @@
 # Don't change this file. Configuration is done in config/environment.rb and config/environments/*.rb
 
-module BootUtil
-  def self.find_gem(name, version)
-    Gem.cache.search(name, "=#{version}").first
-  end
-end
-
 unless defined?(RAILS_ROOT)
   root_path = File.join(File.dirname(__FILE__), '..')
 
@@ -17,64 +11,24 @@ unless defined?(RAILS_ROOT)
   RAILS_ROOT = root_path
 end
 
-unless defined?(RADIANT_ROOT)
-  instance_config = File.join(RAILS_ROOT, "config", "instance.yml")
-  unless File.file?(instance_config)
-    RADIANT_ROOT = RAILS_ROOT
+unless defined? RADIANT_ROOT 
+  if File.directory?(root_path = "#{RAILS_ROOT}/vendor/radiant")
+    RADIANT_ROOT = root_path
   else
-    require 'yaml'
-    cfg = YAML.load_file(instance_config)
-    if version = cfg['Gem Version']
-      require 'rubygems'
-      if radiant_gem = BootUtil.find_gem('radiant', version)
-        require_gem 'radiant', "= #{version}"
-      else
-        STDERR.puts %(
-Cannot find gem for Radiant =#{version}:
-  Install the missing gem with 'gem install -v=#{version} radiant', or
-  change config/instance.yml to define 'Gem Version' with your desired
-  version.
-)
-        exit 1
-      end
-    else
-      RADIANT_ROOT = cfg['Radiant Root']
-    end
+    RADIANT_ROOT = RAILS_ROOT
   end
+end
+
+unless defined? Radiant::Initializer
   (
+    ["#{RADIANT_ROOT}/lib", "#{RADIANT_ROOT}/vendor"] +
     Dir["#{RADIANT_ROOT}/vendor/rails/*/lib"] +
     Dir["#{RADIANT_ROOT}/vendor/*/lib"]
-  ).each do |dir|
-    $:.unshift dir
-  end
-end
-
-unless defined?(Rails::Initializer)
-  if File.directory?("#{RAILS_ROOT}/vendor/rails")
-    require "#{RAILS_ROOT}/vendor/rails/railties/lib/initializer"
-  else
-    environment_without_comments = IO.readlines(File.dirname(__FILE__) + '/environment.rb').reject { |l| l =~ /^#/ }.join
-    environment_without_comments =~ /[^#]RAILS_GEM_VERSION = '([\d.]+)'/
-    rails_gem_version = $1
-    
-    require 'rubygems'
-    if version = defined?(RAILS_GEM_VERSION) ? RAILS_GEM_VERSION : rails_gem_version
-      if rails_gem = BootUtil.find_gem('rails', version)
-        require_gem "rails", "=#{version}"
-        require rails_gem.full_gem_path + '/lib/initializer'
-      else
-        STDERR.puts %(
-Cannot find gem for Rails =#{version}:
-  Install the missing gem with 'gem install -v=#{version} rails', or
-  change environment.rb to define RAILS_GEM_VERSION with your desired version.
-)
-        exit 1
-      end
-    else
-      require_gem "rails"
-      require 'initializer'
-    end
+  ).reverse_each do |path|
+    $LOAD_PATH.unshift path
   end
-  
-  Rails::Initializer.run(:set_load_path)
+  $LOAD_PATH.uniq!
+  require 'radiant'
+  require 'radiant/initializer'
+  Radiant::Initializer.run(:set_load_path)
 end

data/config/database.mysql.yml

@@ -1,3 +1,8 @@
+#
+# This is only an example configuration. Please see the Rails
+# documentation for more details.
+#
+
 development:
   adapter: mysql
   database: radiant_dev

data/config/database.postgresql.yml

@@ -1,3 +1,8 @@
+#
+# This is only an example configuration. Please see the Rails
+# documentation for more details.
+#
+
 development:
   adapter: postgresql
   database: radiant_dev

data/config/database.sqlite.yml

@@ -1,20 +1,16 @@
+#
+# This is only an example configuration. Please see the Rails
+# documentation for more details.
+#
+
 development:
-  adapter: sqlite
-  database: db/radiant_dev.sqlite.db
-  username: root
-  password:
-  host: localhost
+  adapter: sqlite3
+  database: db/radiant_dev.db
   
 test:
-  adapter: sqlite
-  database: db/radiant_test.sqlite.db
-  username: root
-  password:
-  host: localhost
+  adapter: sqlite3
+  database: db/radiant_test.db
 
 production:
-  adapter: sqlite
-  database: db/radiant_live.sqlite.db
-  username: root
-  password:
-  host: localhost
+  adapter: sqlite3
+  database: db/radiant_live.db

data/config/database.sqlserver.yml

@@ -0,0 +1,20 @@
+development:
+  adapter: sqlserver
+  database: radiant_dev
+  username:
+  password:
+  host:
+
+test:
+  adapter: sqlserver
+  database: radiant_test
+  username:
+  password:
+  host:
+
+production:
+  adapter: sqlserver
+  database: radiant_live
+  username:
+  password:
+  host:

data/config/environment.rb

@@ -1,8 +1,3 @@
-# Be sure to restart your web server when you modify this file.
-
-# Rails Gem Version
-RAILS_GEM_VERSION = '1.1.6'
-
 # Uncomment below to force Rails into production mode when 
 # you don't control web/app server and can't set it the proper way
 # ENV['RAILS_ENV'] ||= 'production'
@@ -12,7 +7,7 @@ require File.join(File.dirname(__FILE__), 'boot')
 
 require 'radius'
 
-Rails::Initializer.run do |config|
+Radiant::Initializer.run do |config|
   # Settings in config/environments/* take precedence those specified here
   
   # Skip frameworks you're not going to use
@@ -23,8 +18,6 @@ Rails::Initializer.run do |config|
     app/controllers
     app/models
     app/helpers
-    app/behaviors
-    app/filters
     lib
   ).map { |path| File.join(RADIANT_ROOT, path) }
   config.controller_paths << File.join(RADIANT_ROOT, 'app', 'controllers')
@@ -46,9 +39,15 @@ Rails::Initializer.run do |config|
   # Make Active Record use UTC-base instead of local time
   config.active_record.default_timezone = :utc
   
+  # Activate observers that should always be running
+  config.active_record.observers = :user_action_observer
+  
   # Make sure plugins are loaded from lib and vendor
-  config.plugin_paths = ["#{RAILS_ROOT}/vendor/plugins", "#{RADIANT_ROOT}/lib/plugins",
-    "#{RADIANT_ROOT}/vendor/plugins"]
+  config.plugin_paths = [
+    "#{RAILS_ROOT}/vendor/plugins",
+    "#{RADIANT_ROOT}/lib/plugins",
+    "#{RADIANT_ROOT}/vendor/plugins"
+  ]
 
   # See Rails::Configuration for more options
 end
@@ -56,21 +55,17 @@ end
 # Add new inflection rules using the following format:
 Inflector.inflections do |inflect|
   inflect.uncountable 'config'
+  inflect.uncountable 'meta'
 end
 
 # Auto-require text filters
-Dir["#{RADIANT_ROOT}/app/filters/*_filter.rb"].each do |filter|
+Dir["#{RADIANT_ROOT}/app/models/*_filter.rb"].each do |filter|
+  filter = $1 if filter =~ %r{/([^/]+)\.rb}
   require_dependency filter
 end
 
-# Auto-require behaviors
-Dir["#{RADIANT_ROOT}/app/behaviors/*_behavior.rb"].each do |behavior|
-  require_dependency behavior
-end
-
 # Response Caching Defaults
 ResponseCache.defaults[:directory] = ActionController::Base.page_cache_directory
 ResponseCache.defaults[:logger]    = ActionController::Base.logger
 
-# Activate observers that should always be running
-ActiveRecord::Base.observers = :user_action_observer
+require "status"

data/config/environments/production.rb

@@ -17,6 +17,4 @@ ResponseCache.defaults[:perform_caching]             = true
 # config.action_controller.asset_host                  = "http://assets.example.com"
 
 # Disable delivery errors if you bad email addresses should just be ignored
-# config.action_mailer.raise_delivery_errors = false
-
-require RADIANT_ROOT + '/app/models/page'
+# config.action_mailer.raise_delivery_errors = false

data/config/environments/test.rb

@@ -5,6 +5,8 @@
 # your test database is "scratch space" for the test suite and is wiped
 # and recreated between test runs.  Don't rely on the data there!
 config.cache_classes = true
+config.extension_paths << File.join(File.expand_path(RADIANT_ROOT), 'test', 'fixtures', 'extensions')
+config.extension_paths.uniq!
 
 # Log error messages when you accidentally call methods on nil.
 config.whiny_nils    = true

data/config/routes.rb

@@ -23,6 +23,8 @@ ActionController::Routing::Routes.draw do |map|
     page.page_remove       'admin/pages/remove/:id',             :action => 'remove'
     page.page_add_part     'admin/ui/pages/part/add',            :action => 'add_part'
     page.page_children     'admin/ui/pages/children/:id/:level', :action => 'children',   :level => '1'
+    page.tag_reference     'admin/ui/pages/tag_reference',       :action => 'tag_reference'
+    page.filter_reference  'admin/ui/pages/filter_reference',    :action => 'filter_reference'
     page.clear_cache       'admin/pages/cache/clear',            :action => 'clear_cache'    
   end
 
@@ -51,6 +53,12 @@ ActionController::Routing::Routes.draw do |map|
     user.user_preferences  'admin/preferences',                  :action => 'preferences'
   end
   
+  # Extension Routes
+  map.with_options(:controller => 'admin/extension') do |extension|
+    extension.extension_index  'admin/extensions',                :action => 'index'
+    extension.extension_update 'admin/extensions/update',         :action => 'update'
+  end
+  
   # Site URLs
   map.with_options(:controller => 'site') do |site|
     site.homepage          '',                                   :action => 'show_page', :url => '/'

data/db/migrate/001_create_radiant_tables.rb

@@ -1,12 +1,12 @@
 class CreateRadiantTables < ActiveRecord::Migration
   def self.up
-    create_table "config" do |t|
+    create_table "config", :force => true do |t|
       t.column "key", :string, :limit => 40, :default => "", :null => false
       t.column "value", :string, :default => ""
     end
     add_index "config", ["key"], :name => "key", :unique => true 
 
-    create_table "pages" do |t|
+    create_table "pages", :force => true do |t|
       t.column "title", :string
       t.column "slug", :string, :limit => 100
       t.column "breadcrumb", :string, :limit => 160
@@ -21,14 +21,14 @@ class CreateRadiantTables < ActiveRecord::Migration
       t.column "updated_by", :integer
     end
 
-    create_table "page_parts" do |t|
+    create_table "page_parts", :force => true do |t|
       t.column "name", :string, :limit => 100
       t.column "filter", :string, :limit => 25
       t.column "content", :text
       t.column "page_id", :integer
     end
 
-    create_table "snippets" do |t|
+    create_table "snippets", :force => true do |t|
       t.column "name", :string, :limit => 100, :default => "", :null => false
       t.column "filter", :string, :limit => 25
       t.column "content", :text
@@ -39,7 +39,7 @@ class CreateRadiantTables < ActiveRecord::Migration
     end
     add_index "snippets", ["name"], :name => "name", :unique => true
 
-    create_table "layouts" do |t|
+    create_table "layouts", :force => true do |t|
       t.column "name", :string, :limit => 100
       t.column "content", :text
       t.column "created_at", :datetime
@@ -48,7 +48,7 @@ class CreateRadiantTables < ActiveRecord::Migration
       t.column "updated_by", :integer
     end
     
-    create_table "users" do |t|
+    create_table "users", :force => true do |t|
       t.column "name", :string, :limit => 100
       t.column "email", :string
       t.column "login", :string, :limit => 40, :default => "", :null => false

data/db/migrate/002_insert_initial_data.rb

@@ -1,52 +1,12 @@
 class InsertInitialData < ActiveRecord::Migration
-  class Page < ActiveRecord::Base
-  end
-  class Layout < ActiveRecord::Base
-  end
-  class Snippet < ActiveRecord::Base
-  end
-  class PagePart < ActiveRecord::Base
-      belongs_to :page
-  end
+  
+  # Historical. We no longer rely on this migration to insert the initial data into
+  # the database. Instead we recommend `rake db:bootstrap`.
+
   def self.up
-    now = Time.now
-    
-    puts "Creating the user 'admin' with the password 'radiant'..."
-    admin = User.new :name => 'Administrator', :login => 'admin', :password => 'radiant', :password_confirmation => 'radiant', :admin => true, :created_at => now, :updated_at => now
-    admin.save!
-    
-    puts "Initializing configuration..."
-    Radiant::Config['admin.title'   ] = 'Radiant CMS'
-    Radiant::Config['admin.subtitle'] = 'Publishing for Small Teams'
-    Radiant::Config['default.parts' ] = 'body, extended'
-    
-    puts "Create initial layout..."
-    layout = Layout.create :name => 'Normal', :content => <<-HTML, :created_at => now, :created_by => admin, :updated_at => now, :updated_by => admin
-<html>
-  <head><title><r:title /></title></head>
-  <body>
-    <r:snippet name="header" />
-    <r:content />
-    <r:content part="extended" />
-    <r:snippet name="footer" />
-  </body>
-</html>
-    HTML
-    
-    puts "Creating home page..."
-    home_page = Page.create :title => 'Home Page', :slug => '/', :breadcrumb => 'Home', :status_id => 100, :parent_id => nil, :layout_id => layout, :created_at => now, :created_by => admin, :updated_at => now, :updated_by => admin
-    PagePart.create :name => 'body', :content => 'This is body content for your home page.', :page => home_page
-    
-    puts "Creating snippets..."
-    Snippet.create :name => 'header', :content => <<-HTML
-<h1><r:title /></h1>
-    HTML
-    Snippet.create :name => 'footer', :content => <<-HTML
-<hr />
-<p>Powered by <a href="http://radiantcms.org/">Radiant CMS</a></p>
-    HTML
   end
 
   def self.down
   end
+  
 end

data/db/migrate/006_integer_columns_to_boolean.rb

@@ -1,11 +1,36 @@
 class IntegerColumnsToBoolean < ActiveRecord::Migration
+  
+  class User < ActiveRecord::Base; end
+  
   def self.up
     change_column "users", "admin",     :boolean, :default => false, :null => false
     change_column "users", "developer", :boolean, :default => false, :null => false
   end
-
+  
   def self.down
     change_column "users", "admin",     :integer, :limit => 1, :default => 0, :null => false
     change_column "users", "developer", :integer, :limit => 1, :default => 0, :null => false
   end
+  
+  def self.change_column(table, column, type, options={})
+    model_class = table.singularize.camelize.constantize
+    
+    announce "saving #{model_class} data"
+    old_values = model_class.find(:all).map do |model|
+      [model.id, model.send("#{column}?")]
+    end
+    
+    remove_column table, column
+    add_column table, column, type, options
+    
+    model_class.reset_column_information
+    
+    announce "restoring #{model_class} data"
+    old_values.each do |(id, value)|
+      model = model_class.find(id)
+      model.send "#{column}=", value
+      model.save
+    end
+  end
+  
 end

data/db/migrate/010_merge_behaviors_and_pages.rb

@@ -0,0 +1,57 @@
+class MergeBehaviorsAndPages < ActiveRecord::Migration
+  class OldPage < ActiveRecord::Base
+    set_table_name 'pages'
+  end
+  
+  @@page_map = {
+    "Page Missing" => "FileNotFoundPage"
+  }
+  
+  @@behavior_map = @@page_map.invert
+  
+  def self.up
+    announce "converting behavior names to class names"
+    Page.find(:all).each do |page|
+      unless page.behavior_id.blank?
+        page.behavior_id = page_name(page.behavior_id)
+        page.save!
+      end
+    end
+    rename_column :pages, :behavior_id, :type
+  end
+
+  def self.down
+    rename_column :pages, :type, :behavior_id
+    OldPage.reset_column_information
+    announce "converting class names back to behavior names"
+    OldPage.find(:all).each do |page|
+      unless page.behavior_id.blank?
+        page.behavior_id = behavior_name(page.behavior_id)
+        page.save!
+      end
+    end
+  end
+  
+  def self.page_name(behavior_name)
+    if @@page_map.has_key?(behavior_name)
+      @@page_map[behavior_name]
+    else
+      name = behavior_name.scan(/\w+/).map { |word| word.capitalize }.join
+      name = $1 if name =~ /^(.*?)Behavior$/
+      name += "Page" unless name =~ /Page$/
+      name
+    end
+  end
+  
+  def self.behavior_name(page_name)
+    if @@behavior_map.has_key?(page_name)
+      @@behavior_map[page_name]
+    else
+      name = page_name.gsub(/(^.|[A-Z])/, ' \1').strip
+      name = $1 if name =~ /^(.*)Page$/
+      name
+    end
+  end
+  
+
+end