radiant 0.6.9 → 0.7.0

data/CHANGELOG

@@ -1,9 +1,111 @@
 == Change Log
 
+=== 0.7.0 Intaglio
+* Add Roasters template. [Paul du Coudray]
+* Make ResponseCache spec insensitive to key order. [Sean Cribbs]
+* Adjust <r:children:count /> to use same options as <r:children:each />.
+[Sean Cribbs]
+* Allowing for custom labels and other options in save_model_button.
+[Pat Allan]
+* Ignoring TextMate project files. [Pat Allan]
+* Present a more helpful error message when missing a mailer template.
+[Nikolay Karev]
+* Use ActiveRecord:Base#[] and ActiveRecord:Base#[]= instead of undocumented
+read_attribute and write_attribute. [August Lilleas]
+* Make extension installer use git submodules when appropriate. [Sean Cribbs]
+* Ease extension updates by proxying deprecated named routes. [Sean Cribbs]
+* Add support and specs for conditional GETs with ETags. [Sean Cribbs]
+* Initialize and update submodules when freezing edge. [John Muhl]
+* Add Nginx support to ResponseCache. [Sean Cribbs]
+* Changed (some) permissions examples not to use login_system_matcher.
+[Brandan Lennox]
+* Remove expensive grep of Rails log in spec. [Rick DeNatale]
+* Make markdown filter specs be tolerant of RDiscount. [Sean Cribbs]
+* Be more explicit about vendor libraries, move Textile requirement into
+core. [Sean Cribbs]
+* Add <r:children:each:if/unless_first/last> tags. [Rick DeNatale]
+* Use RDiscount's smart quotes instead of SmartyPants. [John Muhl]
+* Update extension generator to use new admin REST routing. [Jeroen Janssen]
+* Update Admin::ResourceController to overcome respond_to weaknesses by
+choosing HTML format by default. [Sean Cribbs]
+* Add an IE-specific integration spec. [Jeroen Janssen]
+* Update dataset, spec_integration, and vizres plugins. [Sean Cribbs]
+* Make specs and bootstrap work in instance mode. [Sean Cribbs]
+* Override spec:integration task and rescope some spec task options to
+RADIANT_ROOT. [Sean Cribbs]
+* Improve rspec-1.1.12 compatibility. [Sean Cribbs]
+* Add Ruby 1.8.7 compatibility patch. [Sean Cribbs]
+* Fix upgrade issue from 0.5.x where class_name is expected to be present.
+[Sean Cribbs]
+* Remove unneeded patch. [Sean Cribbs]
+* Add some inline documentation to resource controller. [Sean Cribbs]
+* Fix some form problems on pages. [Sean Cribbs]
+* Fix form on snippets/remove. [Sean Cribbs]
+* Make sure resourceful responses deeply clone on inheritance. [Sean Cribbs]
+* Fix broken Ajax children callback. [Sean Cribbs]
+* Fix broken URL in snippets/remove. [Sean Cribbs]
+* Correct assume_migrated_upto_version behavior in instance mode. [Sean Cribbs]
+* Correct missing @@configuration variable in initializer. [John Muhl]
+* Handle SQL special characters in extension names in migrations.
+[Erik Ostrom]
+* Converted extension migrations to use schema_migrations table instead
+of extension_meta. [Nathaniel Talbott, Sean Cribbs, Rick DeNatale]
+* Replaced scenarios with dataset. [Nathaniel Talbott, Adam Williams, Rick DeNatale]
+* Fix RSpec git submodules. [Nathaniel Talbott, Clinton Nixon]
+* Generate and fix gemspec for GitHub. [Sean Cribbs]
+* Add support for newer Textile and Markdown libraries, with fallbacks
+on packaged libraries. [Sean Cribbs, Jason Garber]
+* Make request parameters available to tags. [Brian Landau]
+* Add URL method helpers to tags. [Brian Landau]
+* Add some database indexes. [Yevgeny Smirnoff]
+* Added notice to install RSpec if a certain database error occurs.
+[Sytse Sijbrandij]
+* Refactor LoginSystem to use filter-skipping instead of controller
+tracking. [Sean Cribbs]
+* Add generator specs and more generators. [Brian Landau]
+* Add initial integration specs. [Adam Williams, Mark Imbriaco]
+* Refactor admin controllers and views toward RESTful principles.
+[Sean Cribbs, Clinton Nixon, Rick DeNatale]
+* Remove RSpec from packaged libraries. [Sean Cribbs]
+* Correct CSS validation errors. [John Muhl]
+* Add String#to_slug. [Andrew O'Brien]
+* New page parts should have the default filter_id. [Joe Van Dyk]
+* Show draft children by default on dev host. [Sean Cribbs]
+* Correct db:schema:dump error when in instance mode. [Pat Allan, Sean Cribbs]
+* Simplify set_javascripts_and_stylesheets. [Sean Cribbs]
+* Cleanup boot.rb and allow generators from user-installed plugins. [Sean Cribbs]
+* Added regions to user-preferences screen. [Jim Gay]
+* Apply Rails redirect sanitization patch. [Sean Cribbs]
+* Updated to Rspec and Rspec-Rails 1.1.8 [Jim Gay]
+* Added development dependency to INSTALL [Matt Henry]
+* Added reference to sample database configuration files to INSTALL. [Keith Bennett]
+* Added ZenTest development dependency to README. [Thomas Ingram]
+* Remove REXML expansion fix, included in Rails 2.1.1 [Sean Cribbs]
+* Upgrade to 2.1.1 [Sean Cribbs]
+* Fixed migrations for Rails 2.1 [Josh French]
+* Fixed final specs [Jim Gay]
+* Fixed up some specs for new Rails/RSpec [Josh French]
+* Updated timezone management [Josh French]
+* Update to Rails 2.1 [Jim Gay]
+* Update to RSpec 1.1.4 [Jim Gay]
+* Make Git extension install method recognize submodules. [Sean Cribbs]
+* Fix malformed Textile in standard tag descriptions. [Jason Garber]
+* Update script/extension help output. [Jim Gay]
+* Allow load_subclasses to work when multiple apps are on the same database.
+[Jim Gay]
+* Add REXML expansion fix. [Sean Cribbs]
+* Fix filter_reference admin helper for filter names that have spaces in
+them. [Mislav Marohnić]
+* Make script/extension more friendly, adding help and info commands. [Sean Cribbs]
+* Added more render regions to layout, snippet, user, and extension views. [Sean Cribbs]
+* Fixed the radiant:update:scripts to find the proper directory [Jim Gay]
+* Factor out dev? functionality in StandardTags, allowing other tags to access
+it. [Sean Cribbs]
+
 === 0.6.9 Etch
 * Make <r:random> accept dynamically generated options. [Jim Gay, Sean Cribbs]
 * Correctly set default 'inherit' to false on <r:unless_content> [Mark A. Yoon]
