radiant 0.9.0.rc2 → 0.9.1

data/CHANGELOG

@@ -1,7 +1,22 @@
 == Change Log
 
-=== Edge
-
+=== Refraction 0.9.1 (June 27, 2010)
+
+* Added missing i18n translations for aggregate tages [Jim Gay]
+* Fixed a bug with status_id PostgreSQL [Jim Gay]
+
+=== Refraction 0.9.0 (June 25, 2010)
+
+* Pull in aggregate tags from the aggregation extension [John Muhl, Sean Cribbs, Jim Gay]
+* Fixed a bug which could cause the preferences submenu to dissapear [Mario Visic, Jim Gay]
+* Fixed a bug PostgreSQL for creating pages with nested attributes [Andrew Cates]
+* Updated to Rails 2.3.8 [Jim Gay]
+* Added admin and Radius tag pagination [William Ross]
+* Added will_paginate dependency [William Ross, Jim Gay]
+* Added <r:gravatar/> radius tag [John Muhl]
+* Exposed important view locals for partials that hook into the admin UI [Mislav Marohnić]
+* Update to cucumber-rails 0.3.0 [Jim Gay]
+* Update to Haml 2.2.24 [Jim Gay]
 * Allow loading extension routes from the extension's config/routes.rb [Jim Gay]
 * Cache admin.js in update task [Janne Asmala]
 * Finally rename User.protected_attributes to unprotected_attributes [Jim Gay]
@@ -22,9 +37,6 @@
 * Prevent admin from removing her own admin privilege [Jim Gay]
 * Move to Rails 2.3.5 [Jim Gay]
 * Simplify admin tab API [Jim Gay, John Long, Sean Cribbs]
-
-=== 0.9.0 RC1 (October 9, 2009)
-
 * Turned on HAML's "ugly" whitespace mode in production [John Muhl]
 * Use HTML 5 doctype. [John Muhl]
 * Miscellaneous HTML standards improvements [John Muhl]
@@ -43,7 +55,7 @@
 * Add some helpful shortcut keys. [Sean Cribbs]
 * Implemented "Blade" user-interface. [John Long, Chris Parrish, Daniel Beach, Brandon Mathis, Sean Cribbs, Ben Morrow, John Muhl]
 
-=== 0.8.2 Lustery
+=== 0.8.2 Lustery (April 27, 2010)
 
 * Allow rake tasks to run if a higher version of Cucumber is installed [Jim Gay]
 

data/CONTRIBUTORS

@@ -3,8 +3,14 @@
 The following people have submitted changes which have been applied to the
 core:
 
-=== Edge
+=== 0.9.1 Refraction
 
+* Jim Gay
+
+=== 0.9.0 Refraction
+
+* Mario Visic
+* Andrew Cates
 * Janne Asmala
 * Keith Bingman
 * Dirk Kelly

data/INSTALL

@@ -33,8 +33,3 @@ install 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://wiki.github.com/radiant/radiant/radiant-users

data/README

@@ -34,6 +34,27 @@ configure and run it the way you would a normal Rails application.
 
 See the INSTALL file for more details.
 
+== Installation of a Prerelease
+
+As Radiant nears newer releases, you can experiment with any prerelease version.
+
+Install the prerelease gem with the following command:
+
+    $ gem install radiant --prerelease
+
+This will install the gem with the prerelease name, for example: ‘radiant-0.9.0.rc2’.
+
+== Upgrading an Existing Project to a newer version
+
+1. Update the Radiant assets from in your project:
+
+    $ rake radiant:update
+
+2. Migrate the database:
+
+    $ rake production db:migrate
+
+3. Restart the web server
 
 == Development Requirements
 

data/app/controllers/admin/layouts_controller.rb

@@ -1,4 +1,5 @@
 class Admin::LayoutsController < Admin::ResourceController
+  paginate_models
   only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy,
     :when => [:designer, :admin],
     :denied_url => { :controller => 'admin/pages', :action => 'index' },

data/app/controllers/admin/preferences_controller.rb

@@ -7,7 +7,8 @@ class Admin::PreferencesController < ApplicationController
   end
 
   def show
-    redirect_to :action => 'edit'
+    set_standard_body_style
+    render :edit
   end
 
   def edit
@@ -20,11 +21,11 @@ class Admin::PreferencesController < ApplicationController
         redirect_to :action => 'show'
       else
         flash[:error] = t('preferences_controller.error_updating')
-        render :action => 'edit'
+        render :edit
       end
     else
       announce_bad_data
