radiant 0.5.2 → 0.6.0

data/CHANGELOG

@@ -1 +1,70 @@
-= Change Log
+== Change Log
+
+=== 0.6.0 Lapidary
+* Added support for extensions--an extremely flexible way to extend radiant
+* Merged Behaviors into the Page class; subclass page now instead
+* Improved database support for Postgres and Sqlite
+* Limited support for SQL Server
+* Exceptions from tags now bubble up during testing
+* Page parts are now sorted by ID so the order that you create them in is
+  preserved [Josh Ferguson]
+* Implemented tag documentation DSL and UI [Sean Cribbs]
+* Reworked the setup code
+* Renamed script/setup_database to rake db:bootstrap
+* Reworked the upgrade code to work around rake tasks
+* Added rake tasks for freezing and unfreezing radiant to the edge
+* r:children:each, r:children:first, and r:children:last now all accept the
+  same ordering and limit attributes and have the same defaults
+* Snippets are now responsive to global context via the r:page tag. This means 
+  that any tags inside r:page will refer to the page currently being rendered, 
+  i.e. the page requested, not the local contextual page via tags like 
+  r:children:each, etc. This is most relevant to recursive snippets like the 
+  sitemapper example [Sean Cribbs]
+* r:navigation now uses the pipe character ("|") to delimit URLs in the urls 
+  attribute rather than the semi-colon
+* :date now accepts a "for" attribute that specifies which attribute of the 
+  page to render. Valid values of the attribute are published_at, updated_at, 
+  created_at, and now.
+* Created the r:cycle tag to make alternating tables and lists possible
+* Added popups for filter and tag documentation inside the page editing 
+  interface
+* Added support for optimistic locking for all models [Daniel Shepherd]
+* Added support to Radiant::Config for boolean values [Sean Cribbs]
+* Caching no longer stores the headers and body in the same file [Daniel 
+  Shepherd]
+* Added support for the X-Sendfile header that works in conjunction with 
+  caching to speed it up (by default X-Sendfile support is off) [Daniel 
+  Shepherd]
+* Moved the images and stylesheets into images/admin and stylesheets/admin
+  respectively to make it easier for Radiant's assets to coexist easily with
+  the site's assets
+* Improved the Javascript that automatically updates the slug and breadcrumb
+  based off of the title so that it now response to all change events
+* For the full scoop on what's changed see Sean Cribbs' detailed blog post:
+  http://seancribbs.com/tech/2007/04/18/whats-new-in-radiant-0-6
+
+=== 0.5.2 Raildust (August 10, 2006)
+* Upgraded Rails to 1.1.6 because of a security vulnerability in 1.1.5
+
+=== 0.5.1 Gemdust (August 10, 2006)
+* Upgraded Rails to 1.1.5 because of a security vulnerability in 1.1.4
+* Added basic support for upgrades to the `radiant` command
+* Gem now includes the .htaccess file (this should make Apache users happier)
+* Updated icons for layouts
+* Migrations are now repaired so that you can run `rake migrate` to create the
+  initial database. (`script/setup_database` is still the recommended method.)
+  (closes ticket #46) [Daniel Shepherd]
+* When you collapse a branch in the admin page tree view and move to another
+  tab the collapsed status is now saved so that when you return, the collapsed
+  status is preserved. Also the status of collapsed branches is preserved when
+  collapsing and expanding parent nodes. (closes ticket #29) [Daniel Shepherd]
+* Fixed documentation problem in response_cache.rb (closes ticket #142) [Paul
+  Smith]
+* Fixed problem with timezones on fixtures causing tests to fail in Japan
+  (closes ticket #154) [Bodhi Philpot]
+* Fixed a problem with an error being thrown when the <r:context /> tag was
+  rendered with the inherit attribute set to true and the page part did not
+  exist (closes ticket #155) [Bodhi Philpot]
+
+=== 0.5.0 Grindstone (June 28, 2006)
+* First release.

data/CONTRIBUTORS

@@ -1,13 +1,30 @@
-= Contributors
 
-The following people have submitted changes which have been applied to the core:
+== Contributors
 
-=== 0.5.1
-* Daniel Shepherd
+The following people have submitted changes which have been applied to the
+core:
+
+=== 0.6.0 Lapidary
+* Alexander Horn
+* Adam Williams
+* Sean Santry
+* Sean Cribbs
+* Brian Gernhardt
+* Bodhi Philpot
+* Andrew Barnett
+* Jesse Newland
+* Josh Ferguson
+* Daniel Sheppard
+* Matte Edens
+* Jacob Burkhart
+* Chris Parrish
+
+=== 0.5.1 Gemdust
+* Daniel Sheppard
 * Paul Smith
 * Bodhi Philpot
 
-=== 0.5.0
+=== 0.5.0 Grindstone
 * Matt McCray
 * Paul Smith
 * Scott Walter

data/INSTALL

@@ -0,0 +1,36 @@
+
+== Installation and Setup
+
+Once you have extracted the files into the directory where you would like to
+install Radiant:
+
+1. Create the MySQL/PostgreSQL/SQLite databases for your Web site. You only
+   need to create the "production" database, but you may also want to create
+   the "development" and "test" databases if you are developing extensions
+   or running tests.
+
+2. Edit config/database.yml to taste.
+
+3. Run the database bootstrap rake task:
+   
+     % rake production db:bootstrap
+   
+   (If you would like bootstrap your development database run `rake
+   development db:bootstrap`.)
+
+4. Start it like a normal Rails application. To test execute:
+   
+     % script/server -e production
+   
+   And open your Web browser on port 3000 (http://localhost:3000). The
+   administrative interface is available at /admin/. By default the bootstrap
+   rake task creates a user called "admin" with a password of "radiant".
+
+When using Radiant on a production system you may also need to set permissions
+on the public and cache directories so that your Web server can access those
+directories with the user that it runs under.
+
+Once you've installed Radiant on your own Web site, be sure to add your name
+and Web site to the list of radiant users:
+
+http://dev.radiantcms.org/radiant/wiki/RadiantUsers

data/LICENSE

@@ -1,9 +1,21 @@
 == MIT License
 
-Copyright (c) 2006, John W. Long
+Copyright (c) 2006-2007, John W. Long.
 
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
 
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
 
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

data/README

@@ -1,73 +1,37 @@
 == Welcome to Radiant
 
-Radiant is a no-fluff, open source content management system designed
-for small teams. It is similar to Textpattern or MovableType, but is
-a general purpose content management system (not just a blogging
-engine).
+Radiant is a no-fluff, open source content management system designed for
+small teams. It is similar to Textpattern or MovableType, but is a general
+purpose content management system (not just a blogging engine).
 
 Radiant features:
 
 * An elegant user interface
 * The ability to arrange pages in a hierarchy
-* Flexible templating with layouts, snippets, page parts, and a
-  custom tagging language (Radius: http://radius.rubyforge.org)
-* Special page-oriented plugins called behaviors
+* Flexible templating with layouts, snippets, page parts, and a custom tagging
+  language (Radius: http://radius.rubyforge.org)
 * A simple user management/permissions system
-* Support for Markdown and Textile as well as traditional HTML
-  (it's easy to create other filters)
+* Support for Markdown and Textile as well as traditional HTML (it's easy to
+  create other filters)
+* An advanced plugin system
 * Operates in two modes: dev and production depending on the URL
 * A caching system which expires pages every 5 minutes
-* Built using Ruby on Rails (which means that extending Radiant is
-  as easy as any other Rails application)
+* Built using Ruby on Rails
 * And much more...
 
 
 == License
 
-Radiant is released under the MIT license and is copyright (c) 2006
-John W. Long. A copy of the MIT license can be found in the LICENSE
-file.
+Radiant is released under the MIT license and is copyright (c) 2006 John W.
+Long. A copy of the MIT license can be found in the LICENSE file.
 
 
 == Installation and Setup
 
-Radiant is a traditional Ruby on Rails application, meaning that you
-can configure and run it the way you would a normal Rails
-application.
+Radiant is a traditional Ruby on Rails application, meaning that you can
+configure and run it the way you would a normal Rails application.
 
-Once you have extracted the files into the directory where you would
-like to install Radiant:
-
-1. Create a MySQL/PostgreSQL/SQLite database for your Web site.
-
-2. Create config/database.yml for your database setup. (There are
-   several examples in the config directory.)
-
-3. Run the database setup script:
-
-     % script/setup_database production
-
-4. Start it like a normal Rails application. To test execute:
-
-     % script/server production
-   
-   And open your Web browser on port 3000 (http://localhost:3000).
-   
-When using Radiant on a production system you may also need to set
-permissions on the public and cache directories so that your Web server
-can access those directories with the user that it runs under.
-
-Once you've installed Radiant on your own Web site, be sure to add your
-name and Web site to the list of radiant users:
-
-http://dev.radiantcms.org/radiant/wiki/RadiantUsers
-
-
-== Radiant Admin Interface
-
-The administrative interface is available at /admin/. By default the
-`setup_database` script creates a user called "admin" with a password of
-"radiant".
+See the INSTALL file for more details.
 
 
 == Support
@@ -80,10 +44,9 @@ There is also a Trac powered dev site available here:
 
 http://dev.radiantcms.org/
 
-Please Note: Before filing a ticket on the dev site discuss your question
-or problem on the mailing list. This makes it much easier to manage
-legitimate tickets.
-
+Please Note: Before filing a ticket on the dev site discuss your question or
+problem on the mailing list. This makes it much easier to manage legitimate
+tickets.
 
 Enjoy!
 

data/Rakefile

@@ -1,10 +1,11 @@
-# Add your own tasks in files placed in lib/tasks ending in .rake,
-# for example lib/tasks/switchtower.rake, and they will automatically be available to Rake.
-
-require(File.join(File.dirname(__FILE__), 'config', 'boot'))
+require File.join(File.dirname(__FILE__), 'config', 'boot')
 
 require 'rake'
 require 'rake/testtask'
 require 'rake/rdoctask'
 
-require 'tasks/rails'
+require 'tasks/rails'
+
+unless Rake::Task.task_defined? "radiant:release"
+  Dir["#{RADIANT_ROOT}/lib/tasks/**/*.rake"].sort.each { |ext| load ext }
+end

data/app/controllers/admin/{model_controller.rb → abstract_model_controller.rb}

@@ -1,12 +1,11 @@
 class Admin::AbstractModelController < ApplicationController
   attr_accessor :cache
   
-  def self.model(*symbols)
-    first = symbols.first
-    class_eval %{ @@model_class = "#{first}".singularize.camelize.constantize }
-    super
+  def self.model_class(model_class = nil)
+    @model_class = model_class.to_s.camelize.constantize unless model_class.nil?
+    @model_class
   end
-
+  
   def initialize
     super
     @cache = ResponseCache.instance
@@ -18,12 +17,12 @@ class Admin::AbstractModelController < ApplicationController
 
   def new
     self.model = model_class.new
-    handle_new_or_edit_post
+    render :template => "admin/#{ model_symbol }/edit" if handle_new_or_edit_post
   end
   
   def edit
     self.model = model_class.find_by_id(params[:id])
-    render :template => "admin/#{ model_symbol }/new" if handle_new_or_edit_post
+    handle_new_or_edit_post
   end
   
   def remove
@@ -38,19 +37,19 @@ class Admin::AbstractModelController < ApplicationController
   protected
   
     def model_class
-      self.class.class_eval %{ @@model_class }
+      self.class.model_class
     end
-    
+  
     def model
       instance_variable_get("@#{model_symbol}")
     end
-    def models
-      instance_variable_get("@#{plural_model_symbol}")
-    end
-    
     def model=(object)
       instance_variable_set("@#{model_symbol}", object)
     end
+    
+    def models
+      instance_variable_get("@#{plural_model_symbol}")
+    end
     def models=(objects)
       instance_variable_set("@#{plural_model_symbol}", objects)
     end
@@ -99,19 +98,31 @@ class Admin::AbstractModelController < ApplicationController
     
     def announce_removed
       flash[:notice] = "#{humanized_model_name} has been deleted."
+    end
+    
+    def announce_update_conflict
+      flash[:error] = "#{humanized_model_name} has been modified since it was last loaded. Changes cannot be saved without potentially losing data."
+    end
+    
+    def clear_model_cache
+      cache.clear
     end
     
     def handle_new_or_edit_post(options = {})
       options.symbolize_keys
       if request.post?
-        model.attributes = params[model_symbol]
-        if save
-          cache.clear
-          announce_saved(options[:saved_message])
-          redirect_to continue_url(options)
-          return false
-        else
-          announce_validation_errors
+        model.attributes = params[model_symbol]
+        begin
+          if save
+            clear_model_cache
+            announce_saved(options[:saved_message])
+            redirect_to continue_url(options)
+            return false
+          else
+            announce_validation_errors
+          end
+        rescue ActiveRecord::StaleObjectError
+          announce_update_conflict
         end
       end
       true

data/app/controllers/admin/export_controller.rb

@@ -1,8 +1,6 @@
 class Admin::ExportController < ApplicationController
-  model :exporter, :user, :page, :page_part, :snippet, :layout
-  
   def yaml
-    @response.headers['Content-Type'] = "text/yaml"
+    response.headers['Content-Type'] = "text/yaml"
     render_text Radiant::Exporter.export
   end
 end

data/app/controllers/admin/extension_controller.rb

@@ -0,0 +1,10 @@
+class Admin::ExtensionController < ApplicationController
+  def index
+    @extensions = Radiant::Extension.descendants.sort_by { |e| e.extension_name }
+  end
+  
+  def update
+    Radiant::ExtensionLoader.reactivate(params[:enabled_extensions] || [])
+    redirect_to :action => 'index'
+  end
+end

data/app/controllers/admin/layout_controller.rb

@@ -1,7 +1,5 @@
-require_dependency 'admin/model_controller'
-
 class Admin::LayoutController < Admin::AbstractModelController
-  model :layout
+  model_class Layout
   
   attr_accessor :cache
   

data/app/controllers/admin/page_controller.rb

@@ -1,6 +1,6 @@
-class Admin::PageController < ApplicationController
-  model :page
-  
+class Admin::PageController < Admin::AbstractModelController
+  model_class Page
+  before_filter :initialize_meta_rows_and_buttons, :only => [:new, :edit]
   attr_accessor :cache
 
   def initialize
@@ -13,25 +13,20 @@ class Admin::PageController < ApplicationController
   end
   
   def new
-    @page = Page.new
+    @page = request.get? ? Page.new_with_defaults(config) : Page.new
     @page.slug = params[:slug]
     @page.breadcrumb = params[:breadcrumb]
     @page.parent = Page.find_by_id(params[:parent_id])
-    if request.get?
-      default_parts.each do |name|
-        @page.parts << PagePart.new(:name => name)
-      end
-    end
-    handle_new_or_edit_post
+    render :action => :edit if handle_new_or_edit_post
   end
 
   def edit
-    @page = Page.find_by_id(params[:id])
-    render :action => :new if handle_new_or_edit_post
+    @page = Page.find(params[:id])
+    handle_new_or_edit_post
   end
 
   def remove
-    @page = Page.find_by_id(params[:id])
+    @page = Page.find(params[:id])
     if request.post?
       announce_pages_removed(@page.children.count + 1)
       @page.destroy
@@ -61,13 +56,20 @@ class Admin::PageController < ApplicationController
     render(:layout => false)
   end
 
+  def tag_reference
+    @class_name = params[:class_name]
+    @display_name = @class_name.constantize.display_name
+  end
+  
+  def filter_reference
+    @filter_name = params[:filter_name]
+    @display_name = (@filter_name + "Filter").constantize.filter_name rescue "&lt;none&gt;"
+  end
+  
   private
-    def announce_page_saved
-      flash[:notice] = "Your page has been saved below."
-    end
-    
-    def announce_validation_errors
-      flash[:error] = "Validation errors occurred while processing this form. Please take a moment to review the form and correct any input errors before continuing."
+  
+    def announce_saved(message = nil)
+      flash[:notice] = message || "Your page has been saved below."
     end
     
     def announce_pages_removed(count)
@@ -77,43 +79,43 @@ class Admin::PageController < ApplicationController
         "The page was successfully removed from the site."
       end
     end
-    
+
+    def initialize_meta_rows_and_buttons
+      @buttons_partials ||= []
+      @meta ||= []
+      @meta << {:field => "slug", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 100}]}
+      @meta << {:field => "breadcrumb", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 160}]}
+    end
+     
     def announce_cache_cleared
       flash[:notice] = "The page cache was successfully cleared."
+    end
+    
+    def save
+      parts = @page.parts
+      parts_to_update = {}
+      (params[:part]||{}).each {|k,v| parts_to_update[v[:name]] = v }
+      
+      parts_to_remove = []
+      @page.parts.each do |part|
+        if(attrs = parts_to_update.delete(part.name))
+          part.attributes = part.attributes.merge(attrs)
+        else
+          parts_to_remove << part
+        end
+      end
+      parts_to_update.values.each do |attrs|
+        @page.parts.build(attrs)
+      end
+      if result = @page.save
+        new_parts = @page.parts - parts_to_remove
+        new_parts.each {|x| x.save}
+        @page.parts = new_parts
+      end
+      result
+    end
+    
+    def clear_model_cache
+      @cache.expire_response(@page.url)      
     end
-    
-    def handle_new_or_edit_post
-      if request.post?
-        @page.attributes = params[:page]
-        
-        original_names = @page.parts.map { |part| part.name }
-        new_names = (params[:part] || {}).values.map { |part| part[:name] }
-        names_to_remove = (original_names - new_names)
-        
-        parts_to_update = []
-        (params[:part] || {}).values.each do |v|
-          if part = @page.parts.find_by_name(v[:name])
-            part.attributes = part.attributes.merge(v)
-            parts_to_update << part
-          else
-            @page.parts.build(v)
-          end
-        end
-        if @page.save
-          names_to_remove.each { |name| @page.parts.find_by_name(name).destroy }
-          parts_to_update.each { |part| part.save }
-          @cache.expire_response(@page.url)
-          announce_page_saved
-          if params[:continue]
-            redirect_to page_edit_url(:id => @page.id)
-          else
-            redirect_to page_index_url
-          end
-          return false
-        else
-          announce_validation_errors
-        end
-      end
-      true
-    end
-end
+end