-* Correct authenticity token errors when using cookie session store [Sean 
+* Correct authenticity token errors when using cookie session store [Sean
 Cribbs]
 * Make script/extension executable. [Sean Cribbs]
 * Correct bugs in radiant:freeze:edge task. [Sean Cribbs]
@@ -12,11 +114,11 @@ Cribbs]
 * Correct error in radiant:update:configs task. [Sean Cribbs]
 
 === 0.6.8 Incise
-* Hide page publish date selector unless page.edit.published_date? config is 
+* Hide page publish date selector unless page.edit.published_date? config is
 set. [Sean Cribbs]
 * Add <r:yield /> tag to support snippets that accept blocks. [Andrew Neil]
 * Fix bug with FileNotFoundPage subclasses and draft status. [Glenn Murray]
-* Update radiant:freeze:edge task to support BRANCH, TAG, and REVISION. [John 
+* Update radiant:freeze:edge task to support BRANCH, TAG, and REVISION. [John
 Muhl]
 * Update to Haml 2.0.1. [Jim Gay]
 * Fix radiant:update:configs task to properly evaluate environment.rb

data/CONTRIBUTORS

@@ -4,6 +4,35 @@
 The following people have submitted changes which have been applied to the
 core:
 
+=== 0.7.0 Intaglio
+
+* Paul du Coudray
+* Nikolay Karev
+* August Lilleas
+* Brandan Lennox
+* Jeroen Janssen
+* Erik Ostrom
+* Nathaniel Talbott
+* Yevgeny Smirnoff
+* Sytse Sijbrandij
+* Brian Landau
+* Adam Williams
+* Mark Imbriaco
+* Rick DeNatale
+* Clinton Nixon
+* John Muhl
+* Andrew O'Brien
+* Joe Van Dyk
+* Pat Allan
+* Matt Henry
+* Keith Bennett
+* Thomas Ingram
+* Josh French
+* Jason Garber
+* Mislav Marohnić
+* Jim Gay
+* Sean Cribbs
+
 === 0.6.9 Etch
 * Mark A. Yoon
 * Jim Gay

data/INSTALL

@@ -9,7 +9,7 @@ install Radiant:
    the "development" and "test" databases if you are developing extensions
    or running tests.
 
-2. Edit config/database.yml to taste.
+2. Edit config/database.yml to taste.  There are example files available for various databases in the config directory.
 
 3. Run the database bootstrap rake task:
    
@@ -17,6 +17,8 @@ install Radiant:
    
    (If you would like bootstrap your development database run `rake
    development db:bootstrap`.)
+   
+   If you get the error "no such file to load -- spec/rake/spectask" please install Rspec (gem i rspec).
 
 4. Start it like a normal Rails application. To test execute:
    
@@ -33,4 +35,4 @@ 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://wiki.radiantcms.org/Radiant_Users
+http://wiki.radiantcms.org/Radiant_Users

data/LICENSE

@@ -1,6 +1,6 @@
 == MIT License
 
-Copyright (c) 2006-2007, John W. Long.
+Copyright (c) 2006-2009, John W. Long and Sean D. Cribbs.
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

data/README

@@ -35,6 +35,10 @@ configure and run it the way you would a normal Rails application.
 See the INSTALL file for more details.
 
 
+== Development Requirements
+
+ * gem install ZenTest rspec rspec-rails
+
 == Support
 
 The best place to get support is on the mailing list:

data/app/controllers/admin/abstract_model_controller.rb

@@ -1,6 +1,10 @@
 class Admin::AbstractModelController < ApplicationController
   attr_accessor :cache
   
+  def self.inherited(subclass)
+    ActiveSupport::Deprecation.warn("'Admin::AbstractModelController' has been deprecated.  Please update '#{subclass.name}' to use Admin::ResourceController.")
+  end
+  
   def self.model_class(model_class = nil)
     @model_class = model_class.to_s.camelize.constantize unless model_class.nil?
     @model_class

data/app/controllers/admin/extensions_controller.rb

@@ -0,0 +1,5 @@
+class Admin::ExtensionsController < ApplicationController
+  def index
+    @extensions = Radiant::Extension.descendants.sort_by { |e| e.extension_name }
+  end
+end

data/app/controllers/admin/layouts_controller.rb

@@ -0,0 +1,6 @@
+class Admin::LayoutsController < Admin::ResourceController
+  only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy,
+    :when => [:developer, :admin],
+    :denied_url => { :controller => 'admin/pages', :action => 'index' },
+    :denied_message => 'You must have developer privileges to perform this action.'
+end

data/app/controllers/admin/page_parts_controller.rb

@@ -0,0 +1,9 @@
+class Admin::PagePartsController < Admin::ResourceController
+  def create
+    self.model.attributes = params[model_symbol]
+    @controller_name = 'page'
+    @template_name = 'edit'
+    render :partial => "page_part", :object => model,
+      :locals => {:index => params[:index].to_i}
+  end
+end

data/app/controllers/admin/pages_controller.rb

@@ -0,0 +1,56 @@
+class Admin::PagesController < Admin::ResourceController
+  before_filter :initialize_meta_rows_and_buttons, :only => [:new, :edit, :create, :update]
+
+  responses do |r|
+    r.plural.html { render }
+    r.plural.js do
+      @level = params[:level].to_i
+      @template_name = 'index'
+      response.headers['Content-Type'] = 'text/html;charset=utf-8'
+      render :action => 'children.html.haml', :layout => false
+    end
+  end
+  
+  def index
+    @homepage = Page.find_by_parent_id(nil)
+    response_for :plural
+  end
+
+  def new
+    self.model = model_class.new_with_defaults(config)
+    if params[:page_id].blank?
+      self.model.slug = '/'
+    end
+    response_for :singular
+  end
+
+  private
+    def model_class
+      if params[:page_id]
+        Page.find(params[:page_id]).children
+      else
+        Page
+      end
+    end
+
+    def announce_saved(message = nil)
+      flash[:notice] = message || "Your page has been saved below."
+    end
+
+    def announce_pages_removed(count)
+      flash[:notice] = if count > 1
+        "The pages were successfully removed from the site."
+      else
+        "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}]}
+      @meta << {:field => "description", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 200}]}
+      @meta << {:field => "keywords", :type => "text_field", :args => [{:class => 'textbox', :maxlength => 200}]}
+    end
+end

