radiant 0.5.0 → 0.5.1

data/config/environment.rb

@@ -1,7 +1,7 @@
 # Be sure to restart your web server when you modify this file.
 
 # Rails Gem Version
-RAILS_GEM_VERSION = '1.1.2'
+RAILS_GEM_VERSION = '1.1.5'
 
 # Uncomment below to force Rails into production mode when 
 # you don't control web/app server and can't set it the proper way

data/db/migrate/001_create_radiant_tables.rb

@@ -4,6 +4,7 @@ class CreateRadiantTables < ActiveRecord::Migration
       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|
       t.column "title", :string
@@ -69,5 +70,6 @@ class CreateRadiantTables < ActiveRecord::Migration
     drop_table "snippets"
     drop_table "layouts"
     drop_table "users"
+    drop_table "config"
   end
 end

data/db/migrate/002_insert_initial_data.rb

@@ -1,13 +1,20 @@
 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
   def self.up
     now = Time.now
     
     puts "Creating the user 'admin' with the password 'radiant'..."
-    admin = User.create :name => 'Administrator', :login => 'admin', :password => 'radiant', :password_confirmation => 'radiant', :admin => true, :created_at => now, :updated_at => now
-    admin.created_by = admin
-    admin.updated_by = admin
-    admin.save
-
+    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'

data/lib/console_utils.rb

@@ -0,0 +1,167 @@
+autoload 'FileUtils', 'fileutils'
+autoload 'Pathname', 'pathname'
+
+module ConsoleUtils
+  def stdout
+    @stdout ||= $stdout
+  end
+  
+  def stdin
+    @stdin ||= $stdin
+  end
+
+  def print(*args)
+    stdout << args
+    stdout.flush
+  end
+  
+  def indent_level
+    @indent_level.to_i
+  end
+  
+  def indent_level=(value)
+    @indent_level = value.to_i
+  end
+  
+  def indentation
+    '  ' * indent_level
+  end
+  
+  def indent
+    self.indent_level += 1
+    if block_given?
+      yield
+      unindent
+    end
+    nil
+  end
+  
+  def unindent
+    self.indent_level -= 1
+    nil
+  end
+
+  def puts(*args)
+    args << '' if args.empty?
+    print *(args.map { |a| "#{ indentation }#{ a }\n" })
+  end
+  
+  def announce(text)
+    puts text
+    indent do
+      yield
+    end
+  end
+  
+  def gets
+    stdin.gets
+  end
+
+  def ask_yes_or_no(question, default = :yes)
+    prompt = (default == :yes) ? "[Yn]" : "[yN]"
+    loop do
+      print "#{ indentation }#{ question }? #{ prompt } "
+      case gets.strip.downcase
+      when "yes", "y"
+        break true
+      when "no", "n"
+        break false
+      when ""
+        break default == :yes
+      else
+        invalid_option
+      end
+    end
+  end
+  
+  def copy_files(from, to, options = {})
+    ignore = @ignore || []
+    make_path(to)
+    Dir.foreach(from) do |file|
+      unless ignore.include?(file)
+        full_name = File.join(from, file)
+        if File.directory?(full_name)
+          copy_files full_name, File.join(to, file), options
+        else
+          copy_file full_name, File.join(to, file), options
+        end
+      end
+    end
+  end
+
+  def copy_file(from, to, options = {})
+    overwrite = options[:overwrite] || @overwrite
+    exists = File.file?(to)
+    overwrite = (exists and ask_yes_or_no("overwrite #{to}")) unless overwrite
+    return unless overwrite or not exists
+    make_path(File.dirname(to))
+    FileUtils.cp from, to
+    action = overwrite ? "overwrote" : "created"
+    puts "#{action} #{to}"
+  end
+  
+  def backup_file(filename)
+    if File.file?(filename)
+      backup = "#{ filename }.#{ Time.now.strftime("%Y%m%d") }.bak"
+      FileUtils.cp filename, backup
+      puts "backed up #{filename} as #{File.basename(backup)}"
+    end
+  end
+
+  def make_dir(dir)
+    unless File.directory?(dir)
+      FileUtils.mkdir dir
+      puts "created #{dir}"
+    end
+  end
+
+  def make_path(path)
+    unless File.directory?(path)
+      parts = path.split(%r{\\|/})
+      if parts.size > 1
+        parts.pop
+        make_path File.join(*parts)
+      end
+      make_dir path
+    end
+  end
+  
+  def read_file(filename)
+    contents = ''
+    open(filename) { |f| contents = f.read }
+    contents
+  end
+  
+  def write_file(filename, contents)
+    open(filename, 'w+') do |file|
+      file.puts contents
+    end
+  end
+
+  def create_file(filename, contents, options = {})
+    overwrite = options[:overwrite] || @overwrite
+    exists = File.file?(filename)
+    overwrite = (exists and ask_yes_or_no("overwrite #{filename}")) unless overwrite
+    return unless overwrite or not exists
+    write_file(filename, contents)
+    puts "created #{filename}"
+  end
+  
+  def remove_file(filename, options = {})
+    force = options[:force] || @overwrite
+    exists = File.file?(filename)
+    force = (exists and ask_yes_or_no("remove #{filename}")) unless force
+    return unless exists and force
+    FileUtils.rm filename
+    puts "removed #{filename}"
+  end
+  
+  def make_executable(filename)
+    FileUtils.chmod(0775, filename)
+    puts "made #{filename} executable"
+  end
+  
+  def clean_path(path)
+    Pathname.new(path).cleanpath(true).to_s unless path.nil?
+  end
+end