-      render :action => 'edit'
+      render :edit
     end
   end
 

data/app/controllers/admin/resource_controller.rb

@@ -7,10 +7,9 @@ class Admin::ResourceController < ApplicationController
   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
-
+  cattr_reader :paginated
+  cattr_accessor :default_per_page, :will_paginate_options
+  
   responses do |r|
     # Equivalent respond_to block for :plural responses:
     # respond_to do |wants|
@@ -24,10 +23,10 @@ class Admin::ResourceController < ApplicationController
     r.singular.default { redirect_to edit_model_path if action_name == "show" }
     
     r.not_found.publish(:xml, :json) { head :not_found }
-    r.not_found.default { announce_not_found; redirect_to continue_url(params) }
+    r.not_found.default { announce_not_found; redirect_to :action => "index" }
 
     r.invalid.publish(:xml, :json) { render format_symbol => model.errors, :status => :unprocessable_entity }
-    r.invalid.default {  announce_validation_errors; render :action => template_name }
+    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 }
@@ -67,6 +66,50 @@ class Admin::ResourceController < ApplicationController
     model.destroy
     response_for :destroy
   end
+  
+  def self.model_class(model_class = nil)
+    @model_class ||= (model_class || self.controller_name).to_s.singularize.camelize.constantize
+  end
+
+  # call paginate_models to declare that will_paginate should be used in the index view
+  # options specified here are accessible in the view by calling will_paginate_options
+  # eg.
+  #
+  # Class MyController < Admin::ResourceController
+  #   paginate_models :per_page => 100
+
+  def self.paginate_models(options={})
+    @@paginated = true
+    @@will_paginate_options = options.slice(:class, :previous_label, :next_label, :inner_window, :outer_window, :separator, :container).merge(:param_name => :p)
+    @@default_per_page = options[:per_page]
+  end
+
+  # returns a hash of options that can be passed to will_paginate
+  # the @pagination_for@ helper method calls @will_paginate_options@ unless other options are supplied.
+  #
+  # pagination_for(@events)
+  
+  def will_paginate_options
+    self.class.will_paginate_options || {}
+  end
+  helper_method :will_paginate_options
+
+  # a convenience method that returns true if paginate_models has been called on this controller class
+  # and can be used to make display decisions in controller and view
+  def paginated?
+    self.class.paginated == true
+  end
+  helper_method :paginated?
+
+  # return a hash of page and per_page that can be used to build a will_paginate collection
+  # the per_page figure can be set in several ways:
+  # request parameter > declared by paginate_models > default set in config entry @admin.pagination.per_page@ > overall default of 50
+  def pagination_parameters
+    {
+      :page => (params[:p] || 1).to_i, 
+      :per_page => (params[:pp] || self.class.default_per_page || Radiant::Config['admin.pagination.per_page'] || 50).to_i
+    }
+  end
 
   protected
 
@@ -110,7 +153,7 @@ class Admin::ResourceController < ApplicationController
       instance_variable_set("@#{plural_model_symbol}", objects)
     end
     def load_models
-      self.models = model_class.paginate(pagination_parameters)
+      self.models = paginated? ? model_class.paginate(pagination_parameters) : model_class.all
     end
 
     def model_name
@@ -134,7 +177,16 @@ class Admin::ResourceController < ApplicationController
     end
 
     def continue_url(options)
-      options[:redirect_to] || (params[:continue] ? {:action => 'edit', :id => model.id} : {:action => "index"})
+      options[:redirect_to] || (params[:continue] ? {:action => 'edit', :id => model.id} : index_page_for_model)
+    end
+    
+    def index_page_for_model
+      parts = {:action => "index"}
+      if paginated? && model && i = model_class.all.index(model)
+        p = (i / pagination_parameters[:per_page].to_i) + 1
+        parts[:p] = p if p && p > 1
+      end
+      parts
     end
 
     def edit_model_path
@@ -176,4 +228,6 @@ class Admin::ResourceController < ApplicationController
     def populate_format
       params[:format] ||= 'html' unless request.xhr?
     end
+    
+    
 end

data/app/controllers/admin/snippets_controller.rb

@@ -1,4 +1,5 @@
 class Admin::SnippetsController < Admin::ResourceController
+  paginate_models
   only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy,
     :when => [:designer, :admin],
     :denied_url => { :controller => 'admin/pages', :action => 'index' },

data/app/controllers/admin/users_controller.rb

@@ -1,4 +1,5 @@
 class Admin::UsersController < Admin::ResourceController