data/app/controllers/admin/preferences_controller.rb

@@ -0,0 +1,46 @@
+class Admin::PreferencesController < ApplicationController
+  before_filter :load_user
+
+  def initialize
+    @controller_name = 'user'
+    @template_name = 'preferences'
+  end
+
+  def show
+    redirect_to :action => 'edit'
+  end
+
+  def edit
+    render
+  end
+
+  def update
+    if valid_params?
+      if @user.update_attributes(params[:user])
+        flash[:notice] = 'Your preferences have been updated.'
+        redirect_to admin_pages_path
+      else
+        flash[:error] = 'There was an error updating your preferences.'
+        render :action => 'edit'
+      end
+    else
+      announce_bad_data
+      render :action => 'edit'
+    end
+  end
+
+  private
+
+  def load_user
+    @user = current_user
+  end
+
+  def valid_params?
+    hash = (params[:user] || {}).symbolize_keys
+    (hash.keys - [:password, :password_confirmation, :email]).size == 0
+  end
+
+  def announce_bad_data
+    flash[:error] = 'Bad form data.'
+  end
+end

data/app/controllers/admin/references_controller.rb

@@ -0,0 +1,7 @@
+class Admin::ReferencesController < ApplicationController
+  def show
+    respond_to do |format|
+      format.any { render :action => params[:id] }
+    end
+  end
+end