data/lib/radiant.rb

@@ -1,5 +1,18 @@
 RADIANT_ROOT = File.join(File.dirname(__FILE__), "..") unless defined? RADIANT_ROOT
 
-module Radiant
-  Version = '0.5.0'
+unless defined? Radiant::Version
+  module Radiant
+    module Version
+      Major = '0'
+      Minor = '5'
+      Tiny  = '1'
+    
+      class << self
+        def to_s
+          [Major, Minor, Tiny].join('.')
+        end
+        alias :to_str :to_s
+      end
+    end
+  end
 end

data/lib/tasks/release.rake

@@ -5,7 +5,7 @@ require 'rake/gempackagetask'
 require 'lib/radiant'
 
 PKG_NAME = 'radiant'
-PKG_VERSION = Radiant::Version
+PKG_VERSION = Radiant::Version.to_s
 PKG_FILE_NAME = "#{PKG_NAME}-#{PKG_VERSION}"
 RUBY_FORGE_PROJECT = PKG_NAME
 RUBY_FORGE_USER = 'jlong'
@@ -27,7 +27,7 @@ namespace 'radiant' do
     s.rubyforge_project = RUBY_FORGE_PROJECT
     s.platform = Gem::Platform::RUBY
     s.requirements << 'rails, redcloth, bluecloth, radius'
-    s.add_dependency 'rails',     '= 1.1.2'
+    s.add_dependency 'rails',     '= 1.1.5'
     s.add_dependency 'radius',    '>= 0.5.1', '< 0.6'
     s.add_dependency 'RedCloth',  '>= 3.0.3', '< 3.1'
     s.add_dependency 'BlueCloth', '>= 1.0.0', '< 1.1'
@@ -39,15 +39,19 @@ namespace 'radiant' do
     s.rdoc_options << '--title' << RDOC_TITLE << '--line-numbers' << '--main' << 'README'
     s.extra_rdoc_files = RDOC_EXTRAS
     files = FileList['**/*']
+    files.include 'public/.htaccess'
     files.exclude '**/._*'
+    files.exclude '**/*.rej'
+    files.exclude 'cache/*'
+    files.exclude 'config/database.yml'
+    files.exclude 'config/locomotive.yml'
+    files.exclude 'config/lighttpd.conf'
+    files.exclude 'db/*.sql*.db'
     files.exclude 'doc'
     files.exclude 'log/*'