+  paginate_models
   only_allow_access_to :index, :show, :new, :create, :edit, :update, :remove, :destroy,
     :when => :admin,
     :denied_url => { :controller => 'pages', :action => 'index' },

data/app/controllers/application_controller.rb

@@ -11,7 +11,6 @@ class ApplicationController < ActionController::Base
   before_filter :set_current_user
   before_filter :set_timezone
   before_filter :set_user_locale
-  before_filter :set_pagination_parameters
   before_filter :set_javascripts_and_stylesheets
   before_filter :set_standard_body_style, :only => [:new, :edit, :update, :create]
   
@@ -86,20 +85,4 @@ class ApplicationController < ActionController::Base
       @body_classes.concat(%w(reversed))
     end
     
-    def set_pagination_parameters
-      param_name = WillPaginate::ViewHelpers.pagination_options[:param_name]
-      options = pagination_defaults
-      options[:page] = params.delete(param_name) if params[param_name]
-      options[:per_page] = params.delete(:per_page) if params[:per_page]
-      @pagination_parameters = options
-    end
-
-    def pagination_defaults
-      {
-        :page => 1, 
-        :per_page => Radiant::Config['pagination.per_page'] || 20
-      }
-    end
-    
-    
 end

data/app/controllers/site_controller.rb

@@ -1,8 +1,10 @@
 class SiteController < ApplicationController
+  include Radiant::Pagination::Controller
+  
   skip_before_filter :verify_authenticity_token
   no_login_required
   cattr_writer :cache_timeout
-
+  
   def self.cache_timeout
     @@cache_timeout ||= 5.minutes
   end
@@ -29,10 +31,10 @@ class SiteController < ApplicationController
   private
     def batch_page_status_refresh
       @changed_pages = []
-      @pages = Page.find(:all, :conditions => {:status_id => 90})
+      @pages = Page.find(:all, :conditions => {:status_id => Status[:scheduled].id})
       @pages.each do |page|
         if page.published_at <= Time.now
-           page.status_id = 100
+           page.status_id = Status[:published].id
            page.save
            @changed_pages << page.id
         end
@@ -58,7 +60,7 @@ class SiteController < ApplicationController
     def process_page(page)
       page.pagination_parameters = pagination_parameters
       page.process(request, response)
-   end
+    end
 
     def dev?
       if dev_host = @config['dev.host']

data/app/helpers/application_helper.rb

@@ -215,6 +215,25 @@ module ApplicationHelper
     end
   end
   
+  # returns the usual set of pagination links.
+  # options are passed through to will_paginate 
+  # and a 'show all' depagination link is added if relevant.
+  def pagination_for(list, options={})
+    if list.respond_to? :total_pages
+      options = {
+        :max_per_page => config['pagination.max_per_page'] || 500,
+        :depaginate => true
+      }.merge(options.symbolize_keys)
+      depaginate = options.delete(:depaginate)                                     # supply :depaginate => false to omit the 'show all' link
+      depagination_limit = options.delete(:max_per_page)                           # supply :max_per_page => false to include the 'show all' link no matter how large the collection
+      html = will_paginate(list, will_paginate_options.merge(options))
+      if depaginate && list.total_pages > 1 && (!depagination_limit.blank? || list.total_entries <= depagination_limit.to_i)
+        html << content_tag(:div, link_to("show all", :pp => list.total_entries), :class => 'depaginate')
+      end
+      html
+    end
+  end
+  
   private
   
     def append_image_extension(name)

data/app/models/standard_tags.rb

@@ -93,8 +93,9 @@ module StandardTags
     Cycles through each of the children. Inside this tag all page attribute tags
     are mapped to the current child page.
     
-    Supply @paginated="true"@ to display a paginated list. Most will_paginate options
-    can also be specified, including @per_page@, @previous_label@ and @next_label@.
+    Supply @paginated="true"@ to paginate the displayed list. will_paginate view helper
+    options can also be specified, including @per_page@, @previous_label@, @next_label@,
+    @class@, @separator@, @inner_window@ and @outer_window@.
 
     *Usage:*
     
@@ -111,7 +112,7 @@ module StandardTags
   }
   tag 'children:each' do |tag|
     options = children_find_options(tag)
-    paging = pagination_control(tag)
+    paging = pagination_find_options(tag)
     result = []
     tag.locals.previous_headers = {}
     displayed_children = paging ? tag.locals.children.paginate(options.merge(paging)) : tag.locals.children.all(options)