data/app/controllers/admin/resource_controller.rb

@@ -0,0 +1,180 @@
+class Admin::ResourceController < ApplicationController
+  extend Radiant::ResourceResponses
+  
+  helper_method :model, :current_object, :models, :current_objects, :model_symbol, :plural_model_symbol, :model_class, :model_name, :plural_model_name
+  before_filter :populate_format
+  before_filter :load_models, :only => :index
+  before_filter :load_model, :only => [:new, :create, :edit, :update, :remove, :destroy]
+  after_filter :clear_model_cache, :only => [:create, :update, :destroy]
+
+  def self.model_class(model_class = nil)
+    @model_class ||= (model_class || self.controller_name).to_s.singularize.camelize.constantize
+  end
+
+  responses do |r|
+    # Equivalent respond_to block for :plural responses:
+    # respond_to do |wants|
+    #   wants.xml { render :xml => models }
+    #   wants.json { render :json => models }
+    #   wants.any
+    # end
+    r.plural.publish(:xml, :json) { render format_symbol => models }
+
+    r.singular.publish(:xml, :json) { render format_symbol => model }
+
+    r.invalid.publish(:xml, :json) { render format_symbol => model.errors, :status => :unprocessible_entity }
+    r.invalid.default {  announce_validation_errors; render :action => template_name }
+
+    r.stale.publish(:xml, :json) { head :conflict }
+    r.stale.default { announce_update_conflict; render :action => template_name }
+
+    r.create.publish(:xml, :json) { render format_symbol => model, :status => :created, :location => url_for(:format => format_symbol, :id => model) }
+    r.create.default { redirect_to continue_url(params) }
+
+    r.update.publish(:xml, :json) { head :ok }
+    r.update.default { redirect_to continue_url(params) }
+
+    r.destroy.publish(:xml, :json) { head :deleted }
+    r.destroy.default { redirect_to continue_url(params) }
+  end
+
+  def index
+    response_for :plural
+  end
+
+  [:show, :new, :edit, :remove].each do |action|
+    class_eval %{
+      def #{action}                # def show
+        response_for :singular     #   response_for :singular
+      end                          # end
+    }, __FILE__, __LINE__
+  end
+
+  [:create, :update].each do |action|
+    class_eval %{
+      def #{action}                                       # def create
+        model.update_attributes!(params[model_symbol])    #   model.update_attributes!(params[model_symbol])
+        announce_saved                                    #   announce_saved
+        response_for :#{action}                           #   response_for :create
+      end                                                 # end
+    }, __FILE__, __LINE__
+  end
+
+  def destroy
+    model.destroy
+    announce_removed
+    response_for :destroy
+  end
+
+  protected
+
+    def rescue_action(exception)
+      case exception
+      when ActiveRecord::RecordInvalid
+        response_for :invalid
+      when ActiveRecord::StaleObjectError
+        response_for :stale
+      else
+        super
+      end
+    end
+
+    def template_name
+      case self.action_name
+      when 'new','create'
+        'new'
+      when 'edit', 'update'
+        'edit'
+      when 'remove', 'destroy'
+        'remove'
+      end
+    end
+    
+    def model_class
+      self.class.model_class
+    end
+
+    def model
+      instance_variable_get("@#{model_symbol}") || load_model
+    end
+    alias :current_object :model
+    def model=(object)
+      instance_variable_set("@#{model_symbol}", object)
+    end
+    def load_model
+      self.model = if params[:id]
+        model_class.find(params[:id])
+      else
+        model_class.new
+      end
+    end
+
+    def models
+      instance_variable_get("@#{plural_model_symbol}") || load_models
+    end
+    alias :current_objects :models
+    def models=(objects)
+      instance_variable_set("@#{plural_model_symbol}", objects)
+    end
+    def load_models
+      self.models = model_class.all
+    end
+
+    def model_name
+      model_class.name
+    end
+    def plural_model_name
+      model_name.pluralize
+    end
+    alias :models_name :plural_model_name
+
+    def model_symbol
+      model_name.underscore.intern
+    end
+    def plural_model_symbol
+      model_name.pluralize.underscore.intern
+    end
+    alias :models_symbol :plural_model_symbol
+
+    def humanized_model_name
+      model_name.underscore.humanize
+    end
+
+    def continue_url(options)
+      options[:redirect_to] || (params[:continue] ? {:action => 'edit', :id => model.id} : {:action => "index"})
+    end
+
+    def announce_saved(message = nil)
+      flash[:notice] = message || "#{humanized_model_name} saved below."
+    end
+
+    def announce_validation_errors
+      flash.now[:error] = "Validation errors occurred while processing this form. Please take a moment to review the form and correct any input errors before continuing."
+    end
+
+    def announce_removed
+      flash[:notice] = "#{humanized_model_name} has been deleted."
+    end
+
+    def announce_update_conflict
+      flash.now[: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 format_symbol
+      format.to_sym
+    end
+
+    def format
+      params[:format] || 'html'
+    end
+    
+    # Assist with user agents that cause improper content-negotiation
+    warn "Remove default HTML format, Accept header no longer used. (#{__FILE__}: #{__LINE__})" if Rails.version !~ /^2\.1/
+    def populate_format
+      params[:format] ||= 'html' unless request.xhr?
+    end
+end