+    files.exclude 'pkg'
     files.exclude 'tmp'
-    files.exclude 'cache/*'
     files.exclude 'vendor'
-    files.exclude 'pkg'
-    files.exclude 'config/database.yml'
-    files.exclude 'db/*.sql*.db'
     s.files = files.to_a
   end
 

data/public/.htaccess

@@ -0,0 +1,40 @@
+# General Apache options
+AddHandler fastcgi-script .fcgi
+#AddHandler cgi-script .cgi
+Options +FollowSymLinks +ExecCGI
+
+# If you don't want Rails to look in certain directories,
+# use the following rewrite rules so that Apache won't rewrite certain requests
+# 
+# Example:
+#   RewriteCond %{REQUEST_URI} ^/notrails.*
+#   RewriteRule .* - [L]
+
+# Redirect all requests not available on the filesystem to Rails
+# By default the cgi dispatcher is used which is very slow
+# 
+# For better performance replace the dispatcher with the fastcgi one
+#
+# Example:
+#   RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
+RewriteEngine On
+
+# If your Rails application is accessed via an Alias directive,
+# then you MUST also set the RewriteBase in this htaccess file.
+#
+# Example:
+#   Alias /myrailsapp /path/to/myrailsapp/public
+#   RewriteBase /myrailsapp
+
+RewriteRule ^$ index.html [QSA]
+RewriteRule ^([^.]+)$ $1.html [QSA]
+RewriteCond %{REQUEST_FILENAME} !-f
+RewriteRule ^(.*)$ dispatch.fcgi [QSA,L]
+
+# In case Rails experiences terminal errors
+# Instead of displaying this message you can supply a file here which will be rendered instead
+# 
+# Example:
+#   ErrorDocument 500 /500.html
+
+ErrorDocument 500 "<h2>Application error</h2>Rails application failed to start properly"

data/script/version

@@ -0,0 +1,5 @@
+#!/usr/bin/env ruby
+require File.dirname(__FILE__) + '/../config/boot'
+require "#{RADIANT_ROOT}/lib/radiant"
+
+puts "Radiant #{Radiant::Version}"

data/test/fixtures/pages.yml

@@ -6,7 +6,7 @@ homepage:
   slug: /
   status_id: 100
   parent_id:
-  published_at: 2006-01-30 08:41:07 -05:00
+  published_at: 2006-01-30 08:41:07 
 documentation:
   id: 2
   title: Documentation
@@ -14,7 +14,7 @@ documentation:
   slug: documentation
   status_id: 100
   parent_id: 1
-  published_at: 2006-01-30 08:41:07 -05:00
+  published_at: 2006-01-30 08:41:07 
 books:
   id: 3
   title: Books
@@ -22,7 +22,7 @@ books:
   slug: books
   status_id: 100
   parent_id: 2
-  published_at: 2006-01-30 08:41:07 -05:00
+  published_at: 2006-01-30 08:41:07 
 textile:
   id: 4
   title: Textile
@@ -30,7 +30,7 @@ textile:
   slug: textile
   status_id: 100
   parent_id: 1
-  published_at: 2006-01-30 08:41:07 -05:00
+  published_at: 2006-01-30 08:41:07 
 radius:
   id: 5
   title: Radius Test Page
@@ -39,7 +39,7 @@ radius:
   status_id: 100
   parent_id: 1
   created_by: 3
-  published_at: 2006-01-30 08:41:07 -05:00
+  published_at: 2006-01-30 08:41:07 
 <% for i in 1..3 %>
 radius_child_<%= i %>:
   id: <%= 5 + i %>
@@ -49,7 +49,7 @@ radius_child_<%= i %>:
   status_id: 100
   parent_id: 5
   created_by: 1
-  published_at: 2006-01-30 08:41:07 -05:00
+  published_at: 2006-01-30 08:41:07 
 <% end %>
 page_with_layout:
   id: 9