@@ -124,25 +125,25 @@ module StandardTags
     end
     if paging && displayed_children.total_pages > 1
       tag.locals.paginated_list = displayed_children
-      result << tag.render('pagination')
+      result << tag.render('pagination', tag.attr.dup)
     end
     result
   end
 
   desc %{
     The pagination tag is not usually called directly. Supply paginated="true" when you display a list and it will
-    be paginated automatically.
+    be automatically display only the current page of results, with pagination controls at the bottom.
 
     *Usage:*
     
-    <pre><code><r:children:each paginated="true" per_page="50">
+    <pre><code><r:children:each paginated="true" per_page="50" container="false" previous_label="foo" next_label="bar">
       <r:child>...</r:child>
     </r:children:each>
     </code></pre>
   }
   tag 'pagination' do |tag|
-    if tag.locals.paginated_list.respond_to? :next_page
-      will_paginate(tag.locals.paginated_list, :renderer => Radiant::Pagination::LinkRenderer.new(tag))
+    if tag.locals.paginated_list
+      will_paginate(tag.locals.paginated_list, will_paginate_options(tag))
     end
   end
 
@@ -342,6 +343,149 @@ module StandardTags
     children = tag.locals.page.children.count(:conditions => children_find_options(tag)[:conditions])
     tag.expand unless children > 0
   end
+  
+    desc %{
+    Aggregates the children of multiple URLs using the @urls@ attribute.
+    Useful for combining many different sections/categories into a single
+    feed or listing.
+    
+    *Usage*:
+    
+    <pre><code><r:aggregate urls="/section1; /section2; /section3"> ... </r:aggregate></code></pre>
+  }
+  tag "aggregate" do |tag|
+    raise "`urls' attribute required" unless tag.attr["urls"]
+    urls = tag.attr["urls"].split(";").map(&:strip).reject(&:blank?).map { |u| clean_url u }
+    parent_ids = urls.map {|u| Page.find_by_url(u) }.map(&:id)
+    tag.locals.parent_ids = parent_ids
+    tag.expand
+  end
+  
+  desc %{
+    Sets the scope to the individual aggregated page allowing you to
+    iterate through each of the listed urls.
+    
+    *Usage*:
+    
+    <pre><code><r:aggregate:each urls="/section1; /section2; /section3"> ... </r:aggregate:each></code></pre>
+  }
+  tag "aggregate:each" do |tag|
+    aggregates = []
+    tag.locals.aggregated_pages = tag.locals.parent_ids.map {|p| Page.find(p)}
+    tag.locals.aggregated_pages.each do |aggregate_page|
+      tag.locals.page = aggregate_page
+      aggregates << tag.expand
+    end
+    aggregates
+  end
+  
+  tag "aggregate:each:children" do |tag|
+    tag.locals.children = tag.locals.page.children
+    tag.expand
+  end
+  
+  tag "aggregate:each:children:each" do |tag|
+    options = children_find_options(tag)
+    result = []
+    children = tag.locals.children
+    tag.locals.previous_headers = {}
+    children.find(:all, options).each do |item|
+      tag.locals.child = item
+      tag.locals.page = item
+      result << tag.expand
+    end
+    result
+  end
+  
+  tag "aggregate:children" do |tag|
+    tag.expand
+  end
+  
+  desc %{
+    Renders the total count of children of the aggregated pages.  Accepts the
+    same options as @<r:children:each />@.
+
+    *Usage*:
+    
+    <pre><code><r:aggregate urls="/section1; /section2; /section3">
+      <r:children:count />
+    </r:aggregate></code></pre>
+  }  
+  tag "aggregate:children:count" do |tag|
+    options = aggregate_children(tag)
+    if ActiveRecord::Base.connection.adapter_name.downcase == 'postgresql'
+      options[:group] = Page.columns.map {|c| c.name}.join(', ')
+      Page.find(:all, options).size
+    else
+      Page.count(options)
+    end
+  end
+  desc %{
+    Renders the contained block for each child of the aggregated pages.  Accepts the
+    same options as the plain @<r:children:each />@.
+
+    *Usage*:
+    
+    <pre><code><r:aggregate urls="/section1; /section2; /section3">
+      <r:children:each>
+        ...
+      </r:children:each>
+    </r:aggregate></code></pre>
+  }
+  tag "aggregate:children:each" do |tag|
+    options = aggregate_children(tag)
+    children = Page.find(:all, options)
+    tag.locals.previous_headers = {}
+    returning String.new do |output|
+      children.each do |child|
+        tag.locals.page = child
+        tag.locals.child = child
+        output << tag.expand
+      end
+    end
+  end
+  
+  desc %{
+    Renders the first child of the aggregated pages.  Accepts the
+    same options as @<r:children:each />@.
+
+    *Usage*:
+    
+    <pre><code><r:aggregate urls="/section1; /section2; /section3">
+      <r:children:first>
+        ...
+      </r:children:first>
+    </r:aggregate></code></pre>
+  }
+  tag "aggregate:children:first" do |tag|
+    options = aggregate_children(tag)
+    children = Page.find(:all, options)
+    if first = children.first
+      tag.locals.page = first
+      tag.expand
+    end
+  end
+  
+  desc %{
+    Renders the last child of the aggregated pages.  Accepts the
+    same options as @<r:children:each />@.
+
+    *Usage*:
+    
+    <pre><code><r:aggregate urls="/section1; /section2; /section3">
+      <r:children:last>
+        ...
+      </r:children:last>
+    </r:aggregate></code></pre>
+  }
+  tag "aggregate:children:last" do |tag|
+    options = aggregate_children(tag)
+    children = Page.find(:all, options)
+    if last = children.last
+      tag.locals.page = last
+      tag.expand
+    end
+  end
 
   desc %{
     Renders one of the passed values based on a global cycle counter.  Use the @reset@
@@ -572,6 +716,36 @@ module StandardTags
     end
   end
 
+  desc %{
+    Renders the Gravatar of the author of the current page or the named user.
+
+    *Usage:*
+
+    <pre><code><r:gravatar /></code></pre>
+
+    or
+
+    <pre><code><r:gravatar [name="User Name"]
+        [rating="G | PG | R | X"]
+        [size="32px"] /></code></pre>
+  }
+  tag 'gravatar' do |tag|
+    page = tag.locals.page
+    name = (tag.attr['name'] || page.created_by.name)
+    rating = (tag.attr['rating'] || 'G')
+    size = (tag.attr['size'] || '32px')
+    email = User.find_by_name(name).email
+    if email != ''
+      url = 'http://www.gravatar.com/avatar.php?'
+      url << "gravatar_id=#{Digest::MD5.new.update(email)}"
+      url << "&rating=#{rating}"
+      url << "&size=#{size.to_i}"
+      url
+    else
+      "#{request.protocol}#{request.host_with_port}/images/admin/avatar_#{([size.to_i] * 2).join('x')}.png"
+    end
+  end
+
   desc %{
     Renders the date based on the current page (by default when it was published or created).
     The format attribute uses the same formating codes used by the Ruby @strftime@ function. By
@@ -1006,16 +1180,6 @@ module StandardTags
   end
 
   private
-
-    def pagination_control(tag)
-      attr = tag.attr.symbolize_keys
-      if attr[:paginated] == 'true'
-        pagination_parameters.merge(attr.slice(:previous_label, :next_label, :inner_window, :outer_window, :separator, :per_page))  # tag attributes can't be overridden by input parameters
-      else
-        false
-      end
-    end
-
     def children_find_options(tag)
       attr = tag.attr.symbolize_keys
 
@@ -1059,6 +1223,34 @@ module StandardTags
       end
       options
     end
+      
+    def aggregate_children(tag)
+      options = children_find_options(tag)
+      parent_ids = tag.locals.parent_ids
+    
+      conditions = options[:conditions]
+      conditions.first << " AND parent_id IN (?)"
+      conditions << parent_ids
+      options
+    end
+    
+    def pagination_find_options(tag)
+      attr = tag.attr.symbolize_keys
+      if attr[:paginated] == 'true'
+        pagination_parameters.merge(attr.slice(:per_page))
+      else
+        false
+      end
+    end
+    
+    def will_paginate_options(tag)
+      attr = tag.attr.symbolize_keys
+      if attr[:paginated] == 'true'
+        attr.slice(:class, :previous_label, :next_label, :inner_window, :outer_window, :separator, :per_page).merge({:renderer => Radiant::Pagination::LinkRenderer.new(tag.globals.page.url)})
+      else
+        {}
+      end
+    end
 
     def remove_trailing_slash(string)
       (string =~ %r{^(.*?)/$}) ? $1 : string
@@ -1110,10 +1302,12 @@ module StandardTags
     end
 
     def dev?(request)
+      return false if request.nil?
       if dev_host = Radiant::Config['dev.host']
         dev_host == request.host
       else
         request.host =~ /^dev\./
       end
     end
+    
 end