@@ -59,7 +59,7 @@ page_with_layout:
   status_id: 100
   layout_id: 1
   parent_id: 1
-  published_at: 2006-01-30 08:41:07 -05:00
+  published_at: 2006-01-30 08:41:07 
 another_page_with_layout:
   id: 52
   title: Another Page With Layout
@@ -68,7 +68,7 @@ another_page_with_layout:
   status_id: 100
   layout_id: 1
   parent_id: 1
-  published_at: 2006-01-30 08:41:07 -05:00
+  published_at: 2006-01-30 08:41:07 
 child_of_page_with_layout:
   id: 18
   title: Child of Page With Layout
@@ -76,7 +76,7 @@ child_of_page_with_layout:
   slug: child-of-page-with-layout
   status_id: 100
   parent_id: 9
-  published_at: 2006-01-30 08:47:07 -05:00
+  published_at: 2006-01-30 08:47:07 
 parent:
   id: 10
   title: Parent
@@ -84,7 +84,7 @@ parent:
   slug: parent
   status_id: 100
   parent_id: 1
-  published_at: 2006-01-30 08:41:07 -05:00
+  published_at: 2006-01-30 08:41:07 
 child:
   id: 11
   title: Child
@@ -92,7 +92,7 @@ child:
   slug: child
   status_id: 100
   parent_id: 10
-  published_at: 2006-01-30 08:41:07 -05:00
+  published_at: 2006-01-30 08:41:07 
 archive:
   id: 12
   title: Archive
@@ -101,7 +101,7 @@ archive:
   behavior_id: Archive
   status_id: 100
   parent_id: 1
-  published_at: 2006-01-30 08:41:07 -05:00
+  published_at: 2006-01-30 08:41:07 
 year_index:
   id: 41
   title: %Y Archive
@@ -110,7 +110,7 @@ year_index:
   status_id: 101
   parent_id: 12
   virtual: true
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07 
 month_index:
   id: 42
   title: %B %Y Archive
@@ -119,7 +119,7 @@ month_index:
   status_id: 101
   parent_id: 12
   virtual: true
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07 
 day_index:
   id: 43
   title: %B %d, %Y Archive
@@ -128,7 +128,7 @@ day_index:
   status_id: 101
   parent_id: 12
   virtual: true
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07 
 article:
   id: 13
   title: Article
@@ -136,7 +136,7 @@ article:
   slug: article
   status_id: 100
   parent_id: 12
-  published_at: 2000-05-01 08:41:07 -05:00
+  published_at: 2000-05-01 08:41:07 
 article2:
   id: 14
   title: Article Two
@@ -144,7 +144,7 @@ article2:
   slug: article-2
   status_id: 100
   parent_id: 12
-  published_at: 2000-06-09 08:42:04 -05:00
+  published_at: 2000-06-09 08:42:04 
 article3:
   id: 44
   title: Article Three
@@ -152,7 +152,7 @@ article3:
   slug: article-3
   status_id: 100
   parent_id: 12
-  published_at: 2000-06-10 12:02:43 -05:00
+  published_at: 2000-06-10 12:02:43 
 article4:
   id: 45
   title: Article Four
@@ -160,7 +160,7 @@ article4:
   slug: article-4
   status_id: 100
   parent_id: 12
-  published_at: 2000-08-06 03:32:31 -05:00
+  published_at: 2000-08-06 03:32:31 
 article5:
   id: 46
   title: Article Five
@@ -168,7 +168,7 @@ article5:
   slug: article-5
   status_id: 100
   parent_id: 12
-  published_at: 2001-08-06 03:32:31 -05:00
+  published_at: 2001-08-06 03:32:31 
 article_draft:
   id: 53
   title: Draft Article
@@ -213,7 +213,7 @@ assorted<%= i %>:
   slug: <%= (?a + (10 - i)).chr %>
   status_id: 100
   parent_id: 19
-  published_at: 2000-06-10 07:<%= '%02d' % (17 - i) %>:<%= '%02d' % (i + 11) %> -05:00
+  published_at: 2000-06-10 07:<%= '%02d' % (17 - i) %>:<%= '%02d' % (i + 11) %> 
 <% end %>
 assorted-draft:
   id: 40
@@ -229,7 +229,7 @@ news:
   slug: news
   status_id: 100
   parent_id: 1
-  published_at: 2006-01-30 08:41:07 -05:00
+  published_at: 2006-01-30 08:41:07 
 news_child_published:
   id: 31
   title: A Great Day for Ruby
@@ -237,7 +237,7 @@ news_child_published:
   slug: a-great-day-for-ruby
   status_id: 100
   parent_id: 30
-  published_at: 2006-01-30 08:41:07 -05:00
+  published_at: 2006-01-30 08:41:07 
 news_child_published_2:
   id: 32
   title: Another Great Day for Ruby
@@ -245,7 +245,7 @@ news_child_published_2:
   slug: another-great-day-for-ruby
   status_id: 100
   parent_id: 30
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07 
 grandchild:
   id: 33
   title: Grandchild
@@ -253,14 +253,14 @@ grandchild:
   slug: grandchild
   status_id: 100
   parent_id: 11
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07 
 great_grandchild:
   id: 34
   title: Great-Grandchild
   slug: great-grandchild
   status_id: 100
   parent_id: 33
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07 
 custom_tags:
   id: 35
   title: Custom Tags
@@ -268,56 +268,56 @@ custom_tags:
   behavior_id: Test Behavior
   status_id: 100
   parent_id: 1
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07 
 custom_tags_child:
   id: 36
   title: Custom Tags Child
   slug: child
   status_id: 100
   parent_id: 35
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07 
 page_with_yaml_config:
   id: 37
   title: Page with YAML config
   slug: page-with-yaml-config
   status_id: 100
   parent_id: 1
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07 
 small_test:
   id: 38
   title: Small Test
   slug: small-test
   status_id: 100
   parent_id: 1
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07 
 inheritance_test_page:
   id: 47
   title: Inheritance Test Page
   slug: inheritance-test-page
   status_id: 100
   parent_id: 1
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07 
 inheritance_test_page_child:
   id: 48
   title: Inheritance Test Page Child
   slug: child
   status_id: 100
   parent_id: 47
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07 
 inheritance_test_page_grandchild:
   id: 49
   title: Inheritance Test Page Grandchild
   slug: grandchild
   status_id: 100
   parent_id: 48
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07 
 gallery:
   id: 50
   title: Gallery
   slug: gallery
   status_id: 100
   parent_id: 1
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07 
 missing:
   id: 51
   title: File Not Found
@@ -325,7 +325,7 @@ missing:
   behavior_id: Page Missing
   status_id: 100
   parent_id: 50
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07 
 page_with_content_type_set_on_layout:
   id: 54
   title: Page With Content Type Set On Layout
@@ -333,7 +333,7 @@ page_with_content_type_set_on_layout:
   status_id: 100
   layout_id: 2
   parent_id: 1
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07 
 deep_nested_child_for_breadcrumbs:
   id: 55
   title: Deeply nested child for testing breadcrumbs
@@ -341,7 +341,7 @@ deep_nested_child_for_breadcrumbs:
   breadcrumb: Deeply nested child
   status_id: 100
   parent_id: 6
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07 
 homepage_draft:
   id: 56
   title: Home Page Draft
@@ -349,11 +349,11 @@ homepage_draft:
   slug: homepage_draft
   status_id: 1
   parent_id: 1
-  published_at: 2006-01-30 08:41:07 -05:00
+  published_at: 2006-01-30 08:41:07 
 gallery_draft:
   id: 57
   title: Gallery Draft
   slug: gallery_draft
   status_id: 1
   parent_id: 50
-  published_at: 2006-02-05 08:44:07 -05:00
+  published_at: 2006-02-05 08:44:07